Commit graph

8863 commits

Author SHA1 Message Date
James R
782bf8d31e Fix NOMIXER compiling 2019-12-30 20:08:29 -08:00
Tatsuru
47b096a357 Disable Minecart Spawners for players already riding a minecart 2019-12-31 00:38:09 -03:00
James R
4bf3597116 Fix NOOPENMPT compiling 2019-12-30 19:19:17 -08:00
James R
ff47f911dc Fix command not running if it was split by COM_BufAddText
(Looks at 4865a190578b900b48571e74e0bd97bef88ea71b...)
2019-12-30 18:47:21 -08:00
James R
ab410652ae Fix unclosed quotes leaving the escape character in 2019-12-30 18:44:13 -08:00
Jaime Passos
7b54846a02 Merge remote-tracking branch 'origin/master' into software-clownery 2019-12-30 23:21:42 -03:00
James R
5e94ca07bc Use gametypecount in G_GetGametypeByName 2019-12-30 17:57:38 -08:00
Jaime Passos
181a366d4a Merge remote-tracking branch 'origin/next' into respawndelaygametyperule 2019-12-30 18:39:31 -03:00
James R
fc8c0f8a9a Merge remote-tracking branch 'origin/master' into next 2019-12-30 13:16:53 -08:00
James R
80bb6fe7a0 Merge branch 'modid' into 'next'
Put a mod name in SERVERINFO

See merge request STJr/SRB2!577
2019-12-30 15:41:08 -05:00
James R
5e5f3c4fa7 Merge branch 'renderswitch' into 'master'
Renderer switching

See merge request STJr/SRB2!550
2019-12-30 15:36:17 -05:00
Jaime Passos
7676f11112 Merge remote-tracking branch 'origin/next' into respawndelaygametyperule 2019-12-30 12:09:45 -03:00
Jaime Passos
a04834d1aa Fix alignment in R_ThickStepping 2019-12-30 12:02:09 -03:00
Jaime Passos
590d6729e6 Merge remote-tracking branch 'origin/master' into software-clownery 2019-12-30 11:49:12 -03:00
Monster Iestyn
7c9b1ee2cb Fix P_SetTarget crash by setting th->target to NULL first 2019-12-30 11:49:01 +00:00
lachwright
0839287609 Add unused sounds and remove unused sound slots 2019-12-30 19:00:45 +08:00
James R
c46bfa2be9 Merge branch 'saloondoor-fix' into 'next'
Fix saloon doors not letting players through when marked with the Ambush flag

See merge request STJr/SRB2!600
2019-12-30 00:25:37 -05:00
Tatsuru
3d724f302d Fix saloon doors not letting players through when marked with the Ambush flag 2019-12-30 01:16:50 -03:00
James R
7886a4bbee Don't warn if we start in OpenGL 2019-12-29 18:37:44 -08:00
James R
569453ee93 Warn when going to OpenGL from the menu 2019-12-29 18:37:22 -08:00
James R
98313a8216 Merge branch 'bruh' into 'next'
Fix fuckup

See merge request STJr/SRB2!598
2019-12-29 19:56:20 -05:00
James R
97c5e63dc3 Initialize 'supported' array 2019-12-29 16:52:39 -08:00
James R
a4db30b0cc Merge branch 'newnodeformats' into 'next'
New node formats

See merge request STJr/SRB2!595
2019-12-29 19:11:07 -05:00
Jaime Passos
2f4c270a7b Update r_segs.c 2019-12-29 19:43:38 -03:00
MascaraSnake
136c656cc0 Properly pass nodes data along to functions that need it without breaking the original data pointer 2019-12-29 22:11:15 +01:00
MascaraSnake
81422c4e6d Revert "Pass along virtnodes to extended nodes loading functions to make sure virtnodes->data is moved correctly"
This reverts commit cfc6428569.
2019-12-29 21:57:47 +01:00
MascaraSnake
cfc6428569 Pass along virtnodes to extended nodes loading functions to make sure virtnodes->data is moved correctly 2019-12-29 21:42:16 +01:00
MascaraSnake
e88556efe1 P_GetNodetype: The virtnodes pointer is supposed to be the output parameter, so we have to pass a pointer to that pointer 2019-12-29 21:00:20 +01:00
MascaraSnake
dd02fe0d78 P_GetNodetype: Set virtnodes for traditional Doom format 2019-12-29 20:43:41 +01:00
MascaraSnake
882e8ef7b8 Separate shared parts of seg initialization into P_InitializeSeg 2019-12-29 20:24:14 +01:00
MascaraSnake
36f86077da Move loading of extended subsectors and segs into its own function 2019-12-29 19:54:04 +01:00
MascaraSnake
c287b86fab Get rid of duplicated code in the extended seg parsing 2019-12-29 19:04:50 +01:00
MascaraSnake
3839e95d63 Move reading of extra vertices into separate function 2019-12-29 18:07:44 +01:00
MascaraSnake
45ca959f97 -Move reading of actual extended nodes into separate function, cutting down on code duplication in the process
-Fix a typo in the segs reading
2019-12-29 17:52:49 +01:00
MascaraSnake
e5cb7a7833 Merge branch 'next' into newnodeformats 2019-12-29 16:05:55 +01:00
MascaraSnake
bf25128986 Merge branch 'mapload-refactor' into 'next'
Refactor map loading functions

See merge request STJr/SRB2!594
2019-12-29 10:04:27 -05:00
MascaraSnake
9d009edfc8 Move copying of the nodes signature out of the else case 2019-12-29 15:59:15 +01:00
MascaraSnake
0aed60f4de Separate retrieval of nodetype and nodes lump into its own function (Function. Not file. Sorry.) 2019-12-29 15:50:53 +01:00
MascaraSnake
8032054a47 Separate loading of extended nodes into its own file 2019-12-29 15:15:32 +01:00
MascaraSnake
bb9093ff57 Merge branch 'kill-zshift' into 'next'
Eliminate all unnecessary uses of ZSHIFT

See merge request STJr/SRB2!580
2019-12-29 08:35:52 -05:00
Nev3r
389b9e35c4 Add XNOD, XGLN and XGL3 BSP formats recognition and support. 2019-12-29 14:17:51 +01:00
MascaraSnake
c43a83dc04 Remove virtres_t pointer in P_SpawnSpecials that's no longer needed 2019-12-29 12:26:02 +01:00
MascaraSnake
abdfe60aa7 Store custom FOF flags directly in back toptexture field at map load instead of re-reading the sidedefs data later on 2019-12-29 12:01:41 +01:00
James R
566b4a1626 Don't let us warp to a map that doesn't exist (really!)
Okay so 6464df9876, I WAS mistaken! Except that's
not how you check for a map's existence, at least not how the old map command
did it.
2019-12-29 02:44:27 -08:00
James R
404f3c13e4 If we move the -warp code down, map searching can be used 2019-12-29 02:31:48 -08:00
James R
0a014755b9 I'm still an idiot 2019-12-29 02:16:37 -08:00
James R
2ffff56b39 Who cares? 2019-12-29 02:15:48 -08:00
James R
19aafbfd0b Split map code checking from Command_Map_f 2019-12-29 02:14:02 -08:00
James R
e04e1ac1b4 Merge branch 'mfe-lua' into 'next'
Add missing MFE_ flags to Lua (resolves #103)

See merge request STJr/SRB2!592
2019-12-29 04:44:29 -05:00
MascaraSnake
b333770a3b Merge branch 'next' into mapload-refactor 2019-12-29 09:40:19 +01:00