Commit graph

410 commits

Author SHA1 Message Date
toaster fc8392dac4 Typo (my fault). 2019-11-13 16:54:51 +00:00
toaster b4da50b7fb 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 471ae8ecb4 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
MascaraSnake c87297e3df 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 5729ba3cd2 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 17013bf1b7 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
MascaraSnake 049e599f2e Merge branch 'spinny-sign' into 'master'
Papersprite end signpost

See merge request STJr/SRB2Internal!442
2019-11-11 11:39:56 -05:00
toaster 26e534304d Signed/unsigned comparison error 2019-11-09 16:43:44 +00:00
lachwright 3734eab7b6 Add signpost camera (and fix a typo whoops) 2019-11-09 00:47:51 +08:00
lachwright 8203c6ae90 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 9f24ef25bf Better account for the uninitialised signcolor 2019-11-07 14:44:42 -08:00
James R fff38da832 var2 unused, so remove it; signcolor can be unset 2019-11-07 13:05:50 -08:00
James R be7dcccb71 Declarations after Lua calls 2019-11-07 13:02:33 -08:00
lachwright c43551384d Reduce RVZ particle spawns when no players are in proximity 2019-11-07 16:00:44 +08:00
lachwright cf39e181bb Display Eggman more frequently during skin roulette 2019-11-05 01:33:09 +08:00
lachwright eb6d3b3dbe Improve A_SignSpin 2019-11-04 23:10:13 +08:00
lachwright 5e03d40b33 New end-of-level signpost logic 2019-11-04 16:28:44 +08:00
toaster 4d55a9f4a9 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
mazmazz 91eb380412 Fix some jingle resuming behavior with boss music switching 2019-10-26 15:02:45 -04:00
toaster f2596ab0bb 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
James R d62674c184 Clang warnings 2019-10-22 19:18:56 -07:00
James R ea0a0f4f3c Comment for insanity 2019-10-21 14:28:22 -07:00
James R e2f2166d24 Fix hang due to comparison not working on at least GCC 9.1
I have no idea what the fuck is going on here. k infinitely ascends. (Even
above integer restrictions when I made it UINT8.) I can only imagine some kind
of fuckery in the stack. Surely this is a compiler error.
2019-10-21 14:20:29 -07:00
toaster 7e04cbbc16 Fix mixed declaration and code error in A_RolloutRock (object_tweaks division 2) 2019-10-19 16:01:04 +01:00
toaster ad09f2603d * New object types!
* Red and yellow Boost panels!
        * Added because SUBARASHII and KIMOKAWAIII had several levels using them, and I wanted to make them look better.
        * https://cdn.discordapp.com/attachments/359091121789468672/634486669202161674/srb20015.gif
        * Uses the mapthingnums of Glaber's SOC resource boosters, but absolutely nothing else - not even the magnitudes.
        * Apply MF_AMBUSH to force the player into a spin - even if they don't have a spin ability!
    * Banpyura!
        * A Crushstacean with a spring instead of a crushclaw.
        * https://cdn.discordapp.com/attachments/428262628893261828/634432099306176512/srb20019.gif
        * Wanted this for a while, finally added it.
* Improved springs.
    * Add pw_noautobrake to disable autobrake for half a second when touching yellow horizontal springs, and a second when touching red ones, even on the ground.
    * Add pw_justsprung to disable directionchar for a few tics while touching any springs with a horizontal component to their velocity.
    * Add the diagonal spring flag options Red and Yellow Diagonal Springs have to the Blue Diagonal Spring as well.
    * Started but decided against a tip of the hat to the CD spring spin, hidden behind #define SPRINGSPIN.
* Make directionchar "lag behind" a little bit in waterslides.
* Improved flame jets.
    * They now use new sprites for having their flames move upwards and sideways, instead of having them always face downwards like in 2.1!
