Commit graph

7250 commits

Author SHA1 Message Date
MascaraSnake 17a2d1071c Spawn big fern leaves relative to angle 2019-10-06 10:30:22 +02:00
MascaraSnake 357baeaa60 Added gravflip support to lavafall, Pyre Fly and Pterabyte 2019-10-05 22:20:48 +02:00
MascaraSnake a7d6ebd5bd Lavafall lava also kills rings 2019-10-05 20:37:48 +02:00
MascaraSnake 2f4edc0cb9 Players carried by Pterabyte cannot adjust their angle and are in their falling state 2019-10-05 20:29:47 +02:00
MascaraSnake b9c3f72112 Grouped MFE_TOUCHLAVA together with the other liquid-related flags 2019-10-05 20:10:07 +02:00
MascaraSnake 16d077fde3 Coins don't melt in lava and lavafalls have displayoffset 1 2019-10-05 20:00:54 +02:00
toaster 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
MascaraSnake 99220ae48b Fixed a typo 2019-10-05 10:45:24 +02:00
MascaraSnake cabc4e0294 Implemented lava splish. Feel free to suggest a different "splish" sound. 2019-10-05 10:00:59 +02:00
Jaime Passos 1750ed5383 nights attack 2019-10-02 22:02:13 -03:00
Jaime Passos a7dcf534ca character select 2019-10-02 21:57:04 -03:00
Jaime Passos a0e9fbfffe test 2019-10-02 21:28:02 -03:00
Jaime Passos 6a8539c8f1 test 2019-10-02 20:00:43 -03:00
lachwright 27c9fe5047 Fix false comment 2019-10-03 02:31:32 +08:00
Steel Titanium 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
Steel Titanium 6b10ffb88f
Merge branch 'master' into newmenus 2019-10-01 16:52:31 -04:00
MascaraSnake 5c1fabfaae Lava is now either completely solid or completely intangible. No more half-assing 2019-10-01 21:58:18 +02:00
MascaraSnake 24e80c9b23 Made solid lava walls damaging 2019-10-01 21:17:33 +02:00
toaster 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
MascaraSnake 5460e0e1f9 Merge branch 'master' into acz-fixes 2019-09-30 20:50:33 +02:00
MascaraSnake e75dee7747 Fix various minus carrying bugs 2019-09-30 20:35:47 +02:00
Steel Titanium ebe99dad7a
Make comment more clear 2019-09-30 01:29:57 -04:00
Steel Titanium 592a98a3e8
Fix the sky on the intro cutscene not scrolling. 2019-09-30 01:25:21 -04:00
MascaraSnake d301d2bba4 Fixed a bug with the ring lava melting 2019-09-29 23:22:38 +02:00
MascaraSnake 4375ea8089 Lava now melts rings! 2019-09-29 23:11:21 +02:00
MascaraSnake 3d985c1b9e Pterabytes can now swoop you off a rollout rock 2019-09-29 22:13:10 +02:00
lachwright 6c0e4a154d Resolve merge conflicts 2019-09-30 03:07:03 +08:00
lachwright e57b0f7126 (Hopefully) cover all cases for resetting rock usability 2019-09-30 03:05:08 +08:00
MascaraSnake cd45bca848 Pterabyte: Don't drop off player in the first ten tics after grabbing 2019-09-29 19:51:27 +02:00
MascaraSnake c00144a4f8 Pterabyte: Don't target players who are invincible after being hurt 2019-09-29 19:29:34 +02:00
MascaraSnake 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
MascaraSnake 26ecab14d7 Implemented the Pterabyte grabbing mechanic 2019-09-29 18:42:17 +02:00
lachwright 60cbc2e6b4 Remove unused locals 2019-09-29 21:29:37 +08:00
lachwright 71603006dc Resolve merge conflicts 2019-09-29 20:29:49 +08:00
lachwright 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
MascaraSnake 22e3c37e5d Don't make the Pterabyte radius adjustable (doesn't work correctly right now) 2019-09-29 11:58:33 +02:00
MascaraSnake 598047ae8b Hardcoded the Pterabyte (without the grabbing mechanic) 2019-09-29 10:39:09 +02:00
Steel Titanium cf852e7d39
Fix crash if speed is too high
Also update libopenmpt
2019-09-27 23:53:19 -04:00
Jaime Passos 0aba0aa4b9 Merge remote-tracking branch 'origin/master' into openglskydome2 2019-09-27 22:47:10 -03:00
toaster ff8c43664a 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 55a2f1ee1f Merge branch 'bossprovements' into 'master'
ACZ3 intro

Closes #217

See merge request STJr/SRB2Internal!346
2019-09-27 08:55:19 -04:00
toaster 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
toaster 65d9c52884 Merge branch 'automap-fixes' into 'master'
Automap fixes

See merge request STJr/SRB2Internal!348
2019-09-27 08:52:59 -04:00
toaster 3f1d84a6b3 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 4d058d1d25 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 c091174f2e 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 c97037e98e Merge branch 'inputstuff' into 'master'
Trigonometric input capping

See merge request STJr/SRB2Internal!343
2019-09-27 08:50:55 -04:00
toaster ee2d88d4b7 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 bc128dffdc Fix compiling errors, thanks to toaster. 2019-09-26 23:15:52 +02:00
lachwright 264c60fb70 P_SetTarget fixes, added SPR_SHCK to hw_light.c 2019-09-27 02:13:02 +08:00