MascaraSnake
4ccb4f5c8a
Merge branch 'crossfade-fix' into 'master'
...
Fix crossfades
See merge request STJr/SRB2Internal!514
2019-11-23 04:14:07 -05:00
lachwright
dea1ba6568
Merge branch 'master' into signpost-cleanup
2019-11-23 07:05:45 +08:00
toaster
0f164301e1
Do Cobalt's suggestion, because this branch wasn't gonna get merged in its original state anyways.
2019-11-22 16:27:22 -05:00
MascaraSnake
2c85aa9f69
Merge branch 'drtminus' into 'master'
...
drt minus
See merge request STJr/SRB2Internal!495
2019-11-22 16:09:58 -05:00
MascaraSnake
7400db00b7
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
5611f8eff4
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
b24c709206
clarify comment
2019-11-22 17:50:05 -03:00
Jaime Passos
faa305a2f2
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
227f69f063
fix missing mmx check
2019-11-22 17:30:53 -03:00
MascaraSnake
6545284eaf
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
e9ca39d3bc
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
de2a26bf5d
Swap statistics and tutorial options in the 1 Player menu.
2019-11-22 21:00:03 +01:00
toaster
c8c5237540
Resolve #310 .
2019-11-22 19:51:27 +00:00
sphere
07221c50ce
i'm a dumbass
2019-11-22 20:37:35 +01:00
MascaraSnake
ca74636a27
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
6f82e5197d
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
e3aca4b647
restore secrets = 0, not sure why i changed that
2019-11-22 20:24:57 +01:00
MascaraSnake
44fa076698
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
f7c4ec1965
Merge branch 'mapvisitedupdate' into 'master'
...
Intermission fixes/cleanup
See merge request STJr/SRB2Internal!509
2019-11-22 14:11:31 -05:00
MascaraSnake
18babe3268
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
e351d629bd
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
a3a7dc6bed
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
ae8f0b42aa
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
lachwright
3e1c3b04e7
WIP intro graphics update
2019-11-22 20:08:23 +08:00
sphere
514394a4f3
fuck autocomplete
2019-11-22 04:12:38 +01:00
toaster
143d4aa053
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
3798e886ea
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into mapvisitedupdate
2019-11-21 23:16:06 +00:00
toaster
990d9ed40c
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
7ff616b26e
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
5a7ebb3ba6
Re-reorganize sound options.
2019-11-21 16:53:37 +01:00
sphere
b37c3a414a
Remove unneeded HAVE_MIXERX checks.
2019-11-21 16:35:27 +01:00
MascaraSnake
f13e67bf8f
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
9db5c5875c
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
MascaraSnake
f1ab6783c2
Merge branch 'subtitlesubterfuge' into 'master'
...
Subtitle subterfuge (resolves #306 )
Closes #306
See merge request STJr/SRB2Internal!498
2019-11-21 09:29:13 -05:00
MascaraSnake
3b2b8ab80f
Merge branch 'ptzcrash' into 'master'
...
Fix crash in new fireflower (resolves #305 ).
Closes #305
See merge request STJr/SRB2Internal!497
2019-11-21 09:28:35 -05:00
toaster
7c7eec4b9a
Fix conditionset-based unlocks on the Sound Test.
2019-11-21 13:12:54 +00:00
Jaime Passos
248306ccb0
Remove D_ProcessEvents call in G_PreLevelTitleCard
2019-11-21 02:16:09 -03:00
sphere
f021d35e7e
Move tutorial to the bottom of the 1 Player menu.
2019-11-21 02:43:07 +01:00
sphere
74987beb1f
Reword some evaluation sentences.
2019-11-21 02:24:12 +01:00
sphere
48c454553f
Move SP and MP down if extras aren't unlocked yet.
2019-11-21 02:19:31 +01:00
sphere
9608021824
Rename "secrets" to "extras".
2019-11-21 01:34:32 +01:00
sphere
f587069d0e
Reorganize sound options.
2019-11-21 01:14:09 +01:00
sphere
2d509eff47
Move the main menu options around.
2019-11-21 00:34:58 +01:00
lachwright
35f2572e29
Correct sound for GFZ debris (copy-paste oversight)
2019-11-21 01:26:53 +08:00
lachwright
c5d085d333
Add missing GFZD spriteset
2019-11-21 01:14:24 +08:00
lachwright
ac3924c9c8
Add GFZ debris; reorganize wood debris index
2019-11-21 01:05:22 +08:00
lachwright
cdc7a88b04
Add bump sounds to rollout rock & add Newton's third law to jumping off them
2019-11-20 23:45:34 +08:00
toaster
abf0c5e632
resolve #315
2019-11-20 14:34:19 +00:00
lachwright
cde56dbe6c
WIP fix signpost issues with exitmove
2019-11-20 21:02:34 +08:00
Jaime Passos
e0a9b3d695
Merge remote-tracking branch 'origin/subtitlesubterfuge' into remove-unused-levelwipes
2019-11-19 21:49:45 -03:00
