MascaraSnake
66cc8046a5
Merge branch 'dragonbomber' into 'master'
...
Dragonbomber
See merge request STJr/SRB2Internal!489
2019-11-18 17:10:30 -05:00
MascaraSnake
2ca069e5ba
Merge branch 'titlecards' into 'master'
...
Titlecards
See merge request STJr/SRB2Internal!492
2019-11-18 16:22:32 -05:00
MascaraSnake
5324107edf
Merge branch 'jester-fireball' into 'master'
...
Mario fireball by Jester (resolves #296 )
Closes #296
See merge request STJr/SRB2Internal!487
2019-11-18 15:56:33 -05:00
Jaime Passos
8ce00492c2
Merge remote-tracking branch 'origin/master' into titlecards
2019-11-18 17:55:47 -03:00
Steel Titanium
8db5fb30e2
Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2Internal
2019-11-18 15:41:57 -05:00
MascaraSnake
18d0f2bd90
Merge branch 'nightstail' into 'master'
...
NiGHTS tail
See merge request STJr/SRB2Internal!482
2019-11-18 15:41:52 -05:00
Steel Titanium
dc9a09f837
Merge branch 'public_next' into 'master'
2019-11-18 15:39:41 -05:00
MascaraSnake
064d9c2566
Merge branch 'capsuletweaks' into 'master'
...
Egg Capsule tweaks
See merge request STJr/SRB2Internal!474
2019-11-18 15:24:13 -05:00
MascaraSnake
ecd021abdf
Merge branch 'fhzenemytweaks' into 'master'
...
Hardcode DrT's FHZ improvements (resolves #295 ).
Closes #295
See merge request STJr/SRB2Internal!483
2019-11-18 15:21:59 -05:00
MascaraSnake
2df5fd3b30
Merge branch 'poledance' into 'master'
...
Make ACZ3's slapstick signpost taller (resolves #267 ).
Closes #267
See merge request STJr/SRB2Internal!473
2019-11-18 15:14:48 -05:00
MascaraSnake
abdfc2d237
Merge branch 'exit-move-lj' into 'master'
...
Post-exit movement
See merge request STJr/SRB2Internal!486
2019-11-18 15:10:15 -05:00
MascaraSnake
59af56480e
Merge branch 'titlecard-lowercase-support' into 'master'
...
Lowercase support in titlecards
See merge request STJr/SRB2Internal!481
2019-11-18 15:05:02 -05:00
MascaraSnake
6f8a84b8cc
Merge branch 'endingmus' into 'master'
...
Ending music and associated
See merge request STJr/SRB2Internal!475
2019-11-18 14:33:22 -05:00
MascaraSnake
269b2be9f7
Merge branch 'reset-rollangle' into 'master'
...
Reset rollangle
See merge request STJr/SRB2Internal!494
2019-11-18 14:11:32 -05:00
MascaraSnake
d7bdcb5f4c
Merge branch 'signpost-cleanup' into 'master'
...
Signpost camera cleanup
See merge request STJr/SRB2Internal!490
2019-11-18 14:00:05 -05:00
MascaraSnake
ccf3be6ad8
Merge branch 'pingimprovements' into 'master'
...
Better ping implementation.
See merge request STJr/SRB2Internal!488
2019-11-18 13:58:41 -05:00
MascaraSnake
0c0b544bcf
Merge branch 'metalbwarp' into 'master'
...
Fix Metal Sonic not correctly flipping with gravity (Resolve #289 ).
Closes #289
See merge request STJr/SRB2Internal!472
2019-11-18 13:39:22 -05:00
Jaime Passos
649d040cfe
restore zigzags
2019-11-18 15:32:48 -03:00
Jaime Passos
0f9aa2fcb0
V_PERPLAYER did exactly what I did not want it to do so I'll disable these elements
2019-11-18 15:18:27 -03:00
Jaime Passos
1f9dc8aaa1
missing prototype
2019-11-18 15:13:31 -03:00
Jaime Passos
e3ad4f5731
perplayer
2019-11-18 15:12:55 -03:00
Jaime Passos
8005112879
invert conditional
2019-11-18 15:06:07 -03:00
MascaraSnake
6426825810
Merge branch 'damnnothere' into 'master'
...
Disable the GL sprite shadows behind a #define.
See merge request STJr/SRB2Internal!485
2019-11-18 13:05:43 -05:00
MascaraSnake
686c04292f
Merge branch 'firefuck' into 'master'
...
Firefuck (resolves #291 ).
Closes #291
See merge request STJr/SRB2Internal!476
2019-11-18 13:05:00 -05:00
Jaime Passos
bb8b49b738
LF_WARNINGTITLE
2019-11-18 15:04:40 -03:00
MascaraSnake
f17dd3768f
Merge branch 'papersign3' into 'master'
...
I fucked up papersigns (Resolve #288 ).
Closes #288
See merge request STJr/SRB2Internal!471
2019-11-18 13:03:46 -05:00
Jaime Passos
a644fe6e77
oh sh
2019-11-18 14:32:34 -03:00
Jaime Passos
75468a1d5d
map header option
2019-11-18 14:08:47 -03:00
Jaime Passos
23a5801a09
lua
2019-11-18 13:50:44 -03:00
Jaime Passos
8ad20c1108
Organize
2019-11-18 12:56:41 -03:00
lachwright
2bbd25d207
Important fixes & mine lob speed reduction
2019-11-18 22:57:26 +08:00
Jaime Passos
7bd19aaed1
arg
2019-11-18 11:42:45 -03:00
Jaime Passos
f37e0de8c5
stuff
2019-11-18 11:39:54 -03:00
lachwright
53dd55e953
Allow positive momentum retention when jumping off rollout rocks
2019-11-18 22:36:25 +08:00
lachwright
275833eb51
Whoops, deleted a little too much by accident
2019-11-18 16:26:15 +08:00
lachwright
97e9555cd9
Make camera use signpost's ground z coordinate instead of the player's z coordinate
2019-11-18 16:22:12 +08:00
Jaime Passos
53c1914501
Merge remote-tracking branch 'origin/master' into titlecards
2019-11-17 23:57:18 -03:00
James R
2b9a62a6bc
Shift showping display up a bit
2019-11-17 18:54:23 -08:00
James R
a8a6add1fc
Shift ping display in scores HUD up, so it aligns with the bottom of player name
2019-11-17 18:53:17 -08:00
James R
51a2b76970
Snapping for showping, so it doesn't jump way up on non-green
2019-11-17 18:52:05 -08:00
lachwright
3fb5870445
Prevent mines from sliding upon touching the ground
2019-11-18 10:35:56 +08:00
Louis-Antoine
738bfdf99b
Add missing checks for PF_FINISHED in HUD code
2019-11-18 03:27:39 +01:00
Steel Titanium
b1f39e836d
Better ping implementation.
2019-11-17 20:22:47 -05:00
Jaime Passos
dd39e59749
Restore old sound effect
2019-11-17 21:33:59 -03:00
Jaime Passos
743f04e2ca
Fireball
2019-11-17 21:25:17 -03:00
Louis-Antoine
658fd6e052
Disable exitmove by default
2019-11-17 23:52:51 +01:00
Louis-Antoine
7b5967b0d2
Disable Tails carrying for players who completed the level
...
To avoid trolls...
2019-11-17 23:46:34 +01:00
Louis-Antoine
1ef50d8813
Show the exit icon for finished players
2019-11-17 23:44:48 +01:00
toaster
5afa5f12ee
Disable the GL sprite shadows behind a #define.
...
Reasoning:
* They're horribly broken (they completely ignore slopes).
* A similar final demo GL-only feature (coronas) has been completely disabled.
* Nobody's going to bugfix them before release because not even the devteam's resident GL users use them.
* They look ugly.
2019-11-17 22:18:46 +00:00
lachwright
69fd8e9ac2
Remove tester console prints
2019-11-18 05:31:26 +08:00
