Commit graph

13449 commits

Author SHA1 Message Date
Eidolon
5f6c56cf36 Use precip interp if gl sprite is for precip 2022-11-07 18:17:45 -06:00
Eidolon
4a3dfae2a3 cmake: build zlib manually in internal build 2022-11-07 17:51:37 -06:00
Eidolon
64e063d4dc cmake: Port misc options from Makefiles
- DEBUGMODE
- MOBJCONSISTANCY
- PACKETDROP
- ZDEBUG
- PROFILEMODE (likely moot, dunno how profiling with cmake works
though)
2022-11-06 14:03:02 -06:00
Eidolon
00179e44ed Merge branch 'cmake-warning-config' into 'next'
cmake: Port warning configuration from make

See merge request STJr/SRB2!1844
2022-11-06 16:12:22 +00:00
Eidolon
106d115c3e cmake: Port warning configuration from make
Adds SRB2_CONFIG_ERRORMODE to replace ERRORMODE too.
2022-11-06 10:11:51 -06:00
Eidolon
0b4ceeb73b Merge branch 'scroller-fix' into 'next'
Add_Scroller: Don't call IsSector3DBlock if affectee is a side

Closes #898

See merge request STJr/SRB2!1852
2022-11-06 16:08:22 +00:00
Eidolon
e23be4eaed Merge branch 'spindash-platform-fix' into 'next'
Fix typo in rising FOF binary-to-UDMF conversion

See merge request STJr/SRB2!1853
2022-11-06 16:05:46 +00:00
Eidolon
0348156dd0 Merge branch 'cmake-no-md5-assets' into 'next'
cmake: Remove asset hashing, CMAKE_ASSETS_DIR

See merge request STJr/SRB2!1847
2022-11-06 15:54:25 +00:00
MascaraSnake
812e154638 Fix typo in rising FOF binary-to-UDMF conversion 2022-11-06 07:52:54 +01:00
MascaraSnake
a5a7b20d95 Add_Scroller: Don't call IsSector3DBlock if affectee is a side 2022-11-06 07:48:05 +01:00
Eidolon
90b4f8720e cmake: Remove asset hashing, CMAKE_ASSETS_DIR
Simplifies build setup for cmake.
2022-11-05 23:56:43 -05:00
Eidolon
2e9260c83c Merge branch 'cmake-thelartians-ccache' into 'next'
cmake: Use TheLartians' Ccache script

See merge request STJr/SRB2!1850
2022-11-06 04:38:55 +00:00
Eidolon
036d5cce40 cmake: Use TheLartians' Ccache script on non-Win32
Improves ccache support for Xcode
2022-11-05 23:30:12 -05:00
Monster Iestyn
67fb09ec0d removed a name from credits by request 2022-11-05 21:20:53 +00:00
Eidolon
4337205fa8 Merge branch 'the-one-cmake' into 'next'
Overhaul cmake build

See merge request STJr/SRB2!1832
2022-11-05 05:14:32 +00:00
Eidolon
a015be2a54 cmake: Build all deps and static link 2022-11-05 00:12:09 -05:00
Eidolon
896a7609a7 Merge branch 'cmake-develop-flag' into 'next'
cmake: Add SRB2_CONFIG_DEV_BUILD

See merge request STJr/SRB2!1837
2022-11-05 03:11:36 +00:00
katsy
a10b824e0d pandora's box is condition 28, not 27 2022-11-01 14:59:10 -05:00
Eidolon
f7bc03ad61 Use interp position in GL billboarding 2022-10-30 23:14:11 -05:00
Eidolon
af753b5268 Only call SetupFrame in T-1 hack with player->mo 2022-10-30 21:06:50 -05:00
Eidolon
fdd6550669 Only run view update hack in no-render mode 2022-10-30 21:05:59 -05:00
Eidolon
46603d607e Clear and draw all game hud hook calls to 1 list
Fixes splitscreen issues with lua hud hooks
2022-10-28 23:04:05 -05:00
Eidolon
8fa553a1d0 Ensure view interpolates between T-1 to T 2022-10-28 23:04:05 -05:00
sphere
ea329c93f7 Merge branch 'kill-TMatrix' into 'next'
Kill old TMatrix and TVector code

See merge request STJr/SRB2!1821
2022-10-28 09:13:40 +00:00
sphere
fa4394b3ad Merge branch 'udmf-conveyor-flip' into 'next'
Automatically apply flipspecial to upside-down FOF conveyor belts

