Commit graph

7983 commits

Author SHA1 Message Date
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
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
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
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
lachwright
bfdb0e300c Shhhhh, Fang 2019-11-24 23:46:37 +08: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
MascaraSnake
1b1b4e6c4e Fixed crash when BASH's target disappears during chasing 2019-11-24 10:22:00 +01: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