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
Steel Titanium
b1f39e836d
Better ping implementation.
2019-11-17 20:22:47 -05: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
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
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
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
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
toaster
d6bf82c2e4
Fix incorrect offsets of cached rotsprites
2019-11-14 23:22:18 +00:00
James R
e7fd7602ca
Clang warning
2019-11-14 15:12:50 -08:00
MascaraSnake
397520e090
Merge branch 'papersign2' into 'master'
...
Paper sign tweaks
See merge request STJr/SRB2Internal!460
2019-11-14 18:07:34 -05:00
MascaraSnake
43938ef56d
Merge branch 'flickies_not_in_walls' into 'master'
...
Flickies not in walls
See merge request STJr/SRB2Internal!461
2019-11-14 18:07:19 -05:00
MascaraSnake
910a39ee32
Merge branch 'titleflash' into 'master'
...
Improved title screen flashes
See merge request STJr/SRB2Internal!462
2019-11-14 18:07:05 -05:00
MascaraSnake
0de24336ed
Merge branch 'map-by-name' into 'master'
...
LJ saved me from self destruction by bad code
See merge request STJr/SRB2Internal!463
2019-11-14 18:06:52 -05:00
MascaraSnake
0c304eefce
Merge branch 'coop-item-respawn' into 'master'
...
Allow item respawn in co-op again
See merge request STJr/SRB2Internal!466
2019-11-14 18:06:32 -05:00
MascaraSnake
edcd9abb24
Merge branch 'soundsystemfix' into 'master'
...
Sound system startup fix
Closes #281
See merge request STJr/SRB2Internal!465
2019-11-14 17:50:41 -05:00
MascaraSnake
9a0a85ba67
Merge branch 'secretstuff' into 'master'
...
The letter
See merge request STJr/SRB2Internal!438
2019-11-14 17:49:23 -05:00
Louis-Antoine
3c398fb39f
Disable monitor respawning in co-op
2019-11-14 22:27:02 +01:00
Louis-Antoine
c0fb5489df
Disable item respawn in NiGHTs levels
2019-11-14 21:21:42 +01:00
MascaraSnake
5892de3011
Merge branch 'rotsprite_i' into 'master'
...
Sprite rotation (resolves #183 )
Closes #183
See merge request STJr/SRB2Internal!430
2019-11-14 14:58:13 -05:00
MascaraSnake
aba7e8f9ab
Merge branch 'clearbans-please' into 'master'
...
Write empty file on clearbans
See merge request STJr/SRB2Internal!464
2019-11-14 14:35:03 -05:00
toaster
6986e7b0a1
Woops, condition was accidentially inverted... but also I decided this looks nicer instead.
2019-11-14 19:09:17 +00:00
Louis-Antoine
c5003cb494
Disable perfect bonus in multiplayer
2019-11-14 19:25:19 +01:00
toaster
d93b70ff26
Merge branch 'rotsprite_i' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into rotsprite_toast
2019-11-14 17:15:34 +00:00
Jaime Passos
2fa2ebe4a7
Optimise
2019-11-14 14:12:36 -03:00
toaster
a4efd441af
* Remove the 22(!!) NiGHTS sprite2s that no longer get used in ROTSPRITE builds (which should be our main builds going forward).
...
* Rename `SPR2_NGT0` to `SPR2_NFLY`, and `SPR2_DRL0` to `SPR2_NDRL` to account for this. (requires modifying player.dta)
2019-11-14 17:03:02 +00:00
Jaime Passos
499c724f9f
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-14 12:49:03 -03:00
Jaime Passos
644aebac80
Oh. Sorry.
2019-11-14 12:42:45 -03:00
Louis-Antoine
7ca4184cb2
Allow item respawn in co-op again
...
Why was it even disabled anyway.
2019-11-14 16:37:09 +01:00
