7e04cbbc16
Fix mixed declaration and code error in A_RolloutRock (object_tweaks division 2)
2019-10-19 16:01:04 +01:00
46268214fc
Fix reverse gravity cacti (and all other A_ConnectToGround stuffs).
2019-10-13 17:48:40 +01:00
636760760f
Fix for A_ConnectToGround on gravflipped objects, courtesy of toaster.
2019-10-13 14:41:17 +02:00
3600e1b140
Allow rollout rock's splash sound delay reduction to occur above water
2019-10-12 04:41:50 +08:00
a01373741b
Don't spam splash sounds on the rollout rock
2019-10-12 04:35:51 +08:00
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
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
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
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
c64997bfe5
Add Ambush and Flip flag behaviors
2019-10-07 20:55:58 +08:00
95f6e2008f
Better rollout behavior in lava
2019-10-07 15:25:32 +08: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
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
79b95a53ed
Fix Snapper's head snapping to higher planes, and add gravflip support.
2019-10-06 15:04:04 +01:00
357baeaa60
Added gravflip support to lavafall, Pyre Fly and Pterabyte
2019-10-05 22:20:48 +02:00
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
cabc4e0294
Implemented lava splish. Feel free to suggest a different "splish" sound.
2019-10-05 10:00:59 +02:00
5460e0e1f9
Merge branch 'master' into acz-fixes
2019-09-30 20:50:33 +02:00
e75dee7747
Fix various minus carrying bugs
2019-09-30 20:35:47 +02:00
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
26ecab14d7
Implemented the Pterabyte grabbing mechanic
2019-09-29 18:42:17 +02:00
60cbc2e6b4
Remove unused locals
2019-09-29 21:29:37 +08:00
71603006dc
Resolve merge conflicts
2019-09-29 20:29:49 +08:00
8abb6129c1
Hardcode pumice ball
...
Current known issues: players detached from the ball via any means other than jumping or pain do not have their ball reset properly
2019-09-29 20:18:40 +08:00
22e3c37e5d
Don't make the Pterabyte radius adjustable (doesn't work correctly right now)
2019-09-29 11:58:33 +02:00
598047ae8b
Hardcoded the Pterabyte (without the grabbing mechanic)
2019-09-29 10:39:09 +02:00
55a2f1ee1f
Merge branch 'bossprovements' into 'master'
...
ACZ3 intro
Closes #217
See merge request STJr/SRB2Internal!346
2019-09-27 08:55:19 -04:00
40a7b67a86
Merge branch 'dsz3shockwave' into 'master'
...
Deep Sea Zone 3 hardcoding
Closes #185
See merge request STJr/SRB2Internal!349
2019-09-27 08:54:57 -04:00
264c60fb70
P_SetTarget fixes, added SPR_SHCK to hw_light.c
2019-09-27 02:13:02 +08:00
ec1712064c
* Add vwre vwre intro for Fang Clone Fighter battle. (Still skipped with presence of MTF_AMBUSH)
...
* https://cdn.discordapp.com/attachments/428262628893261828/626792815451701259/srb20006.gif
* Add fadeout instead of slapstick for Fang Clone Fighter death.
* Allow placed Fang and Metal Sonic objects to be marked as Clone Fighters always through presence of MTF_EXTRA.
2019-09-26 17:06:29 +01:00
0cd3e4fd62
Hardcoded DSZ3 shockwave
2019-09-26 05:27:51 +08:00
2a452ddcf5
Remember when Lach recorded their live reaction to 2.2 so far? Do you recall what the reaction to ACZ3 was?
...
If you don't, the reaction was "WHAT?? Why is he here? This is GREAT but, what??" And while the reaction is on the positive end of things, it's stll clearly not advisable for our defining Big Reveal of the already huge update.
To this end: Here is a mini cutscene! https://cdn.discordapp.com/attachments/428262628893261828/626207624043429898/srb20005.gif
* He's digging through Eggman's trash.
* Clearly doesn't expect to see you!
* Ready for a fight all the same.
* You can attack him during the mini cutscene if you're impatient.
* Skipped if you give him MTF_AMBUSH.
* Requires new assets (including map) to test, but I'm not ready to make a MR yet because I have other thoughts first.
Also, since I was poking around in p_enemy.c, I fixed A_Boss1Laser's issues (not working with direct 2.1 port states and having the weird secondary attack).
2019-09-25 14:36:20 +01:00
09868d2999
Dust devil fixes
2019-09-25 16:32:06 +08:00
6815748a3e
Merge branch 'flippost' into 'master'
...
Flippost
Closes #206 and #191
See merge request STJr/SRB2Internal!320
2019-09-08 16:24:58 -04:00
0ed589449a
Merge branch 'newegg' into 'master'
...
Newegg dot blag
See merge request STJr/SRB2Internal!305
2019-09-08 16:11:50 -04:00
d26ff197dc
* Store gravflip ( resolves #206 ) and destscale in starposts. (Using the same field, taking advantage of the fact that object scale will always be positive!)
...
* Update the function signature of P_MixUp to accomodate both it and drawangle instead of doing it outside of the function.
* If the player is spawning from the start of the stage and it's from the ceiling, be in fall frames as requested (resolves #191 ).
2019-09-07 22:12:47 +01:00
c6af108d8c
Merge branch 'musicfixes' into 'master'
...
Minor musicplus-related fixes
See merge request STJr/SRB2Internal!310
2019-09-07 11:45:15 -04:00
54b89eefbb
* Fix jingle captions dying immediately (caused by an S_StopMusic call in P_PlayJingle; resolved by modifying order of operations).
2019-09-07 11:48:58 +01:00
6a9da63d7f
Motor's new Eggman sprites, along with some other sweet bits of boss polish. What else can I say? Just play it.
2019-08-30 19:19:54 +01:00
806b106905
Hardcoded the Pyre Fly
2019-08-30 08:17:25 +02:00
1040a93a6e
Ignore bots when looking for a player
2019-08-28 23:12:25 -04:00
2933ec3e9c
Simplified the lavafall rock states with FF_RANDOMANIM, fixed Var1 for the FF_ANIMATE states
2019-08-27 19:33:54 +02:00
671da01607
Only spawn lavafall rocks if a player is nearby
2019-08-25 23:43:07 +02:00
7ca67a8688
Added reverse gravity support to lavafalls
2019-08-25 23:31:12 +02:00
50e51c137e
Hardcoded the lavafall
2019-08-25 23:05:38 +02:00
toaster
