lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
8,254 Commits 1 Branch 29 Tags 122 MiB
Commit Graph

8254 Commits

Author SHA1 Message Date
James R c1d54007e4 Fix C90 error from NOHW 2019-12-14 13:30:10 -08:00
Jaime Passos 7f092b884b Initialise the variable, obviously 2019-12-13 19:04:36 -03:00
James R c415d80e19 Merge branch 'dashmode-shader' into 'master' 
Add TC_DASHMODE color shader

See merge request STJr/SRB2!526
 2019-12-13 01:58:18 -05:00
James R d64a7defed Merge branch 'toomanyflats-fix' into 'master' 
Fix Ploadflat closing the game with "Too many flats in level" error message

See merge request STJr/SRB2!529
 2019-12-13 01:57:55 -05:00
James R 55f3f27b55 Fix NOHW warnings 2019-12-12 14:00:13 -08:00
Jaime Passos ea129f701c Fix Ploadflat closing the game with "Too many flats in level" error message 2019-12-11 22:45:47 -03:00
James R 6bd5246edd Merge remote-tracking branch 'dev-origin/master' 2019-12-11 16:21:18 -08:00
James R 7a59ade63d Merge branch 'garbage' into 'master' 
memset SERVERINFO maptitle

See merge request STJr/SRB2Internal!624
 2019-12-11 19:19:29 -05:00
lachwright 8a70759e0a Add TC_DASHMODE color shader 2019-12-12 01:27:41 +08:00
Steel Titanium 9ab00049dc appveyor: Forgot to change version to 2.2.0 2019-12-10 12:53:15 -05:00
Alam Ed Arias 14ecb240c4 Merge branch 'public_next' into private 2019-12-08 12:56:37 -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
James R d5816d44f3 Use a third variable of XOR nonsense 2019-12-07 17:36:45 -08: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
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