Commit graph

12305 commits

Author SHA1 Message Date
LJ Sonic
ffbe140af5 Move snake minigame to its own files 2022-12-28 16:12:05 +01:00
LJ Sonic
d03ef0a441 Fix HOMs in large rooms
Credits go to Lactozilla
2022-12-27 20:31:55 +01:00
LJ Sonic
c8e579618a Fix maps with more than 65535 segs not working correctly
This renders the "quadrant hack" and ZenNode largely useless
2022-12-27 20:29:15 +01:00
LJ Sonic
58e5473c9e Fix integer overflow with diagonal node splits
Fixes random invisible walls and possibly more errors
2022-12-27 20:26:38 +01:00
MascaraSnake
937127e987 Disable exit sectors in non-NiGHTS special stages because they interfere with the pits 2022-12-27 16:49:52 +01:00
spherallic
d7606fd85a { 2022-12-27 13:48:42 +01:00
spherallic
f5ede24775 Fix gamepad being unable to skip tutorial prompt 2022-12-27 11:44:56 +01:00
MascaraSnake
3b9ed3e802 EV_DoFloor: Set dummy tag correctly for chained linedef executing 2022-12-27 10:54:24 +01:00
MIDIManNoah
98d544b459 Make some fixes for Metal Sonic's boss fight 2022-12-23 22:19:09 -05:00
spherallic
f3988231d4 Convert old joy## constants 2022-12-22 14:40:35 +01:00
spherallic
1964869c69 Remove redundant control axes & cleanup 2022-12-22 01:40:33 +01:00
spherallic
b772c3a00d Remove "controls per key" option 2022-12-22 00:02:30 +01:00
spherallic
7abdab09bd Check double usage per-player, remove 2.1 code 2022-12-21 23:51:24 +01:00
Lamibe
c1b85b212d Increased maxsend to 200MB 2022-12-19 10:38:17 +01:00
spherallic
a85876d0c2 Change gamepad defaults again, post-refactor 2022-12-16 01:25:54 +01:00
Eidolon
003ee55ccd http-mserv: add SRB2-specific user agent string 2022-12-13 11:44:27 -06:00
Eidolon
ba2a4f06d4 Merge branch 'next' into public_next 2022-12-10 22:04:41 -06:00
Eidolon
30df486dac Update zones.pk3 hash for pre3 (oops) 2022-12-10 15:32:06 -06:00
Eidolon
fdb6f2aff9 sdl: I can't believe it's more version-guards 2022-12-10 02:47:53 -06:00
Eidolon
df28ffd72e sdl: Yet more SDL rumble version-guards 2022-12-10 02:42:14 -06:00
Eidolon
f5f224136b sdl: Version-guard rumble and extended buttons 2022-12-10 02:34:33 -06:00
Eidolon
ec58b1504d sdl: SDL version-guard controller type and hidapi 2022-12-10 02:19:05 -06:00
Eidolon
9e191d0748 Bump SRB2VERSION and MODVERSION for 2.2.11 pre3 2022-12-08 21:27:24 -06:00
Eidolon
4c72154d4f Merge remote-tracking branch 'local-SRB2/next' into public_next 2022-12-08 21:26:28 -06:00
Eidolon
6428d6fc61 Fix axis inversion and camera look inversion 2022-12-08 21:25:10 -06:00
Eidolon
7d8e8e20b7 Merge branch 'gamepad-refactor-lua-rumble' into 'next'
Add haptic functions for Lua scripting

See merge request STJr/SRB2!1872
2022-12-09 02:17:17 +00:00
Eidolon
7f1cafcd3d Merge branch 'gamepad-refactor-lua-features' into 'next'
Add gamepad library and hooks for Lua scripting

See merge request STJr/SRB2!1871
2022-12-09 02:17:03 +00:00
Eidolon
696e2ab909 Merge branch 'gamepad-refactor' into next
Some hacks from the snake minigame patch have been removed as they are
no longer needed.

See STJr/SRB2!1870

# Conflicts:
#	src/g_game.c
#	src/g_input.c
2022-12-08 20:00:41 -06:00
Eidolon
d98d59494f Add missing level-load view reset from RR 2022-12-08 18:21:37 -06:00
sphere
b9c677e537 Merge branch 'triggerafterxcalls' into 'next'
Fix callcount typo

Closes #922

See merge request STJr/SRB2!1890
2022-12-08 12:25:03 +00:00
spherallic
d0a91646ef Allow setting hoop pitch/yaw in degrees (binary) 2022-12-07 12:34:35 +01:00
Eidolon
df131ef131 Bump SRB2VERSION and MODVERSION for 2.2.11 pre2 2022-12-06 18:43:59 -06:00
Eidolon
aac04b818c Merge branch '22-safe-addfolder' into 'public_next'
Path security checks for addfile, addfolder and exec

See merge request STJr/SRB2Internal!633
2022-12-07 00:43:31 +00:00
Eidolon
5cb13f9d1c Bump SRB2VERSION and MODVERSION for 2.2.11 pre1 2022-12-06 18:39:32 -06:00
Eidolon
cf699f23f9 Merge branch 'next' into public_next 2022-12-06 18:39:06 -06:00
Eidolon
9a7d15761d Merge branch '22-exec-files-only' into 'public_next'
Fix exec crashing with out of memory if opening a directory

See merge request STJr/SRB2Internal!634
2022-12-06 08:42:04 +00:00
Eidolon
6d44eb8016 Revert previous RemoveMobjInterpolator move
Matching Ring Racers. Previous move was actually a mistake on the Kart
port. Done so there is never a condition where the interpolator isn't
removed.
2022-12-05 17:22:01 -06:00
Eidolon
5bb7a527a1 Remove mobj interp. on early-free in P_RemoveMobj
Fixes a crash that occurred frequently in special stages/NiGHTS.
2022-12-04 22:25:23 -06:00
MascaraSnake
2cc7fe2bf0 Fix callcount typo 2022-12-04 09:14:55 +01:00
sphere
153def463f Merge branch 'fix-downloadsnakeconcent' into 'next'
[Snake Controller Fix] fix NONET builds

See merge request STJr/SRB2!1888
2022-11-29 12:07:57 +00:00
sphere
2e3253592a Merge branch 'polyvisiblefix' into 'next'
Fix PolyObject visibility/tangibility constants

See merge request STJr/SRB2!1886
2022-11-29 11:28:57 +00:00
sphere
cef1cc3fdc Merge branch 'dynslope-fix' into 'next'
Dynamic slope vertices: Allow untagged vertices which don't move

Closes #917

See merge request STJr/SRB2!1885
2022-11-29 11:28:55 +00:00
Zwip-Zwap Zapony
4e303ec59d better ifdef 2022-11-26 20:46:25 +00:00
ashifolfi
9cec9fbe97 fix NONET builds 2022-11-26 15:34:32 -05:00
LJ Sonic
c025c3408b Merge branch 'reverse-viewpoint-switch' into 'next'
Better viewpoint switching

See merge request STJr/SRB2!1875
2022-11-26 15:17:56 +00:00
LJ Sonic
5a38bbbbf5 Merge branch 'fix-downloadsnakeconcent' into 'next'
Fix Download Consent/Snake minigame not having controller support

Closes #836 and #835

See merge request STJr/SRB2!1883
2022-11-26 15:14:35 +00:00
LJ Sonic
ddc708ac87 Remove shift+F12 shortcut
This would conflict if your shift key is bound to a control =((
2022-11-25 22:40:28 +01:00
sphere
0218f9c2fa Merge branch 'fix-suspicious-statue' into 'next'
Fix suspicious statue still being tangible for ~40 tics after spawning lance-a-bot

Closes #856

See merge request STJr/SRB2!1882
2022-11-25 19:51:15 +00:00
MascaraSnake
4de3ed0ab1 Fix PolyObject visibility/tangibility constants 2022-11-25 18:03:58 +01:00
MascaraSnake
1e6150e7fe Dynamic slope vertices: Allow untagged vertices which don't move 2022-11-24 22:20:54 +01:00
LJ Sonic
28dba7f3c1 Add a separate control for switching to the previous viewpoint 2022-11-23 18:44:58 +01:00
ashifolfi
29aad5b7d5 WOW ITS A GOOD THING I DIDNT FORGET THIS HUH? 2022-11-23 12:27:01 -05:00
ashifolfi
8f5f5c1e22 hack and a half but joystick works now 2022-11-23 12:23:51 -05:00
ashi
1fb6adf390 change |= to &= 2022-11-23 16:22:52 +00:00
ashifolfi
741b1f415d very cool of vscode to not save when I told it to 2022-11-23 11:18:33 -05:00
LJ Sonic
7454235882 Merge branch 'mapmusname-fix' into 'next'
Fix mapmusname not overwriting Lua-provided strings (resolves #880)

Closes #880

See merge request STJr/SRB2!1803
2022-11-23 09:40:43 +00:00
Radicalicious
31520a1a5d Revert usage warning to an error 2022-11-22 16:21:13 +00:00
ashifolfi
7e2dee8796 attempt to get joystick support in snake 2022-11-20 20:17:13 -05:00
ashifolfi
d7b96df07b fix controller not working in download consent menu 2022-11-20 19:00:36 -05:00
ashifolfi
33b5f76045 fix controllers not working in snake game 2022-11-20 18:56:16 -05:00
ashifolfi
aa8410c612 fix statue being tangible for ~40 tics post burst mobj spawn 2022-11-20 18:46:41 -05:00
LJ Sonic
98d2dc4b71 No longer spam the console with viewpoint switching notices 2022-11-16 10:21:59 +01:00
LJ Sonic
d34d90b78b Enable reverse-iterating through viewpoints with shift+F12 2022-11-16 10:21:39 +01:00
LJ Sonic
aba5b953b2 Move viewpoint switching to its own function 2022-11-16 10:11:39 +01:00
Eidolon
e6780f2bee Merge branch 'comptime-no-fail' into 'master'
Minor comptime refactoring.

See merge request STJr/SRB2!1776

(cherry picked from commit dc02339cc9)

9bfc82a1 Prevent comptime.* from failing compilation
a614865d Make comptime.sh conform to POSIX and less redundant, among other improvements
b7711b2b Pass argument list directly to functions that use them; quote arguments when used.
2022-11-15 21:48:47 -05:00
Jaime Ita Passos
4a19294ca8 Merge these two loops together in Controller_GetFromID 2022-11-15 23:45:14 -03:00
Eidolon
dc02339cc9 Merge branch 'comptime-no-fail' into 'master'
Minor comptime refactoring.

See merge request STJr/SRB2!1776
2022-11-16 02:38:04 +00:00
Jaime Ita Passos
14065fb23f Properly make padrumble and padrumble2 CV_OnOff toggles 2022-11-15 23:37:57 -03:00
Jaime Ita Passos
3e088e4e78 Use displayplayer instead of consoleplayer in G_GetInputPlayer 2022-11-15 23:36:32 -03:00
Eidolon
84bc03d24e Merge branch 'po2-32x32-fix' into 'next'
Add PO2 flat cases for sizes smaller than 32x32 (resolves #624)

Closes #624

See merge request STJr/SRB2!1873
2022-11-16 01:40:54 +00:00
Lactozilla
86a052537e Add PO2 flat cases for sizes smaller than 32x32 2022-11-16 01:40:54 +00:00
Eidolon
8109514b73 Merge branch 'fix-udmf-boss3' into 'next'
Use udmf mt arg 4 for pinch phase LE in boss 3

Closes #910

See merge request STJr/SRB2!1869
2022-11-15 10:00:07 +00:00
Lactozilla
4558cc1c1f Fix HWR_SplitWall and sloped midtextures
- Fix bugs with HWR_SplitWall and sloped midtextures
- Clean up HWR_ProcessSeg and HWR_SplitWall
- Determine if the midtexture is visible earlier
- Ensure opaque midtextures always use PF_Masked
2022-11-15 09:55:59 +00:00
Jaime Ita Passos
f0c3de6976 Add gamepad library and hooks for Lua scripting 2022-11-14 02:18:24 -03:00
Jaime Ita Passos
0516350bb4 Add haptic functions for Lua scripting 2022-11-14 01:52:20 -03:00
Jaime Ita Passos
46f7fa406f Refactor gamepad code
Implements the SDL Game Controller API, haptics, and axis bindings.
2022-11-14 00:37:08 -03:00
Eidolon
47ed0567b1 Use udmf mt arg 4 for pinch phase LE in boss 3 2022-11-13 21:28:36 -06:00
Eidolon
c582d73e4c Merge branch 'slowball' into 'next'
Make CA_SLOWFALL Account for Scale

See merge request STJr/SRB2!1806
2022-11-14 02:23:39 +00:00
Eidolon
e0477a86b9 Merge branch 'multi-linkdraw' into 'next'
Improve multiple MF2_LINKDRAW objects in Software

See merge request STJr/SRB2!1843
2022-11-13 23:47:52 +00:00
Eidolon
c5527f9470 Merge branch 'pterabyte-tweaks' into 'next'
Fix Pterabyte spawns (+ behavior tweaks)

See merge request STJr/SRB2!1839
2022-11-13 23:40:56 +00:00
Eidolon
eac8a54a55 Merge branch 'uncap-water-ripples' into 'next'
Uncapped Water Ripples

See merge request STJr/SRB2!1868
2022-11-13 23:29:10 +00:00
Eidolon
b93ae5a144 Merge branch 'fix-addfolder' into 'next'
Fixed folder mods

Closes #889

See merge request STJr/SRB2!1820
2022-11-13 23:21:19 +00:00
Eidolon
90489de517 Merge branch 'slope-fog-fix' into 'next'
Fix slope planes not being able to render fog (fixes #664)

Closes #664

See merge request STJr/SRB2!1637
2022-11-13 20:17:07 +00:00
Zwip-Zwap Zapony
59399e9fcf Uncap water ripples 2022-11-13 16:15:15 +01:00
Eidolon
6709100997 Merge branch 'emblem-drawing-hud' into 'next'
Various changes to emblem drawing (menu changes only)

See merge request STJr/SRB2!1810
2022-11-12 23:37:22 +00:00
Eidolon
9a88c9ea47 Merge branch 'gravityflipping' into 'next'
Gravity flip bugfixes & additions

Closes #378, #661, and #430

See merge request STJr/SRB2!1808
2022-11-12 23:33:07 +00:00
Eidolon
d6640391e4 Merge branch 'very-lethal-lava-land' into 'next'
Only interpolate shadowcasters if they exist

Closes #899

See merge request STJr/SRB2!1864
2022-11-12 23:23:26 +00:00
Eidolon
3ff6c210db Merge branch 'fix-removed-mobj-interp-crash' into 'next'
Remove mobj interpolator only after thinker

See merge request STJr/SRB2!1863
2022-11-12 23:23:06 +00:00
X.organic
b03ef98753 Fix use-after-frees around mobjs
# Conflicts:
#	src/k_kart.c
#	src/p_enemy.c
#	src/p_mobj.c
#	src/p_saveg.c
#	src/p_tick.c
2022-11-12 17:04:25 -06:00
Eidolon
b2fa9e4bd7 Don't sleep w/ fpscap 0 and vsync enabled 2022-11-12 17:18:04 -05:00
Sally Coolatta
fa10530d37 Handle sorting against water FOFs properly 2022-11-12 17:00:45 -05:00
Sally Coolatta
ee9ebe6c54 Improve LINKDRAW with multiple objects
Multiple objects with MF2_LINKDRAW will get sorted between each other, instead of purely done with dispoffset.
2022-11-12 17:00:45 -05:00
Eidolon
e32b8a41e5 Only interpolate shadowcasters if they exist 2022-11-12 15:14:04 -06:00
Eidolon
88667400ee Merge branch 'fix-splat-interp' into 'next'
Fix splat interp and sprite angle

See merge request STJr/SRB2!1858
2022-11-12 21:05:44 +00:00
Eidolon
3bdfa3b9f4 Remove mobj interpolator only after thinker 2022-11-12 14:59:31 -06:00
Eidolon
147b3c925e Ensure st_time does not exceed 2.0 2022-11-12 11:45:10 -06:00
Eidolon
e59684b1a2 Merge branch 'bustablesoundz' into 'next'
Start bustable FOF sounds at the correct height

Closes #846

See merge request STJr/SRB2!1818
2022-11-11 23:15:26 -06:00
Eidolon
2aa9a92e7e Merge branch 'nodoublecrumble' into 'next'
Prevent floating crumbling platforms from being triggered twice

Closes #797 and #594

See merge request STJr/SRB2!1817
2022-11-11 23:13:16 -06:00
Eidolon
24ab858684 Merge branch 'fix-negative-lives-crash' into 'next'
Fix a crash when scrolling away from a save file with a negative lives count.

See merge request STJr/SRB2!1822
2022-11-11 23:11:44 -06:00
Eidolon
c489b8e2fe Merge branch 'udmf-splat-cut' into 'next'
Cut inner walls of splat FOFs

Closes #891

See merge request STJr/SRB2!1829
2022-11-11 23:03:08 -06:00
Eidolon
f3830b2934 Merge branch 'pandoras-letter' into 'next'
Fix hidden 100% completion reward actually being obtained at 50% completion

See merge request STJr/SRB2!1842
2022-11-11 23:00:24 -06:00
ashifolfi
60ab28c1ab improved down arrow check + t->b/b->t looping 2022-11-11 22:57:17 -06:00
ashifolfi
4c08daa01f remove down arrow at bottom of addon list 2022-11-11 22:57:17 -06:00
ashifolfi
e12db019d6 fix addon menu down arrow always being visible 2022-11-11 22:57:17 -06:00
Alam Ed Arias
f5e1d9722f Merge branch 'master' into next 2022-11-11 22:03:58 -05:00
Alam Ed Arias
c008dc4d1f Merge branch 'master' into 'master'
Fix Typo

See merge request STJr/SRB2!1860
2022-11-12 02:49:43 +00:00
Alam Ed Arias
9b4d6a2109 Fix Typo 2022-11-11 21:46:28 -05:00
Alam Ed Arias
bd2bfe462c Merge branch 'master' into 'master'
Cleanup whitespaces and ignore build folders

See merge request STJr/SRB2!1859
2022-11-12 02:35:53 +00:00
Alam Ed Arias
e1fd0dfca3 Cleanup whitespace changes from SRB2_release_2.1.23 2022-11-11 21:19:29 -05:00
Alam Ed Arias
4e1976839b Cleanup whitespace changes from SRB2_release_2.1.25 2022-11-11 21:19:28 -05:00
Alam Ed Arias
46186d7632 Cleanup whitespace changes from SRB2_release_2.2.2 2022-11-11 21:19:26 -05:00
Alam Ed Arias
7e0fa2d34c Cleanup whitespace changes from SRB2_release_2.2.9 2022-11-11 21:19:25 -05:00
Alam Arias
1b5dd687d2 Cleanup whitespace changes from master branch 2022-11-11 20:31:41 -05:00
Alam Arias
ae112a3728 Update hu_stuff.c
Fix NONET build
2022-11-11 20:21:30 -05:00
James R
04855a85dc Use angle between viewz and mobj z to determine splat sprite angle 2022-11-11 17:35:31 -06:00
James R
877d5450d5 Use interpolated mobj x/y/z/angle for splats
# Conflicts:
#	src/hardware/hw_main.c
#	src/r_things.c
2022-11-11 17:35:27 -06:00
Eidolon
7f913b5ace Merge branch 'registervar-sanity' into 'next'
Plug up some holes with lib_cvRegisterVar

Closes #441

See merge request STJr/SRB2!1823
2022-11-10 15:21:29 +00:00
Eidolon
0f406b8b8d Merge branch 'udmf-fof-brightness' into 'next'
HWR transparent FoF plane brightness

See merge request STJr/SRB2!1857
2022-11-10 15:05:49 +00:00
Monster Iestyn
6a6d92a824 Update credits 2022-11-10 14:08:11 +00:00
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
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
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
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
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
krabs
295555d0d0 Fix issues with gravflip of dropped items (rings, ctf flag, weapons, emeralds) 2022-09-11 17:15:25 +02:00
spherallic
1f73c9cf99 Add flag to per-sector gravity for overriding MF2_OBJECTFLIP 2022-09-11 16:15:50 +02:00
spherallic
8d06145377 Play gravity flip sound on jump in jumpflip sectors, reorganize code 2022-09-09 15:35:05 +02:00
spherallic
9fabddd4bb Add sector type that flips gravity upon jumping 2022-09-08 16:56:35 +02:00
spherallic
f0adc71f9b Add flag to invert current gravity to gravity flip executor 2022-09-08 16:56:35 +02:00
spherallic
ef35084d95 Merge remote-tracking branch 'public/master' into next 2022-09-08 16:52:54 +02:00
sphere
892ffbe01b Merge branch 'stop-wuse-after-free' into 'master'
Stop -Wuse-after-free warnings

See merge request STJr/SRB2!1805
2022-09-08 14:51:17 +00:00
sphere
65fa93c4f7 Merge branch 'skin-set-fix' into 'next'
Only set default skin/color when possible

See merge request STJr/SRB2!1772
2022-09-06 15:19:18 +00:00
sphere
fc1cc9ffe5 Merge branch 'unknown-command-dedicated-print' into 'next'
Fix "unknown command" not being printed on dedicated

See merge request STJr/SRB2!1771
2022-09-06 15:19:11 +00:00
sphere
2d16ccf176 Merge branch 'fixmapconditions' into 'next'
Fix map number checks when reading unlockable conditions

Closes #882

See merge request STJr/SRB2!1807
2022-09-06 08:05:35 +00:00
spherallic
8a0f0237f2 Merge branch 'next' into udmf-fof-flags 2022-09-06 09:52:01 +02:00
sphere
5d7d19d2bf Merge branch 'more-whitelisting' into 'next'
Add more menu graphics to the whitelist.

Closes #765

See merge request STJr/SRB2!1731
2022-09-06 07:40:56 +00:00
sphere
9e2d8f059d Merge branch 'write-textmap-bruh' into 'next'
Fix size_t compiler warnings in P_WriteTextmap

See merge request STJr/SRB2!1785
2022-09-05 21:54:20 +00:00
sphere
d67e88ee0c Merge branch 'fix-parenttriestosleep-desc' into 'next'
Fix description of A_ParentTriesToSleep

See merge request STJr/SRB2!1784
2022-09-05 21:49:34 +00:00
spherallic
508536e3d7 Fix map number checks when reading unlockable conditions. 2022-09-05 20:41:09 +02:00
SMS Alfredo
e070880ec0 Do the thing 2022-08-25 15:29:54 -05:00
Jaime Ita Passos
c27d7f916f Stop -Wuse-after-free warnings 2022-08-11 04:30:03 -03:00
Jaime Ita Passos
07011a7044 Stop -Waddress warnings 2022-08-11 04:24:24 -03:00
Radicalicious
1edbbad2df Remove extra whitespace 2022-08-03 23:08:42 +00:00
Radicalicious
71caaf180c Fix mapmusname not overwriting Lua-provided strings 2022-08-02 20:59:13 -05:00
MascaraSnake
dff15fa678 Fix equation slopes overflow 2022-07-31 15:12:59 +02:00
MascaraSnake
ec119eac2f Merge branch 'next' into udmf-fof-flags 2022-07-31 13:27:03 +02:00
MascaraSnake
7389e2ceb6 Use the correct bustflags constant 2022-07-31 13:24:45 +02:00