* Fixed a mixed declaration and code error in A_RolloutRock. (Sorry Lach!)
* Make the Amy Cameo only spawn in SP, Record Attack, or Co-op unless it's the Clone Mode.
* Improved ZB config.
    * Add above new types.
    * Add Blue Diagonal Spring, which existed in the source but not the config.
    * Re-order enemies in ZB config by zone (but keep them in the Enemies section only).
2019-10-18 18:33:45 +01:00
toaster 46268214fc Fix reverse gravity cacti (and all other A_ConnectToGround stuffs). 2019-10-13 17:48:40 +01:00
sphere 636760760f Fix for A_ConnectToGround on gravflipped objects, courtesy of toaster. 2019-10-13 14:41:17 +02:00
lachwright 3600e1b140 Allow rollout rock's splash sound delay reduction to occur above water 2019-10-12 04:41:50 +08:00
lachwright a01373741b Don't spam splash sounds on the rollout rock 2019-10-12 04:35:51 +08:00
toaster 1560453797 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into rvz-hardcode
# Conflicts:
#	src/p_map.c
2019-10-10 17:51:29 +01:00
lachwright d553b6a011 Add sounds to rollout rock in lava 2019-10-09 15:06:50 +08:00
lachwright 82fcdf4d43 Make MT_PUMA not hurt players' ears when placed in groups or loading the map (new functionality for A_PlaySound) 2019-10-09 14:24:27 +08:00
toaster 1155a7c3a0 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into rvz-hardcode
# Conflicts:
#	src/p_mobj.c
2019-10-08 19:43:43 +01:00
lachwright 3412eb655a Colorize non-buoyant rollout rocks (MF2_AMBUSH distinguishability) 2019-10-07 22:51:13 +08:00
lachwright 77dd5260ab Allow rock to disappear if unridden for 12 seconds 2019-10-07 22:22:51 +08:00
lachwright c64997bfe5 Add Ambush and Flip flag behaviors 2019-10-07 20:55:58 +08:00
lachwright 95f6e2008f Better rollout behavior in lava 2019-10-07 15:25:32 +08:00
toaster a2f8b84b5a Good catch by MS. 2019-10-06 16:17:11 +01:00
toaster d19aebb01a * Fix Minus being intangible after launch.
* Implement MS's temp bodge-fix for the TNT getting stuck on the player.
2019-10-06 16:15:13 +01:00
toaster df172ee33f Fix Minus being intangible after it pops up. 2019-10-06 16:09:33 +01:00
toaster 8b1a20f415 Fix Minus causing crashes if it picks up a Snapper. 2019-10-06 16:04:19 +01:00
toaster 5bbc31c18f Merge branch 'acz-fixes' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into acz_touchups
# Conflicts:
#	src/p_enemy.c
2019-10-06 15:18:59 +01:00
toaster 79b95a53ed Fix Snapper's head snapping to higher planes, and add gravflip support. 2019-10-06 15:04:04 +01:00
MascaraSnake 357baeaa60 Added gravflip support to lavafall, Pyre Fly and Pterabyte 2019-10-05 22:20:48 +02:00
toaster 0235d9e7ec Fix Saloon doors.
* Make the center be the object stuff collides with, so that if the door is open people can't slip through.
* Add an MF_AMBUSH enhancement to allow non-minecart players to travel through.
* Make A_SaloonDoorSpawn more customisable. (var1 = object type, var2 = distance sides should be placed apart)
2019-10-05 13:21:35 +01:00
MascaraSnake cabc4e0294 Implemented lava splish. Feel free to suggest a different "splish" sound. 2019-10-05 10:00:59 +02:00
MascaraSnake 5460e0e1f9 Merge branch 'master' into acz-fixes 2019-09-30 20:50:33 +02:00
MascaraSnake e75dee7747 Fix various minus carrying bugs 2019-09-30 20:35:47 +02:00
MascaraSnake 9431497f7d 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 26ecab14d7 Implemented the Pterabyte grabbing mechanic 2019-09-29 18:42:17 +02:00