Commit graph

8140 commits

Author SHA1 Message Date
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
toaster
1fe24405db Make cv_exitmove only have effect if gametype is GT_COOP, otherwise immediately exit (resolves #342). 2019-11-24 13:35:37 +00:00
toaster
53fee8e428 Make mouselook follow the first-person option when a spectator, even when other variables assume you're in third person (resolves #340). 2019-11-24 13:30:49 +00:00
toaster
3f40c7e4a7 * Resolve #345.
* Prevent skincolours from being reset to the skin's prefcolour, but only for not-always-usable characters.
2019-11-24 13:24:37 +00:00
lachwright
7d15925069 Fix elemental stomp activating glide landing after emerging from goop; fix climbing boost-up not scaling properly with player scale 2019-11-24 19:30:20 +08:00
lachwright
0234ed6b6a Make Metal's vertical float speed technically negative 2019-11-24 18:46:59 +08:00
MascaraSnake
1b1b4e6c4e Fixed crash when BASH's target disappears during chasing 2019-11-24 10:22:00 +01:00
lachwright
6788bcef7c Complete new intro 2019-11-24 15:58:03 +08:00
lachwright
703e15ad12 Merge branch 'master' into newintro 2019-11-24 13:11:38 +08:00
MascaraSnake
f6e135dccc Merge branch 'translucenthud-showfps-fix' into 'master'
Title card showfps translucency fix

See merge request STJr/SRB2Internal!522
2019-11-23 18:16:17 -05:00
MascaraSnake
36c4374fff Merge branch 'ra-wipe-fix' into 'master'
Fix RA fade (resolves #329)

Closes #329

See merge request STJr/SRB2Internal!521
2019-11-23 18:16:09 -05:00
MascaraSnake
0e39c7a2f6 Merge branch 'statusbar-stuff' into 'master'
No longer allow showhud to toggle FPS counter or ping bar

See merge request STJr/SRB2Internal!523
2019-11-23 18:09:59 -05:00
MascaraSnake
62ae268a29 Merge branch 'menu-reordering' into 'master'
Menu reordering (also renaming secrets to extras)

See merge request STJr/SRB2Internal!511
2019-11-23 17:51:46 -05:00
MascaraSnake
3ba08506b0 Merge branch 'nightsexitcam' into 'master'
NiGHTS exit camera tweak

See merge request STJr/SRB2Internal!519
2019-11-23 17:51:34 -05:00
MascaraSnake
e0a7fda93d Merge branch 'exitcam' into 'master'
Exit camera fixes (Resolves #327).

Closes #327

See merge request STJr/SRB2Internal!518
2019-11-23 17:51:29 -05:00
MascaraSnake
f8ee67f31c Merge branch 'horizonclimb' into 'master'
Horizonclimb (resolves #323)

Closes #323

See merge request STJr/SRB2Internal!516
2019-11-23 17:51:17 -05:00
MascaraSnake
66103c19bc Merge branch 'superrun' into 'master'
Super runspd fix

See merge request STJr/SRB2Internal!515
2019-11-23 17:51:12 -05:00
MascaraSnake
bd097d5564 Merge branch 'firefuck2' into 'master'
Firefuck II

Closes #310

See merge request STJr/SRB2Internal!512
2019-11-23 17:51:02 -05:00
Jaime Passos
2527e85108 fix showfps with st_translucency 2019-11-23 18:41:28 -03:00
FuriousFox
02a5b53ede Added Dragonbomber 2019-11-23 16:37:33 -05:00
Jaime Passos
4d18646881 fix RA fade 2019-11-23 18:15:09 -03:00
Steel Titanium
25712d9500 No longer allow showhud to toggle FPS counter or ping bar 2019-11-23 16:09:02 -05:00
FuriousFox
7b5e6df63b Added Blue Gargoyle and Green Flame 2019-11-23 15:04:59 -05:00
FuriousFox
142f799e82 Updated sprite for Minus 2019-11-23 14:21:48 -05:00
MascaraSnake
e70f8b383e Fixed a missing space in the "Speeding off to..." text 2019-11-23 18:51:32 +01:00
toaster
d252d82039 Since I was tired of seeing NiGHTS players bump their head into the ceiling, and since similar camera enhancements have been made for the papersprite sign exit, implement a camera lock when exiting while NiGHTS.
https://cdn.discordapp.com/attachments/359091121789468672/647821662003396609/srb20088.gif
2019-11-23 15:40:32 +00:00
toaster
ea5ac5bb6a Remove duplicate viewpointx/viewpointy set. 2019-11-23 15:23:42 +00:00