Commit graph

14414 commits

Author SHA1 Message Date
Sal
f0b09dec6b Merge branch 'linux-render-switching-fix' into 'master'
fix linux renderer switching

See merge request STJr/SRB2!2110
2023-08-20 02:43:26 +00:00
bitten2up
93f11508fc
remove stray else 2023-08-19 19:52:10 -05:00
spherallic
623fa126ad Fix backside ceiling vertex slopes 2023-08-18 15:08:12 +02:00
spherallic
07ef7c4639 Prevent FOF alpha from wrapping around in OpenGL 2023-08-17 20:15:03 +02:00
spherallic
66cc6a5f44 Correct flags for partially intangible FOFs 2023-08-17 19:31:55 +02:00
spherallic
9b296a1547 Disable Makefile deprecation warning for now 2023-08-17 19:27:33 +02:00
Zwip-Zwap Zapony
db59ec5998 Fix interpolation when curling up while flipped
Also fix scaling interpolation while flipped, and fix the NiGHTS Drone flip interpolation on its first tic
2023-08-17 17:39:24 +02:00
sphere
207aba0a52 Merge branch 'fix-segfault-emerald-hunt-spec' into 'next'
Fix segfault when spectating on an Emerald Hunt map

See merge request STJr/SRB2!2105
2023-08-16 11:12:40 +00:00
Monster Iestyn
3eaa365706 Merge branch 'fix-mobj-flag-fumblings' into 'next'
Fix Mobj Flag Fumblings

See merge request STJr/SRB2!2107
2023-08-15 16:12:24 +00:00
Zwip-Zwap Zapony
5830ff500f Fix mobj flag fumblings 2023-08-14 19:05:48 +02:00
Gustaf Alhäll
3d14d155e0
Fix segfault when spectating on an Emerald Hunt map 2023-08-12 12:31:59 +02:00
SteelT
3fbdaa61b7 Merge branch 'cherry-pick-86367e4e' into 'next'
Add gametype parameter to G_SetCustomExitVars and G_ExitLevel

See merge request STJr/SRB2!2101
2023-08-10 00:01:24 +00:00
Sal
f96ebbb2f5 Merge branch 'warp-is-cheat' into 'next'
Warp cheat adjustments

See merge request STJr/SRB2!2098
2023-08-07 18:35:20 +00:00
Sal
492fe94597 Warp cheat adjustments 2023-08-07 18:35:20 +00:00
Sal
f130e9fabd Merge branch 'signal-handler-fix' into 'next'
Fix crash handler showing garbage string for signal title

See merge request STJr/SRB2!2102
2023-08-07 18:34:59 +00:00
SteelT
20e4e8a5c4 Fix crash handler showing garbage string for signal title
This fixes the signal title being shown as something like "Process killed by signal: Process killed by signal: ó>"

Did some minor cleaning while I'm also here
2023-08-07 14:06:24 -04:00
Lactozilla
f17493f379 Use -1 as the default, not 0 2023-08-07 14:30:39 -03:00
Lactozilla
b92dc42848 Add gametype parameter to G_SetCustomExitVars and G_ExitLevel
(cherry picked from commit 86367e4ec1)
2023-08-07 13:23:57 -04:00
Nev3r
57592a566a Merge branch 'linedef-type-442-binary' into 'next'
Fix minor typo in Binary-to-UDMF conversion for linedef type 442

Closes #1087

See merge request STJr/SRB2!2099
2023-08-06 14:50:12 +00:00
MIDIMan
d06098c0aa Changed P_ConvertBinaryLinedefTypes to use args[1] instead of args[3] for linedef type 442 2023-08-05 20:22:11 -04:00
Sal
9e72b78a24 Merge branch 'scale-mishap' into 'next'
Make UDMF scale compatible with ZDoom's spec

See merge request STJr/SRB2!2086
2023-08-04 20:05:35 +00:00
Sal
f11538c478 Make UDMF scale compatible with ZDoom's spec 2023-08-04 20:05:35 +00:00
Sal
be056af77e Merge branch 'total-starts-at-record-score' into 'next'
Total score starts at record score

See merge request STJr/SRB2!2091
2023-08-04 20:05:17 +00:00
Sal
e2c6a3365f Merge branch 'fix-demo-file-list-crash' into 'next'
Improved version checks for demo file lists

See merge request STJr/SRB2!2095
2023-08-04 20:05:12 +00:00
SteelT
6780f89574 Add missing param to G_CheckDemoExtraFiles in G_CheckDemoForError 2023-08-04 15:59:47 -04:00
Sal
ea76826489 Merge branch 'fix-glibc-238' into 'master'
Fix glibc 2.38 compile

