toaster
4d693d5331
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
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
Jaime Passos
2ccdb483cd
Update hw_main.c
2019-11-15 19:40:58 -03:00
Jaime Passos
46f88101b2
Small mistake
2019-11-15 19:36:25 -03:00
Jaime Passos
ffa03980f4
Move scope of wipelumpname
2019-11-15 19:09:02 -03:00
Jaime Passos
150283b20a
I don't get it
2019-11-15 19:04:40 -03:00
Jaime Passos
aecba1ec40
Shadowed declaration and unused parameters
2019-11-15 18:58:45 -03:00
Steel Titanium
56f77a83f4
Fix crash when using the -connect startup paramater ( Resolves #292 )
2019-11-15 16:57:47 -05:00
Jaime Passos
31ee16181f
Accidental missing (void)
2019-11-15 18:53:32 -03:00
Jaime Passos
bc7686c16a
LEVELWIPES
2019-11-15 18:21:12 -03: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
4af83b0b01
* 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
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
Jaime Passos
96ce48f4f2
F_WipeColorFill
2019-11-14 21:31:20 -03:00
Jaime Passos
1b5b216fb8
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-14 20:50:09 -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
Jaime Passos
7168d72580
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-14 20:24:42 -03: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
Jaime Passos
dc7f8bafd5
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-14 19:57:51 -03: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
