James R
|
b5df2d5c3f
|
Merge branch 'polyobj-waypoint-thinker-optimise' into 'next'
Polyobj waypoint thinker optimise
See merge request STJr/SRB2!586
|
2019-12-31 01:33:01 -05:00 |
|
James R
|
4b91e49bf4
|
Merge branch 'fix-lua-scorechains' into 'next'
Fix scoreadd not doing anything in certain cases when modified by Lua
See merge request STJr/SRB2!579
|
2019-12-31 01:32:22 -05:00 |
|
James R
|
077c453e33
|
Merge branch 'dashmode-ctf-monitors' into 'next'
Don't let Metal pop the enemy team's monitors (closes #94)
See merge request STJr/SRB2!584
|
2019-12-31 01:31:55 -05:00 |
|
James R
|
8e61b1003a
|
Merge branch 'dashspeed-fix' into 'next'
Cap dashspeed between mindash and maxdash before revving.
See merge request STJr/SRB2!565
|
2019-12-31 01:31:43 -05:00 |
|
James R
|
b4ebb01e2d
|
Truncate gametype name in server list if it's too long
|
2019-12-30 22:23:19 -08:00 |
|
James R
|
281f30c4fd
|
Replace gametype with gametypename in SERVERINFO
PACKETVERSION 1
|
2019-12-30 22:18:55 -08:00 |
|
James R
|
7af2533d23
|
Make the menu option for renderer switching transparent under NOHW
|
2019-12-30 21:45:19 -08:00 |
|
James R
|
38492073fa
|
IT_PAIR for when you want to define both sides of a menu item
|
2019-12-30 21:40:13 -08:00 |
|
Tatsuru
|
b68a629a71
|
Small
|
2019-12-31 01:48:50 -03:00 |
|
James R
|
e8db39229c
|
Don't let the user switch to OpenGL if NOHW
|
2019-12-30 20:29:41 -08:00 |
|
Tatsuru
|
2d0cdbe34f
|
Appease the C90 entity
|
2019-12-31 01:20:11 -03:00 |
|
James R
|
36c5bb7b0d
|
Fix NOHW compiling
|
2019-12-30 20:18:08 -08:00 |
|
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 |
|
MascaraSnake
|
013f1f70d9
|
-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
|
05a97530c1
|
Add support for flat offset and rotation fields in UDMF
|
2019-12-30 17:28:10 +01:00 |
|
MascaraSnake
|
72bb673209
|
Some minor refactoring of textmap loading code
|
2019-12-30 16:28:22 +01: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 |
|
Nev3r
|
99aace19f5
|
Merge branch 'textmap-parser' of https://git.magicalgirl.moe/STJr/SRB2/ into textmap-parser
|
2019-12-30 14:48:10 +01:00 |
|
Nev3r
|
4a5498473c
|
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
|
f9d6e26558
|
Replace INT16_MAX with LUMPERROR in lump check.
|
2019-12-30 14:45:39 +01:00 |
|
Nev3r
|
7ae2143c91
|
Add a disclaimer when loading textmaps/UDMF.
|
2019-12-30 14:42:41 +01:00 |
|
MascaraSnake
|
ea87af0076
|
Refactor TextmapParse
|
2019-12-30 14:33:41 +01:00 |
|
Nev3r
|
c6c00aa7d5
|
Tweak TextmapCount()'s bracket detection to account for multiple levels, if that ever happens.
|
2019-12-30 13:46:37 +01:00 |
|
MascaraSnake
|
4aee4e3684
|
Refactor TextmapCount
|
2019-12-30 13:27:05 +01:00 |
|
Monster Iestyn
|
7c9b1ee2cb
|
Fix P_SetTarget crash by setting th->target to NULL first
|
2019-12-30 11:49:01 +00:00 |
|
Nev3r
|
e43df2993f
|
Move TextmapFixFlatOffsets() above P_LoadTextmap() so that it can compile.
|
2019-12-30 12:33:24 +01:00 |
|
Nev3r
|
f9aabe753e
|
Refactor TextmapFixFlatOffsets().
|
2019-12-30 12:31:55 +01:00 |
|
Nev3r
|
493c6c8ae2
|
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
2019-12-30 12:23:31 +01:00 |
|
Nev3r
|
f49b8de5fd
|
Adapt P_MakeMapMD5() for textmaps.
|
2019-12-30 12:07:54 +01:00 |
|
Nev3r
|
ed114f655b
|
Fixed missing M_GetToken(NULL);
|
2019-12-30 12:07:02 +01:00 |
|
lachwright
|
0839287609
|
Add unused sounds and remove unused sound slots
|
2019-12-30 19:00:45 +08:00 |
|
Nev3r
|
aaef412823
|
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
|
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
|
97c5e63dc3
|
Initialize 'supported' array
|
2019-12-29 16:52:39 -08: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 |
|
MascaraSnake
|
cfadbb0f36
|
-Add linedef pointer to side_t, so sidedefs are able to tell if they're a front or back sidedef during setup
-Fix a broken condition during setup of texture fields for the change music linedef
|
2019-12-29 09:39:50 +01:00 |
|
Steel Titanium
|
0d15f27026
|
Fix emerald hunt not working properly
|
2019-12-28 21:57:29 -05:00 |
|
Alam Ed Arias
|
d588e3ca9c
|
Merge branch 'master' into next
|
2019-12-28 21:43:16 -05:00 |
|
Jaime Passos
|
f997866b4d
|
Fix broken dynlight list because of a SPR_NON2 that doesn't exist
|
2019-12-28 22:57:37 -03:00 |
|
James R
|
0237dc8ca2
|
Add MFE_TOUCHLAVA and MFE_TRACERANGLE to Lua and SOC
|
2019-12-28 17:52:22 -08:00 |
|
Jaime Passos
|
244f0b228f
|
Fix M_PathParts instead
|
2019-12-28 22:18:41 -03:00 |
|
Jaime Passos
|
3bb7fd4cbf
|
Fix logfiles crashing Windoze
|
2019-12-28 22:14:23 -03:00 |
|
Jaime Passos
|
e63f77ea1a
|
Merge remote-tracking branch 'origin/next' into respawndelaygametyperule
|
2019-12-28 21:39:38 -03:00 |
|
James R
|
90e56bcdf9
|
Merge branch 'levelload-refactor' into 'next'
Hack P_SetupLevel into little pie- actually just clean it up a bit
See merge request STJr/SRB2!587
|
2019-12-28 19:37:06 -05:00 |
|
Jaime Passos
|
dede51fc4c
|
Disallow few more characters.
|
2019-12-28 21:05:42 -03:00 |
|
Jaime Passos
|
5b1b556946
|
Remove characters that will not be allowed in the constant string.
|
2019-12-28 20:54:22 -03:00 |
|
Jaime Passos
|
2166571920
|
Add GTR_CUTSCENES. And I ran out of rule slots. Cool.
|
2019-12-28 20:33:28 -03:00 |
|
Jaime Passos
|
ae0acfba0f
|
Organise gametype ruleset again.
|
2019-12-28 20:18:21 -03:00 |
|
Jaime Passos
|
7a00b3a331
|
Add GTR_FRIENDLY.
|
2019-12-28 19:56:18 -03:00 |
|
Jaime Passos
|
093a1baf1d
|
Remove debugging stuff.
|
2019-12-28 19:50:14 -03:00 |
|
Jaime Passos
|
45af6d8899
|
Rename GTR_MATCHEMERALDS to GTR_POWERSTONES.
|
2019-12-28 19:49:34 -03:00 |
|
Jaime Passos
|
4b604328d5
|
Rename GTR_HIDETIME to GTR_STARTCOUNTDOWN.
|
2019-12-28 19:47:03 -03:00 |
|
lachwright
|
5ed1dc5410
|
Remove MF_NOTHINK from join-breaking referenced objects
|
2019-12-29 03:01:09 +08:00 |
|
MascaraSnake
|
bd7765227e
|
Rename P_GroupLines to the more apt P_LinkMapData
|
2019-12-28 17:40:08 +01:00 |
|
MascaraSnake
|
7e5b87ce42
|
Fix debug prints
|
2019-12-28 17:37:32 +01:00 |
|
MascaraSnake
|
d38ee51d49
|
Separate setting of sector field defaults into P_InitializeSector
|
2019-12-28 17:29:58 +01:00 |
|
MascaraSnake
|
54fe91b1cc
|
Refactor P_SetupLines into P_InitializeLinedef
|
2019-12-28 17:21:31 +01:00 |
|
MascaraSnake
|
1ca25224c2
|
Fix P_SetupLines printing the wrong line number
|
2019-12-28 17:05:04 +01:00 |
|
MascaraSnake
|
85de3614cb
|
Standardize P_LoadVertices and P_LoadSidedefs
|
2019-12-28 16:58:48 +01:00 |
|