Commit graph

10879 commits

Author SHA1 Message Date
Monster Iestyn
0a288260fc Merge branch 'buggle-trouble' into 'next'
P_HomingAttack related fixes

See merge request STJr/SRB2!836
2020-03-22 16:57:22 -04:00
Monster Iestyn
0a360e1d90 Merge branch 'fix-setspriteinfo' into 'next'
Fix lib_setSpriteInfo indexes being off-by-one

See merge request STJr/SRB2!854
2020-03-22 16:40:34 -04:00
fickleheart
09c2e4fe26 Split horizon lines for minimal distortion 2020-03-22 12:52:17 -05:00
fickleheart
6749cb89b5 Distort far edges to viewz for a flat horizon line 2020-03-22 12:28:49 -05:00
fickleheart
3bf609e819 GL horizon lines 2020-03-22 12:13:59 -05:00
Louis-Antoine
39fae7fc06 Remove redundant conditional in P_IsClimbingValid 2020-03-22 17:45:07 +01:00
Louis-Antoine
2f5d3311f5 Cleanup P_IsClimbingValid 2020-03-22 17:39:51 +01:00
Louis-Antoine
f6cbf71df2 Remove unused define 2020-03-22 17:29:15 +01:00
Louis-Antoine
29294a53cc Encapsulate plane height checks 2020-03-22 17:28:50 +01:00
Louis-Antoine
3cf315f6da Fix typo in camera handling code 2020-03-22 15:21:23 +01:00
MascaraSnake
be5eb29bea Merge branch 'udmf-next' into udmf-colormaps 2020-03-22 12:57:19 +01:00
MascaraSnake
547f3887e3 Add wall spike arrow to UDB config as well 2020-03-22 12:56:59 +01:00
MascaraSnake
f5a8f7a79b Merge branch 'next' into udmf-next 2020-03-22 12:56:21 +01:00
MascaraSnake
5aee7a27eb Merge branch 'master' into next 2020-03-22 12:55:56 +01:00
MascaraSnake
331e906548 Add arrow to wall spike in ZB config 2020-03-22 12:55:34 +01:00
MascaraSnake
7586f8f58d Merge branch 'udmf-next' into udmf-colormaps 2020-03-22 08:08:47 +01:00
MascaraSnake
d87bb1fcad Move UDB configs into a subfolder 2020-03-22 08:08:34 +01:00
MascaraSnake
62603ff226 Merge branch 'udmf-next' into udmf-colormaps 2020-03-22 08:05:05 +01:00
MascaraSnake
1d7e830bdc Add UDB config 2020-03-22 08:04:28 +01:00
MascaraSnake
8850962810 Merge branch 'next' into udmf-next 2020-03-22 07:52:09 +01:00
MascaraSnake
93587d393d Merge branch 'master' into next 2020-03-22 07:51:35 +01:00
MascaraSnake
5edec462a3 Minor ZB config fix 2020-03-22 07:50:57 +01:00
MascaraSnake
4c03fd5783 Merge branch 'next' into udmf-next 2020-03-21 20:18:07 +01:00
MascaraSnake
19aedbb0a7 Merge branch 'master' into next 2020-03-21 20:17:48 +01:00
MascaraSnake
828bc47846 Another ZB config fix 2020-03-21 20:17:28 +01:00
MascaraSnake
9b76d3af6f 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
59899f3cce Merge branch 'master' into next 2020-03-21 19:16:52 +01:00
MascaraSnake
91f6c68a8f 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
915e6fce23 Add Object Special text for Star Post 2020-03-21 15:16:07 +01:00
LJ Sonic
0942c3f39a Merge branch 'delete-slopes' into 'next'
Delete slopes

See merge request STJr/SRB2!857
2020-03-21 09:35:27 -04:00
LJ Sonic
fee49140e1 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
ee754b211f Define SERVER_URL_PROTOCOL const for easy reconfiguration 2020-03-21 07:47:29 -05:00
MascaraSnake
7c8fa41b54 Updates and fixes for the ZB config 2020-03-21 12:06:52 +01:00
MascaraSnake
9c3544e8d7 Merge branch 'master' into next 2020-03-21 09:40:57 +01:00
MascaraSnake
4b71029bdd 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
8219268f2e Add support for srb2:// URL handler (server links) 2020-03-21 01:36:39 -05:00
Louis-Antoine
4e7605f0e2 Make SRB2 flat like Earth 2020-03-20 18:55:29 +01:00
Monster Iestyn
ffb2674a6e 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
17ffdda974 Merge branch 'delete-lua' into 'next'
Delete Lua

See merge request STJr/SRB2!852
2020-03-20 09:53:24 -04:00
MascaraSnake
ba7ebb55fc Merge branch 'udmf-next' into udmf-colormaps 2020-03-20 12:29:17 +01:00
MascaraSnake
f92d5806b5 Add sector flag that protects the colormap from being changed 2020-03-20 12:19:02 +01:00
MascaraSnake
79852f0ec0 Adapt setup of colormap linedefs 2020-03-20 11:19:30 +01:00
fickleheart
077b4f14e2 hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh 2020-03-19 18:55:10 -05:00
Jaime Passos
4579c6f631 Fix lib_setSpriteInfo indexes being off-by-one 2020-03-19 19:09:34 -03:00
Monster Iestyn
45092d854f We don't need m_cheat.h either in g_demo.c 2020-03-19 21:10:23 +00:00
Monster Iestyn
bcfbaec629 We definitely don't need these files to compile! 2020-03-19 20:43:56 +00:00
Monster Iestyn
690ccb49d8 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
8ae098a1e3 update Makefile, CMakeLists.txt and MSVC project files 2020-03-19 20:13:39 +00:00
Monster Iestyn
ac7a71f85b 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
789ddf9a66 Update CircleCI config 2020-03-19 19:26:46 +01:00