See merge request STJr/SRB2!1827
2022-10-28 09:11:18 +00:00
sphere
fad7c429a5 Merge branch 'udmf-equation-slopes' into 'next'
Fix equation slopes overflow

Closes #757

See merge request STJr/SRB2!1830
2022-10-28 09:11:10 +00:00
Eidolon
518cb0b3fd cmake: Add SRB2_CONFIG_DEV_BUILD 2022-10-24 18:39:52 -05:00
Alam Ed Arias
7631d0f521 Merge branch 'next' into kill-TMatrix 2022-10-23 00:33:20 -04:00
Eidolon
56e48f1f5f make: Fix ifdef check from dummy target changes 2022-10-20 21:11:21 -05:00
Eidolon
deaa82aa7f make: Fix ifdef check from dummy target changes 2022-10-20 21:10:21 -05:00
Eidolon
89a6d81f53 Merge branch 'win32-dpi-awareness' into 'next'
win32: Add dpi aware manifest config

See merge request STJr/SRB2!1835

(cherry picked from commit e37918ebb0)

bc44e792 win32: Add dpi aware manifest config
2022-10-18 18:48:09 -04:00
Eidolon
e37918ebb0 Merge branch 'win32-dpi-awareness' into 'next'
win32: Add dpi aware manifest config

See merge request STJr/SRB2!1835
2022-10-18 22:47:51 +00:00
Eidolon
bc44e792eb win32: Add dpi aware manifest config 2022-10-17 22:36:29 -05:00
Eidolon
ef2b9551d2 Add missing .mk for dummy target
(cherry picked from commit d46c201332)
2022-10-13 18:19:43 -05:00
Eidolon
d46c201332 Add missing .mk for dummy target 2022-10-13 18:18:18 -05:00
Eidolon
50ac745ed1 Merge branch 'dummy-revival' into 'next'
Revive the dummy interface

See merge request STJr/SRB2!1831

(cherry picked from commit 3b8cb3982a)

ba55947e Make dummy compile again, if SDL is explicitly set to 0
2022-10-13 19:00:04 -04:00
Eidolon
3b8cb3982a Merge branch 'dummy-revival' into 'next'
Revive the dummy interface

See merge request STJr/SRB2!1831
2022-10-13 22:59:26 +00:00
sphere
31a6b7b365 Merge branch 'improve-439-again' into 'next'
Allow linedef action 439 to set different back-side textures (again)

See merge request STJr/SRB2!1812
2022-10-10 16:21:06 +00:00
MascaraSnake
a6a1b0a720 Refactor linedef type 439 a little 2022-10-10 07:39:34 +02:00
GoldenTails
ba55947ee6 Make dummy compile again, if SDL is explicitly set to 0 2022-10-10 00:30:23 -05:00
Eidolon
f43839ef8d uncapped: Reset cam interpolation on P_ResetCamera 2022-10-09 16:40:52 -05:00
Eidolon
41f17495c4 uncapped: Update closed captions only on new tics 2022-10-09 15:29:28 -05:00
spherallic
81b1526c2c Check the correct backside for textures, then go back to front textures. 2022-10-09 18:53:34 +02:00
MascaraSnake
496bd79f9b Cut inner walls of splat FOFs 2022-10-09 16:56:25 +02:00
MascaraSnake
6ad18e5aec Merge branch 'udmf-current-bugfix' into 'next'
Don't require floor touch for currents in non-FOF sectors

Closes #893

See merge request STJr/SRB2!1826
2022-10-09 13:39:22 +00:00
MascaraSnake
bfaa8ca5c6 Merge branch 'wildcanyon' into 'next'
Check for SF_CANBUSTWALLS, not glide&climb (resolves #892)

Closes #892

See merge request STJr/SRB2!1825
2022-10-09 13:38:58 +00:00
MascaraSnake
17801469fc Merge branch 'fix-stagefailed-checking' into 'next'
Fix reading the value of stagefailed

See merge request STJr/SRB2!1819
2022-10-09 13:38:32 +00:00
MascaraSnake
979bc471ba Conveyor belts: Only apply flipspecial if it's a 3D floor 2022-10-09 15:27:07 +02:00
MascaraSnake
2afea367cb Apply flipspecial automatically to ceiling carry effects 2022-10-08 11:06:14 +02:00
MascaraSnake
d2f2c71685 Don't require floor touch for currents in non-FOF sectors unless it's a horizontal currents in binary (because backwards compatibility) 2022-10-08 10:20:20 +02:00