See merge request STJr/SRB2!2092
2023-08-04 18:41:29 +00:00
Sally Coolatta
39175c6c70 Improved version checks for demo file lists
No longer relies on the demoversion global variable (which was incorrect for a couple instances, like ghosts), now we pass the version to the file list functions. Also don't set any demo global variables when checking a demo for valid files before playback. Also also, exit said file check function asap if its a title demo instead of doing it after we've already opened the file.
2023-08-04 14:36:56 -04:00
James R
b120d00c9f Fix glibc 2.38 compile
glibc 2.38 added strlcpy and strlcat.
2023-08-03 16:46:47 -07:00
Sally Coolatta
33c7a930a7 Total score starts at record score
Means there's actually feedback for how much score you got in the current level.
2023-08-02 11:31:05 -04:00
Sal
0ce41f3e1d Merge branch 'itallreturnstonothing' into 'next'
Handle empty music lump name on music change

See merge request STJr/SRB2!2090
2023-08-02 15:24:42 +00:00
spherallic
8990b83071 Handle empty/"-" music lump name on music change 2023-08-02 17:05:38 +02:00
Sal
b7443cfa05 Merge branch 'lawofattraction' into 'next'
Fix ring attraction and homing attack math errors (resolves #1045, #1001)

Closes #1001 and #1045

See merge request STJr/SRB2!2033
2023-08-02 14:54:33 +00:00
Sal
cdf5890c5d Merge branch 'mi-lua-fixes' into 'next'
Lua fixes

See merge request STJr/SRB2!2085
2023-08-02 00:20:32 +00:00
Sal
1f799257a1 Merge branch 'extras-levelselect-fix' into 'next'
Extras level select fix

See merge request STJr/SRB2!2084
2023-08-02 00:20:21 +00:00
Sal
0dcf5368e5 Merge branch 'supersign' into 'next'
Make Both Sign State and Sprite2 Disable Models (Solves #1077)

See merge request STJr/SRB2!2089
2023-08-02 00:20:08 +00:00
SMS Alfredo
24cad83287 Make both sign state and sprite2 disable models 2023-08-01 17:43:39 -05:00
Sal
d33358eed0 Merge branch 'recordscore-fix' into 'next'
Don't set recordscore to 0 in G_PlayerFinishLevel

See merge request STJr/SRB2!2087
2023-08-01 19:35:47 +00:00
SteelT
fd4c50589d Don't set recordscore to 0 in G_PlayerFinishLevel
Fixes the recordscore being reset on intermission start
2023-08-01 15:23:14 -04:00
Monster Iestyn
c9efaf3a1a fix warping from SP pause level select breaking if game was started with no save slot (such as from extras menu) 2023-08-01 17:52:06 +01:00
Monster Iestyn
e8256e2b43 allow archiving/unarchiving of skin_t userdata in netgames 2023-08-01 13:17:52 +01:00
Monster Iestyn
d91d9bf7fc add redflag, blueflag, rflagpoint and bflagpoint to Lua 2023-08-01 12:57:03 +01:00
Monster Iestyn
70928120c2 allow use of P_IsFlagAtBase in HUD code, since it doesn't actually modify anything 2023-08-01 12:45:58 +01:00
Sal
1ddc04abc6 Merge branch 'cmake-rr-ports' into 'next'
Ring Racers CMake + Debug build improvements

See merge request STJr/SRB2!2075
2023-08-01 02:29:45 +00:00
Sal
26583a9845 Ring Racers CMake + Debug build improvements 2023-08-01 02:29:45 +00:00
Sal
8630dd1644 Merge branch 'faketic-fix' into 'next'
Fix minor off-by-one error in faketic calculation

See merge request STJr/SRB2!2077
2023-08-01 02:29:05 +00:00
Sal
ca042db371 Merge branch 'fix-missing-ssf-entries' into 'next'
Fix wrong SSF_* values in Lua due to missing entries

See merge request STJr/SRB2!2080
2023-08-01 02:28:26 +00:00
Sal
e442dc262e Merge branch 'resetplayer-rodeo' into 'next'
Fix #1064

Closes #1064

See merge request STJr/SRB2!2081
2023-08-01 02:25:43 +00:00
Monster Iestyn
fb00b65f41 ...you know what, just call G_LoadGame for SP_PauseLevelSelectDef in M_LevelSelectWarp too 2023-07-31 23:36:07 +01:00
Gustaf Alhäll
ddc5cc6e48
Fix wrong SSF_* values in Lua due to missing entries 2023-07-31 22:51:50 +02:00
sphere
960a015683 Merge branch 'addfolderalloc' into 'next'
Reallocate wadfiles when adding folders

Closes #1067

See merge request STJr/SRB2!2078
2023-07-31 19:53:45 +00:00