stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-28 15:11:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
14175 commits 173 branches 41 tags 186 MiB
Commit graph

14175 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Nev3r
2ef231c073 Merge branch 'fix-cmake-test' into 'next' 
cmake: Fix build errors related to test suite

See merge request STJr/SRB2!2070
 2023-07-26 18:37:17 +00:00
James R
7261db1eee cmake: fix -DSRB2_CONFIG_ENABLE_TESTS=OFF build 2023-07-26 14:16:15 -04:00
SteelT
34f2594b48 Update Catch2 to latest version 
This combined with the previous commit fixes building the test suite
 2023-07-26 14:09:48 -04:00
James R
dc103330ac Rename strcasestr to nongnu_strcasestr, macro strcasestr ifndef _GNU_SOURCE 
Fix for GCC C++ compiler, which always defines _GNU_SOURCE.
 2023-07-26 14:03:55 -04:00
Sally Coolatta
91e915b963 Fix recordscore not including intermission bonuses 2023-07-26 13:44:43 -04:00
Sally Coolatta
42bf107b71 #define BOOL boolean -> #define boolean BOOL 2023-07-26 13:23:48 -04:00
Sal
a7964ffc69 Merge branch 'm-random-take2' into 'next' 
New M_Random implementation

See merge request STJr/SRB2!1780
 2023-07-26 14:53:01 +00:00
tertu marybig
9e5a828508 New M_Random implementation 2023-07-26 14:53:01 +00:00
Sal
a956aadb15 Merge branch 'forwardmove-rng-what-da-hell' into 'next' 
Remove P_RandomFixed call when players are moving

See merge request STJr/SRB2!2057
 2023-07-26 14:08:08 +00:00
Sal
03ae681714 Merge branch 'a_scaletoground' into 'next' 
Fix A_ConnectToGround's Handling of Scaled Mobjs

Closes #1038

See merge request STJr/SRB2!2029
 2023-07-26 12:17:14 +00:00
Sal
31e28bc5a1 Merge branch 'laffytaffy' into 'next' 
Warn in console instead of hard erroring when attempting to modify a vanilla skincolor (resolves #1046)

Closes #1046

See merge request STJr/SRB2!2058
 2023-07-26 12:14:21 +00:00
katsy
4bbf4c21c2 Warn in console instead of hard erroring when attempting to modify a vanilla skincolor (resolves #1046) 2023-07-26 12:14:21 +00:00
Sal
c390a7c0c0 Merge branch 'fix-use-after-free-drawstring' into 'next' 
Fix use-after-free when calling v.drawString in Lua

See merge request STJr/SRB2!2005
 2023-07-26 12:13:49 +00:00
Gustaf Alhäll
9253a8cc54 Fix use-after-free when calling v.drawString in Lua 2023-07-26 08:12:58 -04:00
Sal
f67aea7fc2 Merge branch 'fix-softlock-empty-name' into 'next' 
Fix softlocking as Sonic & Tails when Player 2 has no name

See merge request STJr/SRB2!2056
 2023-07-26 12:10:24 +00:00
Sal
e96a1630b5 Merge branch 'fix-zmovement-remove-crash' into 'next' 
Fix crash when P_ZMovement calls from Lua removes the object

See merge request STJr/SRB2!2054
 2023-07-26 12:09:05 +00:00