Commit graph

482 commits

Author SHA1 Message Date
Sal
135c9598a8 Merge branch 'hud-is-fucked' into 'next'
HUD inconsistency in Record Attack

See merge request KartKrew/Kart-Public!164
2020-05-15 19:26:26 -04: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
sphere
4d9d125a99 Fix some errors and add some comments. Also, actnum is not an INT32. 2020-05-12 17:20:28 +02:00
sphere
21130dfbb0 Support act numbers up to 99 and draw both digits individually. 2020-05-12 17:17:24 +02:00
Sally Coolatta
15d18640de Merge remote-tracking branch 'public/master' into merge-12 2020-05-12 03:16:14 -04:00
Zwip-Zwap Zapony
cb9d0a2fbe Fix splitscreen Title Card act name regression
This fixes act names not being shown on player 2's view
2020-05-11 19:57:20 +02: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
6bf117300b Add back viewpoint names & fix console inputs in replays 2020-04-30 15:50:30 +02:00
Wolfy
5e4ec61d82 Merge remote-tracking branch 'remotes/bird/isolatedbatching' into awful-mix
# Conflicts:
#	src/hardware/hw_cache.c
#	src/hardware/hw_draw.c
#	src/hardware/hw_glob.h
#	src/hardware/hw_main.c
#	src/r_bsp.h
#	src/r_data.c
2020-04-11 23:47:25 -05:00
James R
71f4433b98 Merge branch 'dye' into 'next'
Expose colorization to mappers and SOC

See merge request STJr/SRB2!679
2020-04-09 19:50:32 -04:00
James R
61be09e6bf Merge remote-tracking branch 'origin/master' into gifs-port 2020-03-28 21:00:39 -07:00
Jimita the Cat
60624edc1a Add support for flashpals in screenshots
(cherry picked from commit e765b9400cf741eb8aaa72768ef677769ee5c12b)
2020-03-23 16:54:17 -07:00
James R
abcba53781 Merge remote-tracking branch 'origin/master' into parties 2020-03-22 18:28:07 -07:00
James R
cbd4693de7 Merge remote-tracking branch 'origin/master' into parties 2020-03-22 14:34:29 -07:00
Sally Cochenour
b1ec5654bc Merge branch 'master' into targets 2020-03-22 14:31:17 -04:00
Sryder
da2f1fc972 Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
# Conflicts:
#	src/k_kart.c
2020-03-21 23:27:55 +00:00
James R
fd1cb69a87 Merge remote-tracking branch 'origin/master' into parties 2020-03-21 12:45:23 -07:00
Louis-Antoine
46df2b9551 Use HAVE_BLUA as fuel for my fireplace 2020-03-19 18:36:14 +01:00
Sryder
c268313f0a Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
# Conflicts:
#	src/Makefile
#	src/k_kart.c
#	src/p_map.c
#	src/p_setup.c
#	src/p_spec.c
2020-03-16 00:13:42 +00:00
Latapostrophe
1f5bbb2c3d Merge branch 'push-more-lua' into awful-mix 2020-03-11 07:37:47 +01:00
Latapostrophe
f98a74638f More explicit var names for countdown and countdown2 2020-03-11 07:37:33 +01:00
Sally Cochenour
3633dc341a Merge branch 'master' into targets 2020-03-01 15:42:49 -05:00
Jaime Passos
9d0e3465f9 G_CoopGametype, for all the GT_COOP cases 2020-02-29 00:57:22 -03:00
Jaime Passos
d831163487 Consider hide-and-seek as GTR_HIDEFROZEN 2020-02-28 23:52:33 -03:00
Jaime Passos
d5f6e5fcc6 Race is Competition without the lives 2020-02-28 23:47:38 -03:00
James R
4f40edaf01 Maybe localdisplayplayers is a bad idea 2020-02-23 23:21:20 -08:00
James R
f164320c88 Make the order of displayplayers irrelevant and split splitscreen into splitscreen and r_splitscreen 2020-02-23 23:20:20 -08:00
Jaime Passos
7a34372885 Let spectators decide where they spawn
Also fixes some issues with tag gametypes
2020-02-23 19:23:00 -03:00
Jaime Passos
48a9ea8d0e Turn players IT if they join the game after the hide time in tag gametypes
Except in gametypes with hide time stasis, because they can't change team.
2020-02-23 17:02:50 -03:00
SwitchKaze
99a1840101 Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors 2020-02-23 11:50:13 -05:00
James Hale
51137837c4 Custom skincolors 2020-02-21 21:56:39 -05:00
Steel Titanium
fc042e90f0 Merge branch 'master' into next 2020-02-21 21:01:29 -05:00
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Tatsuru
5b240e4119 Merge branch 'coloredtitlecard' into Tatsuru/SRB2-dye 2020-02-19 17:47:13 -03:00
James R
ba9f866acf Merge branch 'exitmove-tweaks' into 'next'
Exitmove tweaks

See merge request STJr/SRB2!709
2020-02-18 21:58:18 -05:00
fickleheart
0de2068b88 More fixes for titlecard option stuff 2020-02-09 17:53:50 -06:00
Jaime Passos
cfafdf7bed Fix title card not showing up at all if focus lost 2020-01-26 23:50:36 -03:00
Tatsuru
2d7d8fc1b1 HUD visual indicator + property fix 2020-01-19 21:55:08 -03:00
Tatsuru
b37fc4573a No more losing lives when finished 2020-01-19 14:30:05 -03:00
toaster
8926b8b324 Fix snapping of extra multiplayer text. (Resolves #101) 2020-01-10 12:50:58 +00:00
fickleheart
067b132eb1 Merge remote-tracking branch 'origin/next' into next-newcontrols 2020-01-04 09:57:09 -06:00
Tatsuru
c0eff50908 I see trees of green 2020-01-03 16:39:39 -03:00
Tatsuru
dd6698a958 Colored title cards 2020-01-03 16:21:08 -03:00
James R
b5d9cf9d06 Merge branch 'thiccnames' into 'next'
Allow 6-letter character names to be drawn with the thick font

See merge request STJr/SRB2!618
2020-01-01 21:49:13 -05:00
lachwright
5df1de42b5 Allow 6-letter character names to be drawn with the thick font 2020-01-01 23:49:29 +08:00
fickleheart
77ba835f4f Merge branch 'next' into next-newcontrols
# Conflicts:
#	src/g_game.c
#	src/p_setup.c
2019-12-31 12:58:36 -06:00
Jaime Passos
585db9fe2d Merge remote-tracking branch 'origin/next' into respawndelaygametyperule 2019-12-30 18:39:31 -03:00
James R
67ca512120 Merge remote-tracking branch 'origin/master' into next 2019-12-30 13:16:53 -08:00