Louis-Antoine
8b3e4d122b
Show player number instead of node when someone joins
2019-11-16 01:42:02 +01:00
James R
53f5d7ffc3
Don't confuse node with player in commands
...
(cherry picked from commit 17bdf39dc8372ed9c6c31fa8d00eba03396a55bf)
2019-11-15 16:07:15 -08:00
Jaime Passos
12e8c11382
Update hw_main.c
2019-11-15 19:40:58 -03:00
Jaime Passos
55c42d9cb7
Small mistake
2019-11-15 19:36:25 -03:00
Jaime Passos
5b0730839b
Move scope of wipelumpname
2019-11-15 19:09:02 -03:00
Jaime Passos
41835e07ea
I don't get it
2019-11-15 19:04:40 -03:00
Jaime Passos
7ba7620059
Shadowed declaration and unused parameters
2019-11-15 18:58:45 -03:00
Steel Titanium
aff55ee27b
Fix crash when using the -connect startup paramater ( Resolves #292 )
2019-11-15 16:57:47 -05:00
Jaime Passos
f55b0f52ca
Accidental missing (void)
2019-11-15 18:53:32 -03:00
Jaime Passos
c15ee65015
LEVELWIPES
2019-11-15 18:21:12 -03:00
Louis-Antoine
29501a992b
Merge branch 'master' into exit-move-lj
2019-11-15 19:35:47 +01:00
Louis-Antoine
d95a1e2ff3
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
98712ad703
Resolve #291 .
2019-11-15 16:39:30 +00:00
toaster
efa609d366
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
52bd4b05e1
* Make the Egg Capsule only explode for one second, but have the number of explosions (and flickies) multiplied 1.5 times.
...
* If the player is spindashing when the level is exited, they will un-spindash. (Currently you get stuck in charging)
2019-11-15 15:20:36 +00:00
toaster
892f6eca27
Make ACZ3's slapstick signpost taller ( resolves #267 ).
2019-11-15 14:52:34 +00:00
Louis-Antoine
ff62a0732a
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
d91d07da5b
Fix Metal Sonic not correctly flipping with gravity. (Doesn't require a new Metal recording.)
2019-11-15 13:10:41 +00:00
toaster
66001cc73c
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
56e5e3a01e
Deobfuscate the R_ParseSpriteInfo call
2019-11-14 19:56:26 -08:00
James R
aa158cccd9
Freed before read, oops!
2019-11-14 19:28:33 -08:00
Jaime Passos
88fb22d688
Yeah, yeah...
2019-11-14 22:14:40 -03:00
Jaime Passos
76488d835f
F_WipeColorFill
2019-11-14 21:31:20 -03:00
Jaime Passos
cc5c70ce7b
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-14 20:50:09 -03:00
toaster
d0fac1988a
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
Jaime Passos
6be45ec241
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-14 20:24:42 -03:00
toaster
46e8bf2f30
Fix incorrect offsets of cached rotsprites
2019-11-14 23:22:18 +00:00
James R
d36086ba33
Clang warning
2019-11-14 15:12:50 -08:00
MascaraSnake
80fd112009
Merge branch 'papersign2' into 'master'
...
Paper sign tweaks
See merge request STJr/SRB2Internal!460
2019-11-14 18:07:34 -05:00
MascaraSnake
6c6d89ca57
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
031a352f72
Merge branch 'titleflash' into 'master'
...
Improved title screen flashes
See merge request STJr/SRB2Internal!462
2019-11-14 18:07:05 -05:00
MascaraSnake
3d8043ff64
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
b0786f12de
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
Jaime Passos
d95a93b537
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-14 19:57:51 -03:00
MascaraSnake
07ea748d96
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
8f6890025c
Merge branch 'secretstuff' into 'master'
...
The letter
See merge request STJr/SRB2Internal!438
2019-11-14 17:49:23 -05:00
Louis-Antoine
f4beb4a56f
Disable monitor respawning in co-op
2019-11-14 22:27:02 +01:00
Louis-Antoine
18dc6013ed
Disable item respawn in NiGHTs levels
2019-11-14 21:21:42 +01:00
MascaraSnake
3352f914d7
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
89f1e1ce61
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
15da6c153a
Woops, condition was accidentially inverted... but also I decided this looks nicer instead.
2019-11-14 19:09:17 +00:00
Louis-Antoine
cccf1c8a7b
Disable perfect bonus in multiplayer
2019-11-14 19:25:19 +01:00
toaster
278ddcf770
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
8506d420a6
Optimise
2019-11-14 14:12:36 -03:00
toaster
afe28b0a0a
* 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
10d1b63ff2
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-14 12:49:03 -03:00
Jaime Passos
cb4820c505
Oh. Sorry.
2019-11-14 12:42:45 -03:00
Louis-Antoine
ffd9cfebe6
Allow item respawn in co-op again
...
Why was it even disabled anyway.
2019-11-14 16:37:09 +01:00
Jaime Passos
4292c5fc0b
Other things I missed. Also added SF_NONIGHTSROTATION. Do I even have to keep the old behaviour? I have no idea.
2019-11-14 12:27:22 -03:00
toaster
261041dc69
Resolve #281 . (Might have problems with non-SDL interfaces, but definitely good for what we're shipping with.)
2019-11-14 14:19:13 +00:00
