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
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
sphere
a225970360
Use zones.pk3 instead of zones.dta.
2019-09-29 05:31:50 +02:00
Monster Iestyn
d3c4a9a92b
whoops, didn't mean to include this
2019-09-28 20:45:44 +01:00
Steel Titanium
65bc2ef0d6
Fix crash if speed is too high
...
Also update libopenmpt
2019-09-27 23:53:19 -04:00
Jaime Passos
fa9cef1cc0
Merge remote-tracking branch 'origin/master' into openglskydome2
2019-09-27 22:47:10 -03:00
Monster Iestyn
0e7df5ee87
Added < 0 checks to all three variables added in last commit
...
(no point checking >= MAXPLAYERS tbh, there's no reason the game would even set those values that I can think of offhand)
2019-09-27 23:15:38 +01:00
Monster Iestyn
939cfe8271
Added consoleplayer, displayplayer and secondarydisplayplayer, by popular request
2019-09-27 21:16:11 +01: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
