Commit graph

611 commits

Author SHA1 Message Date
Sally Coolatta
7b4d84c3f3 Merge remote-tracking branch 'public/master' 2020-08-12 18:55:43 -04:00
Sally Coolatta
b9436ee015 More fixing up
Got tired again, but now it makes it to f_finale
2020-08-11 18:46:00 -04:00
Sally Coolatta
8731c6b7a4 Another round of fixing up
- gametyperules are now fitting for kart, not applied to the whole codebase though
- a few more files compile
2020-08-11 16:13:17 -04:00
Sally Coolatta
a442b6a4f6 Fix up D_SRB2Main 2020-08-10 21:11:46 -04:00
Sally Coolatta
76241bb26b D_AddFile fixes 2020-08-10 20:35:17 -04:00
Sally Coolatta
a8a88c9e53 This string got really mad at me for this 2020-08-10 20:09:40 -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
a6b2bc99de Demo variable fixes 2020-08-10 19:42:45 -04:00
Sally Coolatta
78d4d3c3e9 Fix broken indenting in D_Display 2020-08-10 19:30:05 -04:00
SteelT
9446a397d6 Remove some stray endifs 2020-08-10 18:45:32 -04:00
Sally Coolatta
a68d68f8db Some D_Display issues 2020-08-10 17:29:27 -04:00
Sally Coolatta
3b34b3230c Bruh 2020-08-10 12:01:11 -04:00
Sally Coolatta
2710d50d99 Merge d_main.c 2020-08-10 12:00:37 -04:00
Sally Coolatta
e296e1309a YAY, round 2 2020-08-09 21:02:56 -04:00
James R
f9e74e8ba2 Merge branch 'kill-cd-support' into 'next'
Kill CD support

See merge request STJr/SRB2!1102
2020-08-09 20:48:25 -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
Steel Titanium
913c07959e Kill CD support 2020-08-07 17:06:19 -04:00
James R
9077a4ff03 Kill MIDI 2020-08-07 12:39:08 -07:00
Sally Coolatta
c1b1641f35 Merge d_main.c 2020-08-02 14:45:23 -04: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
47719474ef Merge remote-tracking branch 'origin/next' into http-mserv 2020-07-13 08:58:43 -07:00
James R
3a34fa8561 Merge remote-tracking branch 'origin/master' into next 2020-07-12 17:11:22 -07:00
James R
84d9aa93c7 Merge remote-tracking branch 'origin/next' into http-mserv 2020-07-11 17:41:46 -07:00
James R
f4989f36bd Fix a lot of stuff related to the version automation 2020-07-10 22:39:46 -07:00
James R
d92afe87a0 Automate VERSION/SUBVERSION; move version related definitions to version.h
CMake support. Srb2win.rc still needs touchy, whatever.
2020-07-10 22:20:33 -07:00
Jaime Passos
615c7121ed gr_ -> gl_ 2020-07-06 01:15:08 -03:00
SteelT
dbd5198ac2 Merge branch 'marathonmode' into 'next'
MARATHON RUN

See merge request STJr/SRB2!941
2020-06-17 19:36:10 -04:00
Steel Titanium
06f76f07f4 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into sal-oglshaderport
# Conflicts:
#	src/hardware/r_opengl/r_opengl.c
2020-06-17 18:15:07 -04:00
James R
0349cc4127 Merge remote-tracking branch 'origin/master' into http-mserv 2020-06-12 23:36:39 -07:00
LJ Sonic
5e7ffb055f Merge branch 'snake' into 'next'
Add a Snake minigame to the file transfer screen

See merge request STJr/SRB2!903
2020-06-10 07:38:37 -04:00
Hannu Hanhi
8ea66e3813 OpenGL draw call batching system 2020-06-07 21:20:52 +03:00
Hannu Hanhi
6961bba693 Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge 2020-06-07 20:01:05 +03:00
Sally Coolatta
136bb1d252 Add K_CanChangeRules, and start a "single session" GP when warping to a map in single player 2020-06-06 19:45:13 -04:00
Sally Coolatta
f4c0011a76 Merge branch 'master' into grand-pricks 2020-06-04 14:41:56 -04:00
James R
3162a203be Merge remote-tracking branch 'pub/master' into wtf 2020-06-03 15:57:09 -07: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
sphere
a0a16e2e79 Fix the "Custom skincolors" branch not compiling with GCC 10. 2020-05-28 18:43:04 +02:00
SwitchKaze
afe56667b8 Update to 2.2.4 2020-05-22 16:47:51 -05:00
Sryder
8e39dfa5c6 D_ModifierKeyResponder is unused now so remove it. 2020-05-20 11:37:38 +01:00
Monster Iestyn
389e7d415d make savegamename in doomdef.h an extern, put the actual definition in d_main.c
(cherry picked from commit 89cd756cd83e4a03a34d1f16da18142d8167d889)
2020-05-15 09:52:16 -07:00
toaster
7c12990bdf Make live event backup files savedata specific (new format: live%s.bkp, where %s is the time attack folder name/savegame name - so vanilla's is livesrb2sav.bkp). 2020-05-15 13:37:06 +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
James R
77cb76a8a6 Put some mutex on CONS_Printf etc. hahaha 2020-05-13 17:26:34 -07:00
James R
1e64eae0c7 Make mod update, room list and server list multithreaded
This took fucking ages and it still fails sometimes in edge cases, but I
don't give a FUCK right now.
2020-05-13 17:24:27 -07: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
James R
9056ca0525 Merge remote-tracking branch 'origin/master' into http-mserv 2020-05-12 17:50:32 -07:00
Monster Iestyn
62a640e282 make savegamename in doomdef.h an extern, put the actual definition in d_main.c 2020-05-12 18:37:15 +01:00
Sally Coolatta
95a077b4dd C'mon git merge everything, not just most of it |:V 2020-05-12 03:16:35 -04:00