MascaraSnake
2f1e17da56
Merge branch 'nightslevsel' into 'master'
...
NiGHTS Attack left-right level selection
See merge request STJr/SRB2Internal!608
2019-12-05 16:53:21 -05:00
Alam Ed Arias
8a37eaeaa0
Fix compiling for MSVC
2019-12-05 12:38:50 -05:00
toaster
dbe1d4ebc5
Allow the NiGHTS Attack menu to have the levels selectable left-and-right-wise, just like Record Attack.
2019-12-05 11:12:35 +00:00
toaster
d74991ded1
Don't flip P1 of a two-character save card, for aesthetique reasons.
2019-11-29 15:58:37 +00:00
MascaraSnake
701d724f1d
Merge branch 'xtrafix' into 'master'
...
Stop being so XTRA (resolves #362 ).
Closes #362
See merge request STJr/SRB2Internal!552
2019-11-25 17:02:32 -05:00
MascaraSnake
f1bbfcc95d
Merge branch 'nightsnoforce' into 'master'
...
Charsel tweaks
See merge request STJr/SRB2Internal!551
2019-11-25 16:54:27 -05:00
toaster
937cd7688a
Fix Continue sprites not working for custom characters (incorrect SPR2_XTRA bounds check).
...
Also, change all the references to XTRA_ constants to consistently check for > its value, instead of >= its value plus one (or that there's any frames at all) - for extra clarity/consistency, and capacity for re-ordering later.
2019-11-25 18:52:38 +00:00
MascaraSnake
23ca6d16ae
Merge branch 'statisticase' into 'master'
...
Statisticase (resolves #339 ).
Closes #339
See merge request STJr/SRB2Internal!531
2019-11-25 13:21:09 -05:00
toaster
fea05765ec
Skip character select entirely if only one character is available on the list.
2019-11-25 17:06:06 +00:00
toaster
13ee2476d8
Skip tagteam characters (ie, Sonic&Tails) for NiGHTS secret map character selection.
2019-11-25 16:55:18 +00:00
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
Steel Titanium
1d68b6b2ba
Fix time emblem overlapping best time on NiGHTS Mode menu ( Resolves #353 )
2019-11-24 16:37:13 -05:00
toaster
4b9eb8fbe8
Enable lowercase text for Statistics and Unlockable Checklist menus ( resolves #339 ).
2019-11-24 13:51:53 +00: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
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
Jaime Passos
4d18646881
fix RA fade
2019-11-23 18:15:09 -03:00
sphere
b6172a2b2e
Swap statistics and tutorial options in the 1 Player menu.
2019-11-22 21:00:03 +01:00
sphere
3e428a5176
i'm a dumbass
2019-11-22 20:37:35 +01:00
sphere
0acbe21d49
restore secrets = 0, not sure why i changed that
2019-11-22 20:24:57 +01: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
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
sphere
6f7edf8aa7
Move tutorial to the bottom of the 1 Player menu.
2019-11-21 02:43:07 +01:00
sphere
a4b58efe28
Move SP and MP down if extras aren't unlocked yet.
2019-11-21 02:19:31 +01:00
sphere
693d6b5ca5
Rename "secrets" to "extras".
2019-11-21 01:34:32 +01:00
sphere
f50785d1d6
Reorganize sound options.
2019-11-21 01:14:09 +01:00
sphere
c672dfc12d
Move the main menu options around.
2019-11-21 00:34:58 +01:00
Jaime Passos
3ed8470b58
remove unused levelwipes
2019-11-18 19:22:46 -03:00
Jaime Passos
925940b44e
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-18 18:48:19 -03:00
MascaraSnake
59af56480e
Merge branch 'titlecard-lowercase-support' into 'master'
...
Lowercase support in titlecards
See merge request STJr/SRB2Internal!481
2019-11-18 15:05:02 -05:00
Steel Titanium
b1f39e836d
Better ping implementation.
2019-11-17 20:22:47 -05:00
toaster
5b161a6f60
Update end tally and sound test to accomodate new title font.
2019-11-17 14:56:05 +00:00
James R
d2cd9e7239
Remove defaultname, since players are probably sure on their name change
2019-11-15 17:32:43 -08:00
Jaime Passos
bc7686c16a
LEVELWIPES
2019-11-15 18:21:12 -03:00
Jaime Passos
7168d72580
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-14 20:24:42 -03:00
Jaime Passos
dc7f8bafd5
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-14 19:57:51 -03:00
toaster
35b6e8ca94
Disable menu input on the title screen for the first second (ie, before the flash), to guarantee people won't start the menu the very first tic after the fade and ruin the animation. (Console and gif/screenshot recording still works, for the impatient.)
2019-11-14 12:52:34 +00:00
MascaraSnake
aeedb86d8c
Merge branch 'stopclock' into 'master'
...
Stop the clock!
See merge request STJr/SRB2Internal!450
2019-11-13 14:39:59 -05:00
MascaraSnake
a6af55717f
Merge branch 'forceskin_bs' into 'master'
...
MP Charsel menu fixes
See merge request STJr/SRB2Internal!457
2019-11-13 14:00:11 -05:00
toaster
a921e9c7d8
* Prevent (extremely unlikely) wraparound of patch frame calculation for the epynomous Radio (sigsegv prevention).
...
* Use thinstring for Authors field on the screen.
2019-11-13 13:44:00 +00:00
MascaraSnake
d648a2ad87
Merge branch 'radiomode' into 'master'
...
Radio mode
See merge request STJr/SRB2Internal!443
2019-11-13 04:16:38 -05:00
Jaime Passos
4acdb54d87
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-12 20:36:06 -03:00
MascaraSnake
fae4fb16e9
Merge branch 'internal-md3-vanilla-c' into 'master'
...
Internal MD3 merge 2 good riddance glBegin
See merge request STJr/SRB2Internal!362
2019-11-12 15:44:20 -05:00
MascaraSnake
07228e6038
Merge branch 'nonightsbot2' into 'master'
...
Properly fix bot showing up in NiGHTS stages (resolves #261 for real).
Closes #261
See merge request STJr/SRB2Internal!417
2019-11-12 15:41:01 -05:00
Digiku
c8b47193d8
Merge branch 'new-title-multi-res' into 'master'
...
2.2 Title Screen
See merge request STJr/SRB2Internal!439
2019-11-11 08:46:36 -05:00
toaster
a2749d79a2
* Correctly grey out skin on MP charsel menu if skinchange is restricted.
...
* Also grey out colour if team gametype.
2019-11-10 15:21:14 +00:00
toaster
da041e1224
Minor addition: Get in the way less when doing Record Attack stuff in DEVELOP builds. (Can revert before this branch is merged, but was necessary to test...)
2019-11-08 15:48:11 +00:00
James R
91c759ad9f
Merge branch 'recordattack-menu-draw-fix' into 'master'
...
Record attack fixes
See merge request STJr/SRB2Internal!441
2019-11-07 17:53:03 -05:00
James R
fa1f335e1f
Merge branch 'secrets-charsel-music-fix' into 'master'
...
Fix char select music not playing in secrets menu
Closes #272
See merge request STJr/SRB2Internal!421
2019-11-07 17:51:38 -05:00
