Commit graph

1556 commits

Author SHA1 Message Date
Sally Coolatta
e425eabf04 Merge branch 'master' into grand-pricks 2020-05-17 11:39:39 -04:00
Sally Coolatta
0dd19f4f50 Merge branch 'master' into new-menus 2020-05-16 04:37:44 -04:00
toaster
76da8262e6 Correctly reset map/timer for retries where the first map in Marathon Run is LF_NORELOAD (by forcing a reload when the retry option is used). 2020-05-15 21:17:57 +01:00
toaster
5495ea16aa * In-game timer option! Doesn't tick in intermission or in lag, only when a frame is actually run. Realtime option remains default.
* Tweak retry behaviour to restart timer and not subtract life if you're on the first level and haven't hit a checkpoint yet.
2020-05-15 16:33:20 +01:00
toaster
7c97218284 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into marathonmode
# Conflicts:
#	src/doomdef.h
2020-05-15 13:23:37 +01:00
toaster
4c412d931a 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
Latapostrophe
6c68c95654 Make explosions cause earthquakes and initiate flashpals 2020-05-14 17:55:33 +02:00
Sally Coolatta
47c2c875d5 Increase bot difficulty every match based on placement, implement rival tag
Rival tag does not have an in-game indicator, but it is there & it gives the bot better odds
2020-05-14 02:18:32 -04:00
Latapostrophe
bf30ad91e4 Don't save Luavars in record attack, especially not for ghosts 2020-05-14 01:41:06 +02:00
Sally Coolatta
5c8275f905 Don't reset score when retrying 2020-05-13 05:21:35 -04:00
Sally Coolatta
fa5fccffc5 Implement lives system
Lose a life & restart the current race if you place below the top half. Lose all of your lives, and you get kicked to the title screen.
2020-05-13 02:14:39 -04:00
Sally Coolatta
249fff87ad Merge branch 'new-cars-movie' into colorize-tweak 2020-05-12 22:46:46 -04:00
Sally Coolatta
0038241325 Merge branch 'master' into new-cars-movie 2020-05-12 22:41:37 -04:00
Sally Coolatta
63797b35f7 Merge branch 'pet-robo' into grand-pricks 2020-05-12 22:40:02 -04:00
Sally Coolatta
1788d29263 Merge branch 'master' into pet-robo 2020-05-12 22:38:23 -04:00
sphere
4d9d125a99 Fix some errors and add some comments. Also, actnum is not an INT32. 2020-05-12 17:20:28 +02:00
Sally Coolatta
15d18640de Merge remote-tracking branch 'public/master' into merge-12 2020-05-12 03:16:14 -04:00
Sally Coolatta
b4f5d931cc Skincolor code cleanup
Split everything off into its own file and turn SETBRIGHTNESS from a define into a function (K_ColorRelativeLuminance).
2020-05-11 02:28:25 -04:00
Sally Coolatta
e2d95ae9c1 Fake results for bots that didn't get to finish in time 2020-05-09 23:08:11 -04:00
Sally Coolatta
8bb145e249 Use proper scoring system in GP 2020-05-09 22:33:10 -04:00
Sally Coolatta
4ae81ff236 Add menu for selecting cup & other options 2020-05-09 20:03:14 -04:00
Sally Coolatta
06002beb65 Add cupheaders to g_game.c
Whoops
2020-05-09 18:42:00 -04:00
Sally Coolatta
b4f8d708a4 Merge branch 'master' into new-menus 2020-05-09 17:04:10 -04:00
Jaime Passos
a4d6addbca Merge remote-tracking branch 'origin/next' into gtr-fixes 2020-05-09 17:12:52 -03:00
Latapostrophe
6e016b3f0b Use Followercolor_cons_t to account for extra values and avoid more dumb crashes 2020-05-09 11:57:33 +02:00
Latapostrophe
be96831645 Forgot to save followercolor. This fixes replay crashes 2020-05-09 11:51:11 +02:00
lachwright
9b1ec81622 Start hill-parking 2020-05-09 06:24:53 +08:00
Sally Coolatta
9ea37836e2 New kart animations!
- Add unique frames for inward and outward drifting.
- Increase the speed threshold required to reach your "fast driving" frames.
- Use slow driving frames when you're slowing down, even if you're techincally above the fast speed threshold.
- Use frameangle to smooth out the transition into drifting, instead of having "pre-turned" drift frames.
2020-05-08 17:26:27 -04:00
Latapostrophe
766f7f035f Let followers change colour separatly from players 2020-05-04 18:08:41 +02:00
Latapostrophe
59452ae026 Merge branch 'v2-master' into followme-internal 2020-05-04 12:52:47 +02:00
Sally Coolatta
cb12d1ebf8 Merge branch 'master' into pet-robo 2020-05-03 21:30:40 -04:00
lachwright
1568114d13 Dashmode fixes:
- Don't force the player's default normalspeed and jumpfactor while not in dashmode
- Properly trim the fuse for followmobj ghosts spawned during dashmode
- Add deliberate dashmode ghosts for Metal's jet fume
2020-05-01 08:26:23 +08:00
James R
a1502046cf Merge remote-tracking branch 'origin/master' into resume 2020-04-30 09:32:40 -07:00
Latapostrophe
0897f6f21a Cam lockon, allow viewpoint change during freecam 2020-04-28 23:24:48 +02:00
ThatAwesomeGuy173
3e37730545 Use "addons" instead of "add-ons" for consistency 2020-04-22 01:24:59 -06:00
ThatAwesomeGuy173
1bd3055937 Do the same for other messages too 2020-04-22 00:03:45 -06:00
James R
8490919257 Bye death fades 2020-04-19 22:06:22 -07:00
Sally Cochenour
21bab775b1 Add difficulty settings 2020-04-19 09:07:29 -04:00
Latapostrophe
4c1459cd4e Chaos Conflicts 2020-03-29 12:14:27 +02:00
Sally Cochenour
ff621d3e46 Skins, rudimentary ticcmd building for bots 2020-03-28 12:39:27 -04:00
Sally Cochenour
e5ae9d1513 Merge branch 'master' into pet-robo 2020-03-28 08:43:40 -04:00
Sally Cochenour
657a15fae2 Merge branch 'master' into new-items 2020-03-28 00:23:39 -04:00
Sally Cochenour
751fd9ad1b Start on bots, doesn't work 2020-03-27 23:51:49 -04:00
toaster
0f591967ff 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
Sally Cochenour
d1580a5b42 More Flame Shield visuals 2020-03-26 08:48:02 -04:00
James R
572bf314e5 Merge remote-tracking branch 'origin/master' into resume 2020-03-22 19:01:05 -07:00
James R
abcba53781 Merge remote-tracking branch 'origin/master' into parties 2020-03-22 18:28:07 -07:00
Sally Cochenour
25bc236bde Merge branch 'master' into new-items 2020-03-22 20:50:28 -04:00
James R
cbd4693de7 Merge remote-tracking branch 'origin/master' into parties 2020-03-22 14:34:29 -07:00
Sally Cochenour
7f07fa9b2d Move item box counter stuff into k_battle 2020-03-22 16:23:56 -04:00