Commit graph

8316 commits

Author SHA1 Message Date
James R
112ac631ef Merge branch 'garbage' into 'master'
memset SERVERINFO maptitle

See merge request STJr/SRB2Internal!624
2019-12-11 19:19:29 -05:00
James R
66524a1e3f Maybe I'm mistaken but this probably isn't needed 2019-12-11 16:14:06 -08:00
lachwright
fa52f69c21 Add TC_DASHMODE color shader 2019-12-12 01:27:41 +08:00
Jaime Passos
a337ed749c Update r_plane.c 2019-12-11 12:36:54 -03:00
Jaime Passos
463e2567fe Restore portal culling code that went gone by pure accident 2019-12-11 11:35:34 -03:00
Jaime Passos
bd51f26807 Tilted water 2019-12-10 17:01:19 -03:00
Steel Titanium
ab50f1255d appveyor: Forgot to change version to 2.2.0 2019-12-10 12:53:15 -05:00
Jaime Passos
af292bc2c5 Die, Apple! 2019-12-08 22:31:59 -03:00
Jaime Passos
042f14236b Speed up level loading
Don't flush every texture just because the palette MAY have changed
2019-12-08 22:28:13 -03:00
Jaime Passos
4ccc854a90 Die 2019-12-08 22:12:56 -03:00
Jaime Passos
768293fb0b Merge branch 'opengl-is-a-bad-renderer' of https://git.magicalgirl.moe/STJr/SRB2 into opengl-is-a-bad-renderer 2019-12-08 21:10:48 -03:00
Jaime Passos
4bb8532714 Translate the French 2019-12-08 21:10:14 -03:00
Alam Ed Arias
409e938735 Merge branch 'public_next' into private 2019-12-08 12:56:37 -05:00
Alam Ed Arias
c17d52e5a8 Merge branch 'master' into opengl-is-a-bad-renderer 2019-12-08 12:50:45 -05:00
Alam Ed Arias
f7abc7c30f Merge branch 'buildbot' into 'master'
Fix All the buidlbot issues

See merge request STJr/SRB2!520
2019-12-08 12:49:26 -05:00
Alam Ed Arias
3bcc16be11 Merge remote-tracking branch 'public/strcasestr-swap' into buildbot 2019-12-08 12:36:23 -05:00
Alam Ed Arias
86ef0d5e55 P_AddWadFile: the PK3 may not have folders 2019-12-08 12:35:21 -05:00
Alam Ed Arias
7e5c8d81e4 OpenGL: note that the Buffer API is OpenGL 1.5, so we can be used in STATIC_OPENGL 2019-12-08 12:33:11 -05:00
Alam Ed Arias
a3857301cd OpenGL: yflip is used to hold more then true/false 2019-12-08 12:32:23 -05:00
Jaime Passos
4a593ed92d HWR_FreeMipmapCache already calls HWR_FreeMipmapCache indirectly
(done by calling HWR_LoadTextures, which in turn calls HWR_FreeTextureCache)
2019-12-08 04:40:29 -03:00
Jaime Passos
33f9ce9d1c Actually don't even call HWR_FreeMipmapCache between levels because I feel like it's futile outside of PWAD loading 2019-12-08 04:32:25 -03:00
Jaime Passos
ed5373c3e8 LMFAOOOOOOOOOOOOOOOOOOOOOOOO 2019-12-08 04:15:25 -03:00
Jaime Passos
5d2bbb53fc Optimize mipmaps 2019-12-08 03:23:37 -03:00
Jaime Passos
2c53951f7f Update hw_main.c 2019-12-08 02:27:51 -03:00
Jaime Passos
7e2d980183 Delete md2_transform 2019-12-08 02:25:53 -03:00
Jaime Passos
4765062db7 Make some things clearer here. 2019-12-08 01:54:03 -03:00
Jaime Passos
85cde87ae1 Just in case? 2019-12-07 23:55:28 -03:00
Jaime Passos
e0c5bb649a Cleanup FreeMipmapColormap 2019-12-07 23:46:05 -03:00
James R
3482e147c2 Use a third variable of XOR nonsense 2019-12-07 17:36:45 -08:00
James R
ee07656120 memset this or the stupid masterserver (used to) show garbage bytes
Also for security I guess...
2019-12-07 15:47:18 -08:00
James R
dbf83f90c5 Make the cmake version 2.2.0 2019-12-07 14:28:03 -08:00
James R
b0b471868c Merge branch 'cmake-no-patch-pk3' into 'master'
Remove patch.pk3 from cmake

See merge request STJr/SRB2!516
2019-12-07 17:26:35 -05:00
Tasos Sahanidis
16ca409b11 Remove patch.pk3 from cmake 2019-12-07 20:31:40 +02:00
MascaraSnake
af81adfdd3 Merge branch 'zbconfig-tweaks' into 'master'
Rename CastleBot FaceStabber to Lance-a-Bot for maximum pun

See merge request STJr/SRB2Internal!622
2019-12-07 12:13:17 -05:00
Jaime Passos
44daeb340e Update d_main.c 2019-12-07 11:55:53 -03:00
MascaraSnake
c2cd1adb8b One more asset hash change 2019-12-07 14:17:26 +01:00
MascaraSnake
90126cfb15 SDURF to SURF turned out to be contentious. 2019-12-07 06:46:37 -05:00
toaster
3b7b788e4c Revert paperprojection, but keep it as a #define in case someone fixes it in a patch. 2019-12-07 10:22:10 +00:00
MascaraSnake
fe6b04c838 Rename SDURF to SURF and CastleBot FaceStabber to Lance-a-Bot for maximum pun 2019-12-07 09:51:09 +01:00
Alam Ed Arias
247ef908f0 Let fix that GCC warning 2019-12-06 18:12:50 -05:00
MascaraSnake
1c4ed89ab6 Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2Internal 2019-12-07 00:12:10 +01:00
MascaraSnake
c0bc5f7c5a Minor changes to the readme 2019-12-07 00:11:57 +01:00
James R
c3c3fac1a8 Use strncpy 2019-12-06 15:09:07 -08:00
MascaraSnake
136a4a8e15 Merge branch 'nondevelop' into 'master'
Get 2.2(.0) release ready

Closes #461

See merge request STJr/SRB2Internal!615
2019-12-06 17:47:32 -05:00
MascaraSnake
e31a10df30 Change versionstring to 2.2.0 2019-12-06 23:47:05 +01:00
MascaraSnake
7f0bb0686d Updated MD5 hashes 2019-12-06 23:43:54 +01:00
MascaraSnake
3ad7f9e445 Merge branch 'master' into nondevelop 2019-12-06 23:23:01 +01:00
MascaraSnake
7a9151a969 Merge branch 'stretch-credits' into 'master'
Lengthen credits for msuic parity

See merge request STJr/SRB2Internal!620
2019-12-06 17:19:17 -05:00
MascaraSnake
19286d33f9 Merge branch 'creditweak' into 'master'
Update SRB2 Community Contributors list for Revan's Nimbus Ruins skybox.

See merge request STJr/SRB2Internal!621
2019-12-06 17:18:54 -05:00
Steel Titanium
147960f4db Correct comment 2019-12-06 17:10:14 -05:00