Commit graph

12017 commits

Author SHA1 Message Date
Eidolon
07665ae502 hwr: Use UDMF FOF_SPLAT for splat flats and walls 2022-11-09 17:40:43 -06:00
Eidolon
0f2fe5983e hwr: Use lightlevel on transparent planes 2022-11-09 17:31:49 -06:00
Eidolon
12c2ddb115 Merge branch 'uncappedrevengeance' into next
Uncapped

See merge request STJr/SRB2!1856

# Conflicts:
#	src/dummy/i_system.c
#	src/win32/win_sys.c
2022-11-08 21:13:50 -06:00
Eidolon
3597957af1 Merge branch 'cmake-zlib-internalized' into 'next'
cmake: build zlib manually in internal build

See merge request STJr/SRB2!1856
2022-11-09 02:30:35 +00:00
Eidolon
4037d04994 cmake: copy build shared internal libs to bin/ 2022-11-08 19:21:21 -06:00
Eidolon
6d1a3bfce0 Reset camera when moving player to spawn/starpost 2022-11-08 18:48:50 -06:00
James R
dc1beb8e5b Fix buffer overflow when pasting into chat 2022-11-07 22:35:18 -06:00
Eidolon
62b142f136 Uncap room list ellipsis animation 2022-11-07 20:08:33 -06:00
Eidolon
3c5855b64a Uncap sound test 2022-11-07 19:48:42 -06:00
Eidolon
4a580558f0 Tweak showfps alignment 2022-11-07 18:50:23 -06:00
toaster
0cd3629d00 Explicit pointer cast for R_InterpolatePrecipMobjState 2022-11-07 18:17:45 -06:00
Eidolon
5f6c56cf36 Use precip interp if gl sprite is for precip 2022-11-07 18:17:45 -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
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
Monster Iestyn
67fb09ec0d removed a name from credits by request 2022-11-05 21:20:53 +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
spherallic
57cf1f870d Fix Pterabyte spawns, revert mashing requirement, increase grace period 2022-10-25 13:11:30 +02: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
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
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
spherallic
c92a371aa9 Clean up the start of P_CheckQuicksand 2022-10-08 10:58:09 +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
katsy
79e8e10e07 check for canbustwalls, not glide&climb 2022-10-04 16:22:07 -05:00
spherallic
73e2d8d1bc Fix CircleCI build error 2022-10-04 10:38:57 +02:00
SteelT
534b610a76 Plug up some holes with lib_cvRegisterVar
* Error if a consvar is set to an empty string
* Error if a consvar is not given a defaultvalue
2022-10-03 16:04:38 -04:00
GoldenTails
3244d6586d Fix a crash when scrolling away from a save file with a negative lives count. 2022-10-02 19:08:01 -05:00
Alam Ed Arias
f310d84766 replaced old TVector and TMatrix code 2022-10-01 15:40:45 -04:00
Lamibe
7785d66467 Fixed folder mods 2022-10-01 17:46:48 +02:00
Alam Ed Arias
d11fbe4504 New Fixed Point Matrix functions 2022-09-30 22:04:12 -04:00
SteelT
325675e277 Fix reading the value of stagefailed 2022-09-30 20:27:54 -04:00
spherallic
9da90cef8e Merge branch 'next' into gravityflipping 2022-09-30 21:27:32 +02:00
sphere
e08ebac5c8 Merge branch 'depth-buffer-24' into 'next'
Request 24-bit depth buffer from SDL

See merge request STJr/SRB2!1635
2022-09-30 14:01:33 +00:00
sphere
70161ff52e Merge branch 'fancarry' into 'next'
Add carry type to fans (with fixed merge conflicts)

See merge request STJr/SRB2!1809
2022-09-30 13:07:19 +00:00
Alam Ed Arias
e5518a1241 replace TMatrix with matrix_t 2022-09-30 00:27:10 -04:00
spherallic
bf466bfbd9 Fix P_InJumpFlipSector checking for outdated FOF flags 2022-09-29 19:32:53 +02:00
spherallic
f37d466343 Merge branch 'next' into gravityflipping 2022-09-29 19:27:00 +02:00
sphere
bc5c65306b Merge branch 'table-len-metamethod' into 'next'
Fix __len metamethod ignored on tables

See merge request STJr/SRB2!1328
2022-09-28 21:54:07 +00:00
sphere
21808e883b Merge branch 'better-wad-search' into 'next'
Clean up the WAD searching code a little.

