MascaraSnake
f22e0a41da
Merge branch 'udmf-polyobjects' into udmf-lighting
2021-09-23 11:22:23 +02:00
MascaraSnake
05b93b676e
Merge branch 'udmf-scrollers' into udmf-polyobjects
2021-09-23 11:02:23 +02:00
MascaraSnake
7f6933317d
Merge branch 'udmf-plane-linedefs' into udmf-scrollers
2021-09-23 10:41:23 +02:00
MascaraSnake
5df1dd324d
Fix oversight in T_MoveFloor
2021-09-23 10:24:02 +02:00
MascaraSnake
f1ad91ab34
Add linedef type 467 to ZB config
2021-09-21 11:47:59 +02:00
MascaraSnake
2e120953ec
Fix typo in linedef type 400 conversion
2021-09-21 11:35:04 +02:00
MascaraSnake
1b339a9e00
Adapt linedef types 600-601 to UDMF
2021-09-20 08:36:55 +02:00
MascaraSnake
609fb91e4b
Stop elevator abuse
2021-09-20 08:18:59 +02:00
MascaraSnake
1784c7b0ef
Add linedef executor for modifying (as opposed to copying) a sector's light level
2021-09-20 07:54:10 +02:00
MascaraSnake
6871262909
Allow "fade light level" linedef executor to fade relative to current value
2021-09-19 23:12:30 +02:00
MascaraSnake
318c1b477d
Adapt lighting effects to UDMF
2021-09-19 17:07:08 +02:00
MascaraSnake
44faed6285
Make light levels in thinkers INT16
2021-09-19 16:25:27 +02:00
MascaraSnake
9180b86e9e
No more unnecessary light level twiddling
2021-09-19 16:12:06 +02:00
MascaraSnake
18c2cfcace
Clean up arguments for the lighting effect functions
2021-09-19 15:52:54 +02:00
MascaraSnake
fe708db398
Adapt setup of some lighting linedef executors to UDMF
2021-09-19 14:23:04 +02:00
MascaraSnake
68aa14f7d0
Netsync floor/ceiling lighting
2021-09-19 09:20:00 +02:00
MascaraSnake
e43831bedb
Expose floor/ceiling lighting to Lua
2021-09-19 09:06:39 +02:00
MascaraSnake
e15c160773
Implement per-sector floor/ceiling lighting
2021-09-19 08:58:21 +02:00
MascaraSnake
de82afe338
Merge branch 'udmf-scrollers' into udmf-polyobjects
2021-09-17 10:36:35 +02:00
MascaraSnake
e144f97d35
Merge branch 'udmf-plane-linedefs' into udmf-scrollers
2021-09-17 10:35:41 +02:00
MascaraSnake
a5959c0248
Merge branch 'next' into udmf-plane-linedefs
...
# Conflicts:
# src/p_inter.c
2021-09-17 10:34:07 +02:00
James R
923e6f31aa
Fix faulty comparison
...
Logical comparisons evaluate to a boolean value...
2021-09-12 19:03:39 -07:00
James R
fec5f2778e
Fix compiler warnings
2021-09-12 19:03:39 -07:00
Tatsuru
952ae51669
Merge branch 'hudlib-hook-refactor' into 'next'
...
Refactor HUD hooks too
See merge request STJr/SRB2!1577
2021-09-13 01:38:05 +00:00
James R
c33d8b3b5d
Merge remote-tracking branch 'origin/next' into hudlib-hook-refactor
2021-09-12 18:37:47 -07:00
Tatsuru
db92f31f7d
Revert "Merge branch 'draw-act-num' into 'next'"
...
This reverts merge request !1532
2021-09-12 18:41:36 -04:00
Tatsuru
30567d75df
Merge branch 'draw-act-num' into 'next'
...
Expose act number drawing functions to Lua
See merge request STJr/SRB2!1532
2021-09-12 22:15:43 +00:00
Tatsuru
252a48c2dc
Merge branch 'shorter-hidetime' into 'next'
...
Cut cv_hidetime's minimum value to 1 (resolves #586 )
Closes #586
See merge request STJr/SRB2!1544
2021-09-12 22:13:26 +00:00
Tatsuru
1875c0dc79
Merge branch 'where-the-fuck-is-my-mobj-at' into 'next'
...
Add player mobj check to P_PlayerInPain (resolves #640 )
Closes #640
See merge request STJr/SRB2!1587
2021-09-12 22:06:54 +00:00
Tatsuru
bb0a0bd4ab
Merge branch 'oneline' into 'next'
...
Add a missing scale assignment to A_Boss3ShockThink
See merge request STJr/SRB2!1588
2021-09-12 22:04:28 +00:00
SMS Alfredo
d5cdb2dc78
Add a missing scale assignment to A_Boss3ShockThink
2021-09-12 22:04:28 +00:00
Tatsuru
9187656b90
Merge branch 'shocksplit' into 'next'
...
Split up x/y/z averages in A_Boss3ShockThink (resolves #589 )
Closes #589
See merge request STJr/SRB2!1538
2021-09-12 21:49:28 +00:00
Tatsuru
cd5ba1271a
Merge branch 'youvebeenblocked' into 'next'
...
Add proper parameters to MobjMoveBlocked so you can actually tell what you're being blocked by (Resolves #332 )
Closes #332
See merge request STJr/SRB2!1491
2021-09-12 21:38:40 +00:00
Tatsuru
66f054f150
Merge branch 'mapload-trigger-fix' into 'next'
...
Don't call map load trigger linedefs when joining or reloading gamestate
See merge request STJr/SRB2!1592
2021-09-12 21:08:52 +00:00
Tatsuru
df249a4a4d
Merge branch 'folder-fixes' into 'next'
...
Fix minor issues with folder addons
See merge request STJr/SRB2!1617
2021-09-12 21:08:07 +00:00
LZA
aaf4653f1e
Fix minor issues with folder addons
2021-09-12 21:08:06 +00:00
Tatsuru
96a378ef1e
Merge branch 'replay-overwrite-fix' into 'next'
...
Replay overwrite fix
See merge request STJr/SRB2!1523
2021-09-12 20:33:15 +00:00
Tatsuru
94799e2196
Merge branch 'fix-antique-ghost-netvars' into 'next'
...
Fix antique ghost netvars
See merge request STJr/SRB2!1545
2021-09-12 20:33:01 +00:00
Tatsuru
59e1706f5c
Merge branch 'png-trans-fix' into 'next'
...
Fix issue with png_get_tRNS
See merge request STJr/SRB2!1606
2021-09-12 20:30:36 +00:00
Tatsuru
7a53b242b6
Merge branch 'develop-fix' into 'next'
...
Add VERSIONSTRING_RC to DEVELOP builds for compiler compatibility
Closes #663
See merge request STJr/SRB2!1607
2021-09-12 20:29:02 +00:00
Tatsuru
9016b5cf7c
Merge branch 'playercontroldirection' into 'next'
...
Remove camera dependency from P_GetPlayerControlDirection
Closes #183
See merge request STJr/SRB2!1512
2021-09-12 20:27:42 +00:00
Tatsuru
0781b91de5
Merge branch 'fix-archiving-error-msg' into 'next'
...
Fix incorrect error message during Lua archiving
See merge request STJr/SRB2!1593
2021-09-12 20:27:17 +00:00
Tatsuru
bcd7468d25
Merge branch 'lua-camera' into 'next'
...
Allow Lua write access to camera_t variables & expose the cameras globally
See merge request STJr/SRB2!1581
2021-09-12 20:20:49 +00:00
SteelT
f62064d4ba
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into next
2021-09-12 16:18:26 -04:00
Tatsuru
bff2106016
Merge branch 'even-more-slope-copying' into 'next'
...
Add flag to line slopes for even more slope copying
See merge request STJr/SRB2!1550
2021-09-12 20:16:52 +00:00
SteelT
e2ea480af9
Merge branch 'master' into next
2021-09-12 15:46:32 -04:00
SteelT
a822de5ffc
Merge branch 'fix-gme-disabled' into 'master'
...
Fix gme support being effectively disabled
See merge request STJr/SRB2!1586
2021-09-11 15:05:34 +00:00
Tatsuru
8aee7fcbce
Merge branch 'floorsprite-fix' into 'next'
...
Fix #649
Closes #649
See merge request STJr/SRB2!1604
2021-09-11 15:00:14 +00:00
Tatsuru
6ed063dcce
Merge branch 'polish-lua-inputs' into 'next'
...
Polish the Lua input library
See merge request STJr/SRB2!1598
2021-09-11 14:59:41 +00:00
Tatsuru
033c661431
Merge branch 'folder' into 'next'
...
Implement folder loading
See merge request STJr/SRB2!1568
2021-09-10 17:10:26 +00:00
