stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-14 17:01:07 +00:00
Code Issues Projects Releases Packages Wiki Activity
14191 commits 174 branches 41 tags 299 MiB
Commit graph

14191 commits

This branch
This branch
All branches
Author SHA1 Message Date
SeventhSentinel
33a1351508 I may be stupid 2023-08-10 14:02:44 -04: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
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
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
Monster Iestyn
77d70aaa1b relocate savedata code from P_LoadLevel to G_InitNew as well 
(this doesn't fix !1064 yet, this just makes the code a bit tidier)
 2023-07-31 20:06:28 +01:00
Monster Iestyn
d20ca3d919 reset emeralds and luabanks in G_InitNew, not Got_Mapcmd 2023-07-31 19:44:50 +01:00
spherallic
28ef38faad Reallocate wadfiles when adding folders 2023-07-31 15:32:22 +02:00
LJ Sonic
70ec89682e Fix minor off-by-one error in faketic calculation 2023-07-30 14:26:17 +02:00
Sal
952c84050b Merge branch 'gl-signpost-fix' into 'next' 
Make HWR_AllowModel check for SPR2_SIGN instead of S_PLAY_SIGN

Closes #1066

See merge request STJr/SRB2!2076
 2023-07-30 12:14:43 +00:00
MIDIMan
f4d944e49a Make HWR_AllowModel check for SPR2_SIGN instead of S_PLAY_SIGN 2023-07-29 20:45:10 -04:00
Sal
205ab612f7 Merge branch 'kill-asm' into 'next' 
Kill ASM

Closes #1063

See merge request STJr/SRB2!2074
 2023-07-28 17:03:27 +00:00
katsy
0cca1a77ff remove NASM from readme and circleci 2023-07-28 11:26:02 -05:00
Sal
74bd0c15e2 Merge branch 'no-fixed-asm' into 'next' 
Remove FixedMul and FixedDiv2 asm implementations

See merge request STJr/SRB2!1632
 2023-07-28 11:38:59 +00:00
tertu marybig
723a148089 Remove FixedMul and FixedDiv2 asm implementations 2023-07-28 11:38:59 +00:00
katsy
7634a96031 delete ASM code, remove NASM 2023-07-27 23:58:53 -05:00
katsy
5068e0fe5d Merge remote-tracking branch 'stjr/next' into kill-asm 2023-07-27 23:17:06 -05:00