7fedde9811
Merge branch 'promiscuousplanes' into 'master'
...
Headbumps and associated
Closes #242
See merge request STJr/SRB2Internal!360
2019-10-10 02:36:10 -04:00
c17a3227a0
Merge branch 'bumperstuff' into 'master'
...
Change the time NiGHTS bumpers aren't responded to to 5 tics rather than 9.
Closes #246
See merge request STJr/SRB2Internal!365
2019-10-10 02:35:33 -04:00
a138c0ebf2
Merge branch 'acz_touchups' into 'master'
...
ACZ touchups
Closes #209 , #208 , and #158
See merge request STJr/SRB2Internal!359
2019-10-10 02:34:46 -04:00
7ceef506fc
Merge branch 'specialstage_water' into 'master'
...
Don't deplete special stage timer in water if you have water protection
See merge request STJr/SRB2Internal!364
2019-10-10 02:33:05 -04:00
b2529136e0
Reduce speed sneaker's top speed factor to 1.67x
2019-10-09 21:39:51 +08:00
d553b6a011
Add sounds to rollout rock in lava
2019-10-09 15:06:50 +08:00
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
43e13b38c9
Change one of the Pyrefly captions.
2019-10-08 19:45:43 +01:00
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
4870107974
Increased THZ goop speed by 25%, per Cobalt's script. (Hardcoding it was way more difficult than it looked, I'm rusty at my maths :V )
2019-10-08 16:38:53 +01:00
bc794a2227
Players can jostle free from Pterabytes
2019-10-08 00:00:41 +02:00
788415a4db
Don't apply autobrake to Pterabyte-carried players
2019-10-07 22:33:06 +02:00
0fceb66e71
Make the Pyrefly glowing and damaging in its fire-spawning state
2019-10-07 22:23:52 +02:00
ce5d0691ac
Merge branch 'rvz-hardcode' of git.magicalgirl.moe:STJr/SRB2Internal into rvz-hardcode
2019-10-07 19:12:03 +02:00
8062422f13
Fixed wrong sound being played by Pyreflies with Ambush
2019-10-07 19:11:36 +02:00
3412eb655a
Colorize non-buoyant rollout rocks (MF2_AMBUSH distinguishability)
2019-10-07 22:51:13 +08:00
77dd5260ab
Allow rock to disappear if unridden for 12 seconds
2019-10-07 22:22:51 +08:00
46a1d6897c
Address checkbox 1 and 2 of #235 .
...
* If using twinspin and have melee ability too, go into melee landing when hitting the ground.
* Only have melee go directly forward if standing/idle, otherwise use drawangle.
2019-10-07 15:03:28 +01:00
c64997bfe5
Add Ambush and Flip flag behaviors
2019-10-07 20:55:58 +08:00
d84564d9f2
Change the time NiGHTS bumpers aren't responded to to 5 tics rather than 9.
2019-10-07 13:08:49 +01:00
95f6e2008f
Better rollout behavior in lava
2019-10-07 15:25:32 +08:00
2113774a6a
Don't deplete special stage timer in water if you have water protection
2019-10-07 09:01:17 +02:00
bfb9bac5bd
Collision polish
2019-10-07 14:51:32 +08:00
fe2f383997
Fixed a typo
2019-10-07 08:36:40 +02:00
bed9dff077
Readability changes
2019-10-07 13:36:36 +08:00
306779fac0
Readability changes
2019-10-07 13:35:10 +08:00
7850d43725
Let ridden rollout rocks collide with other players
2019-10-07 13:14:23 +08:00
6fd645ef27
A-arrows on Record Attack level select
...
Menu code sucks, did you know?
2019-10-06 14:45:42 -07:00
0be3743450
Key handler to allow selecting map by arrow keys in Record Attack
...
Enter still goes to the platter.
2019-10-06 14:11:16 -07:00
058ed632de
Fixed solid objects (such as Minus-carried TNT barrels) not colliding with players.
...
Springs and gas jets are exempt because all hell might break loose otherwise.
2019-10-06 19:53:54 +02:00
9b94fd3752
* Add rudimentary support for MF2_LINKDRAW in GL.
...
* Allow MF_ENEMY objects to flash, just as they do in Software.
2019-10-06 16:31:13 +01:00
a2f8b84b5a
Good catch by MS.
2019-10-06 16:17:11 +01:00
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
df172ee33f
Fix Minus being intangible after it pops up.
2019-10-06 16:09:33 +01:00
8b1a20f415
Fix Minus causing crashes if it picks up a Snapper.
2019-10-06 16:04:19 +01:00
aec5f26819
Fix entering an intangible FOF causing minecart derailment explosions. (Probably; I didn't get the bug to happen in the first place, but this looks like a likely culprit.)
2019-10-06 15:44:24 +01:00
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
2d33950590
Merge branch 'rvz-hardcode' of https://git.magicalgirl.moe/STJr/SRB2Internal into rvz-hardcode
2019-10-06 22:12:47 +08:00
cc87ba39c2
There's code in B_RespawnBot that handles gravflip, but none in B_CheckRespawn. This commit fixes that. (Only done on this branch since bots had already been touched.)
2019-10-06 15:11:00 +01:00
79b95a53ed
Fix Snapper's head snapping to higher planes, and add gravflip support.
2019-10-06 15:04:04 +01:00
a5704238c7
Resolve #242 by adding SF_TRIGGERSPECIAL_HEADBUMP, enabled by ML_EFFECT2.
...
Also, readd SF_INVERTPRECIP, which was done in a random branch last year and then lost because it was never merged. Enabled by ML_EFFECT1.
2019-10-06 14:34:25 +01:00
defffd667e
Fixed and simplified the big fern leaf spawning code
2019-10-06 14:18:27 +02:00
93ce5bb94d
Add solidity back to MT_SALOONDOOR, to work as a backup in case MT_SALOONDOORCENTER doesn't work (which it has issues with in one location in ACZ2 for some reason, and I can't identify why).
...
Fully resolves #209 , in any case.
2019-10-06 12:14:18 +01:00
df2600cbea
Resolve #208 .
...
* Tailsbots can't get into Minecarts.
* Tailsbots will stop trying to move around when the player gets pw_carry, which usually means some sort of big gimmick is happening and trying to move along with it would make the tailsbot look stupid.
2019-10-06 12:13:13 +01:00
17a2d1071c
Spawn big fern leaves relative to angle
2019-10-06 10:30:22 +02:00
357baeaa60
Added gravflip support to lavafall, Pyre Fly and Pterabyte
2019-10-05 22:20:48 +02:00
a7d6ebd5bd
Lavafall lava also kills rings
2019-10-05 20:37:48 +02:00
2f4edc0cb9
Players carried by Pterabyte cannot adjust their angle and are in their falling state
2019-10-05 20:29:47 +02:00
b9c3f72112
Grouped MFE_TOUCHLAVA together with the other liquid-related flags
2019-10-05 20:10:07 +02:00
16d077fde3
Coins don't melt in lava and lavafalls have displayoffset 1
2019-10-05 20:00:54 +02:00
MascaraSnake