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
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
99220ae48b
Fixed a typo
2019-10-05 10:45:24 +02:00
cabc4e0294
Implemented lava splish. Feel free to suggest a different "splish" sound.
2019-10-05 10:00:59 +02:00
1750ed5383
nights attack
2019-10-02 22:02:13 -03:00
a7dcf534ca
character select
2019-10-02 21:57:04 -03:00
a0e9fbfffe
test
2019-10-02 21:28:02 -03:00
6a8539c8f1
test
2019-10-02 20:00:43 -03:00
27c9fe5047
Fix false comment
2019-10-03 02:31:32 +08:00
625de1f4f6
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
6b10ffb88f
Merge branch 'master' into newmenus
2019-10-01 16:52:31 -04:00
5c1fabfaae
Lava is now either completely solid or completely intangible. No more half-assing
2019-10-01 21:58:18 +02:00
24e80c9b23
Made solid lava walls damaging
2019-10-01 21:17:33 +02:00
f224e03e1d
Amy cameo for Frozen Hillside. Wait for the MR, I'll make a fuller pitch there...
2019-10-01 18:19:37 +01:00
b72609f7f7
Merge branch 'master' into mi-tinkers-with-lua-again
2019-09-30 20:51:29 +01: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
5bbd56b6fa
Improve glide bounces
2019-09-30 16:35:05 +08:00
7d57d53d45
Allow camera movement while climbing; allow sliding while landing from a glide
2019-09-30 14:38:58 +08:00
ebe99dad7a
Make comment more clear
2019-09-30 01:29:57 -04:00
592a98a3e8
Fix the sky on the intro cutscene not scrolling.
2019-09-30 01:25:21 -04:00
c72b5d8a49
Allow retention of momentum when climbing off surfaces
2019-09-30 10:55:57 +08:00
906a2b1f59
Merge branch 'master' into knuxstuff
...
Update to master (necessary for climbing changes)
2019-09-30 09:56:04 +08:00
d301d2bba4
Fixed a bug with the ring lava melting
2019-09-29 23:22:38 +02:00
4375ea8089
Lava now melts rings!
2019-09-29 23:11:21 +02:00
3d985c1b9e
Pterabytes can now swoop you off a rollout rock
2019-09-29 22:13:10 +02:00
6c0e4a154d
Resolve merge conflicts
2019-09-30 03:07:03 +08:00
e57b0f7126
(Hopefully) cover all cases for resetting rock usability
2019-09-30 03:05:08 +08:00
cd45bca848
Pterabyte: Don't drop off player in the first ten tics after grabbing
2019-09-29 19:51:27 +02:00
c00144a4f8
Pterabyte: Don't target players who are invincible after being hurt
2019-09-29 19:29:34 +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
toaster