MascaraSnake
c838ac30e9
Lavafall lava also kills rings
2019-10-05 20:37:48 +02:00
MascaraSnake
5bfe79047a
Players carried by Pterabyte cannot adjust their angle and are in their falling state
2019-10-05 20:29:47 +02:00
MascaraSnake
370e50837e
Grouped MFE_TOUCHLAVA together with the other liquid-related flags
2019-10-05 20:10:07 +02:00
MascaraSnake
c0654572f2
Coins don't melt in lava and lavafalls have displayoffset 1
2019-10-05 20:00:54 +02:00
toaster
edc65a1a22
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
9d276b9a16
Fixed a typo
2019-10-05 10:45:24 +02:00
MascaraSnake
9b795e56c4
Implemented lava splish. Feel free to suggest a different "splish" sound.
2019-10-05 10:00:59 +02:00
lachwright
d9f4772fbc
Fix false comment
2019-10-03 02:31:32 +08:00
MascaraSnake
b38bd1a078
Lava is now either completely solid or completely intangible. No more half-assing
2019-10-01 21:58:18 +02:00
MascaraSnake
002e45ee53
Made solid lava walls damaging
2019-10-01 21:17:33 +02:00
toaster
7ade43f685
Amy cameo for Frozen Hillside. Wait for the MR, I'll make a fuller pitch there...
2019-10-01 18:19:37 +01:00
MascaraSnake
12f555de25
Merge branch 'master' into acz-fixes
2019-09-30 20:50:33 +02:00
MascaraSnake
e75767ece8
Fix various minus carrying bugs
2019-09-30 20:35:47 +02:00
Steel Titanium
edf4dd8e0a
Make comment more clear
2019-09-30 01:29:57 -04:00
Steel Titanium
b9234d1d8c
Fix the sky on the intro cutscene not scrolling.
2019-09-30 01:25:21 -04:00
MascaraSnake
4c0628b6bb
Fixed a bug with the ring lava melting
2019-09-29 23:22:38 +02:00
MascaraSnake
83b32eacbe
Lava now melts rings!
2019-09-29 23:11:21 +02:00
MascaraSnake
c1d06a1b49
Pterabytes can now swoop you off a rollout rock
2019-09-29 22:13:10 +02:00
lachwright
41cc52ce25
Resolve merge conflicts
2019-09-30 03:07:03 +08:00
lachwright
4a47b66990
(Hopefully) cover all cases for resetting rock usability
2019-09-30 03:05:08 +08:00
MascaraSnake
4c6a4b76cc
Pterabyte: Don't drop off player in the first ten tics after grabbing
2019-09-29 19:51:27 +02:00
MascaraSnake
b169ff93d4
Pterabyte: Don't target players who are invincible after being hurt
2019-09-29 19:29:34 +02:00
MascaraSnake
ca9fdd4f0e
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
309d26069f
Implemented the Pterabyte grabbing mechanic
2019-09-29 18:42:17 +02:00
lachwright
7cf2328e62
Remove unused locals
2019-09-29 21:29:37 +08:00
lachwright
949ef287b7
Resolve merge conflicts
2019-09-29 20:29:49 +08:00
lachwright
f67ef441b3
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
MascaraSnake
017d29ff76
Don't make the Pterabyte radius adjustable (doesn't work correctly right now)
2019-09-29 11:58:33 +02:00
MascaraSnake
c4f1085f02
Hardcoded the Pterabyte (without the grabbing mechanic)
2019-09-29 10:39:09 +02:00
toaster
bc9f9d740a
Merge branch 'addons-menu-cleanup' into 'master'
...
Addons menu cleanup
See merge request STJr/SRB2Internal!316
2019-09-27 08:55:36 -04:00
toaster
74efc0e1f4
Merge branch 'bossprovements' into 'master'
...
ACZ3 intro
Closes #217
See merge request STJr/SRB2Internal!346
2019-09-27 08:55:19 -04:00
toaster
95f848d0ee
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
toaster
7f33a402a4
Merge branch 'automap-fixes' into 'master'
...
Automap fixes
See merge request STJr/SRB2Internal!348
2019-09-27 08:52:59 -04:00
toaster
bd2b7ccc84
Merge branch 'patch-fixes' into 'master'
...
Patch fixes (Resolves #230 )
Closes #230
See merge request STJr/SRB2Internal!347
2019-09-27 08:52:41 -04:00
toaster
7eb3aeb33b
Merge branch 'lachfixes' into 'master'
...
Several bug fixes!
Closes #210 , #192 , and #189
See merge request STJr/SRB2Internal!345
2019-09-27 08:52:23 -04:00
toaster
9fa8c7a4c2
Merge branch '231-tails-ai-should-die-when-taking-damage-in-ultimate' into 'master'
...
Resolve "Tails AI should die when taking damage in Ultimate"
Closes #231
See merge request STJr/SRB2Internal!344
2019-09-27 08:51:11 -04:00
toaster
7d51ecf5ba
Merge branch 'inputstuff' into 'master'
...
Trigonometric input capping
See merge request STJr/SRB2Internal!343
2019-09-27 08:50:55 -04:00
toaster
c1dea190a8
Merge branch 'internal-hotplug-stableid' into 'master'
...
Controller hotplug support.
See merge request STJr/SRB2Internal!342
2019-09-27 08:50:34 -04:00
sphere
88ad1937d6
Fix compiling errors, thanks to toaster.
2019-09-26 23:15:52 +02:00
lachwright
7563e7be6f
P_SetTarget fixes, added SPR_SHCK to hw_light.c
2019-09-27 02:13:02 +08:00
toaster
85f50ef54b
* 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
lachwright
5b92f15e44
Added A_Boss3ShockThink to dehacked.c
2019-09-26 18:57:25 +08:00
lachwright
f9cf4746b2
Lowered shockwave speed
2019-09-26 17:12:03 +08:00
lachwright
4d31ebf47a
Hardcoded DSZ3 shockwave
2019-09-26 05:27:51 +08:00
lachwright
7d4c39a738
Fix errormode compilation error
2019-09-25 23:09:05 +08:00
toaster
3d793fc1ea
Correctly restrict MF_NOCLIPTHING-objects from being interacted with from both moving and non-moving side.
2019-09-25 15:49:37 +01:00
lachwright
9f4c65dc01
Fixes shield ability usage when pressing spin on ACZ ropes (and also changes flame shield angling)
2019-09-25 22:36:48 +08:00
toaster
01f507f3f4
Don't lock on if something is literally intangible.
2019-09-25 15:12:19 +01:00
toaster
de82d338bd
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
lachwright
09c9ff0217
(Crudely) fixed camera jitter on certain FOF slopes
2019-09-25 21:15:19 +08:00
