stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-19 09:20:59 +00:00
Code Issues Projects Releases Packages Wiki Activity
14183 commits 172 branches 41 tags 280 MiB
Commit graph

14183 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
b637df4ce0 removed a name from credits by request 2022-11-05 17:00:51 -05:00
Monster Iestyn
67fb09ec0d removed a name from credits by request 2022-11-05 21:20:53 +00:00
Eidolon
ce5c41d7eb Merge branch 'the-one-cmake' into 'next' 
Overhaul cmake build

See merge request STJr/SRB2!1832

(cherry picked from commit 4337205fa8)

# Conflicts:
#	src/sdl/CMakeLists.txt
 2022-11-05 03:09:38 -05: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
9277870fa2 Merge branch 'cmake-develop-flag' into 'next' 
cmake: Add SRB2_CONFIG_DEV_BUILD

See merge request STJr/SRB2!1837

(cherry picked from commit 896a7609a7)

518cb0b3 cmake: Add SRB2_CONFIG_DEV_BUILD
 2022-11-04 23:11:49 -04: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
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
James R
76879299f9 Restrict exec path to srb2 directories 2022-10-14 22:10:24 -07:00
James R
9761ab52d9 FIL_ReadFileTag: use fopenfile 
Fixes exec, for example, crashing the game if given
a directory. Test: `exec .`
 2022-10-14 21:57:14 -07:00
James R
3bd3369fdc Add fopenfile, alternative to fopen that does not ever open directories 2022-10-14 21:56:01 -07:00
James R
b1a86b0b34 Disallow adding files with absolute path or traversing upward 
(Except as part of srb2home, srb2path or addons_folder --
this lets addons menu work, primarily.)

- disallowed when using addfile or addfolder
- security check for xcmd receive
 2022-10-14 20:41:45 -07:00
James R
373af01092 Add startswith and endswith, functions that compare the beginning or ending of a string 2022-10-14 20:41:45 -07: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
katsy
2714ac44b4 reallow score chains from rolling 2022-10-12 20:38:29 -05: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
049bfd7bd4 Minor code cleanup in P_ConvertBinaryLinedefTypes 2022-10-09 17:17:16 +02:00