thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
9704 commits 1 branch 12 tags 205 MiB
Commit graph

466 commits

Author SHA1 Message Date
Louis-Antoine
4e7605f0e2 Make SRB2 flat like Earth 2020-03-20 18:55:29 +01:00
Louis-Antoine
46df2b9551 Use HAVE_BLUA as fuel for my fireplace 2020-03-19 18:36:14 +01:00
Monster Iestyn
f186def0bf Include r_skins.h instead of r_things.h in many files where all they wanted from it was skins stuff 
(oddly enough, this actually revealed some secret file dependencies previously included via r_things.h! I also needed to include d_player.h in r_skins.h itself it seems)
 2020-03-09 13:54:56 +00:00
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
lachwright
390511a531 Cast to statenum_t for 32-bit compatibility 2020-02-11 20:36:48 +08:00
lachwright
2544681658 Add proper support for animated signpost 2020-02-11 15:53:25 +08:00
Louis-Antoine
a997683d1c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into keep-body 
# Conflicts:
#	src/g_game.c
#	src/p_setup.c
 2020-01-22 03:57:22 +01:00
Louis-Antoine
08589dcd96 Give flashing tics to disconnected players and prevent drowning 2020-01-22 03:14:44 +01:00
James R
e831a61df5 Merge branch 'clear-sign-sprite' into 'next' 
Add generic signpost sprite for skins that don't have one

See merge request STJr/SRB2!626
 2020-01-16 19:57:54 -05:00
toaster
4f77e1e99b Allow Rollout Rocks that are being ridden to: 
* Break bustable FOFs like pushables.
* Activate pushable-counting executor activators.
* Get pushed by currents/wind.

This takes advantage of the previously-existing hack relating to objects with MF_PUSHABLE infotable (but not active) flags and a nonzero fuse, which is used as the condition to group this under (rather than MT_ROLLOUTROCK specific fuckery).

Thanks to the bug report submitted by our kirbs pal for getting me off my ass this evening.
 2020-01-08 22:36:29 +00:00
lachwright
12e43a2e9b Randomize skin during signpost roulette 2020-01-04 14:49:44 +08:00
lachwright
95ca48ada7 Add generic signpost sprite for skins that don't have one 2020-01-03 13:12:18 +08:00
James R
529ccf9271 Merge branch 'saloondoor-fix' into 'next' 
Fix saloon doors not letting players through when marked with the Ambush flag

See merge request STJr/SRB2!600
 2019-12-30 00:25:37 -05:00
Tatsuru
d01fb277dc Fix saloon doors not letting players through when marked with the Ambush flag 2019-12-30 01:16:50 -03:00
lachwright
65c5f7f571 Remove MF_NOTHINK from join-breaking referenced objects 2019-12-29 03:01:09 +08:00
Jaime Passos
070adb4191 Merge remote-tracking branch 'origin/next' into rotsprite2 2019-12-26 20:27:29 -03:00
Jaime Passos
8405dc4c07 Merge remote-tracking branch 'origin/next' into gametype-clownery 2019-12-23 23:08:16 -03:00
Jaime Passos
ad317cd8a2 Merge remote-tracking branch 'origin/next' into gametype-clownery 2019-12-19 02:15:45 -03:00
lachwright
4be3a0706c Fix pflags not being properly reset when entering dust devil from top 2019-12-19 12:03:36 +08:00
Jaime Passos
789e881abc GTR_TEAMFLAGS 2019-12-18 11:43:50 -03:00
Jaime Passos
be227cc58c un-ROTSPRITE rollangle and spriteinfo 2019-12-17 13:09:25 -03:00
Steel Titanium
6797e328bb Fix crash on mapload when removing Dragonbomber with Lua 2019-12-16 21:25:41 -05:00
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05:00
Alam Ed Arias
b869d29580 Fixup compiling errors 2019-12-02 12:12:26 -05:00
MascaraSnake
16703a6752 Merge branch 'metalfix' into 'master' 
Boss Scream fix

See merge request STJr/SRB2Internal!581
 2019-12-01 02:26:24 -05:00
toaster
4f38017598 Wait, no, I'm an idiot. 2019-11-30 14:56:43 +00:00
MascaraSnake
cebd7df2fc Merge branch 'jumphood' into 'master' 
Jumphood

