stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 09:11:48 +00:00
Code Issues Projects Releases Packages Wiki Activity
14381 commits 174 branches 41 tags 300 MiB
Commit graph

14381 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sally Coolatta
b5b7b7c1e3 Merge remote-tracking branch 'upstream/master' into next 2023-08-20 00:23:26 -04:00
Sal
ec559612b9 Merge branch 'nights-pull-emblem-fix' into 'next' 
Don't NiGHTS pull emblems you can't collect

See merge request STJr/SRB2!2113
 2023-08-20 04:03:07 +00:00
Sally Coolatta
9d9b6d83c2 Don't NiGHTS pull emblems you can't collect 2023-08-19 23:58:43 -04:00
Sal
3bcd1dc25a Merge branch 'write-color-properly' into 'next' 
Fix P_WriteSkincolor

Closes #1068

See merge request STJr/SRB2!2112
 2023-08-20 03:41:51 +00:00
Sally Coolatta
d589953fc4 Fix P_WriteSkincolor 2023-08-19 23:39:54 -04:00
Sal
b6f41bd7b8 Merge branch 'cheated-fixes' into 'next' 
Level select cheat fixes

Closes #1090

See merge request STJr/SRB2!2111
 2023-08-20 03:16:14 +00:00
Sal
7ef7de1bc5 Level select cheat fixes 2023-08-20 03:16:14 +00:00
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
Lactozilla
976b9b862d Restore player skins if forced skin restrictions are lifted 2023-08-15 13:51:12 -03: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
Lactozilla
dd4deaa5e9 Reduce code duplication 2023-08-15 12:43:31 -03:00
Lactozilla
8d56a4d32e Move splitscreen code path out of SetSkinLocal and into SendNameAndColor 2023-08-15 12:37:18 -03:00
Lactozilla
a745997243 Better handling of cv_skin/cv_playercolor in singleplayer 2023-08-15 12:27:38 -03:00
Lactozilla
e106b56b53 Only set the picked character once 2023-08-15 04:45:50 -03:00
Lactozilla
062af20628 Don't change cv_skin or cv_playercolor if there is no need to 2023-08-15 04:29:50 -03:00
Lactozilla
0bb65166c9 Always allow changing color in multiplayer player setup menu 2023-08-15 03:49:31 -03:00
Lactozilla
9dc2447559 Ensure the correct color is set for the player object in splitscreen 2023-08-15 03:46:55 -03: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
Lactozilla
3377fa986a Remember the player's color after a team gametype 2023-08-07 13:37:07 -03: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