373 commits

Author	SHA1	Message	Date
Sally Coolatta	9d7ec0ab8f	Merge SRB2 next ... Probably doesn't compile yet, but I got rid of all of the conflicts for anyone who wants to take a stab at it.	2021-02-27 05:18:36 -05:00
Sally Coolatta	1f082f15e6	Merge SRB2 master	2021-02-27 02:25:14 -05:00
Sally Coolatta	d63b428565	Merge Kart-Public next	2021-02-27 02:16:21 -05:00
Jaime Ita Passos	c1beb1f384	Revert accidental push	2021-02-25 20:17:27 -03:00
Jaime Ita Passos	6d17b48838	[Meta] Change branding	2021-02-25 19:49:34 -03:00
Jaime Ita Passos	7e28b7d3e9	OpenGL backend: Manage uploaded GPU textures with an internal list ... Indirectly fixes the game doing whatever after freeing a patch. This commit implements a FTextureInfo struct type, instead of it being a typedef to the GLMipmap_s struct type.	2021-01-27 17:48:57 -03:00
himie	742a665481	Add large address aware flag ... This allows the final exe to use more than 2gb of RAM in a 64-bit system which should get rid of most out of memory errors on 32-bit builds	2021-01-25 17:00:09 -06:00
James R	887f4a0919	Merge branch 'master' into next	2020-12-12 02:38:51 -08:00
James R	d6ed2f4ac8	Merge branch 'spritestuff2-fixes' into 'next' ... Some fixes for spritestuff2 See merge request STJr/SRB2!1264	2020-11-25 19:26:49 -05:00
James R	e4c7516608	Merge branch 'master' into no-dd-make	2020-11-22 15:29:37 -08:00
James R	4f39497feb	Merge branch 'master' into next	2020-11-22 15:23:12 -08:00
Jaime Ita Passos	b8a13e6006	Change how texture deletion works in OpenGL	2020-11-22 17:03:04 -03:00
James R	cb1326b0eb	Remove Direct Draw from the Makefiles ... MINGW/MINGW64 implies SDL.	2020-11-21 15:19:54 -08:00
Nev3r	19b11a8c75	Remove direct definition for D__USE_MINGW_ANSI_STDIO, as the latest standards consider this to be deprecated.	2020-11-13 11:33:27 +01: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	9b6aa946ea	Merge remote-tracking branch 'srb2/master' into the-scary-22-merge	2020-10-24 19:28:06 -04:00
Jaime Passos	e23929a899	Refactor patch rotation	2020-10-10 18:43:26 -03: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	b7c4a82a0f	Replace C90's junk with a modest macro	2020-10-06 23:04:23 -07:00
Steel Titanium	db0757aa69	Provide a default exe manifest	2020-10-03 19:53:59 -04:00
James R	92cd4fd8ba	Update Srb2win.rc	2020-10-02 16:11:39 -07:00
Steel Titanium	ca6689c8a0	Fix quotes appearing in product version string	2020-09-25 18:55:37 -04:00
Sally Coolatta	b5fcd74ef9	Merge master ... Slopes in a few maps are really broken ... think it's anchors, I'm gonna leave that to jart :V	2020-09-25 12:00:50 -04:00
James R	ef108cbb36	Merge remote-tracking branch 'pub/next'	2020-09-20 14:07:54 -07:00
Steel Titanium	e656a7d92d	Link with exchndl, instead of dynamically loading it. ... It caused problems with crash reports not being made if the current working directory gets changed. Not even recommended anymore per the drmingw readme https://github.com/jrfonseca/drmingw#exchndl	2020-09-17 15:59:02 -04:00
SteelT	6a168ac5e9	Merge branch 'pictureformats' into 'next' ... PNG conversion refactoring See merge request STJr/SRB2!675	2020-09-10 15:58:18 -04:00
James R	605ea2c668	Update version to 2.2.7 RC1	2020-09-01 15:38:51 -07:00
James R	7c1f73ed71	NO_DISCORDRPC to disable rich presence on Windows	2020-08-30 19:11:30 -07:00
Sally Coolatta	a92ec01f43	Update win 32 bit libraries, implement win 64 bit libraries	2020-08-23 05:47:55 -04:00
Sally Coolatta	632df264a3	Merge remote-tracking branch 'public/next' into discord-rpc-support	2020-08-16 20:57:31 -04:00
Sally Coolatta	30144d5d06	Things to get it to run ... Build is still MASSIVELY broken, you can't even get into a level, still investigating	2020-08-15 20:09:36 -04:00
Jaime Passos	7bc4af41ab	Merge branch 'pictureformats' into patch-stuff-again-2	2020-08-15 20:48:28 -03:00
Sally Coolatta	172ffea590	update srb2win.rc, D_ConvertVersionNumbers uses kart's 2 number style instead of vanilla's 3 number style	2020-08-15 11:54:50 -04:00
Jaime Passos	cb3660331a	Refactor renderer switching	2020-08-14 22:27:16 -03:00
Sally Coolatta	f9ca40e673	Merge branch 'master' into the-scary-22-merge	2020-08-12 20:59:09 -04:00
SteelT	5271db81b7	Merge win32/win_dll.c	2020-08-10 15:41:49 -04:00
SteelT	7ad5057fe9	Merge win32/win_vid.c	2020-08-10 15:41:39 -04:00
SteelT	9759c3666b	Merge win32/Srb2win-vc10.vcxproj.filters	2020-08-10 13:06:14 -04:00
Sally Coolatta	e296e1309a	YAY, round 2	2020-08-09 21:02:56 -04:00
James R	66d36d4fdf	Merge branch 'opengl-skydome-fixes' into 'next' ... Move the sky dome code out of r_opengl.c, fix issues with shaders See merge request STJr/SRB2!1071	2020-08-09 20:45:01 -04:00
Jaime Passos	a7f3dd7eff	Refactor patch loading	2020-08-08 05:16:47 -03:00
SteelT	af9e73cef0	Easy conflicts - src/win32/win_dll.c and src/win32/win_vid.c	2020-08-06 18:10:16 -04:00
SteelT	a470716f48	Merge src/win32/Srb2win-vc10.vcxproj	2020-08-06 01:12:19 -04:00
Jaime Passos	10189ecdc0	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats	2020-07-21 22:25:00 -03:00
Jaime Passos	16c4ba672a	Move the sky dome code out of r_opengl.c, fix issues with shaders	2020-07-17 02:48:05 -03:00
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	f841fd3b1c	Update patch.pk3 hash and Srb2win.rc	2020-07-10 18:13:01 -04:00