stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-17 02:01:35 +00:00
Code Issues Projects Releases Packages Wiki Activity
9981 commits 174 branches 41 tags 300 MiB
Commit graph

9981 commits

This branch
This branch
All branches
Author SHA1 Message Date
MascaraSnake
c931b4fa67 Merge branch 'next' into udmf-next 2020-03-22 12:56:21 +01:00
MascaraSnake
5864788333 Merge branch 'master' into next 2020-03-22 12:55:56 +01:00
MascaraSnake
48e8c9058a Add arrow to wall spike in ZB config 2020-03-22 12:55:34 +01:00
MascaraSnake
60588734cc Merge branch 'udmf-colormaps' into udmf-fofs-mkii 2020-03-22 08:09:01 +01:00
MascaraSnake
34221d05fc Merge branch 'udmf-next' into udmf-colormaps 2020-03-22 08:08:47 +01:00
MascaraSnake
79bfe14678 Move UDB configs into a subfolder 2020-03-22 08:08:34 +01:00
MascaraSnake
77936f6c12 Merge branch 'udmf-colormaps' into udmf-fofs-mkii 2020-03-22 08:06:03 +01:00
MascaraSnake
2133bc89e6 Merge branch 'udmf-next' into udmf-colormaps 2020-03-22 08:05:05 +01:00
MascaraSnake
c4b5c20d3d Add UDB config 2020-03-22 08:04:28 +01:00
MascaraSnake
2c8daabba1 Merge branch 'next' into udmf-next 2020-03-22 07:52:09 +01:00
MascaraSnake
bc1e42d222 Merge branch 'master' into next 2020-03-22 07:51:35 +01:00
MascaraSnake
6911097b56 Minor ZB config fix 2020-03-22 07:50:57 +01:00
MascaraSnake
faac3c7023 Merge branch 'next' into udmf-next 2020-03-21 20:18:07 +01:00
MascaraSnake
c5b4d4bd7e Merge branch 'master' into next 2020-03-21 20:17:48 +01:00
MascaraSnake
c806d8a5e8 Another ZB config fix 2020-03-21 20:17:28 +01:00
MascaraSnake
1580e14cbc Merge branch 'next' into udmf-next 
# Conflicts:
#	extras/conf/Includes/SRB222_linedefs.cfg
#	extras/conf/Includes/SRB222_misc.cfg
#	src/p_spec.c
 2020-03-21 20:04:31 +01:00
MascaraSnake
42445b39d7 Merge branch 'master' into next 2020-03-21 19:16:52 +01:00
MascaraSnake
a2729ddefc Merge branch 'config-fixes' into 'master' 
Updates and fixes for the ZB config

See merge request STJr/SRB2!859
 2020-03-21 14:16:04 -04:00
MascaraSnake
d2c83e1cda Add Object Special text for Star Post 2020-03-21 15:16:07 +01:00
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
MascaraSnake
6e8760524c Implement water FOF types 2020-03-20 16:15:39 +01:00
MascaraSnake
1e306dc7b4 Implement linedef type 100-146 2020-03-20 16:08:48 +01:00
MascaraSnake
a9866f84ad Implemented FOF types 100-105 2020-03-20 16:03:48 +01: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
MascaraSnake
f6f86cf139 Merge branch 'udmf-next' into udmf-colormaps 2020-03-20 12:29:17 +01:00
MascaraSnake
0ecf8616ba Add sector flag that protects the colormap from being changed 2020-03-20 12:19:02 +01:00
MascaraSnake
7cf9ad2f2b Adapt setup of colormap linedefs 2020-03-20 11:19:30 +01: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