James R
|
67ca512120
|
Merge remote-tracking branch 'origin/master' into next
|
2019-12-30 13:16:53 -08:00 |
|
James R
|
0408572380
|
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
|
14fb5dccc8
|
Merge branch 'renderswitch' into 'master'
Renderer switching
See merge request STJr/SRB2!550
|
2019-12-30 15:36:17 -05:00 |
|
MascaraSnake
|
1654119ae9
|
-Set defaults for vertex and mapthing fields in textmap
-Fix P_InitializeSector being called too early (band-aid fix for now, will reorganize this properly later)
|
2019-12-30 21:23:00 +01:00 |
|
MascaraSnake
|
dff1e92ba8
|
Add support for flat offset and rotation fields in UDMF
|
2019-12-30 17:28:10 +01:00 |
|
MascaraSnake
|
b22460bd32
|
Some minor refactoring of textmap loading code
|
2019-12-30 16:28:22 +01:00 |
|
Jaime Passos
|
12068930b2
|
Merge remote-tracking branch 'origin/next' into respawndelaygametyperule
|
2019-12-30 12:09:45 -03:00 |
|
Jaime Passos
|
8d1ad4dc2e
|
Fix alignment in R_ThickStepping
|
2019-12-30 12:02:09 -03:00 |
|
Jaime Passos
|
2c247d8210
|
Merge remote-tracking branch 'origin/master' into software-clownery
|
2019-12-30 11:49:12 -03:00 |
|
Nev3r
|
e0b4921855
|
Merge branch 'textmap-parser' of https://git.magicalgirl.moe/STJr/SRB2/ into textmap-parser
|
2019-12-30 14:48:10 +01:00 |
|
Nev3r
|
839718499d
|
Make P_LoadMapData() a return a boolean as well as P_LoadMapFromFile(); if they fail to load, they return false, and thus P_SetupLevel() will also return false.
TextmapCount() also now returns false if brackets are left open inside a textmap.
|
2019-12-30 14:47:48 +01:00 |
|
Nev3r
|
73698c70aa
|
Replace INT16_MAX with LUMPERROR in lump check.
|
2019-12-30 14:45:39 +01:00 |
|
Nev3r
|
0edb23eaf7
|
Add a disclaimer when loading textmaps/UDMF.
|
2019-12-30 14:42:41 +01:00 |
|
MascaraSnake
|
8756b81fa0
|
Refactor TextmapParse
|
2019-12-30 14:33:41 +01:00 |
|
Nev3r
|
dd56500ed0
|
Tweak TextmapCount()'s bracket detection to account for multiple levels, if that ever happens.
|
2019-12-30 13:46:37 +01:00 |
|
MascaraSnake
|
9c07bde69c
|
Refactor TextmapCount
|
2019-12-30 13:27:05 +01:00 |
|
Monster Iestyn
|
014d2f6358
|
Fix P_SetTarget crash by setting th->target to NULL first
|
2019-12-30 11:49:01 +00:00 |
|
Nev3r
|
6fe6cfad1a
|
Move TextmapFixFlatOffsets() above P_LoadTextmap() so that it can compile.
|
2019-12-30 12:33:24 +01:00 |
|
Nev3r
|
fadebabc78
|
Refactor TextmapFixFlatOffsets().
|
2019-12-30 12:31:55 +01:00 |
|
Nev3r
|
ac81463031
|
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
2019-12-30 12:23:31 +01:00 |
|
Nev3r
|
71d13d1a67
|
Adapt P_MakeMapMD5() for textmaps.
|
2019-12-30 12:07:54 +01:00 |
|
Nev3r
|
dd66aa9a14
|
Fixed missing M_GetToken(NULL);
|
2019-12-30 12:07:02 +01:00 |
|
lachwright
|
69663fe872
|
Add unused sounds and remove unused sound slots
|
2019-12-30 19:00:45 +08:00 |
|
Nev3r
|
6e8a023fdd
|
Add basic textmap support; currently crashes when trying to free the virtres, at vres_free().
|
2019-12-30 11:33:22 +01:00 |
|
James R
|
529ccf9271
|
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 |
|
Nami
|
e4d1b9491c
|
Let's try this again!
|
2019-12-29 20:36:24 -08:00 |
|
Tatsuru
|
d01fb277dc
|
Fix saloon doors not letting players through when marked with the Ambush flag
|
2019-12-30 01:16:50 -03:00 |
|
James R
|
a330a7ee40
|
Don't warn if we start in OpenGL
|
2019-12-29 18:37:44 -08:00 |
|
James R
|
3883d44bb5
|
Warn when going to OpenGL from the menu
|
2019-12-29 18:37:22 -08:00 |
|
James R
|
2f6ec18562
|
Initialize 'supported' array
|
2019-12-29 16:52:39 -08:00 |
|
Jaime Passos
|
ee94af04d5
|
Update r_segs.c
|
2019-12-29 19:43:38 -03:00 |
|
MascaraSnake
|
108af9935e
|
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
|
f74798f020
|
Revert "Pass along virtnodes to extended nodes loading functions to make sure virtnodes->data is moved correctly"
This reverts commit 24acac6fe2.
|
2019-12-29 21:57:47 +01:00 |
|
MascaraSnake
|
24acac6fe2
|
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
|
3a123654b4
|
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
|
9ccd74e99a
|
P_GetNodetype: Set virtnodes for traditional Doom format
|
2019-12-29 20:43:41 +01:00 |
|
MascaraSnake
|
039219d478
|
Separate shared parts of seg initialization into P_InitializeSeg
|
2019-12-29 20:24:14 +01:00 |
|
MascaraSnake
|
a73dc9a4d0
|
Move loading of extended subsectors and segs into its own function
|
2019-12-29 19:54:04 +01:00 |
|
MascaraSnake
|
2925030f8f
|
Get rid of duplicated code in the extended seg parsing
|
2019-12-29 19:04:50 +01:00 |
|
MascaraSnake
|
3a02aa1c4e
|
Move reading of extra vertices into separate function
|
2019-12-29 18:07:44 +01:00 |
|
MascaraSnake
|
39f3a1e88d
|
-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
|
f9a1d4a36d
|
Merge branch 'next' into newnodeformats
|
2019-12-29 16:05:55 +01:00 |
|
MascaraSnake
|
6b53b883c5
|
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
|
ac6c61e419
|
Move copying of the nodes signature out of the else case
|
2019-12-29 15:59:15 +01:00 |
|
MascaraSnake
|
464c2b04de
|
Separate retrieval of nodetype and nodes lump into its own function (Function. Not file. Sorry.)
|
2019-12-29 15:50:53 +01:00 |
|
MascaraSnake
|
ae66bbda24
|
Separate loading of extended nodes into its own file
|
2019-12-29 15:15:32 +01:00 |
|
MascaraSnake
|
8d561a20c1
|
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
|
d689e06c6a
|
Add XNOD, XGLN and XGL3 BSP formats recognition and support.
|
2019-12-29 14:17:51 +01:00 |
|
MascaraSnake
|
1e3a06f420
|
Remove virtres_t pointer in P_SpawnSpecials that's no longer needed
|
2019-12-29 12:26:02 +01:00 |
|
MascaraSnake
|
2cf9408a7d
|
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 |
|