Commit graph

8244 commits

Author SHA1 Message Date
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
Steel Titanium
f988ac87d3 Merge branch 'master' into next 2019-11-14 18:41:57 -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
Steel Titanium
8678616918 Merge branch 'ferror-you-were-lied-to' into 'master'
Fix false file error reporting

See merge request STJr/SRB2!514
2019-11-14 18:20:34 -05: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
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
Jaime Passos
0a44158db9 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
763b49e83f 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
toaster
35b6e8ca94 Disable menu input on the title screen for the first second (ie, before the flash), to guarantee people won't start the menu the very first tic after the fade and ruin the animation. (Console and gif/screenshot recording still works, for the impatient.) 2019-11-14 12:52:34 +00:00
James R
7815b876b9 Save bans when cleared too
(Why doesn't it work for I_Quit?)
2019-11-13 17:37:53 -08:00
toaster
5a26b684ad I'm a dumbass who makes extremely consequential typoes (and since the typo is no longer in effect, the supergold can be brightened some more)
https://cdn.discordapp.com/attachments/244035368595357697/644316971738857483/srb20060.gif
2019-11-13 23:27:01 +00:00
James R
9290fa7e20 Warn if the gametype is not valid at all! 2019-11-13 14:31:44 -08:00
James R
85b6b307e8 Optimizations from LJ and generic functions 2019-11-13 14:26:28 -08:00
toaster
594974f287 Sev wanted no darkness during the initial animation... I think this is an acceptible compromise!
https://cdn.discordapp.com/attachments/428262628893261828/644295409283497995/srb20058.gif
2019-11-13 22:02:06 +00:00
toaster
6d7b448f49 https://cdn.discordapp.com/attachments/244035368595357697/644293089049182218/srb20057.gif
* Make the white flash a little easier on the eyes by putting the full-screen fade behind the title wing/ring, then drawing multiple overlaid colormapped versions of them on top of each other.
* Darken the pre-flash screen.
2019-11-13 21:52:35 +00:00