Commit Graph

8184 Commits

Author SHA1 Message Date
toaster 64cda33d6d SMOOTH PAPERCOLLISION TIME!!!!!!!!
resolves #273, damn i feel good
2019-11-25 20:12:42 +00:00
Nev3r 1b360d2cd8 Fix the "play from nowhere as long as you're in the tagged areas" behavior in the Play Sound line executor. 2019-11-25 20:30:06 +01:00
toaster ef556ca6d5 Fix Continue sprites not working for custom characters (incorrect SPR2_XTRA bounds check).
Also, change all the references to XTRA_ constants to consistently check for > its value, instead of >= its value plus one (or that there's any frames at all) - for extra clarity/consistency, and capacity for re-ordering later.
2019-11-25 18:52:38 +00:00
MascaraSnake 8596445de6 Merge branch 'statisticase' into 'master'
Statisticase (resolves #339).

Closes #339

See merge request STJr/SRB2Internal!531
2019-11-25 13:21:09 -05:00
MascaraSnake 3a12c13e50 Merge branch 'nightsmode-menu-fix' into 'master'
Fix time emblem overlapping best time on NiGHTS Mode menu (Resolves #353)

Closes #353

See merge request STJr/SRB2Internal!539
2019-11-25 13:20:31 -05:00
MascaraSnake e48f4170fc Merge branch 'springroll' into 'master'
Spring roll (Resolves #336).

Closes #336

See merge request STJr/SRB2Internal!543
2019-11-25 13:20:16 -05:00
MascaraSnake bdc0075ee0 Merge branch 'speclook' into 'master'
Speclook (resolves #340).

Closes #340

See merge request STJr/SRB2Internal!529
2019-11-25 13:20:00 -05:00
LJ Sonic 406ff44bae Merge branch 'speedingofftocorner' into 'master'
Fix "Speeding off to..." placement in non-green resolutions

See merge request STJr/SRB2Internal!549
2019-11-25 13:12:04 -05:00
LJ Sonic 0cc5d35308 Merge branch 'reversesmash' into 'master'
Spikes and gravity (resolves #348).

Closes #348

See merge request STJr/SRB2Internal!541
2019-11-25 13:11:48 -05:00
LJ Sonic 31af9107e3 Merge branch 'lavafall-firedamage' into 'master'
Give RVZ lavafalls fire damage (resolves #352)

Closes #352

See merge request STJr/SRB2Internal!540
2019-11-25 13:09:18 -05:00
LJ Sonic 66c46bb3ea Merge branch 'mapisnowZONE' into 'master'
Map is now ZONE

See merge request STJr/SRB2Internal!548
2019-11-25 13:08:01 -05:00
LJ Sonic 69c41c5013 Merge branch 'bashfix' into 'master'
Fixed crash when BASH's target disappears during chasing

Closes #341

See merge request STJr/SRB2Internal!525
2019-11-25 13:06:16 -05:00
LJ Sonic 1892ab0de5 Merge branch 'tutboxgl' into 'master'
Tutorial Prompt in GL (resolves #349).

Closes #349

See merge request STJr/SRB2Internal!544
2019-11-25 13:05:46 -05:00
LJ Sonic 9541137f5e Merge branch 'join-bug-fix' into 'master'
Fix for the join bug

Closes #302, #338, and #347

See merge request STJr/SRB2Internal!545
2019-11-25 12:58:48 -05:00
LJ Sonic 80b346fe80 Merge branch 'eximove-sign-fix' into 'master'
Do not focus the camera on the end sign if exitmove is active

See merge request STJr/SRB2Internal!550
2019-11-25 12:57:42 -05:00
LJ Sonic 6c453ebf6e Merge branch 'mpspecialfixes' into 'join-bug-fix'
MP Special Stage fixes (resolves #347).

See merge request STJr/SRB2Internal!546
2019-11-25 12:56:22 -05:00
LJ Sonic 66ffe8f922 Merge branch 'gameovercoop' into 'join-bug-fix'
Co-op Game Over fix

See merge request STJr/SRB2Internal!547
2019-11-25 12:55:44 -05:00
toaster f86b46640d Skip character select entirely if only one character is available on the list. 2019-11-25 17:06:06 +00:00
toaster fc407cf6ce Skip tagteam characters (ie, Sonic&Tails) for NiGHTS secret map character selection. 2019-11-25 16:55:18 +00:00
toaster 5cf803f7d0 Allow character select for NiGHTS stages on the Secret Level Select now that every character has NiGHTS sprites.
(think of this as the collorary to 358, not a direct change)
2019-11-25 16:46:26 +00:00
Louis-Antoine 404d09e35a Do not focus the camera on the end sign if exitmove is active 2019-11-25 17:23:35 +01:00
lachwright f7ede3b313 Merge branch 'master' into unglue-metalsonic 2019-11-26 00:20:47 +08:00
lachwright 287e8133bb Add comment 2019-11-26 00:20:43 +08:00
lachwright 5719a93211 Fix 'Speeding off to...' placement in non-greeen resolutions 2019-11-26 00:16:46 +08:00
toaster 6398779983 Correct two instances where "Zone" is forced uppercase. 2019-11-25 16:04:03 +00:00
toaster 2110fa6bd1 Fix extra lives given to game-overed players not re-entering them into the action when cv_coopstarposts is 0. 2019-11-25 14:59:06 +00:00
toaster 71e74ca363 Fix a bunch of shit with MP special stages!
* Prevent an infinite quantity of Emeralds being spawned when P_GiveEmerald is called while a MP Special Stage is in session (resolves #347).
* Fix FuriousFox's ridiculous timer on special stage spawn (mentioned in the comments of the previous issue) by correctly marking spectator players in special stages as finished, and preventing the underflow.
2019-11-25 14:33:15 +00:00
MascaraSnake 17acec0cd1 Merge branch 'zbskies2' into 'master'
More ZB Config Updates (retry)

See merge request STJr/SRB2Internal!537
2019-11-25 03:04:22 -05:00
MascaraSnake 10df92d232 Merge branch 'shhhhhfang' into 'master'
Make DSWBREAK a singular sound

See merge request STJr/SRB2Internal!534
2019-11-25 03:00:49 -05:00
MascaraSnake 9e598f583a Merge branch 'hwr-cache-fix' into 'master'
Fix FreeMipmapColormap crash (resolves #287 and #351)

Closes #287 and #351

See merge request STJr/SRB2Internal!538
2019-11-25 02:59:07 -05:00
MascaraSnake 9cf7d60288 Merge branch 'exitmove-erz2-fix' into 'master'
Account for exiting but non-finished players in G_EnoughPlayersFinished

Closes #354

See merge request STJr/SRB2Internal!542
2019-11-25 02:57:47 -05:00
Louis-Antoine a187460865 Revert "Render title map on connecting to server screen too"
This reverts commit b6e145f0c5.
2019-11-25 01:09:00 +01:00
toaster 82843fc78e Fix Tutorial prompt being incorrect size in GL (resolves #349). 2019-11-25 00:08:38 +00:00
toaster df5c8e792f Go from spindash into ordinary roll if player's speed is suddenly above the speed you're allowed to roll at. 2019-11-24 22:55:37 +00:00
Louis-Antoine 74ae5819c4 Account for exiting but non-finished players in G_EnoughPlayersFinished 2019-11-24 23:40:40 +01:00
toaster c0bc46ca9c A bunch of spike tweaks.
* Make it possible to break them in reverse gravity (resolves #348) by making the spikes break in a circle around the spike touched, rather than in a circle around the player.
* Fix the spike chunks spawned not being flipped in reverse gravity by using P_SpawnMobjFromMobj.
* Make their breaking sound singular (prevents eardrum destruction).
2019-11-24 22:38:26 +00:00
MascaraSnake 7b80d509cc Give RVZ lavafalls fire damage 2019-11-24 23:01:17 +01:00
Steel Titanium d4a8fd8e64
Fix time emblem overlapping best time on NiGHTS Mode menu (Resolves #353) 2019-11-24 16:37:13 -05:00
FuriousFox b231719eed Missed a semicolon 2019-11-24 16:09:18 -05:00
FuriousFox ba69a39802 Updated the list of which skies are associated with which maps, rearranged the list of character to match the character select in-game, and added myself to the file's credits.
(Re-did all of this because I think I messed up the branches and stuff last time.
2019-11-24 15:43:49 -05:00
Jaime Passos c9ff8ec26b Fix FreeMipmapColormap crash 2019-11-24 17:37:11 -03:00
MascaraSnake 23643e05c0 Merge branch 'racexitmove' into 'master'
Racexitmove (resolves #342).

Closes #342

See merge request STJr/SRB2Internal!530
2019-11-24 13:15:08 -05:00
MascaraSnake d4ca1fb6e7 Merge branch 'patch-1' into 'master'
ZoneBuilder Config Updates

See merge request STJr/SRB2Internal!520
2019-11-24 13:14:45 -05:00
toaster 3594623891 Courteousy of fickle, an adjustment to papersprite rendering that prevents the object's x1 and x2 being slightly off where they should be. Not perfect, but absolutely better than it was!
Also, tweak the Minecart segment spawning position, since this was originally placed based on the awkward rendering.
2019-11-24 16:42:13 +00:00
lachwright 6733a8c38f Shhhhh, Fang 2019-11-24 23:46:37 +08:00
lachwright 4e9e5a072f Have Minus spawn debris upon landing, as suggested 2019-11-24 23:42:27 +08:00
toaster 6773b39a40 Woops 2019-11-24 15:19:15 +00:00
lachwright 9a7979d841 Have Minus rotate in mid-air 2019-11-24 22:29:26 +08:00
toaster 508feaad9d Enable lowercase text for Statistics and Unlockable Checklist menus (resolves #339). 2019-11-24 13:51:53 +00:00
toaster 4dfae1a65b Make cv_exitmove only have effect if gametype is GT_COOP, otherwise immediately exit (resolves #342). 2019-11-24 13:35:37 +00:00