thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-03-15 23:52:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
9810 commits 2 branches 14 tags 206 MiB
Commit graph

9810 commits

This branch
This branch
All branches
Author SHA1 Message Date
lachwright
741b2a4fad Merge branch 'master' into knuxstuff 
Update to master (necessary for climbing changes)
 2019-09-30 09:56:04 +08:00
Jaime Passos
2740711092 png fix yes so cool 2019-09-29 19:10:49 -03:00
Jaime Passos
41ff5ef79c sprite2info soc yummy yummy yes 2019-09-29 19:03:10 -03:00
MascaraSnake
4c0628b6bb Fixed a bug with the ring lava melting 2019-09-29 23:22:38 +02:00
MascaraSnake
83b32eacbe Lava now melts rings! 2019-09-29 23:11:21 +02:00
MascaraSnake
c1d06a1b49 Pterabytes can now swoop you off a rollout rock 2019-09-29 22:13:10 +02:00
lachwright
41cc52ce25 Resolve merge conflicts 2019-09-30 03:07:03 +08:00
lachwright
4a47b66990 (Hopefully) cover all cases for resetting rock usability 2019-09-30 03:05:08 +08:00
Jaime Passos
c373570584 better soc 2019-09-29 15:53:04 -03:00
MascaraSnake
4c6a4b76cc Pterabyte: Don't drop off player in the first ten tics after grabbing 2019-09-29 19:51:27 +02:00
MascaraSnake
b169ff93d4 Pterabyte: Don't target players who are invincible after being hurt 2019-09-29 19:29:34 +02:00
Jaime Passos
61f29c9dd6 Giant mistake 2019-09-29 14:12:53 -03:00
MascaraSnake
ca9fdd4f0e Merge branch 'rvz-hardcode' of git.magicalgirl.moe:STJr/SRB2Internal into rvz-hardcode 
# Conflicts:
#	src/d_player.h
#	src/dehacked.c
#	src/p_map.c
#	src/p_user.c
 2019-09-29 18:49:53 +02:00
MascaraSnake
309d26069f Implemented the Pterabyte grabbing mechanic 2019-09-29 18:42:17 +02:00
Jaime Passos
e07c7aae2c I want to be able to stack skins in a sprite2 block 2019-09-29 12:41:15 -03:00
Jaime Passos
12fd1849bd change comment and error message 2019-09-29 12:16:38 -03:00
Jaime Passos
dfe05a650c hehee 2019-09-29 12:13:51 -03:00
lachwright
7cf2328e62 Remove unused locals 2019-09-29 21:29:37 +08:00
lachwright
949ef287b7 Resolve merge conflicts 2019-09-29 20:29:49 +08:00
lachwright
f67ef441b3 Hardcode pumice ball 
Current known issues: players detached from the ball via any means other than jumping or pain do not have their ball reset properly
 2019-09-29 20:18:40 +08:00
MascaraSnake
017d29ff76 Don't make the Pterabyte radius adjustable (doesn't work correctly right now) 2019-09-29 11:58:33 +02:00
MascaraSnake
c4f1085f02 Hardcoded the Pterabyte (without the grabbing mechanic) 2019-09-29 10:39:09 +02:00
sphere
a225970360 Use zones.pk3 instead of zones.dta. 2019-09-29 05:31:50 +02:00
Jaime Passos
c02c7fb28b JIMITA DO THE SOC 2019-09-28 19:13:51 -03:00
Jaime Passos
5c8b7a142b JIMITA DO TH EROTSPRITE 2019-09-28 17:56:27 -03:00
Monster Iestyn
d3c4a9a92b whoops, didn't mean to include this 2019-09-28 20:45:44 +01:00
Jaime Passos
2e493a3d4d quick maths 2019-09-28 13:40:40 -03:00
Jaime Passos
b7748aa594 memory management 2019-09-28 12:50:07 -03:00
Jaime Passos
e2ce3988fb Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-09-28 12:14:55 -03:00
Steel Titanium
65bc2ef0d6 Fix crash if speed is too high 
Also update libopenmpt
 2019-09-27 23:53:19 -04:00
