Commit graph

7949 commits

Author SHA1 Message Date
toaster
518976f81d 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
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
MascaraSnake
15780351b1 Merge branch 'tailsupbruhtonium' into 'master'
Tails Flight Indicator Bruh Moment

Closes #331, #330, and #309

See merge request STJr/SRB2Internal!517
2019-11-23 10:15:16 -05: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
MascaraSnake
52ca361765 Merge branch 'planes-mmx-fix' into 'master'
Fix missing MMX check

See merge request STJr/SRB2Internal!513
2019-11-22 16:09:03 -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
MascaraSnake
16f0e3c9f7 Merge branch 'rollout-bumps' into 'master'
Add fun™ to rollout rocks

See merge request STJr/SRB2Internal!504
2019-11-22 14:25:39 -05:00
sphere
0acbe21d49 restore secrets = 0, not sure why i changed that 2019-11-22 20:24:57 +01:00
MascaraSnake
5cc282e69d Merge branch 'radiomode3' into 'master'
Fix conditionset-based unlocks on the Sound Test (resolves #312).

Closes #312

See merge request STJr/SRB2Internal!508
2019-11-22 14:12:03 -05:00
MascaraSnake
2a27fb7676 Merge branch 'mapvisitedupdate' into 'master'
Intermission fixes/cleanup

See merge request STJr/SRB2Internal!509
2019-11-22 14:11:31 -05:00
MascaraSnake
7c10bb0bfd Merge branch 'followghost' into 'master'
Followmobj Record Attack fix (resolves #322).

Closes #322

See merge request STJr/SRB2Internal!510
2019-11-22 14:10:59 -05:00
MascaraSnake
7a6045f798 Merge branch 'playersall' into 'master'
Players All reliability fix (resolves #301 and #315)

Closes #301 and #315

See merge request STJr/SRB2Internal!500
2019-11-22 14:10:39 -05:00
MascaraSnake
b276366816 Merge branch 'remove-unused-levelwipes' into 'master'
(Cleanup) Remove unused levelwipes

See merge request STJr/SRB2Internal!507
2019-11-22 09:21:17 -05:00
MascaraSnake
73eb3a0ef8 Merge branch 'titlecard-event-fix' into 'master'
Remove D_ProcessEvents call in G_PreLevelTitleCard (resolves #317)

Closes #317

See merge request STJr/SRB2Internal!506
2019-11-22 09:12:02 -05:00
sphere
da90ebcdfb fuck autocomplete 2019-11-22 04:12:38 +01:00
toaster
897409242e Move all the visitation/emblems/record attack update stuff into a single function, and call that function in two different places depending on whether the tally screen is visited or not. 2019-11-21 23:38:33 +00:00
toaster
073f9dbb77 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into mapvisitedupdate 2019-11-21 23:16:06 +00:00
toaster
3e750a4cbe Correct location of followmobj scale write to match read (resolves #322).
Requires deleting all of RC1's Record Attack replays with followmobj characters, but I think you'll agree that's a reasonable price to pay.
2019-11-21 22:50:04 +00:00
toaster
342fe570e7 Do a whole bunch of cleanup for mapvisited and intermission related things.
* Move the visitation flags, Record Attack/NiGHTS Attack data, and emblem checking to outside of Y_StartIntermission.
* Y_CleanupScreenBuffer never got called for maps which skip the intermission, leading to a small memory leak; this is now fixed by moving it to G_AfterIntermission.
* Y_FollowIntermission was just G_AfterIntermission with modeattacking specific behaviour, but this is desired for all places where G_AfterIntermission is called, so just merge this into G_AfterIntermission.

Notably, these changes are necessary because there are now three maps in the main SP campaign which do not end with traditional intermissions. As a result, this fixes an issue where Black Core's tracks are not available in the Sound Test (due to MV_BEATEN never being applied).

Also, since I was here: Remove "gotperfect" from recorddata_t. This is a duplicate of `mapvisited[gamemap-1] & MV_PERFECT` which uses more memory. I have kept the new spacing in the gamedata for compatibility with RC1 savedatas, but moved it across to the original method everywhere else.
2019-11-21 16:10:28 +00:00
sphere
39e3874750 Re-reorganize sound options. 2019-11-21 16:53:37 +01:00
sphere
1407d367a1 Remove unneeded HAVE_MIXERX checks. 2019-11-21 16:35:27 +01:00
MascaraSnake
93faf0f3ff Merge branch 'gametype-out-of-range' into 'master'
Prevent gametype changes being out of range

See merge request STJr/SRB2Internal!503
2019-11-21 09:31:05 -05:00
MascaraSnake
3bb505b8e6 Merge branch 'hi-lj' into 'master'
Fix issue with strcasestr that causes a map command crash

See merge request STJr/SRB2Internal!502
2019-11-21 09:30:18 -05:00