Commit graph

230 commits

Author SHA1 Message Date
Sally Coolatta
c93330bf20 Use enum for better maintainability & error checking 2020-10-25 11:34:15 -04:00
Sally Coolatta
3469ab12ba Add extra warning for CON_STARTUP_LOADSTEPS being incorrect 2020-10-25 10:48:32 -04:00
Sally Coolatta
12f56d64a7 Adds a simple white loading bar at the bottom of startup, instead of covering the cool reference with text
Mockup of what it looks like, since the window's invisble when you try to print-scr it: https://cdn.discordapp.com/attachments/275750804227489794/769931098636943391/unknown.png
2020-10-25 10:35:24 -04:00
Sally Coolatta
7c2bd0d1c2 Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
Sally Coolatta
ddf466d61f Fix compile errors 2020-10-24 19:52:09 -04:00
Sally Coolatta
9b6aa946ea Merge remote-tracking branch 'srb2/master' into the-scary-22-merge 2020-10-24 19:28:06 -04:00
Zippy_Zolton
325b481f17 81 2020-10-20 19:59:33 -05:00
Zippy_Zolton
6a705a7aa7 SonicX orange 2020-10-20 15:11:00 -05:00
Zippy_Zolton
a5f2e924d9 SonicX aqua 2020-10-20 14:59:30 -05:00
Zippy_Zolton
fdfc4201e3 SonicX8000 purple, peridot, rosy 2020-10-20 14:52:25 -05:00
Zippy_Zolton
bee97b0abb sonicx azure 2020-10-20 14:40:10 -05:00
Zippy_Zolton
e487dd3d09 pencilvoid aqua 2020-10-20 14:03:27 -05:00
Zippy_Zolton
8e39e11d5a blue & red really seem like a hassle don't they 2020-10-19 20:36:59 -05:00
Zippy_Zolton
22d05aa7dc t 2020-10-19 19:58:50 -05:00
Zippy_Zolton
42d1492fde forgot to send this like 3 hours ago 2020-10-19 18:41:23 -05:00
Zippy_Zolton
dfc1e77b16 red abd bkyue sikbucx 2020-10-19 14:12:28 -05:00
Zippy_Zolton
544991413d improvement 2020-10-18 23:47:14 -05:00
Zippy_Zolton
28e842c3d8 better colors 2020-10-18 22:52:40 -05:00
Zippy_Zolton
50927f250a thanks goldie 2020-10-18 21:59:34 -05:00
Zippy_Zolton
547274e67b update 2020-10-18 17:45:46 -05:00
Zippy_Zolton
4de2cfa657 possibly final 2020-10-18 17:01:31 -05:00
Zippy_Zolton
cf9336b22e Calloc 2020-10-18 16:41:14 -05:00
Zippy_Zolton
344e07ae3c possibly fixed 2020-10-18 16:21:06 -05:00
Zippy_Zolton
8c9880a44f Improved text colormaps 2020-10-18 16:00:01 -05:00
Jaime Passos
b44837324f Merge branch 'next' into patch-stuff-again-2 2020-10-10 17:01:10 -03:00
James R
6363162826 Merge branch 'sanity-meter-empty' into 'next'
Replace cvar initializers with a macro

See merge request STJr/SRB2!1178
2020-10-08 22:02:25 -04:00
James R
14e586bfd3 Merge branch 'autocomplete-aliases' into 'next'
Autocomplete aliases in console

See merge request STJr/SRB2!1113
2020-10-08 20:30:07 -04:00
James R
b7c4a82a0f Replace C90's junk with a modest macro 2020-10-06 23:04:23 -07:00
James R
cc7702005f Fix console backpic scaling
KARTKREW is 640x400 LOL
2020-09-22 16:12:00 -07:00
Steel Titanium
2f06ff44cc Add new STARTUP lump, for the splash screen 2020-08-28 17:11:38 -04:00
Jaime Passos
cb3660331a Refactor renderer switching 2020-08-14 22:27:16 -03:00
Jaime Passos
c5cda018ea Cache the console patch only once in CON_DrawBackpic 2020-08-14 20:48:15 -03:00
James R
67fbce8532 Autocomplete aliases in console 2020-08-14 00:00:45 -07:00
Sally Coolatta
f9ca40e673 Merge branch 'master' into the-scary-22-merge 2020-08-12 20:59:09 -04:00
Sally Coolatta
7b4d84c3f3 Merge remote-tracking branch 'public/master' 2020-08-12 18:55:43 -04:00
Sally Coolatta
7ac6723e46 gamecontrol has another index for player num, instead of being duplicated for players 2-4 2020-08-10 20:08:32 -04:00
Sally Coolatta
e296e1309a YAY, round 2 2020-08-09 21:02:56 -04:00
James R
6a49ffa217 Merge branch 'word-delet' into 'next'
Word delete and backspace in console

See merge request STJr/SRB2!1092
2020-08-09 20:46:37 -04:00
James R
42dbdd8c4a Merge branch 'http-mserv' into 'next'
HTTP Based Master Server + Multithreading

See merge request STJr/SRB2!940
2020-08-09 20:24:26 -04:00
Jaime Passos
a7f3dd7eff Refactor patch loading 2020-08-08 05:16:47 -03:00
Steel Titanium
62c85ea4a5 WIP: Remove support for DOS
WIP because I don't know if this wording is right for the error.
2020-07-25 18:55:51 -04:00
James R
f94ded5051 Ctrl + Backspace/Delete in Console 2020-07-24 04:06:04 -07:00
James R
84d9aa93c7 Merge remote-tracking branch 'origin/next' into http-mserv 2020-07-11 17:41:46 -07:00
SteelT
dbd5198ac2 Merge branch 'marathonmode' into 'next'
MARATHON RUN

See merge request STJr/SRB2!941
2020-06-17 19:36:10 -04:00
toaster
83f1abecb3 Merge conflict resolution for console.c/h 2020-06-01 00:10:44 +01:00
Sally Coolatta
63917ffccc The start of the scary 2.2 merge
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
2020-05-29 13:43:38 -04:00
James R
bcf7bf4816 Use Unlock_state here too
(cherry picked from commit f82ff5c3e7)
2020-05-14 17:28:55 -07:00
James R
f82ff5c3e7 Use Unlock_state here too 2020-05-14 17:23:06 -07: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
James R
77cb76a8a6 Put some mutex on CONS_Printf etc. hahaha 2020-05-13 17:26:34 -07:00