Commit graph

8254 commits

Author SHA1 Message Date
Jaime Passos
4d83db5bb2 Die, Apple! 2019-12-08 22:31:59 -03:00
Jaime Passos
5c02bc59db 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
c6769e7220 Die 2019-12-08 22:12:56 -03:00
Jaime Passos
7f58002e12 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
25464c867a Translate the French 2019-12-08 21:10:14 -03:00
Alam Ed Arias
e91a689478 Merge branch 'master' into opengl-is-a-bad-renderer 2019-12-08 12:50:45 -05:00
Alam Ed Arias
2d68eac528 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
d8eccc2921 Merge remote-tracking branch 'public/strcasestr-swap' into buildbot 2019-12-08 12:36:23 -05:00
Alam Ed Arias
1d0cd586ba P_AddWadFile: the PK3 may not have folders 2019-12-08 12:35:21 -05:00
Alam Ed Arias
623629b04a 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
35168ddeae OpenGL: yflip is used to hold more then true/false 2019-12-08 12:32:23 -05:00
Jaime Passos
d74f2a003b 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
4c808cb7e2 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
d8a804febc LMFAOOOOOOOOOOOOOOOOOOOOOOOO 2019-12-08 04:15:25 -03:00
Jaime Passos
cc12496e9c Optimize mipmaps 2019-12-08 03:23:37 -03:00
Jaime Passos
ce61b17117 Update hw_main.c 2019-12-08 02:27:51 -03:00
Jaime Passos
964978a337 Delete md2_transform 2019-12-08 02:25:53 -03:00
Jaime Passos
bc60a0a887 Make some things clearer here. 2019-12-08 01:54:03 -03:00
Jaime Passos
40b862967d Just in case? 2019-12-07 23:55:28 -03:00
Jaime Passos
e9e0683d5e Cleanup FreeMipmapColormap 2019-12-07 23:46:05 -03:00
James R
d5816d44f3 Use a third variable of XOR nonsense 2019-12-07 17:36:45 -08:00
James R
5ba363fda6 Make the cmake version 2.2.0 2019-12-07 14:28:03 -08:00
James R
7167e59b83 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
9c5e558117
Remove patch.pk3 from cmake 2019-12-07 20:31:40 +02:00
Jaime Passos
69c08f93bb Update d_main.c 2019-12-07 11:55:53 -03:00
MascaraSnake
79b04c5872 One more asset hash change 2019-12-07 14:17:26 +01:00
toaster
0bd1399c52 Revert paperprojection, but keep it as a #define in case someone fixes it in a patch. 2019-12-07 10:22:10 +00:00
Alam Ed Arias
d02648450a Let fix that GCC warning 2019-12-06 18:12:50 -05:00
MascaraSnake
0768032a43 Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2Internal 2019-12-07 00:12:10 +01:00
MascaraSnake
4dde4c6d07 Minor changes to the readme 2019-12-07 00:11:57 +01:00
James R
53cfba1f42 Use strncpy 2019-12-06 15:09:07 -08:00
MascaraSnake
c33d163c00 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
0d22970c78 Change versionstring to 2.2.0 2019-12-06 23:47:05 +01:00
MascaraSnake
f6563c85ed Updated MD5 hashes 2019-12-06 23:43:54 +01:00
MascaraSnake
bf477c6ed4 Merge branch 'master' into nondevelop 2019-12-06 23:23:01 +01:00
MascaraSnake
239242f513 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
78de32b623 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
5f9f255f77
Correct comment 2019-12-06 17:10:14 -05:00
toaster
66bd864592 Update SRB2 Community Contributors list for Revan's Nimbus Ruins skybox. 2019-12-06 22:06:35 +00:00
lachwright
8f2d81ec74 Lengthen credits for msuic parity 2019-12-07 05:59:26 +08:00
MascaraSnake
a0ebb32912 Merge branch 'introskiptext' into 'master'
Add "Press ENTER to skip..." text to the intro's first scene

See merge request STJr/SRB2Internal!619
2019-12-06 16:48:29 -05:00
MascaraSnake
a3549cc8f2 Merge branch 'datestuff' into 'master'
Date stuff

See merge request STJr/SRB2Internal!618
2019-12-06 16:10:36 -05:00
MascaraSnake
f3fd5a50cb Merge branch 'signpost-cleanup' into 'master'
Signpost fixes

See merge request STJr/SRB2Internal!602
2019-12-06 15:58:46 -05:00
toaster
674fcd7923 Add "Press ENTER to skip..." text to the intro's first scene, for new players who might otherwise sit through a load of (polished) crap. :P 2019-12-06 20:50:41 +00:00
MascaraSnake
f4c89c2dac Merge branch 'analogfixes' into 'master'
Small analog mode fixes

See merge request STJr/SRB2Internal!604
2019-12-06 15:32:10 -05:00
Steel Titanium
f304931ac4
get lua_blockmaplib.c too 2019-12-06 15:27:20 -05:00
Steel Titanium
86cd363d16
Merge branch 'datestuff' of git.magicalgirl.moe:STJr/SRB2Internal into datestuff 2019-12-06 15:23:02 -05:00
Steel Titanium
f02418e70c
Fix copy+paste goof 2019-12-06 15:21:41 -05:00
Jaime Passos
fcc4427de6 Update r_patch.h 2019-12-06 17:07:57 -03:00
Jaime Passos
c4518cce9d Update r_patch.c 2019-12-06 17:05:36 -03:00