Commit graph

296 commits

Author SHA1 Message Date
toaster e1a217dc10 Two minor fixes for Marathon Mode.
* Apply the RTA penalty to the live event backup rather than the current timer. (Resolves #184)
* Snap the character name and timer mode text to the bottom of the screen, just above the bar.
2020-07-12 13:00:08 +01:00
toaster 8a5069156f Add a small amount of extra info to the Evaluation screen for Marathon Mode, on request from multiple runners. 2020-07-10 21:16:28 +01:00
James R 96bccd5f9f Credit Oni for CODE 2020-07-04 12:59:56 -07:00
James R e1996a437d Add "Discord Community Testers" to the Testing section 2020-07-01 16:29:26 -07:00
James R 99a9c935f9 Credits: add back fickle, add Chrispy and Hannu 2020-07-01 16:23:26 -07:00
James R fae583915a Remove Producer role from the credits 2020-07-01 16:04:46 -07:00
SteelT bff6b19056 Merge branch 'marathonmode' into 'next'
MARATHON RUN

See merge request STJr/SRB2!941
2020-06-17 19:36:10 -04:00
SwitchKaze 46191cade7 Update to 2.2.4 2020-05-22 16:47:51 -05:00
toaster e99d38ffaf Make a falsy useBlackRoc prevent doing Black Rock sparkle calculations and Egg Rock pulse sounds. 2020-05-15 13:19:52 +01:00
toaster d593e2e1bb Introducing Marathon Run. (I was going to call it Marathon Mode, but NiGHTS Mode being right next to it on the menu looked terrible.)
Basically a dedicated Record Attack-like experience for speedrunning the game as a continuous chunk rather than ILs. Has several quality of life features.

Benefits include:
* An unambiguous real-time bar across the bottom of the screen, always displaying the current time, ticking up until you reach the ending.
* Disable the console (pausing is still allowed, but the timer will still increment).
* Automatically skip intermissions as if you're holding down the spin button.
* Show centiseconds on HUD automatically, like record attack.
* "Live Event Backups" - a category of run fit for major events like GDQ, where recovery from crashes or chokes makes for better entertainment. Essentially a modified SP savefile, down to using the same basic functions, but has its own filename and tweaked internal layout.
* "spmarathon_start" MainCfg block parameter and "marathonnext" mapheader parameter, allowing for a customised flow (makes this fit for purpose for an eventual SUGOI port).
* Disabling inter-level custom cutscenes by default with a menu option to toggle this (won't show up if the mod doesn't *have* any custom cutscenes), although either way ending cutscenes (vanilla or custom) remain intact since is time is called before them.
* Won't show up if you have a mod that consists of only one level (determined by spmarathon_start's nextlevel; this won't trip if you manually set its marathonnext).
* Unconditional gratitude on the evaluation screen, instead of a negging "Try again..." if you didn't get all the emeralds (which you may not have been aiming for).
* Gorgeous new menu (no new assets required, unless you wanna give it a header later).

Changes which were required for the above but affect other areas of the game include:
* "useBlackRock" MainCFG block parameter, which can be used to disable the presence of the Black Rock or Egg Rock in both the Evaluation screen and the Marathon Run menu (for total conversions with different stories).
* Disabling Continues in NiGHTS mode, to match the most common singleplayer experience post 2.2.4's release (is reverted if useContinues is set to true).
* Hiding the exitmove "powerup" outside of multiplayer. (Okay, this isn't really related, I just saw this bug in action a lot while doing test runs and got annoyed enough to fix it here.)
* The ability to use V_DrawPromptBack (in hardcode only at the moment, but) to draw in terms of pixels rather than rows of text, by providing negative instead of positive inputs).
* A refactoring of redundant game saves smattered across the ending, credits, and evaluation - in addition to saving the game slightly earlier.
* Minor m_menu.c touchups and refactorings here and there.

Built using feedback from the official server's #speedruns channel, among other places.
2020-05-14 23:10:00 +01:00
toaster da86c17ee1 Disable continues outside of no-save/Ultimate by default, but allow SOC to re-enable them globally.
Please look at the merge request description for a full explanation, since I know the vanilla team has been hashing this out and I don't want to add fuel to the fire without at least presenting a solid case.
2020-03-26 20:16:44 +00:00
Louis-Antoine e3cbdf8fab Use HAVE_BLUA as fuel for my fireplace 2020-03-19 18:36:14 +01:00
SwitchKaze 6415e10216 Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors 2020-02-23 11:50:13 -05:00
James Hale 56b67a3b4f Custom skincolors 2020-02-21 21:56:39 -05:00
James R 7060083db5 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Steel Titanium 773ed0a056
Update credit at Rob's request 2020-02-16 20:10:30 -05:00
lachwright 7a5d7afb30 Add Rob as the game's producer 2020-02-06 23:06:15 +08:00
Steel Titanium d03d09f397 Update credits again 2020-02-05 15:20:35 -05:00
James R 4238003887 Merge remote-tracking branch 'origin/master' into next 2020-01-30 23:54:56 -08:00
James R 6528b4a0f8 Merge branch 'opengl-skipintro-sigabrt' into 'master'
Fix crash when using -skipintro and the renderer is set to OpenGL from config

See merge request STJr/SRB2!714
2020-01-31 02:34:08 -05:00
Jaime Passos 28fd2380df Fix F_StartContinue fading out incorrectly in OpenGL 2020-01-27 13:28:07 -03:00
James R 59ed381fc0 Credit Tatsuru, he's done a bit 2020-01-24 16:38:46 -08:00
James R dfcd058c80 (BRUH MOMENT) activettscale was -1, so do recache after it's set 2020-01-21 12:21:18 -08:00
Steel Titanium 54ec64062c Revert "Move to the end of the list"
This reverts commit 32c65ae844.
2020-01-16 19:20:05 -05:00
Steel Titanium 32c65ae844 Move to the end of the list 2020-01-16 18:59:39 -05:00
Steel Titanium 4c6edd87df Restore this that got removed shomehow 2020-01-16 14:31:36 -05:00
Steel Titanium 36511afda9 Add missing name to the credits 2020-01-16 14:28:47 -05:00
James R 7deb18bdc9 Merge remote-tracking branch 'origin/master' into next 2020-01-08 13:27:14 -08:00
lachwright e069e149d9 Apply skin's highresscale to continue screen 2020-01-07 13:56:54 +08:00
James R fc8c0f8a9a Merge remote-tracking branch 'origin/master' into next 2019-12-30 13:16:53 -08:00
MascaraSnake 2d90098b6a Use startpos->z instead of startpos->options >> ZSHIFT in F_StartTitleScreen 2019-12-26 20:55:29 +01:00
Jaime Passos 03a3b02301 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-25 05:43:46 -03:00
Jaime Passos 43946d9826 Merge remote-tracking branch 'origin/master' into wipes2 2019-12-11 12:57:59 -03:00
Jaime Passos 9248f12d55 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-10 23:01:10 -03:00
MascaraSnake 239242f513 Merge branch 'stretch-credits' into 'master'
Lengthen credits for msuic parity

See merge request STJr/SRB2Internal!620
2019-12-06 17:19:17 -05:00
MascaraSnake 78de32b623 Merge branch 'creditweak' into 'master'
Update SRB2 Community Contributors list for Revan's Nimbus Ruins skybox.

See merge request STJr/SRB2Internal!621
2019-12-06 17:18:54 -05:00
toaster 66bd864592 Update SRB2 Community Contributors list for Revan's Nimbus Ruins skybox. 2019-12-06 22:06:35 +00:00
lachwright 8f2d81ec74 Lengthen credits for msuic parity 2019-12-07 05:59:26 +08:00
MascaraSnake a0ebb32912 Merge branch 'introskiptext' into 'master'
Add "Press ENTER to skip..." text to the intro's first scene

See merge request STJr/SRB2Internal!619
2019-12-06 16:48:29 -05:00
toaster 674fcd7923 Add "Press ENTER to skip..." text to the intro's first scene, for new players who might otherwise sit through a load of (polished) crap. :P 2019-12-06 20:50:41 +00:00
Steel Titanium d415cd5c6d
Update copyright date on source files 2019-12-06 13:49:42 -05:00
Jaime Passos b5d5749bfb Merge remote-tracking branch 'origin/master' into wipes2 2019-12-05 01:48:58 -03:00
Jaime Passos 7384522aef Fix Continue game state wipes 2019-12-05 01:47:51 -03:00
Jaime Passos 6adb957f0f Slap colormap fades everywhere 2019-12-04 19:25:39 -03:00
MascaraSnake 5662f8de00 Merge branch 'credits-update' into 'master'
Credits update

See merge request STJr/SRB2Internal!484
2019-12-04 16:59:46 -05:00
MascaraSnake 20c1a0158d Added Sev to the Art section of the credits 2019-12-04 00:07:56 +01:00
MascaraSnake c2577b6eb3 Added more people to the credits and reorganized them slightly 2019-12-04 00:02:47 +01:00
MascaraSnake 602ba32ecc A few more credits additions/adjustments 2019-12-03 22:22:48 +01:00
lachwright be3d7b7dcd - Remove y coordinate from struct for credits_pics
- Update x coordinates for credits_pics entries
- Reorder credits_pics entries (what even was the previous order lol)
- Add zig zag graphics to credits roll
- Attempt to scale the y positions of credits graphics with the length of the credits roll
- New escape character for credits entries: \2, which centers the text and makes it yellow
- Add support for colored text to V_DrawStringAtFixed
2019-12-02 22:24:05 +08:00
sphere ec3548c7f4 Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00