Commit graph

6895 commits

Author SHA1 Message Date
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
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
Louis-Antoine
88def9b8e8 Do not focus the camera on the end sign if exitmove is active 2019-11-25 17:23:35 +01: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
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
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
MascaraSnake
2ad057d9b9 Give RVZ lavafalls fire damage 2019-11-24 23:01:17 +01:00
Jaime Passos
6cdcb24360 Fix FreeMipmapColormap crash 2019-11-24 17:37:11 -03: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
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
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
toaster
206f3ac51c Have the vertical aiming focus on the signpost's z rather than continue to focus on the player even while the camera is forced to be near the signpost. (resolves #327) 2019-11-23 15:11:24 +00:00
toaster
75e714956f It's not safe to store a file-scope pointer to a mobj_t* without having any mechanism to clear it between map reloadings, so move the Tailsbot "press jump now to fly!" indicator into tails->target.
Resolves #331, and likely also #330 and #309.
2019-11-23 14:43:47 +00:00
toaster
dbeec7dacc Prevent Knuckles latching onto horizon special linedefs.
Also, update all references to the horizon special to use a #defined constant instead of a magic number.
2019-11-23 14:20:41 +00:00
MascaraSnake
710fbf8cd5 Merge branch 'crossfade-fix' into 'master'
Fix crossfades

See merge request STJr/SRB2Internal!514
2019-11-23 04:14:07 -05:00
MascaraSnake
6ac467896b Merge branch 'drtminus' into 'master'
drt minus

See merge request STJr/SRB2Internal!495
2019-11-22 16:09:58 -05:00
toaster
0a49bab070 I was reading the Sonic 3 Unlocked blog by NeoHazard when I came across a very interesting post.
https://s3unlocked.blogspot.com/2017/12/over-threshold.html

It turns out that in Sonic 3 & Knuckles, the threshold for crossing into the super animation is increased compared to normal gameplay. This makes a lot of sense - however, both Sonic Mania and the Taxman/Stealth mobile remakes missed this. I quickly tested and confirmed that SRB2 had the same issue, so here's the fix.
2019-11-22 21:06:25 +00:00
Jaime Passos
8797e139ee clarify comment 2019-11-22 17:50:05 -03:00
Jaime Passos
476e6cc6ed Fix crossfades
Fixes NoReload using the wrong wipestyle.
Also fixes non-titlemap title screen wipes using the wrong wipestyle.
2019-11-22 17:44:42 -03:00
Jaime Passos
99217974d0 fix missing mmx check 2019-11-22 17:30:53 -03:00
MascaraSnake
76ef50f73e Merge branch 'gfz-debris' into 'master'
VAdaPEGA's GFZ debris

See merge request STJr/SRB2Internal!505
2019-11-22 15:27:11 -05:00
MascaraSnake
27f99a7461 Merge branch 'infopoke' into 'master'
MS Info packet tweaks (resolves #300)

Closes #300

See merge request STJr/SRB2Internal!499
2019-11-22 15:21:41 -05:00
sphere
b6172a2b2e Swap statistics and tutorial options in the 1 Player menu. 2019-11-22 21:00:03 +01:00
toaster
21880219aa Resolve #310. 2019-11-22 19:51:27 +00:00
sphere
3e428a5176 i'm a dumbass 2019-11-22 20:37:35 +01:00
MascaraSnake
10ab32a68d Merge branch 'dsz3target' into 'master'
Sea Egg targeting systems online! (resolves #303)

Closes #303

See merge request STJr/SRB2Internal!501
2019-11-22 14:26:40 -05:00