James R
|
0f3b77de8c
|
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
|
e70ae46a76
|
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
|
0fdf838c86
|
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
|
3bcfe5ae99
|
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
|
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 |
|
Monster Iestyn
|
014d2f6358
|
Fix P_SetTarget crash by setting th->target to NULL first
|
2019-12-30 11:49:01 +00: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 |
|
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
|
ca5a1b8a18
|
Merge branch 'bruh' into 'next'
Fix fuckup
See merge request STJr/SRB2!598
|
2019-12-29 19:56:20 -05:00 |
|
James R
|
2f6ec18562
|
Initialize 'supported' array
|
2019-12-29 16:52:39 -08:00 |
|
James R
|
a33131d227
|
Merge branch 'newnodeformats' into 'next'
New node formats
See merge request STJr/SRB2!595
|
2019-12-29 19:11:07 -05: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 |
|
James R
|
aed7d817ab
|
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
|
65afc96c0c
|
Merge branch 'next' into mapload-refactor
|
2019-12-29 09:40:19 +01:00 |
|
MascaraSnake
|
1fc2a4755a
|
-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 |
|
Alam Ed Arias
|
1785b8149e
|
Merge branch 'master' into next
|
2019-12-28 21:43:16 -05:00 |
|
Alam Ed Arias
|
efad84a2d5
|
Revert "Delete the original configuration file."
This reverts commit 196e76cece.
|
2019-12-28 21:43:10 -05:00 |
|
Alam Ed Arias
|
bdccabe6a7
|
Merge branch 'fixmain' into 'master'
Fix logfiles crashing Windoze (resolves #102)
Closes #102
See merge request STJr/SRB2!591
|
2019-12-28 21:15:23 -05:00 |
|
James R
|
31b03fadcd
|
Add MFE_TOUCHLAVA and MFE_TRACERANGLE to Lua and SOC
|
2019-12-28 17:52:22 -08:00 |
|
Jaime Passos
|
ce138d67dc
|
Fix M_PathParts instead
|
2019-12-28 22:18:41 -03:00 |
|
Jaime Passos
|
ccbe29e5ab
|
Fix logfiles crashing Windoze
|
2019-12-28 22:14:23 -03:00 |
|
James R
|
c576804671
|
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 |
|
James R
|
963f757495
|
Merge branch 'give-brains-back' into 'next'
Remove MF_NOTHINK from join-breaking referenced objects
See merge request STJr/SRB2!589
|
2019-12-28 19:33:35 -05:00 |
|
lachwright
|
65c5f7f571
|
Remove MF_NOTHINK from join-breaking referenced objects
|
2019-12-29 03:01:09 +08:00 |
|
MascaraSnake
|
411b1e17d9
|
Rename P_GroupLines to the more apt P_LinkMapData
|
2019-12-28 17:40:08 +01:00 |
|
MascaraSnake
|
ea402eea09
|
Fix debug prints
|
2019-12-28 17:37:32 +01:00 |
|
MascaraSnake
|
40d45d9221
|
Separate setting of sector field defaults into P_InitializeSector
|
2019-12-28 17:29:58 +01:00 |
|
MascaraSnake
|
f06184b466
|
Refactor P_SetupLines into P_InitializeLinedef
|
2019-12-28 17:21:31 +01:00 |
|