Commit graph

304 commits

Author SHA1 Message Date
James R
c325306ddf Merge remote-tracking branch 'origin/master' into makefile-revision-final 2021-06-07 18:36:01 -07:00
James R
ee72312dea Merge remote-tracking branch 'origin/master' into makefile-revision-final 2021-05-07 13:32:19 -07:00
LJ Sonic
d325c7e6d3 The year is 2021 2021-05-07 17:45:56 +02:00
Tatsuru
3159d5a6e4 2.2.9 prep 2021-05-06 21:58:21 -03:00
James R
44d217807f Collect makefiles 2021-05-03 23:07:44 -07:00
Jaime Ita Passos
2ca8efd7ee Revert accidental push 2021-02-25 20:17:27 -03:00
Jaime Ita Passos
5b1dc6ba33 [Meta] Change branding 2021-02-25 19:49:34 -03:00
Jaime Ita Passos
5501d495c7 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
James R
143ec3e40b Merge branch 'master' into next 2020-12-12 02:38:51 -08:00
James R
4ab667c6a0 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
f39300ac74 Merge branch 'master' into no-dd-make 2020-11-22 15:29:37 -08:00
James R
6d9e036c7f Merge branch 'master' into next 2020-11-22 15:23:12 -08:00
Jaime Ita Passos
9ab3acae2d Change how texture deletion works in OpenGL 2020-11-22 17:03:04 -03:00
James R
79bbb3fe46 Remove Direct Draw from the Makefiles
MINGW/MINGW64 implies SDL.
2020-11-21 15:19:54 -08:00
Nev3r
1a8ec39f6c 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
Jaime Passos
6e5f71dd45 Refactor patch rotation 2020-10-10 18:43:26 -03:00
Jaime Passos
b15bbd505c Merge branch 'next' into patch-stuff-again-2 2020-10-10 17:01:10 -03:00
James R
15008f31a7 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
dbd79a29a4 Replace C90's junk with a modest macro 2020-10-06 23:04:23 -07:00
Steel Titanium
0aa1b16fd1 Provide a default exe manifest 2020-10-03 19:53:59 -04:00
James R
401508e9d4 Update Srb2win.rc 2020-10-02 16:11:39 -07:00
Steel Titanium
9e036e6291 Fix quotes appearing in product version string 2020-09-25 18:55:37 -04:00
SteelT
a033f482be Merge branch 'pictureformats' into 'next'
PNG conversion refactoring

See merge request STJr/SRB2!675
2020-09-10 15:58:18 -04:00
James R
4b7d16283d Update version to 2.2.7 RC1 2020-09-01 15:38:51 -07:00
Jaime Passos
9b426b474c Merge branch 'pictureformats' into patch-stuff-again-2 2020-08-15 20:48:28 -03:00
Jaime Passos
78cc4a78d0 Refactor renderer switching 2020-08-14 22:27:16 -03:00
James R
8394bf6055 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
91ed56ef40 Refactor patch loading 2020-08-08 05:16:47 -03:00
Jaime Passos
ca060a4372 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats 2020-07-21 22:25:00 -03:00
Jaime Passos
48a6652973 Move the sky dome code out of r_opengl.c, fix issues with shaders 2020-07-17 02:48:05 -03:00
James R
93615b07be Merge remote-tracking branch 'origin/next' into http-mserv 2020-07-13 08:58:43 -07:00
James R
b9a24001d8 Merge remote-tracking branch 'origin/next' into remove-glide-2 2020-07-12 16:05:15 -07:00
James R
479bbeacbe Merge remote-tracking branch 'origin/next' into http-mserv 2020-07-11 17:41:46 -07:00
Steel Titanium
dcd56a7fe3 Update patch.pk3 hash and Srb2win.rc 2020-07-10 18:13:01 -04:00
SteelT
31364d2120 Merge branch '225-prep' into 'next'
2.2.5 preparation

See merge request STJr/SRB2!1039
2020-07-07 14:55:06 -04:00
lachwright
994bf78fe2 Update Srb2win.rc 2020-07-08 00:48:01 +08:00
Jaime Passos
7911deebf8 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats 2020-07-06 19:29:14 -03:00
Jaime Passos
4f6420274f Remove Software tricks 2020-07-06 01:26:56 -03:00
Jaime Passos
abeedc4b65 Delete hw_glide.h 2020-07-06 00:27:34 -03:00
Louis-Antoine
c96e07b61c Delete CLIENT_CONNECTIONSCREEN and JOININGAME defines 2020-06-27 02:01:16 +02:00
SteelT
bff6b19056 Merge branch 'marathonmode' into 'next'
MARATHON RUN

See merge request STJr/SRB2!941
2020-06-17 19:36:10 -04:00
Steel Titanium
3946309ece 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
LJ Sonic
7ffee074d8 Merge branch 'next' into 'better-download'
# Conflicts:
#   src/d_clisrv.c
2020-06-10 07:57:49 -04:00
Hannu Hanhi
da98ea242e Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge 2020-06-07 20:01:05 +03:00
Monster Iestyn
7e562a3ca5 Merge branch 'master' into next 2020-06-06 20:35:48 +01:00
Monster Iestyn
b11d58aef5 clean up BUGTRAP code in win32/win_main.c to avoid unmatched }
(though that said we don't officially care about the win32 folder files anymore)
2020-06-03 20:47:49 +01:00
LJ Sonic
715cb857f5 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
SwitchKaze
46191cade7 Update to 2.2.4 2020-05-22 16:47:51 -05:00
Louis-Antoine
db85c62c6f Allow resuming the most recent file transfer 2020-05-19 11:28:24 +02:00
toaster
271c6d354b Re-order Marathon bar to be drawn before FPS and captions if applicable. 2020-05-15 13:39:27 +01:00