Commit graph

8007 commits

Author SHA1 Message Date
MascaraSnake
c169fc64ec Merge branch 'fix-play-sfx-exec-part2' into 'master'
Fix the "play sound from nowhere as long as you're in the tagged areas" behavior

See merge request STJr/SRB2Internal!553
2019-11-25 16:54:08 -05:00
MascaraSnake
742b4eb142 Merge branch 'paperprojection' into 'master'
Papersprite projection tweak

See merge request STJr/SRB2Internal!535
2019-11-25 16:53:48 -05:00
MascaraSnake
ab7fe745c6 Merge branch 'charlock' into 'master'
Charlock (resolves #345).

Closes #345

See merge request STJr/SRB2Internal!528
2019-11-25 16:44:38 -05:00
MascaraSnake
50545cbc6a Merge branch 'unglue-metalsonic' into 'master'
Unglue Metal Sonic after floating onto a platform

Closes #344

See merge request STJr/SRB2Internal!526
2019-11-25 16:44:18 -05:00
MascaraSnake
b52c71b6e2 Merge branch 'minusflip' into 'master'
Have Minus rotate in mid-air

Closes #326

See merge request STJr/SRB2Internal!532
2019-11-25 16:43:49 -05:00
MascaraSnake
0f149b0feb Merge branch 'knuxstuff' into 'master'
Minor Knuckles fixes

See merge request STJr/SRB2Internal!527
2019-11-25 16:41:56 -05:00
Nev3r
380715810b 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
MascaraSnake
23ca6d16ae 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
dc57c03346 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
8ed00fca89 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
2f1b6a1700 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
8cd29cc006 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
2c238e1bb9 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
4ce6c7d4c1 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
dbae6064f9 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
8a4214448f 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
4c33d5fcde 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
e725b34c5c 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
5ab19b44ce 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
d64fa9c478 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
b1f2d87443 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
Louis-Antoine
88def9b8e8 Do not focus the camera on the end sign if exitmove is active 2019-11-25 17:23:35 +01:00
lachwright
74b180f798 Merge branch 'master' into unglue-metalsonic 2019-11-26 00:20:47 +08:00
lachwright
bf46194ab6 Add comment 2019-11-26 00:20:43 +08:00
lachwright
82e393ab73 Fix 'Speeding off to...' placement in non-greeen resolutions 2019-11-26 00:16:46 +08:00
toaster
2b2d2a8441 Correct two instances where "Zone" is forced uppercase. 2019-11-25 16:04:03 +00:00
toaster
bb918c88f7 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
4c276b86de 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
502b26de58 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
f8d418c4af 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
87fe72db5f 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
559a2beaac 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
aac5e41f3d Revert "Render title map on connecting to server screen too"
This reverts commit 502c72e975.
2019-11-25 01:09:00 +01:00
toaster
2ab899192b Fix Tutorial prompt being incorrect size in GL (resolves #349). 2019-11-25 00:08:38 +00:00
toaster
875fe6575c 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
7977a344c7 Account for exiting but non-finished players in G_EnoughPlayersFinished 2019-11-24 23:40:40 +01:00
toaster
d8ce67a6c8 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
2ad057d9b9 Give RVZ lavafalls fire damage 2019-11-24 23:01:17 +01:00
Steel Titanium
1d68b6b2ba Fix time emblem overlapping best time on NiGHTS Mode menu (Resolves #353) 2019-11-24 16:37:13 -05:00
FuriousFox
dd01248c9c Missed a semicolon 2019-11-24 16:09:18 -05:00
FuriousFox
995451efaa 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
6cdcb24360 Fix FreeMipmapColormap crash 2019-11-24 17:37:11 -03:00
MascaraSnake
6531ab5423 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
9db5dc6d42 Merge branch 'patch-1' into 'master'
ZoneBuilder Config Updates

See merge request STJr/SRB2Internal!520
2019-11-24 13:14:45 -05:00
toaster
155b29694c 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
bfdb0e300c Shhhhh, Fang 2019-11-24 23:46:37 +08:00
lachwright
4a23d46bce Have Minus spawn debris upon landing, as suggested 2019-11-24 23:42:27 +08:00
toaster
e0c6fe7326 Woops 2019-11-24 15:19:15 +00:00
lachwright
86ff608cfd Have Minus rotate in mid-air 2019-11-24 22:29:26 +08:00
toaster
4b9eb8fbe8 Enable lowercase text for Statistics and Unlockable Checklist menus (resolves #339). 2019-11-24 13:51:53 +00:00