stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-22 12:31:32 +00:00
Code Issues Projects Releases Packages Wiki Activity
9911 commits 171 branches 41 tags 312 MiB
Commit graph

9911 commits

This branch
This branch
All branches
Author SHA1 Message Date
LJ Sonic
006b1e8c0e Merge branch 'delete-slopes' into 'next' 
Delete slopes

See merge request STJr/SRB2!857
 2020-03-21 09:35:27 -04:00
LJ Sonic
fa9c2f43f7 Merge branch 'skip-empty-gametypes' into 'master' 
Skip empty gametypes in level select menu

See merge request STJr/SRB2!819
 2020-03-21 08:52:54 -04:00
fickleheart
f32ab5918e Define SERVER_URL_PROTOCOL const for easy reconfiguration 2020-03-21 07:47:29 -05:00
MascaraSnake
06f9246fd3 Updates and fixes for the ZB config 2020-03-21 12:06:52 +01:00
MascaraSnake
e2c9815606 Merge branch 'master' into next 2020-03-21 09:40:57 +01:00
MascaraSnake
2107b89586 Remove the multi-file ZB configs. We're stick with the single-file config for ZB and doing all the UDMF stuff in UDB 2020-03-21 09:40:37 +01:00
fickleheart
feb18208cb Add support for srb2:// URL handler (server links) 2020-03-21 01:36:39 -05:00
Louis-Antoine
892a8dd6e7 Make SRB2 flat like Earth 2020-03-20 18:55:29 +01:00
Monster Iestyn
7a585e2498 Merge branch 'next' into demos-refactor 
# Conflicts:
#	src/g_game.c

(also update g_demo.c)
 2020-03-20 17:48:31 +00:00
LJ Sonic
37b70fe857 Merge branch 'delete-lua' into 'next' 
Delete Lua

See merge request STJr/SRB2!852
 2020-03-20 09:53:24 -04:00
fickleheart
78ec210896 hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh 2020-03-19 18:55:10 -05:00
Jaime Passos
5eaa73b6ac Fix lib_setSpriteInfo indexes being off-by-one 2020-03-19 19:09:34 -03:00
Monster Iestyn
4236ae7c08 We don't need m_cheat.h either in g_demo.c 2020-03-19 21:10:23 +00:00
Monster Iestyn
6610150bfe We definitely don't need these files to compile! 2020-03-19 20:43:56 +00:00
Monster Iestyn
dd76be16cb Create G_FreeGhosts, for the benefit of G_DeferedInitNew (assuming it actually needs to do ghosts = NULL; at all) 2020-03-19 20:42:51 +00:00
Monster Iestyn
1a14234088 update Makefile, CMakeLists.txt and MSVC project files 2020-03-19 20:13:39 +00:00
Monster Iestyn
dcb4ce8cb9 Created g_demo.c/.h, for the demo recording and playback code that formerly lived in g_game.c 2020-03-19 20:09:55 +00:00
Louis-Antoine
a436ece941 Update CircleCI config 2020-03-19 19:26:46 +01:00
Louis-Antoine
e3cbdf8fab Use HAVE_BLUA as fuel for my fireplace 2020-03-19 18:36:14 +01:00
Louis-Antoine
c1b50397ce Fix compiler warning 2020-03-19 14:40:35 +01:00
Louis-Antoine
1d5d6ead65 Fix misleading naming 2020-03-19 14:40:12 +01:00
Louis-Antoine
58c42eec29 Simplify hook code 2020-03-19 14:38:42 +01:00
LJ Sonic
92016a742b Merge branch 'lua-music' into 'next' 
Expose more music-related functions to Lua

See merge request STJr/SRB2!817
 2020-03-19 06:53:57 -04:00
