Commit graph

897 commits

Author SHA1 Message Date
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
TehRealSalt
0fdcc22d93 - Only update to waypoints you're in the radius of (applies to players & spb)
- Player direction value uses momentum angle rather than facing angle (fixes weird nextwaypoint/position flickering while drifting)
- Raise default radius to 384
2019-10-22 16:44:56 -04:00
James R
6b22b6e450 Comment for insanity 2019-10-21 14:28:22 -07:00
James R
d4b778884b 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
73b662c575 Fix mixed declaration and code error in A_RolloutRock (object_tweaks division 2) 2019-10-19 16:01:04 +01:00
toaster
383b93e43a * 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
James R
3d67fea63a Apply BMBOUNDFIX to A_MineExplode 2019-10-15 23:29:02 -07:00
TehRealSalt
e6dc29358e Reduced SPB target distance to 1024 units (previously 3072 units) 2019-10-15 21:46:45 -04:00
TehRealSalt
e7d0fde5fd Merge branch 'master' into sal-waypoints 2019-10-15 21:34:41 -04:00
TehRealSalt
d1c20c2a5a Don't allow finish lines to be hit multiple times per tic 2019-10-15 21:30:23 -04:00
toaster
940785a665 Fix reverse gravity cacti (and all other A_ConnectToGround stuffs). 2019-10-13 17:48:40 +01:00
sphere
f585b7c896 Fix for A_ConnectToGround on gravflipped objects, courtesy of toaster. 2019-10-13 14:41:17 +02:00
lachwright
9a6877715b Allow rollout rock's splash sound delay reduction to occur above water 2019-10-12 04:41:50 +08:00
lachwright
561389dd9f Don't spam splash sounds on the rollout rock 2019-10-12 04:35:51 +08:00
toaster
e9867c4bd7 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
a3ecd3836e Add sounds to rollout rock in lava 2019-10-09 15:06:50 +08:00
lachwright
54699398a0 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
ed304a5b19 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
e8aea6da8a Colorize non-buoyant rollout rocks (MF2_AMBUSH distinguishability) 2019-10-07 22:51:13 +08:00
lachwright
90b867bf22 Allow rock to disappear if unridden for 12 seconds 2019-10-07 22:22:51 +08:00
lachwright
b04180e5bf Add Ambush and Flip flag behaviors 2019-10-07 20:55:58 +08:00
lachwright
2d4b2a66d0 Better rollout behavior in lava 2019-10-07 15:25:32 +08:00
toaster
70c0763840 Good catch by MS. 2019-10-06 16:17:11 +01:00
toaster
1db188ef70 * 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
4180bf9693 Fix Minus being intangible after it pops up. 2019-10-06 16:09:33 +01:00
toaster
4db78ba88a Fix Minus causing crashes if it picks up a Snapper. 2019-10-06 16:04:19 +01:00
toaster
cf4abf6b36 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
93a41f3653 Fix Snapper's head snapping to higher planes, and add gravflip support. 2019-10-06 15:04:04 +01:00
MascaraSnake
581311d640 Added gravflip support to lavafall, Pyre Fly and Pterabyte 2019-10-05 22:20:48 +02:00
James R
675c896417 Nevermind the FixedMul 2019-10-05 12:46:24 -07:00
James R
f1e5f64e66 Use K_MatchGenericExtraFlags for reverse gravity rings
Also corrected a mistaken usage of scale.
2019-10-05 12:38:44 -07:00