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
14ecb240c4
Merge branch 'public_next' into private
2019-12-08 12:56:37 -05: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
mazmazz
65ca45c147
Debian libopenmpt0 name fix
2019-12-07 20:32:04 -05:00
James R
cadaecbfcf
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
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
mazmazz
bca33bdb0e
Remove patch.pk3 from Deployer ASSET_FILES_HASHED
2019-12-07 16:26:28 -05:00
mazmazz
58650397e2
Travis Deployer: Use xenial instead of bionic for building installers
...
Bionic breaks package signing because importing the private key is unsuccessful. Works in xenial. The buildbot distro doesn't matter because we're just sending source packages to Launchpad which builds on the target distro.
2019-12-07 15:58:59 -05:00
mazmazz
1f8c6574fb
Debian packaging fixes, libopenmpt
2019-12-07 15:50:48 -05:00
mazmazz
9fa09c9842
Travis Linux Deployer fixes
2019-12-07 15:14:33 -05:00
mazmazz
2a9a2c0f02
Travis yflip error
2019-12-07 14:30:51 -05:00
mazmazz
0d41a55071
Deployer fixes for 2.2.0
2019-12-07 13:56:05 -05:00
Tasos Sahanidis
9c5e558117
Remove patch.pk3 from cmake
2019-12-07 20:31:40 +02:00
MascaraSnake
23f44f48fb
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
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
MascaraSnake
2775d5f52f
SDURF to SURF turned out to be contentious.
2019-12-07 06:46:37 -05: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
MascaraSnake
d87251f853
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
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