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
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
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
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
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
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
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
toaster
e936b0d893
Hardcode DrT's FHZ improvements. Puttin' the FREEZE in feature freeze amirite haha
2019-11-17 20:34:25 +00:00
toaster
1662d8ed50
Align to base rather than top.
2019-11-17 15:55:22 +00:00
toaster
0c170c4177
Fix overlapping on You Can Now Become Super Sonic screen.
2019-11-17 15:20:20 +00:00
toaster
5b161a6f60
Update end tally and sound test to accomodate new title font.
2019-11-17 14:56:05 +00:00
toaster
e155da7280
Since I had to tweak this branch to do the scrapped changing-to-title-music-at-a-different-time thing (since it was too late, and too late is WAY worse than too early): Have the credits music fade out over a shorter time when going to the title screen (vs going to evaluation), as opposed to stopping entirely.
2019-11-17 14:14:38 +00:00
Nev3r
e3e93016cd
Mapname lowercase support ( #146 )
...
* Moved levelname parsing to before where uppercase conversion occurs.
* Extended titlecard font range.
* Replaced misc. "ZONE" strings with "Zone" for titlecard purposes.
* Don't convert to uppercase when rendering the titlecard name.
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-11-16 20:36:25 -05:00
MascaraSnake
7faf9a3a4a
Merge branch 'sprinfo-bruh-moment' into 'master'
...
Freed before read, oops!
See merge request STJr/SRB2Internal!470
2019-11-16 12:54:21 -05:00
MascaraSnake
3b3441ca40
Merge branch 'clearer-nodes-command' into 'master'
...
Make the "nodes" command clearer
See merge request STJr/SRB2Internal!477
2019-11-16 12:53:31 -05:00
MascaraSnake
b61c2b0c4d
Merge branch 'fix-default-snac' into 'master'
...
defaultname, defaultskin and defaultcolor changes
See merge request STJr/SRB2Internal!479
2019-11-16 12:52:48 -05:00
MascaraSnake
0427a6217b
Merge branch 'titlescreen-connect-crash-fix' into 'master'
...
Fix crash when using the -connect startup paramater (Resolves #292 )
Closes #292
See merge request STJr/SRB2Internal!478
2019-11-16 03:54:49 -05:00
James R
d2cd9e7239
Remove defaultname, since players are probably sure on their name change
2019-11-15 17:32:43 -08:00
James R
37dc402540
Move setting from defaults to M_FirstLoadConfig, so it triggers even when the title screen doesn't start
2019-11-15 17:31:53 -08:00
Louis-Antoine
ca5b1297ee
Show player number instead of node when someone joins
2019-11-16 01:42:02 +01:00
James R
1c2eb88163
Don't confuse node with player in commands
...
(cherry picked from commit 17bdf39dc8372ed9c6c31fa8d00eba03396a55bf)
2019-11-15 16:07:15 -08:00
Steel Titanium
56f77a83f4
Fix crash when using the -connect startup paramater ( Resolves #292 )
2019-11-15 16:57:47 -05:00
Louis-Antoine
d3b113c84a
Merge branch 'master' into exit-move-lj
2019-11-15 19:35:47 +01:00
Louis-Antoine
175f367b9c
Make the "nodes" command clearer
...
Because literally anyone who isn't a dev has
no idea what those fucking numbers even mean...
Before:
$nodes
00 - Sonic - 01 - 666.66.420.42:5029
01 - Tales - 00 - self
02 - Nukes - 255
03 - Ammie - 255
04 - Fangs - 255
05 - Metal - 255
After:
$nodes
00 - Sonic - node 01 - 666.66.420.42:5029
01 - Tales - node 00 - self
02 - Nukes
03 - Ammie
04 - Fangs
05 - Metal
2019-11-15 17:50:40 +01:00
toaster
8ef83d3e57
Resolve #291 .
2019-11-15 16:39:30 +00:00
toaster
28c662b5a3
Ending music and associated.
...
* Play the good or bad ending track, instead of perfect silence.
* Fade out the credits music over 5 seconds when the credits go to the evaluation (timed to have finished just before the "you unlocked this!" jingle).
2019-11-15 15:58:25 +00:00
toaster
9c221d2362
Make ACZ3's slapstick signpost taller ( resolves #267 ).
2019-11-15 14:52:34 +00:00
Louis-Antoine
28b0b7c404
Let players move after completing the level
...
This only takes effect in co-op,
and can be disabled with "exitmove off"
2019-11-15 15:35:28 +01:00
toaster
9d26ce23ec
Fix Metal Sonic not correctly flipping with gravity. (Doesn't require a new Metal recording.)
2019-11-15 13:10:41 +00:00
toaster
1d4b4e70dd
Resolve #288 .
...
* Fix off-by-one error I caused in the skin randomisation selection.
* Clean up signcolour set to never go outside of valid entry range.
* Fix the preventing-console-spam mechanism for invalid sprites viewed in-game by only setting the state's sprite/frame to S_UNKNOWN's if the object's sprite/frame is currenly equal to the state's.
2019-11-15 12:47:21 +00:00
James R
befdbec5bd
Deobfuscate the R_ParseSpriteInfo call
2019-11-14 19:56:26 -08:00
James R
1ca3bd7725
Freed before read, oops!
2019-11-14 19:28:33 -08:00
Jaime Passos
d0a996349b
Yeah, yeah...
2019-11-14 22:14:40 -03:00
toaster
0384cbb58a
Merge branch 'rotsprite_toast' into 'master'
...
Fix incorrect offsets of cached rotsprites
See merge request STJr/SRB2Internal!468
2019-11-14 18:49:12 -05:00