See merge request STJr/SRB2Internal!573
 2019-11-30 06:53:15 -05:00
toaster
d6ed463227 Make the fling always occur, and only have the horizontal momentum apply if not MTF_EXTRA. 2019-11-30 10:31:18 +00:00
toaster
e3c8f7bcd3 This Black Eggman? ***YEET*** 
Resolve issue #399 in the silliest way possible: by having Brak be yeeted off the platform by an explosion at his feet, preventing the downed mech from being anywhere near the escape pod.
 2019-11-29 21:55:25 +00:00
toaster
0f21a18159 Give the Robo-Hood a cute jump sound whenever it's fleeing you. 2019-11-29 19:18:05 +00:00
toaster
b177507be2 Resolve #374. 2019-11-26 17:06:30 +00:00
MascaraSnake
b52c71b6e2 Merge branch 'minusflip' into 'master' 
Have Minus rotate in mid-air

Closes #326

See merge request STJr/SRB2Internal!532
 2019-11-25 16:43:49 -05:00
lachwright
4a23d46bce Have Minus spawn debris upon landing, as suggested 2019-11-24 23:42:27 +08:00
MascaraSnake
1b1b4e6c4e Fixed crash when BASH's target disappears during chasing 2019-11-24 10:22:00 +01:00
lachwright
553e80332e Add bump sounds to rollout rock & add Newton's third law to jumping off them 2019-11-20 23:45:34 +08:00
James R
5793ba8220 locvars not needed 2019-11-18 15:48:29 -08:00
MascaraSnake
66cc8046a5 Merge branch 'dragonbomber' into 'master' 
Dragonbomber

See merge request STJr/SRB2Internal!489
 2019-11-18 17:10:30 -05:00
MascaraSnake
2df5fd3b30 Merge branch 'poledance' into 'master' 
Make ACZ3's slapstick signpost taller (resolves #267).

Closes #267

See merge request STJr/SRB2Internal!473
 2019-11-18 15:14:48 -05:00
lachwright
2bbd25d207 Important fixes & mine lob speed reduction 2019-11-18 22:57:26 +08:00
lachwright
814ee200fa Add Dragonbomber enemy 2019-11-18 05:23:59 +08:00
toaster
9c221d2362 Make ACZ3's slapstick signpost taller (resolves #267). 2019-11-15 14:52:34 +00:00
toaster
1d4b4e70dd Resolve #288. 
* Fix off-by-one error I caused in the skin randomisation selection.
* Clean up signcolour set to never go outside of valid entry range.
* Fix the preventing-console-spam mechanism for invalid sprites viewed in-game by only setting the state's sprite/frame to S_UNKNOWN's if the object's sprite/frame is currenly equal to the state's.
 2019-11-15 12:47:21 +00:00
MascaraSnake
397520e090 Merge branch 'papersign2' into 'master' 
Paper sign tweaks

See merge request STJr/SRB2Internal!460
 2019-11-14 18:07:34 -05:00
MascaraSnake
43938ef56d Merge branch 'flickies_not_in_walls' into 'master' 
Flickies not in walls

See merge request STJr/SRB2Internal!461
 2019-11-14 18:07:19 -05:00
Jaime Passos
499c724f9f Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-11-14 12:49:03 -03:00
toaster
b0505e268e * Add a "moveforward" param to P_InternalFlickySpawn, which controls whether to spawn the flicky a little in front or behind of the object making it. 
* Expose this via additional upper-16-bits flags of A_FlickySpawn.
* Use this to make Snailers not spawn their flicky inside the wall they're attached to.
* Make the behaviour of Egg Capsules more consistent mechanically regarding the flicky spawning, using the above as one relevant element.
 2019-11-13 20:14:08 +00:00
MascaraSnake
aeedb86d8c Merge branch 'stopclock' into 'master' 
Stop the clock!

See merge request STJr/SRB2Internal!450
 2019-11-13 14:39:59 -05:00
toaster
02530840e9 Ok, I'm really paying for my hubris. Corrected a faulty optimisation in my fix. 2019-11-13 17:06:54 +00:00
toaster
df87eb664c I should be more careful when commiting, lmao. (Just a little bit of tying off loose ends for peace of mind.) 2019-11-13 16:59:29 +00:00
toaster
d185eee68f Typo (my fault). 2019-11-13 16:54:51 +00:00