See merge request STJr/SRB2!1678
2022-09-28 21:33:30 +00:00
sphere
27f2b04109 Merge branch 'readhuditem-parse-fix' into 'next'
readhuditem parse fixes

Closes #887

See merge request STJr/SRB2!1816
2022-09-28 21:04:44 +00:00
sphere
a53d9b3788 Merge branch '457failuretagfix' into 'next'
Fix action 457 (Track object angle) not triggering the 'failure' tag

Closes #883

See merge request STJr/SRB2!1814
2022-09-28 21:04:02 +00:00
sphere
ac7f983c8a Merge branch 'exclusivescrollfix' into 'next'
Fix 'exclusive' flag on plane scrollers being inverted

Closes #885

See merge request STJr/SRB2!1813
2022-09-28 21:03:56 +00:00
sphere
8da4eab173 Merge branch 'udmf-fof-flags' into 'next'
Fix UDMF FOF flags

See merge request STJr/SRB2!1802
2022-09-28 21:03:44 +00:00
spherallic
2623649871 "That line shouldn't be there at all :v" -MascaraSnake 2022-09-28 22:57:34 +02:00
spherallic
78eae609cc Start bustable FOF sounds at the correct height 2022-09-26 23:51:51 +02:00
spherallic
1cf5bdf82b Prevent floating crumbling platforms from being triggered twice 2022-09-26 20:32:57 +02:00
spherallic
862fdaaa3d Revert "prevent immediate re-flipping", streamline P_GetMobjGravity 2022-09-26 13:41:37 +02:00
SteelT
fe8be242d0 readhuditem parse fixes
Fix readhuditem not parsing flags correctly
Fix unknown word warning erroneously describing the HUD item as a level header
2022-09-26 02:31:50 -04:00
spherallic
00ecddf3e9 Fix action 457 reading the failure tag from the wrong offset field 2022-09-18 12:55:17 +02:00
spherallic
5f62af05f1 Fix 'exclusive' flag on plane scrollers being inverted 2022-09-18 11:21:00 +02:00
spherallic
cd85240ec3 Add toggle for action 439 to use backside textures 2022-09-17 11:40:44 +02:00
sphere
cfdbc8f44a Merge branch 'vissprite-color' into 'next'
Allow objects with MF2_LINKDRAW to use their own color

See merge request STJr/SRB2!1576
2022-09-17 07:32:51 +00:00
spherallic
872a2001c8 Add new linedef executor trigger that checks gravity 2022-09-17 02:14:25 +02:00
spherallic
a85b820b44 Don't skip map completion emblems when skipping record attack emblems. 2022-09-17 00:59:35 +02:00
spherallic
4f744bc06f Various changes to emblem drawing:
- Emblems in a row now have a little bit of spacing between them.
- Score/time/ring emblems are drawn only once in the pause menu.
- Record Attack & NiGHTS Mode show in-level emblems as well.
2022-09-17 00:47:08 +02:00
sphere
aaae90a5e3 Merge branch 'soundflags' into 'next'
Use sound flags for sfxinfo, fix SF_TOTALLYSINGLE checks

See merge request STJr/SRB2!1765
2022-09-16 22:31:51 +00:00
spherallic
efc0f7a758 Correct SF_TOTALLYSINGLE checks. 2022-09-16 23:59:19 +02:00
spherallic
2664fc700a Check for sector special flag instead of special number 2022-09-16 23:05:24 +02:00
spherallic
b7dd3ac4bf Restore CR_FAN application for fan sectors 2022-09-16 22:56:26 +02:00
spherallic
612424e2e2 Merge branch 'next' into fancarry 2022-09-16 22:54:08 +02:00
spherallic
9e9e3f4cca Correct ceilingz handling in quicksand 2022-09-12 14:00:17 +02:00
spherallic
9499d16221 Fix quicksand in reverse gravity 2022-09-12 11:27:28 +02:00
spherallic
3427d4309f Prevent immediate re-flipping after a per-sector gravity flip 2022-09-11 23:12:51 +02:00
spherallic
42fc6c877b Remove hack in P_GetMobjGravity for spinfire, fix the underlying issue 2022-09-11 20:04:20 +02:00
spherallic
0ee81a1cc3 Support gravity override flag in UDMF 2022-09-11 19:46:57 +02:00
spherallic
5e6185abe2 Fix Elemental stomp's flames while Gravity Boots are active 2022-09-11 18:28:17 +02:00
spherallic
3d29e9770f Re-add momz inversion on dropped emeralds 2022-09-11 17:41:55 +02:00