Commit graph

8491 commits

Author SHA1 Message Date
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
mazmazz
3bbefcfbe5 Debian libopenmpt0 name fix 2019-12-07 20:32:04 -05: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
mazmazz
f1ce648c0b Remove patch.pk3 from Deployer ASSET_FILES_HASHED 2019-12-07 16:26:28 -05:00
mazmazz
914d6ef5a9 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
2c9e505778 Debian packaging fixes, libopenmpt 2019-12-07 15:50:48 -05:00
mazmazz
3128fe6b2a Travis Linux Deployer fixes 2019-12-07 15:14:33 -05:00
mazmazz
3bf83ff717 Travis yflip error 2019-12-07 14:30:51 -05:00
mazmazz
126dbc4a82 Deployer fixes for 2.2.0 2019-12-07 13:56:05 -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
toaster
74279862c3 Update SRB2 Community Contributors list for Revan's Nimbus Ruins skybox. 2019-12-06 22:06:35 +00:00
lachwright
97b72422c4 Lengthen credits for msuic parity 2019-12-07 05:59:26 +08:00
MascaraSnake
32f76e8c65 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
fffd385151 Merge branch 'datestuff' into 'master'
Date stuff

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

See merge request STJr/SRB2Internal!602
2019-12-06 15:58:46 -05:00
toaster
c5a9a0c246 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
23e9a3d19c 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
4cc7bd7a16 get lua_blockmaplib.c too 2019-12-06 15:27:20 -05:00
Steel Titanium
adbdf688e7 Merge branch 'datestuff' of git.magicalgirl.moe:STJr/SRB2Internal into datestuff 2019-12-06 15:23:02 -05:00
Steel Titanium
7ec6757ecd Fix copy+paste goof 2019-12-06 15:21:41 -05:00
Jaime Passos
7d2df40988 Update r_patch.h 2019-12-06 17:07:57 -03:00
Jaime Passos
f715d9062b Update r_patch.c 2019-12-06 17:05:36 -03:00
MascaraSnake
dc3d68bf22 Merge branch 'f12fix' into 'master'
Fix F12 issues

Closes #356 and #377

See merge request STJr/SRB2Internal!616
2019-12-06 15:01:28 -05:00
Alam Ed Arias
f36fa64b57 Not dealing with size_t mess with SDL code 2019-12-06 14:42:47 -05:00
MascaraSnake
44b6cc1056 Merge branch 'undo_double' into 'master'
OpenGL cast to float, not store in double

See merge request STJr/SRB2Internal!617
2019-12-06 14:28:41 -05:00
Jaime Passos
4f0c201e20 Merge branch 'lt-extraneous-parameters' into 'master'
Remove unnecessary function parameters from title card code

See merge request STJr/SRB2Internal!603
2019-12-06 14:22:39 -05:00
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05:00
Alam Ed Arias
25806d93e0 OpenGL cast to float, not store in double 2019-12-06 13:45:11 -05:00