Jaime Passos
e95bd8add3 Merge remote-tracking branch 'origin/master' into renderswitch 2019-09-27 22:53:57 -03:00
Jaime Passos
fa9cef1cc0 Merge remote-tracking branch 'origin/master' into openglskydome2 2019-09-27 22:47:10 -03:00
Monster Iestyn
0e7df5ee87 Added < 0 checks to all three variables added in last commit 
(no point checking >= MAXPLAYERS tbh, there's no reason the game would even set those values that I can think of offhand)
 2019-09-27 23:15:38 +01:00
Monster Iestyn
939cfe8271 Added consoleplayer, displayplayer and secondarydisplayplayer, by popular request 2019-09-27 21:16:11 +01:00
toaster
bc9f9d740a Merge branch 'addons-menu-cleanup' into 'master' 
Addons menu cleanup

See merge request STJr/SRB2Internal!316
 2019-09-27 08:55:36 -04:00
toaster
74efc0e1f4 Merge branch 'bossprovements' into 'master' 
ACZ3 intro

Closes #217

See merge request STJr/SRB2Internal!346
 2019-09-27 08:55:19 -04:00
toaster
95f848d0ee Merge branch 'dsz3shockwave' into 'master' 
Deep Sea Zone 3 hardcoding

Closes #185

See merge request STJr/SRB2Internal!349
 2019-09-27 08:54:57 -04:00
toaster
7f33a402a4 Merge branch 'automap-fixes' into 'master' 
Automap fixes

See merge request STJr/SRB2Internal!348
 2019-09-27 08:52:59 -04:00
toaster
bd2b7ccc84 Merge branch 'patch-fixes' into 'master' 
Patch fixes (Resolves #230)

Closes #230

See merge request STJr/SRB2Internal!347
 2019-09-27 08:52:41 -04:00
toaster
7eb3aeb33b Merge branch 'lachfixes' into 'master' 
Several bug fixes!

Closes #210, #192, and #189

See merge request STJr/SRB2Internal!345
 2019-09-27 08:52:23 -04:00
toaster
9fa8c7a4c2 Merge branch '231-tails-ai-should-die-when-taking-damage-in-ultimate' into 'master' 
Resolve "Tails AI should die when taking damage in Ultimate"

Closes #231

See merge request STJr/SRB2Internal!344
 2019-09-27 08:51:11 -04:00
toaster
7d51ecf5ba Merge branch 'inputstuff' into 'master' 
Trigonometric input capping

See merge request STJr/SRB2Internal!343
 2019-09-27 08:50:55 -04:00
toaster
c1dea190a8 Merge branch 'internal-hotplug-stableid' into 'master' 
Controller hotplug support.

See merge request STJr/SRB2Internal!342
 2019-09-27 08:50:34 -04:00
sphere
88ad1937d6 Fix compiling errors, thanks to toaster. 2019-09-26 23:15:52 +02:00
lachwright
7563e7be6f P_SetTarget fixes, added SPR_SHCK to hw_light.c 2019-09-27 02:13:02 +08:00
toaster
85f50ef54b * Add vwre vwre intro for Fang Clone Fighter battle. (Still skipped with presence of MTF_AMBUSH) 
* https://cdn.discordapp.com/attachments/428262628893261828/626792815451701259/srb20006.gif
* Add fadeout instead of slapstick for Fang Clone Fighter death.
* Allow placed Fang and Metal Sonic objects to be marked as Clone Fighters always through presence of MTF_EXTRA.
 2019-09-26 17:06:29 +01:00
lachwright
5b92f15e44 Added A_Boss3ShockThink to dehacked.c 2019-09-26 18:57:25 +08:00
lachwright
f9cf4746b2 Lowered shockwave speed 2019-09-26 17:12:03 +08:00
lachwright
4d31ebf47a Hardcoded DSZ3 shockwave 2019-09-26 05:27:51 +08:00
Monster Iestyn
59109b6ef4 Write a new hack for getting sector->linecount from sector->lines in Lua, to put my mind at rest about it at last. 
1) In sector_get, actually push the memory address of the lines array within sector_t, rather than push the value of "lines" itself (essentially, we we want a pointer to a double pointer, or rather a TRIPLE pointer haha)
2) In the sectorlines_* functions, use offsetof to shift the memory address so we can obtain the value of linecount within the sector_t struct, and dereference the result to obtain the value of linecount itself
3) ??? profit

Untested and uncompiled atm, but I have some confidence this might work
 2019-09-25 20:27:41 +01:00