Commit graph

8490 commits

Author SHA1 Message Date
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
lachwright
1d74a0c29a Update to 9/25 Lua script 2019-10-05 03:02:27 +08:00
lachwright
578d7f8a79 Fix AI angling 2019-10-05 02:48:20 +08:00
lachwright
3c5f680b38 Initial commit 2019-10-03 12:49:46 +08: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
Jaime Passos
2740711092 png fix yes so cool 2019-09-29 19:10:49 -03:00
Jaime Passos
41ff5ef79c sprite2info soc yummy yummy yes 2019-09-29 19:03:10 -03: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
Jaime Passos
c373570584 better soc 2019-09-29 15:53:04 -03: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
Jaime Passos
61f29c9dd6 Giant mistake 2019-09-29 14:12:53 -03: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
Jaime Passos
e07c7aae2c I want to be able to stack skins in a sprite2 block 2019-09-29 12:41:15 -03:00
Jaime Passos
12fd1849bd change comment and error message 2019-09-29 12:16:38 -03:00
Jaime Passos
dfe05a650c hehee 2019-09-29 12:13:51 -03: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