fickleheart
725826a64b Avoid infinite loops if no maps are selectable (y tho) 2020-03-18 22:56:20 -05:00
fickleheart
05b2570ae7 Merge remote-tracking branch 'upstream/next' into lua-music 2020-03-18 22:43:07 -05:00
fickleheart
9c86cd0bc2 More union types for the union type god 2020-03-18 22:42:31 -05:00
fickleheart
520e3c5dc3 Are these casts unnecessary...?? 2020-03-18 22:40:11 -05:00
fickleheart
647f73c8f2 Clean up after myself 2020-03-18 22:38:51 -05:00
fickleheart
dd0d86120b > building SRB2 without Lua in 2020 2020-03-18 22:38:18 -05:00
fickleheart
e0badd1e5b Rename hook to ShouldJingleContinue 2020-03-18 22:35:21 -05:00
Steel Titanium
5dac9c6875 Merge branch 'master' into next 2020-03-18 15:42:02 -04:00
SteelT
04131d3268 Merge branch 'fix-nights-mode-menu-wrong-return' into 'master' 
NiGHTS Mode menu fixes

See merge request STJr/SRB2!841
 2020-03-18 15:41:17 -04:00
SteelT
e3a5164ddf Merge branch 'deadzone-sigfpe-fix' into 'master' 
Fix division-by-0 crash from 100% gamepad deadzones, and lack of input from 0% deadzones

See merge request STJr/SRB2!838
 2020-03-18 15:39:04 -04:00
SteelT
bd058ecc4b Merge branch 'viewpointswitch-fix' into 'next' 
Fix incorrect newdisplayplayer in forced ViewpointSwitch

See merge request STJr/SRB2!814
 2020-03-18 15:34:18 -04:00
LJ Sonic
38bcfe4997 Merge branch 'screenshot-menu-header' into 'master' 
Actually use the "SCREENSHOT OPTIONS" header for its menu.

See merge request STJr/SRB2!832
 2020-03-18 10:56:35 -04:00
LJ Sonic
c43ca31dc2 Merge branch 'increase-input-buffer' into 'next' 
Increase the length of the player input buffer

See merge request STJr/SRB2!835
 2020-03-18 09:49:14 -04:00
Jaime Passos
1904e3b5e9 Fix OpenGL 2020-03-17 15:23:13 -03:00
Jaime Passos
c2cd9a71fa Fix con_backpic 2020-03-17 13:05:54 -03:00
Monster Iestyn
31b1188a3e Merge branch 'master' into next 2020-03-15 20:32:43 +00:00
LJ Sonic
0a54c40ff4 Merge branch 'fix-playernode-crash' into 'next' 
Fix buffer overrun with players with no associated node

See merge request STJr/SRB2!810
 2020-03-15 15:36:45 -04:00
Monster Iestyn
3f43dd22f9 Merge branch 'skins-refactor' into 'master' 
Skins refactor

See merge request STJr/SRB2!843
 2020-03-15 15:31:49 -04:00
Steel Titanium
efab0f479c Merge branch 'master' into next 2020-03-14 22:21:12 -04:00
SteelT
49001b207e Merge branch 'nadraw-fix' into 'master' 
Fix NiGHTS Attack crash after render mode change

See merge request STJr/SRB2!837
 2020-03-14 22:19:35 -04:00
SteelT
88fff119ea Merge branch 'hwrflipcolchromakey' into 'master' 
Fix HWR_DrawFlippedColumnInCache ignoring chroma key TF

See merge request STJr/SRB2!826
 2020-03-14 22:13:19 -04:00
SteelT
e80a09a651 Merge branch 'tex' into 'master' 
Replace NextTexAvail with glGenTextures

See merge request STJr/SRB2!828
 2020-03-14 22:12:02 -04:00
SteelT
2d16281d86 Merge branch 'acz-fence' into 'master' 
Fix ASTBlendPixel blending with nothing

See merge request STJr/SRB2!827
 2020-03-14 22:11:23 -04:00
sphere
bdab78152c Check if emblem hints are actually unlocked. 2020-03-13 10:46:57 -04:00
Monster Iestyn
ddc0762ecc Merge branch 'master' into next 2020-03-09 19:53:08 +00:00
Monster Iestyn
db6a3bbd1f Merge branch 'archive-sprite2-hotfix' into 'master' 
Archive sprite2 Hotfix

See merge request STJr/SRB2!845
 2020-03-09 15:50:55 -04:00
LJ Sonic
5e705b84ae Merge branch 'patch-1' into 'master' 
Fix desyncs never recovering if node and player mismatch

See merge request STJr/SRB2!842
 2020-03-09 12:56:41 -04:00