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
23584 commits 1 branch 12 tags 205 MiB
Commit graph

927 commits

Author SHA1 Message Date
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
toaster
f43044d77b When you have the skin to set to in A_SignPlayer be "next skin", it's possible the initial skin to pick is a not-available character. This commit prevents that. 2019-11-13 16:51:50 +00:00
toaster
28a573fac3 Paper sign tweaks. 
* Add "twinkling" and "landing sounds to paper signpost.
* Fix whitespace on definitions.
* It says locvar2 is unused in the comment for A_SignSpin, but it's used for the "doesn't have a spawnpoint" thing. Make it deathstate instead, so the object doesn't disappear.
 2019-11-13 16:33:53 +00:00
Jaime Passos
24d20d2abb Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-11-12 21:38:02 -03:00
MascaraSnake
00b8fc42b0 Merge branch 'a_skullattack-hang' into 'master' 
GFZ3's boss hangs when dodging

See merge request STJr/SRB2Internal!403
 2019-11-12 18:25:58 -05:00
toaster
f7c5774b7e Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into metalrecording 
# Conflicts:
#	src/p_user.c
 2019-11-12 21:56:46 +00:00
MascaraSnake
8f89ad3b72 Merge branch 'jingle-fixes' into 'master' 
Fix some jingle resuming behavior when also changing base level music

See merge request STJr/SRB2Internal!415
 2019-11-12 15:41:53 -05:00
Jaime Passos
b078b8791a Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-11-11 14:41:55 -03:00
MascaraSnake
79b6f4247d Merge branch 'spinny-sign' into 'master' 
Papersprite end signpost

See merge request STJr/SRB2Internal!442
 2019-11-11 11:39:56 -05:00
toaster
083f72eb31 Signed/unsigned comparison error 2019-11-09 16:43:44 +00:00
TehRealSalt
88cb623c2a 3D signpost 2019-11-08 23:25:46 -05:00
lachwright
2f4528663c Add signpost camera (and fix a typo whoops) 2019-11-09 00:47:51 +08:00
toaster
2663c79d21 STOP THE CLOCK linedef exectutor! 
* When activated, stops the timer in SP/MP.
* Applies to the mapheader countdowntimer as well.
* If you're playing Record Attack, also exits the level immediately.
* It has no special modes, no linedef flags, no parameters, nothing.
* Only not an innate property of A_BossDeath because people may want it to NOT happen sometimes, or make it happen with non-boss events too.

Also, skip over calling P_DoPlayerExit if the player isn't in game.
 2019-11-08 15:47:12 +00:00
lachwright
ea02042bae Add support for custom sign color with var2 (shortcut for requests I sometimes got from character spriters in 2.1, e.g. neon green Pointy Sonic using a purple sign) 2019-11-08 20:09:12 +08:00
James R
e8de2c39c6 Better account for the uninitialised signcolor 2019-11-07 14:44:42 -08:00
James R
85e3b3999b var2 unused, so remove it; signcolor can be unset 2019-11-07 13:05:50 -08:00
James R
a2ca74b688 Declarations after Lua calls 2019-11-07 13:02:33 -08:00
lachwright
47508ea7f8 Reduce RVZ particle spawns when no players are in proximity 2019-11-07 16:00:44 +08:00
lachwright
6143e7a994 Display Eggman more frequently during skin roulette 2019-11-05 01:33:09 +08:00
lachwright
eb47aa9cf9 Improve A_SignSpin 2019-11-04 23:10:13 +08:00
lachwright
f828e040bb New end-of-level signpost logic 2019-11-04 16:28:44 +08:00
toaster
297f1ad9a6 Metal Sonic battle improvements. 
* Tweaked to use new sprites.
* Jet fume behaves much closer to Lach's wonderful work.
* Instead of clobbering tracer to spawn powerup overlay, use hprev.
* Change timings. One second less to charge up, but two seconds less to spin them out.
* Remove terrible pinch overlay in favour of new dashmode-mimic flashing.
 2019-10-29 23:11:12 +00:00
TehRealSalt
607d177512 Fix copypaste typo 2019-10-28 16:28:56 -04:00
TehRealSalt
8704d684fc Revert "Break SPBChase into a few more functions" 
This reverts commit 41f69b3c16.
 2019-10-28 16:27:52 -04:00
TehRealSalt
41f69b3c16 Break SPBChase into a few more functions 
Not really easy to read still, but it's a tiny bit better than before
 2019-10-28 16:25:38 -04:00
Jaime Passos
116fb2639e Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-10-28 14:29:10 -03:00
mazmazz
a23cc44d93 Fix some jingle resuming behavior with boss music switching 2019-10-26 15:02:45 -04:00
Latapostrophe
58bed7d923 New item list + shrink destroys items 2019-10-26 17:08:22 +02:00
Latapostrophe
55c2fe31be SPB on floor 2019-10-26 13:27:43 +02:00
toaster
0842d1f328 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into object_tweaks 
# Conflicts:
#	extras/conf/SRB2-22.cfg
 2019-10-25 20:32:15 +01:00
Latapostrophe
d39d40360d Merge branch 'sal-waypoints' of git.magicalgirl.moe:KartKrew/Kart into spb-waypoints 2019-10-24 23:35:16 +02:00
Latapostrophe
6fbaa72e82 Lower SPB speed, add SPB on minimap, add slight targetting on SPB against non-1st 2019-10-24 23:35:05 +02:00
TehRealSalt
b69d105af3 Add respawn animation 
This commit also fixes MF_NOCLIP not working properly on players. Sink now spawns an SPB explosion on successful hit, since dying is no longer a harsh punishment.
 2019-10-24 16:35:39 -04:00
Latapostrophe
08ae2c926e Accidentally removed a bit of code I shouldn't have removed 2019-10-24 21:00:58 +02:00
Latapostrophe
ae72a365f3 Fix SPB pathing 2019-10-24 20:50:27 +02:00
TehRealSalt
674c0aec17 Merge branch 'master' into new-items 2019-10-24 10:08:37 -04:00
James R
7f1a276a6c Clang warnings 2019-10-22 19:18:56 -07:00