Jaime Passos
8a05afa1aa
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-18 18:48:19 -03:00
MascaraSnake
8adc5bd876
Merge branch 'titlecards' into 'master'
...
Titlecards
See merge request STJr/SRB2Internal!492
2019-11-18 16:22:32 -05:00
MascaraSnake
1365ef49b3
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
aa659836ee
Merge remote-tracking branch 'origin/master' into titlecards
2019-11-18 17:55:47 -03:00
Steel Titanium
8d9ef84970
Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2Internal
2019-11-18 15:41:57 -05:00
MascaraSnake
baaec6f191
Merge branch 'nightstail' into 'master'
...
NiGHTS tail
See merge request STJr/SRB2Internal!482
2019-11-18 15:41:52 -05:00
Steel Titanium
efac76f833
Merge branch 'public_next' into 'master'
2019-11-18 15:39:41 -05:00
MascaraSnake
2001cad144
Merge branch 'capsuletweaks' into 'master'
...
Egg Capsule tweaks
See merge request STJr/SRB2Internal!474
2019-11-18 15:24:13 -05:00
MascaraSnake
1210545a8e
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
7a48a8d72d
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
233ff8bd27
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
5649365c19
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
98f2ee598d
Merge branch 'endingmus' into 'master'
...
Ending music and associated
See merge request STJr/SRB2Internal!475
2019-11-18 14:33:22 -05:00
MascaraSnake
3e7e749327
Merge branch 'reset-rollangle' into 'master'
...
Reset rollangle
See merge request STJr/SRB2Internal!494
2019-11-18 14:11:32 -05:00
MascaraSnake
881524a2d7
Merge branch 'signpost-cleanup' into 'master'
...
Signpost camera cleanup
See merge request STJr/SRB2Internal!490
2019-11-18 14:00:05 -05:00
MascaraSnake
778543af08
Merge branch 'pingimprovements' into 'master'
...
Better ping implementation.
See merge request STJr/SRB2Internal!488
2019-11-18 13:58:41 -05:00
MascaraSnake
dbdbc116c7
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
dc70a24b30
restore zigzags
2019-11-18 15:32:48 -03:00
Jaime Passos
b7f2b74d9a
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
29792c7a2b
missing prototype
2019-11-18 15:13:31 -03:00
Jaime Passos
cf24b57d8f
perplayer
2019-11-18 15:12:55 -03:00
Jaime Passos
5c55c86dd2
invert conditional
2019-11-18 15:06:07 -03:00
MascaraSnake
9da5932d88
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
535aa79418
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
85f1b847e9
LF_WARNINGTITLE
2019-11-18 15:04:40 -03:00
MascaraSnake
3e7242af3c
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
444953d0bb
oh sh
2019-11-18 14:32:34 -03:00
Jaime Passos
6920d20a0f
map header option
2019-11-18 14:08:47 -03:00
Jaime Passos
e40bf85a6f
lua
2019-11-18 13:50:44 -03:00
Jaime Passos
4ea3513076
Organize
2019-11-18 12:56:41 -03:00
Jaime Passos
9d17614c55
arg
2019-11-18 11:42:45 -03:00
Jaime Passos
6c98dde736
stuff
2019-11-18 11:39:54 -03:00
lachwright
27fcaf0f93
Whoops, deleted a little too much by accident
2019-11-18 16:26:15 +08:00
lachwright
4c432c376e
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
8a7b3d7022
Merge remote-tracking branch 'origin/master' into titlecards
2019-11-17 23:57:18 -03:00
James R
4439d29ed7
Shift showping display up a bit
2019-11-17 18:54:23 -08:00
James R
b05dec5294
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
22421b1031
Snapping for showping, so it doesn't jump way up on non-green
2019-11-17 18:52:05 -08:00
Louis-Antoine
b4987636fe
Add missing checks for PF_FINISHED in HUD code
2019-11-18 03:27:39 +01:00
Steel Titanium
2584241a44
Better ping implementation.
2019-11-17 20:22:47 -05:00
Jaime Passos
635e121bfc
Restore old sound effect
2019-11-17 21:33:59 -03:00
Jaime Passos
64939816fb
Fireball
2019-11-17 21:25:17 -03:00
Louis-Antoine
24744d07e4
Disable exitmove by default
2019-11-17 23:52:51 +01:00
Louis-Antoine
688bf0158d
Disable Tails carrying for players who completed the level
...
To avoid trolls...
2019-11-17 23:46:34 +01:00
Louis-Antoine
6c98a150be
Show the exit icon for finished players
2019-11-17 23:44:48 +01:00
toaster
4cc1b2b327
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
toaster
ef5558af97
Hardcode DrT's FHZ improvements. Puttin' the FREEZE in feature freeze amirite haha
2019-11-17 20:34:25 +00:00
toaster
0c98fb746c
Add some NiGHTS animations which default to normal player sprite2s to the existing player->panim set list, which makes Tails' tails appear due to how P_DoTailsOverlay is coded (assuming the skin is Tails, requiring them to have SPR2_NFLY available).
2019-11-17 18:04:02 +00:00
toaster
8ce054a7c8
Align to base rather than top.
2019-11-17 15:55:22 +00:00
toaster
5909b85627
Fix overlapping on You Can Now Become Super Sonic screen.
2019-11-17 15:20:20 +00:00
