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
7dd57a66c4
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
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
lachwright
c2b98b0e27
Merge branch 'rvz-hardcode' of https://git.magicalgirl.moe/STJr/SRB2Internal into rvz-hardcode
2019-10-06 22:12:47 +08:00
toaster
bfc5c7680f
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
toaster
93a41f3653
Fix Snapper's head snapping to higher planes, and add gravflip support.
2019-10-06 15:04:04 +01:00
toaster
1ba694aa0b
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
MascaraSnake
3a2449287d
Fixed and simplified the big fern leaf spawning code
2019-10-06 14:18:27 +02:00
toaster
4456c15190
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
toaster
f0e9bdd0ec
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
MascaraSnake
04673d6f74
Spawn big fern leaves relative to angle
2019-10-06 10:30:22 +02:00
MascaraSnake
581311d640
Added gravflip support to lavafall, Pyre Fly and Pterabyte
2019-10-05 22:20:48 +02:00
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
Jaime Passos
4a0b423342
nights attack
2019-10-02 22:02:13 -03:00
Jaime Passos
7f0032b9b1
character select
2019-10-02 21:57:04 -03:00
Jaime Passos
bc81f03db2
test
2019-10-02 21:28:02 -03:00
Jaime Passos
5a2b8abdd6
test
2019-10-02 20:00:43 -03:00
lachwright
d9f4772fbc
Fix false comment
2019-10-03 02:31:32 +08:00
Steel Titanium
a1fab13ac1
Some changes.
...
Restore the menu headers for record attack and character select menu.
Attempt to optimize the NiGHTS mode menu. (Help getting the scrolling to work in an efficient way would be nice).
2019-10-01 23:40:59 -04:00
Steel Titanium
2c7e53f32f
Merge branch 'master' into newmenus
2019-10-01 16:52:31 -04: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
Monster Iestyn
5ce5b1275d
Merge branch 'master' into mi-tinkers-with-lua-again
2019-09-30 20:51:29 +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
lachwright
e8a85570f8
Improve glide bounces
2019-09-30 16:35:05 +08:00
lachwright
52e7ae5322
Allow camera movement while climbing; allow sliding while landing from a glide
2019-09-30 14:38:58 +08: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
lachwright
6f394319cc
Allow retention of momentum when climbing off surfaces
2019-09-30 10:55:57 +08:00
lachwright
741b2a4fad
Merge branch 'master' into knuxstuff
...
Update to master (necessary for climbing changes)
2019-09-30 09:56:04 +08: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
