1313 commits

Author	SHA1	Message	Date
Steel Titanium	d53d65b798	Update the version number	2020-07-06 21:29:02 -04:00
Jaime Passos	c385eca5d2	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats	2020-07-06 19:29:14 -03: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
James R	0349cc4127	Merge remote-tracking branch 'origin/master' into http-mserv	2020-06-12 23:36:39 -07: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
mazmazz	121d4c87e3	CMAKE: Fix toggle fullscreen breakage due to missing define ... This is lazy. The correct solution is to eliminate the define in the program code	2020-06-09 17:32:14 -04: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
mazmazz	0ce8bdaea1	Merge remote-tracking branch 'stjr-gl/master' into cmake-adjustments	2020-06-08 11:57:57 -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
Sally Coolatta	3e36e15628	Merge master	2020-06-08 00:52:37 -04:00
mazmazz	29c66c579c	CMAKE: Add SRB2_DEBUG_INSTALL to toggle *.debug in install/package	2020-06-08 00:38:13 -04:00
mazmazz	167e889046	Fix OPENMPT deprecation error, openmpt_module_ctl_set	2020-06-08 00:09:29 -04:00
mazmazz	502de28d38	CMAKE improvements: optional asset install; exe.debug for RelWithDebInfo	2020-06-08 00:01:15 -04:00
mazmazz	c74eed0a2c	Added SDL Mixer X to CMAKE (Windows only)	2020-06-08 00:01:15 -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
Sally Coolatta	2a7f79b800	Merge branch 'grand-pricks' into nametags	2020-06-04 17:21:36 -04:00
Sally Coolatta	120dc253af	Merge remote-tracking branch 'origin/iwantmychat' into nametags	2020-06-03 20:19:26 -04:00
James R	e11101f69a	Don't show ping if no one else is racing	2020-06-03 17:09:33 -07:00
James R	3162a203be	Merge remote-tracking branch 'pub/master' into wtf	2020-06-03 15:57:09 -07: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
SteelT	9ff6af856e	Resolve conflicts on the SDL interface files.	2020-05-29 16:17:26 -04: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