MascaraSnake
|
7e6ac2ac92
|
Adapt setup of vertex-based slopes to UDMF
|
2020-01-06 15:34:28 +01:00 |
|
MascaraSnake
|
64dc6659c5
|
Merge branch 'next' into linedef-args
|
2020-01-06 14:46:47 +01:00 |
|
MascaraSnake
|
b9a8ebbdac
|
Merge branch 'move-map-copying' into 'next'
Reorder map loading
See merge request STJr/SRB2!635
|
2020-01-06 04:24:39 -05:00 |
|
MascaraSnake
|
0ee12ebbd5
|
Adapt setup of line-based slopes to UDMF
|
2020-01-05 14:31:56 +01:00 |
|
MascaraSnake
|
db97414643
|
Merge branch 'move-map-copying' into linedef-args
|
2020-01-04 23:32:29 +01:00 |
|
MascaraSnake
|
6f3354f24f
|
Merge branch 'next' into linedef-args
|
2020-01-04 23:10:39 +01:00 |
|
Nev3r
|
764a8ad43f
|
Remove vertex_t's z variable.
|
2020-01-04 18:29:02 +01:00 |
|
MascaraSnake
|
9a3e2c7911
|
Move P_ProcessLinedefsAfterSidedefs into P_LoadMapData, but move map data copying after everything else
|
2020-01-04 11:08:05 +01:00 |
|
MascaraSnake
|
6bca318fa8
|
Compressing sidedefs can break both special effects and netgame syncing, so let's get rid of it
|
2020-01-03 21:50:27 +01:00 |
|
MascaraSnake
|
382edce32b
|
Merge branch 'textmap-parser' into 'next'
Textmap parser
See merge request STJr/SRB2!604
|
2020-01-03 04:14:38 -05:00 |
|
MascaraSnake
|
16fbfde7c1
|
Merge branch 'textmap-parser' into linedef-args
|
2020-01-02 22:54:51 +01:00 |
|
MascaraSnake
|
79b1559925
|
P_LoadExtendedSubsectorsAndSegs: Print size_t with %s
|
2020-01-02 22:28:32 +01:00 |
|
MascaraSnake
|
85a94e1a58
|
Implement linedef args (unused and untested so far)
|
2020-01-02 12:23:14 +01:00 |
|
MascaraSnake
|
33044e0a97
|
Fix two bugs in extended segs loading, and add some error checking while I'm at it
|
2020-01-02 09:51:07 +01:00 |
|
MascaraSnake
|
14207f3297
|
P_LoadExtendedSubsectorsAndSegs: Slightly simplify the seg vertex reading code
|
2020-01-02 00:32:29 +01:00 |
|
MascaraSnake
|
edb5cc7f97
|
P_LoadTextmap: Bail out if certain mandatory fields are not set
|
2020-01-01 23:52:30 +01:00 |
|
MascaraSnake
|
4a5c550488
|
Move MAXFLATSIZE define to p_spec.h so p_spec.c doesn't have to redefine it
|
2020-01-01 16:01:07 +01:00 |
|
MascaraSnake
|
97c54bc5f0
|
Rework textmap parser to always read a parameter's value, even if it doesn't recognize the parameter
|
2020-01-01 15:52:59 +01:00 |
|
MascaraSnake
|
0ac318cd78
|
Whoops
|
2020-01-01 15:11:39 +01:00 |
|
MascaraSnake
|
9da0b78666
|
Move shared parts of sidedef initialization into P_InitializeSidedef
|
2020-01-01 15:10:41 +01:00 |
|
MascaraSnake
|
699de06c05
|
Check if certain mandatory linedef and sidedef fields are set, and use fallback values if not
|
2020-01-01 14:27:01 +01:00 |
|
MascaraSnake
|
3fc9749316
|
Setup repeatcnt in P_LoadSidedefs instead of P_ProcessLinedefsWithSidedefs, since UDMF can set it directly
|
2020-01-01 14:13:24 +01:00 |
|
MascaraSnake
|
b425f913f2
|
P_LoadTextmap: Set defaults for all linedef and sidedef fields that UDMF is allowed to set
|
2020-01-01 13:40:17 +01:00 |
|
Jaime Passos
|
77d6601e8b
|
Fix desynch
|
2019-12-31 14:00:25 -03:00 |
|
Jaime Passos
|
585db9fe2d
|
Merge remote-tracking branch 'origin/next' into respawndelaygametyperule
|
2019-12-30 18:39:31 -03:00 |
|
James R
|
67ca512120
|
Merge remote-tracking branch 'origin/master' into next
|
2019-12-30 13:16:53 -08: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 |
|
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 |
|
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
|
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 |
|
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
|
2f6ec18562
|
Initialize 'supported' array
|
2019-12-29 16:52:39 -08: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 |
|