stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-22 18:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity
8408 commits 172 branches 41 tags 281 MiB
Commit graph

8408 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
MascaraSnake
201cdef381 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
1f183e1c1f Not dealing with size_t mess with SDL code 2019-12-06 14:42:47 -05:00
MascaraSnake
e105c2f749 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
d7bfe7d652 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
d415cd5c6d
Update copyright date on source files 2019-12-06 13:49:42 -05:00
Alam Ed Arias
f576e61753 OpenGL cast to float, not store in double 2019-12-06 13:45:11 -05:00
lachwright
2e77970526 Fix whitespace issues from when I was new to this shit 2019-12-07 02:31:31 +08:00
lachwright
4a26aec031 Actually fix F12 issues 2019-12-07 02:27:48 +08:00
Steel Titanium
e8f634e99a
Update DLL-README.txt 2019-12-06 13:22:03 -05:00