Commit Graph

305 Commits

Author SHA1 Message Date
LJ Sonic d325c7e6d3 The year is 2021 2021-05-07 17:45:56 +02:00
katsy 876daa7d6e fix ctf flag garbage 2021-04-07 04:57:18 -05:00
LJ Sonic 09d911a5b6 Revert "Replace all instances of P_AproxDistance with FixedHypot"
This reverts commit 75633bde50.
2021-02-13 17:45:20 +01:00
James R 75633bde50 Replace all instances of P_AproxDistance with FixedHypot 2020-12-12 14:53:54 -08:00
James R e55d842d7f Kill SEENAMES 2020-12-12 02:11:23 -08:00
James R 4ab667c6a0 Merge branch 'spritestuff2-fixes' into 'next'
Some fixes for spritestuff2

See merge request STJr/SRB2!1264
2020-11-25 19:26:49 -05:00
Jaime Ita Passos 5293c52bca Remove SHORT macros for referencing patch width/height/offsets 2020-11-22 20:02:47 -03:00
James R 6d6eb79226 Merge branch 'uncap-palettes' into 'next'
Uncap palette lump palettes & allow flashpal palettes to display during pause

See merge request STJr/SRB2!1255
2020-11-22 17:16:21 -05:00
lachwright 5454068843 Uncap palette lump palettes & allow flashpal palettes to display during pause 2020-11-16 17:37:12 +11:00
Jaime Passos b15bbd505c Merge branch 'next' into patch-stuff-again-2 2020-10-10 17:01:10 -03:00
Jaime Passos dcaad758f4 Improved memory management for patches 2020-09-07 02:23:07 -03:00
Zwip-Zwap Zapony d87c0eeaf1 Fix Ringslinger weapon ring penalty missnapment 2020-08-18 11:42:35 +02:00
James R 3e8cf5ab06 Merge branch 'bt_spin' into 'next'
Replace all occurances of BT_USE with BT_SPIN (2.2!)

See merge request STJr/SRB2!982
2020-08-09 21:03:17 -04:00
Jaime Passos 91ed56ef40 Refactor patch loading 2020-08-08 05:16:47 -03:00
GoldenTails 457714e480 Remove 2 characters of whitespace
This is what I get for using find+replace I guess lol
2020-07-11 21:59:54 -05:00
GoldenTails 465ad1a7bc Replace all occurances of BT_USE with BT_SPIN (2.3?)
I'd use `next-major` but it doesn't exist lol
2020-07-11 21:59:54 -05:00
sphere e95265a7fa Comment out unused border patch variables, so GFZFLR01 isn't required anymore. 2020-07-11 12:11:26 +02:00
LJ Sonic 98c657e703 Merge branch 'sf_nosupersprites' into 'next'
Add SF_NOSUPERSPRITES

See merge request STJr/SRB2!1000
2020-07-04 06:51:11 -04:00
James R 067d9b9a63 Merge remote-tracking branch 'origin/next' into gtr-fixes 2020-06-24 19:31:19 -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
lachwright edfd64877c Add SF_NOSUPERSPRITES 2020-06-17 04:53:42 +08:00
SwitchKaze 46191cade7 Update to 2.2.4 2020-05-22 16:47:51 -05:00
toaster 2aa542d2bf 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 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
sphere 0287c6956e Fix some errors and add some comments. Also, actnum is not an INT32. 2020-05-12 17:20:28 +02:00
sphere 69c11a8220 Support act numbers up to 99 and draw both digits individually. 2020-05-12 17:17:24 +02:00
Zwip-Zwap Zapony 334ad93c56 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
Jaime Passos 39c5ab4e17 Merge remote-tracking branch 'origin/next' into gtr-fixes 2020-05-09 17:12:52 -03:00
James R b8d40a5783 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
Louis-Antoine e3cbdf8fab Use HAVE_BLUA as fuel for my fireplace 2020-03-19 18:36:14 +01:00
Jaime Passos 4e7b47440f G_CoopGametype, for all the GT_COOP cases 2020-02-29 00:57:22 -03:00
Jaime Passos 6fb5a6efb6 Consider hide-and-seek as GTR_HIDEFROZEN 2020-02-28 23:52:33 -03:00
Jaime Passos d3ed5ad44f Race is Competition without the lives 2020-02-28 23:47:38 -03:00
Jaime Passos b103a792c0 Let spectators decide where they spawn
Also fixes some issues with tag gametypes
2020-02-23 19:23:00 -03:00
Jaime Passos 678935f26a 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 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
Steel Titanium 76f26cda24 Merge branch 'master' into next 2020-02-21 21:01:29 -05:00
James R 7060083db5 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Tatsuru 380b2f87bb Merge branch 'coloredtitlecard' into Tatsuru/SRB2-dye 2020-02-19 17:47:13 -03:00
James R 92f65fd822 Merge branch 'exitmove-tweaks' into 'next'
Exitmove tweaks

See merge request STJr/SRB2!709
2020-02-18 21:58:18 -05:00
fickleheart 19cdb002ab More fixes for titlecard option stuff 2020-02-09 17:53:50 -06:00
Jaime Passos 1774ba22b6 Fix title card not showing up at all if focus lost 2020-01-26 23:50:36 -03:00
Tatsuru db22d503a4 HUD visual indicator + property fix 2020-01-19 21:55:08 -03:00
Tatsuru e9a8c2d21a No more losing lives when finished 2020-01-19 14:30:05 -03:00
toaster cbbc76b673 Fix snapping of extra multiplayer text. (Resolves #101) 2020-01-10 12:50:58 +00:00
fickleheart f8a3e3b898 Merge remote-tracking branch 'origin/next' into next-newcontrols 2020-01-04 09:57:09 -06:00
Tatsuru 423d1af48d I see trees of green 2020-01-03 16:39:39 -03:00
Tatsuru 5568e445ed Colored title cards 2020-01-03 16:21:08 -03:00
James R 9931f0d58f 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