Commit graph

12616 commits

Author SHA1 Message Date
FlykeSpice
a8c6a65260 Fix visplanes getting allocated twice
I guess that is legacy remnant stuff
2021-10-11 00:20:11 -04:00
Vincent Robinson
f70491b2b5 Make linedef 96 apply to tags from 97-99, but not to itself 2021-10-04 14:23:56 -07:00
SteelT
0f4074f22d Remove unused I_GetMouseGrab function 2021-09-23 13:46:26 -04: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
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
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
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
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
James R
cf30fd1bd7 Merge branch 's' into 'next'
Make next compile again

See merge request STJr/SRB2!1611
2021-08-31 23:47:26 +00:00
namishere
39bd9c6da8 Make next compile again 2021-08-30 23:18:25 -07:00
SteelT
4c20dd7350 Merge branch 'james-but-full' into 'next'
Add my full name in the credits

See merge request STJr/SRB2!1610
2021-08-31 06:09:42 +00:00