spherallic
c1c7607cb0
Add toggle for linedef action 401 to not change the ceiling texture.
2021-12-02 01:52:45 +01:00
sphere
16251734ce
Merge branch 'hehballs' into 'next'
...
Fix Large Spike Balls not dealing spike damage
See merge request STJr/SRB2!1661
2021-12-01 10:06:01 +00:00
SMS Alfredo
aca0ba0f4b
wow
2021-11-30 22:46:51 -06:00
SMS Alfredo
a5e1167ad2
balls
2021-11-30 20:51:15 -06:00
spherallic
9bdfafc9dd
Add DMG_FIRE to Pyrefly fire and lavafall objects.
2021-11-29 19:25:30 +01:00
MascaraSnake
d44ef91f6f
Re-add FF_BUSTUP to INT_CONST
2021-11-28 19:34:42 +01:00
spherallic
49e6e7a80f
Fix retracting spikes dealing typeless damage instead of spike damage.
2021-11-27 16:19:04 +01:00
spherallic
1afb0c556a
Make Brak's electric barrier damage Elemental and Flame Shields.
2021-11-27 14:23:02 +01:00
spherallic
6a6b292c73
Fix Flame Shield interactions in old-style special stages.
2021-11-27 14:22:21 +01:00
sphere
491ffc7447
Merge branch 'firedeath' into 'next'
...
Fix #214 (Crushstacean + Fireball Player Removal)
Closes #214
See merge request STJr/SRB2!1629
2021-11-26 14:11:09 +00:00
SMS Alfredo
cf79bc8382
Fix #214 (Crushstacean + Fireball Player Removal)
2021-11-26 14:11:09 +00:00
sphere
59660c56c2
Merge branch 'name-unnamed-userdata' into 'next'
...
Give userdata that needed names some names.
See merge request STJr/SRB2!1639
2021-11-26 14:07:39 +00:00
sphere
b83de902a5
Merge branch 'less-console-text-draw' into 'next'
...
Pause the console refresh while startup wads are loading. (Competing with !1347 ) (Resolves #412 )
Closes #412
See merge request STJr/SRB2!1357
2021-11-26 13:57:55 +00:00
sphere
dd2a1c8394
Merge branch 'master' into 'next'
...
merge master into next again
See merge request STJr/SRB2!1659
2021-11-26 13:57:28 +00:00
sphere
f97261ae85
Merge branch 'let-mixed-declarations' into 'master'
...
Remove mixed code and declarations warning
See merge request STJr/SRB2!1618
2021-11-26 13:55:43 +00:00
sphere
e0071c1c36
Merge branch '11-array-bounds' into 'master'
...
Fix GCC 11 array-bounds warning in P_SetupStateAnimation
See merge request STJr/SRB2!1614
2021-11-26 13:55:40 +00:00
spherallic
4480af69c7
Only show Ultimate mode warning in unmodified vanilla gameplay.
2021-11-26 14:18:08 +01:00
sphere
08e63fc822
Show values on (float) sliders in the options menu.
2021-11-26 14:18:00 +01:00
sphere
d9fde5c395
Add emblem counter to the Extras checklist.
2021-11-26 14:17:49 +01:00
sphere
a48c8826a1
Add modifiedgame warning to save select menu.
2021-11-26 14:17:36 +01:00
sphere
00c50aea78
Merge branch 'master' into 'next'
...
merge master into next
Closes #671
See merge request STJr/SRB2!1657
2021-11-25 09:25:52 +00:00
sphere
b868716672
Merge branch 'tails' into 'next'
...
Remove misplaced CopyTiccmd from 2phuman (resolves #674 )
Closes #674
See merge request STJr/SRB2!1627
2021-11-25 09:19:53 +00:00
sphere
f191525fbb
Merge branch 'interfree' into 'next'
...
Don't cache the default background patches if we have an interscreen (resolves #546 )
Closes #546
See merge request STJr/SRB2!1619
2021-11-25 09:19:46 +00:00
sphere
e01c91d58a
Merge branch 'fix-nonet-compiling' into 'next'
...
Fix NONET compiling
See merge request STJr/SRB2!1651
2021-11-25 09:19:30 +00:00
sphere
b955c9c4d5
Merge branch 'boxsparkle_mario' into 'next'
...
Exclude MT_BOXSPARKLE from Mario blocks
See merge request STJr/SRB2!1556
2021-11-24 13:43:20 +00:00
sphere
8a5cf4aea6
Merge branch 'ringslinger-penalty-split' into 'next'
...
Fix Ringslinger weapon ring penalty missplitment
Closes #684
See merge request STJr/SRB2!1655
2021-11-24 13:27:07 +00:00
sphere
88e022b6e1
Merge branch '555-2-2-9-rotated-patches-are-cropped-have-incorrect-dimensions' into 'next'
...
Fix #555
Closes #555
See merge request STJr/SRB2!1648
2021-11-24 12:22:11 +00:00
Hannu Hanhi
8136f5522b
Fix uninitialized history pointers in thinkframe_hooks array
2021-11-10 01:55:31 +02:00
sphere
d776b1a23e
Merge branch 'revert-2578e01c' into 'next'
...
Revert "Merge branch 'writable-colormaps' into 'next'" (closes #675 )
Closes #675
See merge request STJr/SRB2!1649
2021-11-09 16:06:59 +00:00
Zwip-Zwap Zapony
cade6f3cf6
Fix Ringslinger weapon ring penalty missplitment
2021-11-09 16:59:49 +01:00
Hannu Hanhi
56c5a887c8
Call the Lua timestamp function getTimeMicros
2021-11-08 20:28:35 +02:00
Jaime Ita Passos
1d7061b892
Fix NONET compiling
2021-11-08 01:34:03 -03:00
Jaime Ita Passos
32a68f35c9
Change my name
2021-11-08 01:11:51 -03:00
LZA
34b05efdf1
Revert "Merge branch 'writable-colormaps' into 'next'"
...
This reverts merge request !959
2021-11-08 03:40:53 +00:00
Jaime Ita Passos
a14c008dee
Fix #555
2021-11-08 00:38:24 -03:00
Hannu Hanhi
270c7701b4
Timestamp function for Lua
2021-11-08 01:17:30 +02:00
sphere
9a5bb59801
https://mb.srb2.org/threads/the-most-utterly-unimportant-typo-ever.27152
2021-11-07 12:51:21 +01:00
Jaime Ita Passos
0ecfc38c46
Remove misplaced line from R_DrawTiltedSplat_NPO2_8
2021-11-06 01:49:29 -03:00
katsy
da33cb674e
fix water fof height calculation on slopes
2021-11-05 16:51:44 -05:00
SteelT
c55e973364
MSYS2: Don't compile with dynamic base
...
Resolves #671
2021-11-03 17:16:46 -04:00
sphere
06dfd360ee
Merge branch 'drawntooverlay' into 'next'
...
Make Overlay objects account for player->drawangle
See merge request STJr/SRB2!1599
2021-10-29 10:40:25 +00:00
SMS Alfredo
865c0a081d
Make Overlay objects account for player->drawangle
2021-10-29 10:40:25 +00:00
Hannu Hanhi
77ecfb9cdc
Perfstats averaging and refactor
2021-10-29 02:18:02 +03:00
sphere
2d8230cb27
Merge branch 'sunnywithcloudsandshowers' into 'next'
...
Fix broken rain to rain weather switching
See merge request STJr/SRB2!1626
2021-10-27 17:52:29 +00:00
katsy
e10eddd11d
Fix broken rain to rain weather switching
2021-10-27 17:52:29 +00:00
sphere
edaa955bcc
Merge branch 'dave-credits' into 'next'
...
Fix #672
Closes #672
See merge request STJr/SRB2!1623
2021-10-27 17:51:29 +00:00
GoldenTails
8110473643
Give userdata that needed names some names.
2021-10-22 18:31:37 -05:00
FlykeSpice
a8c6a65260
Fix visplanes getting allocated twice
...
I guess that is legacy remnant stuff
2021-10-11 00:20:11 -04:00
MascaraSnake
5f7babb53f
Adapt linedef type 313 to UDMF
2021-09-26 20:42:01 +02:00
MascaraSnake
c9f510d096
Merge branch 'udmf-linedef-executors' into udmf-executor-triggers
2021-09-26 07:12:32 +02:00
MascaraSnake
75ef804f64
Merge branch 'udmf-lighting' into udmf-linedef-executors
2021-09-26 07:01:56 +02:00
MascaraSnake
53f8a1bfb2
Merge branch 'udmf-polyobjects' into udmf-lighting
2021-09-26 07:01:23 +02:00
MascaraSnake
98f99e52f8
Merge branch 'udmf-scrollers' into udmf-polyobjects
2021-09-26 06:56:12 +02:00
MascaraSnake
db0e6b23d7
Merge branch 'udmf-plane-linedefs' into udmf-scrollers
2021-09-26 06:53:20 +02:00
MascaraSnake
bfc13c2529
Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs
2021-09-26 06:50:34 +02:00
MascaraSnake
f26f41e03a
Fix thinker functions that still use tag instead of args[0] for FOFs
2021-09-26 06:48:26 +02:00
SteelT
0f4074f22d
Remove unused I_GetMouseGrab function
2021-09-23 13:46:26 -04:00
MascaraSnake
3cc66ba9cb
Merge branch 'udmf-linedef-executors' into udmf-executor-triggers
2021-09-23 11:44:17 +02:00
MascaraSnake
25bc48b8dd
Merge branch 'udmf-lighting' into udmf-linedef-executors
2021-09-23 11:31:01 +02:00
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
280d23782c
Adapt linedef executor triggers that don't involve sector effects to UDMF
2021-09-23 10:21:53 +02:00
katsy
ed5942a0b6
fix tailsbot controls
2021-09-22 23:18:54 -05:00
katsy
791b981fd8
null gamestate during pre-intermission to prevent unwanted interaction
2021-09-22 16:22:47 -05:00
MascaraSnake
a61343bc8b
P_LinedefExecute: Use global taglists to find trigger linedefs
2021-09-22 10:38:08 +02:00
MascaraSnake
03c1c592ab
I surrender - we need more linedef args (also adapt the remaining linedef executors to UDMF)
2021-09-22 08:57:48 +02:00
MascaraSnake
8ef8279764
Adapt FOF-related linedef executors to UDMF
2021-09-22 07:32:39 +02:00
MascaraSnake
df7b22ac8a
Minor cleanup in P_ConvertBinaryMap
2021-09-21 15:34:47 +02:00
MascaraSnake
61e9adf30b
Adapt linedef type 412 to UDMF
2021-09-21 15:31:53 +02:00
MascaraSnake
132f3f21f1
Adapt linedef type 457 to UDMF
2021-09-21 15:10:50 +02:00
MascaraSnake
d8b5cb6c90
Adapt linedef type 422 to UDMF
2021-09-21 14:59:58 +02:00
MascaraSnake
be480eead0
Linedef type 464: Re-add mobjtype check that I accidentally removed
2021-09-21 12:59:20 +02:00
MascaraSnake
8b6140ddb2
Linedef type 464: Use taglist search to find egg capsule center
2021-09-21 12:55:56 +02:00
MascaraSnake
41d18bc591
Binary-to-UDMF conversion: Set up mapthing tags before global taglists are built
2021-09-21 12:55:22 +02:00
MascaraSnake
2e120953ec
Fix typo in linedef type 400 conversion
2021-09-21 11:35:04 +02:00
MascaraSnake
d47069fbb6
Adapt linedef types 409 and 410 to UDMF
2021-09-21 11:30:34 +02:00
James R
d88eb7cc14
Missed the 'i'
2021-09-21 02:17:44 -07:00
James R
143a515445
Correct Big Wave Dave/InstantSonic credits
2021-09-21 02:15:11 -07:00
MascaraSnake
cabafeef1c
Adapt linedef type 464 to UDMF
2021-09-21 10:35:01 +02:00
MascaraSnake
890934264b
Adapt linedef type 414 to UDMF
2021-09-21 10:14:55 +02:00
MascaraSnake
69e0c636a0
Adapt linedef type 459 to UDMF
2021-09-21 09:05:40 +02:00
MascaraSnake
ea1d442f31
Adapt linedef type 434 to UDMF
2021-09-21 08:34:55 +02:00
MascaraSnake
17bd20a15e
Adapt linedef type 463 to UDMF
2021-09-21 07:44:55 +02:00
MascaraSnake
b898a773ab
Adapt linedef types 425 and 442 to UDMF
2021-09-21 07:36:54 +02:00
MascaraSnake
76c6b6f24f
Forgot to adapt half of linedef type 449
2021-09-20 15:07:08 +02:00
MascaraSnake
1bbf1b2887
Adapt linedef type 438 to UDMF
2021-09-20 14:50:18 +02:00
MascaraSnake
3a73c6167c
Adapt linedef type 439 to UDMF
2021-09-20 14:42:21 +02:00
MascaraSnake
877ec96eec
Adapt a whole bunch of linedef executors to UDMF
2021-09-20 14:25:07 +02:00
MascaraSnake
00b04f6d9e
Adapt some player-related linedef executors to UDMF
2021-09-20 13:31:32 +02:00
MascaraSnake
4028d392b0
Adapt linedef types 423 and 424 to UDMF
2021-09-20 12:42:31 +02:00
MascaraSnake
d2eb4587c2
Adapt linedef type 415 to UDMF
2021-09-20 12:32:01 +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
MascaraSnake
9d3dc98939
Fix "render insides" condition being inverted for intangible FOFs
2021-09-17 09:57:53 +02:00
katsy
3d2f9e6150
don't create the default patches if we have an interscreen
2021-09-13 17:20:20 -05:00
James R
0ac36b7ce1
Remove mixed code and declarations warning
2021-09-12 19:07:40 -07: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
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
Tatsuru
2eed4a9265
Merge branch 'sunbehindcloud' into 'next'
...
Refactor weather switching (fixes #541 )
Closes #541
See merge request STJr/SRB2!1498
2021-09-10 17:00:44 +00:00
katsy
50fe45efe6
Refactor weather switching ( fixes #541 )
2021-09-10 17:00:43 +00:00
Tatsuru
eec765749b
Merge branch 'drawcroppedpatch-improvements' into 'next'
...
V_DrawCroppedPatch(...) Lua exposure and improvements
See merge request STJr/SRB2!1316
2021-09-10 16:14:38 +00:00
Tatsuru
ce98758bd6
Merge branch 'equationslopes' into 'next'
...
Add generalized slopes in UDMF
See merge request STJr/SRB2!1530
2021-09-09 22:12:18 +00:00
SteelT
2578e01cfb
Merge branch 'writable-colormaps' into 'next'
...
Make the colormap returned by v.getColormap() writable.
See merge request STJr/SRB2!959
2021-09-05 21:07:10 +00:00
James R
1af05afb0e
Merge branch 'better-gcc-check' into 'master'
...
Makefile: Improve gcc detection
See merge request STJr/SRB2!1608
2021-09-04 00:43:16 +00:00
James R
cbc5cc3b2a
Fix GCC 11 array-bounds warning in P_SetupStateAnimation
...
Removing inline here silences the warning somehow, it
could be a GCC bug?
2021-09-03 17:18:00 -07:00
James R
c1458aa6c7
Merge branch 'master' into next
2021-09-03 17:15:53 -07:00
James R
8e0831a183
Fix unused variable warning under NOPNG
2021-09-03 17:15:36 -07:00
namishere
39bd9c6da8
Make next compile again
2021-08-30 23:18:25 -07:00
James R
f4f7af6f6d
Add my full name
2021-08-30 18:40:36 -07:00
