Commit graph

832 commits

Author SHA1 Message Date
James R
47719474ef Merge remote-tracking branch 'origin/next' into http-mserv 2020-07-13 08:58:43 -07:00
James R
e09a430804 Merge remote-tracking branch 'origin/next' into remove-glide-2 2020-07-12 16:05:15 -07:00
James R
84d9aa93c7 Merge remote-tracking branch 'origin/next' into http-mserv 2020-07-11 17:41:46 -07:00
Steel Titanium
b53e6e834d Update version number 2020-07-10 17:29:03 -04:00
SteelT
5242d77c12 Merge branch '225-prep' into 'next'
2.2.5 preparation

See merge request STJr/SRB2!1039
2020-07-07 14:55:06 -04:00
Lachlan Wright
a050f04cd0 Merge branch 'remove-tricks' into 'next'
Remove Software tricks

See merge request STJr/SRB2!1036
2020-07-07 13:47:33 -04:00
Steel Titanium
d53d65b798 Update the version number 2020-07-06 21:29:02 -04:00
Steel Titanium
29d6b5c758 Merge branch 'master' into next 2020-07-06 12:13:00 -04:00
Jaime Passos
9788afa820 Remove Software tricks 2020-07-06 01:26:56 -03:00
Jaime Passos
abc4f22a3e Delete hw_glide.h 2020-07-06 00:27:34 -03:00
Zachary McAlpin
bad02950e8 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-24 20:55:08 -05:00
James R
0dcba91c4f Merge branch 'gme-cleanup-fixes' into 'next'
GME cleanup and fixes

See merge request STJr/SRB2!1001
2020-06-24 21:41:49 -04:00
Zachary McAlpin
feb56fc3b6 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-24 19:47:52 -05: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
Steel Titanium
55bace797f Use SAMPLERATE for consistency with the rest of the code 2020-06-17 14:50:22 -04:00
Steel Titanium
26a2677863 Fix VGZ sometimes causing SRB2 to crash by not playing the song early in I_LoadSong 2020-06-17 14:31:49 -04:00
Steel Titanium
aab378fe1a Reduce code duplication by creating get_zlib_error function
Reduce calls to gme_set_equalizer in I_LoadSong by moving it to I_PlaySong
Return false if it fails to decompress VGZ data in some form.
2020-06-17 14:19:19 -04:00
Zachary McAlpin
1ed6d49931 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-12 07:32:44 -05:00
Steel Titanium
2986739fd7 Merge branch 'master' into next 2020-06-11 20:11:26 -04:00
Zachary McAlpin
1b831c0bbe Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-11 15:02:31 -05:00
lachwright
62183201c9 Allow macOS builds to be launched through Steam 2020-06-12 01:19:06 +08:00
LJ Sonic
3203d4a62e Merge branch 'next' into 'better-download'
# Conflicts:
#   src/d_clisrv.c
2020-06-10 07:57:49 -04:00
Zachary McAlpin
3a8e053d9d Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-09 19:54:47 -05:00
Steel Titanium
468a9b96b7 Fix no previous prototype for TimeFunction 2020-06-08 19:56:24 -04:00
Steel Titanium
b8bbf5d9f4 Merge branch 'next' into sal-oglshaderport 2020-06-08 19:36:23 -04:00
Lachlan Wright
d7e7d977e6 Merge branch 'fix-continuing-mouse' into 'next'
Fix mouse being grabbed in continue screen

See merge request STJr/SRB2!983
2020-06-08 05:25:24 -04:00
mazmazz
167e889046 Fix OPENMPT deprecation error, openmpt_module_ctl_set 2020-06-08 00:09:29 -04:00
Zachary McAlpin
5495fef76c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-07 22:42:43 -05: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
sphere
de73af46e2 Fix mouse being grabbed in the continue screen. 2020-06-07 00:40:33 +02:00
Monster Iestyn
4aa626eeda Merge branch 'master' into next 2020-06-06 20:50:12 +01:00
Monster Iestyn
0dd462c17c use void rather than VOID, because the logging init code isn't exclusively Win32, whoops 2020-06-06 20:49:12 +01:00
Monster Iestyn
3a7417c8fe Merge branch 'master' into next 2020-06-06 20:35:48 +01:00
Monster Iestyn
b493010b5e Merge branch 'cppcheck-fixes' into 'master'
Cppcheck fixes

See merge request STJr/SRB2!967
2020-06-06 15:28:48 -04:00
Monster Iestyn
fedbac6f64 Merge branch 'master' into next 2020-06-06 17:39:43 +01:00
Monster Iestyn
7dd0ba0f45 added liolib.c to the VC10 project files, since it was missing from them 2020-06-06 17:38:35 +01:00
Monster Iestyn
d6ef2625f5 sdl/i_main.c: while we're here, split all the logging initialisation code into a separate function, to make main function more clean 2020-06-03 20:47:49 +01:00
Monster Iestyn
c90b8c583b sdl/i_main.c: fix wrong placement of #endif for LOGMESSAGES code 2020-06-03 20:47:49 +01:00
LJ Sonic
05e8d12427 Merge branch 'next' into 'better-download'
# Conflicts:
#   src/sdl/i_system.c
#   src/win32/win_sys.c
2020-06-01 08:16:53 -04:00
Zachary McAlpin
8826eeeeb9 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-05-29 15:32:59 -05:00
SwitchKaze
afe56667b8 Update to 2.2.4 2020-05-22 16:47:51 -05:00
Louis-Antoine
362adf4576 Allow resuming the most recent file transfer 2020-05-19 11:28:24 +02:00
Zachary McAlpin
d45a120786 Remove redundant M_QuitResponse call 2020-05-18 14:56:10 -05:00
Zachary McAlpin
5470a03e11 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-05-18 14:50:58 -05:00
toaster
af7e7bc18c Re-order Marathon bar to be drawn before FPS and captions if applicable. 2020-05-15 13:39:27 +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
37fc2496de Wait for threads before SDL_Quit (lol) 2020-05-13 17:25:52 -07:00