stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-18 17:01:20 +00:00
Code Issues Projects Releases Packages Wiki Activity
14192 commits 172 branches 41 tags 276 MiB
Commit graph

14192 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Sal
99c95e2d7a Merge branch 'fix-mobjcollide-removemobj-segfault' into 'next' 
Fix segfault when calling P_RemoveMobj from MobjCollide hook

See merge request STJr/SRB2!2041
 2023-07-26 12:03:09 +00:00
Sal
020a7b878e Merge branch 'fix-memory-bloat' into 'next' 
Clean up and simplify zone memory allocation

See merge request STJr/SRB2!2059
 2023-07-26 12:01:52 +00:00
Sal
a8aee74829 Merge branch 'drawseg-clipping-optimized' into 'next' 
Drawseg clipping optimized, from prboom-plus

See merge request STJr/SRB2!2067
 2023-07-26 12:00:58 +00:00
Sal
8ed51989e1 Merge branch 'renderhitbox-fix' into 'next' 
Small renderhitbox fix

See merge request STJr/SRB2!2068
 2023-07-26 12:00:22 +00:00
Sal
7eff445d1f Merge branch 'cmake-clang-tidy' into 'next' 
cmake: Add optional clang-tidy integration

See merge request STJr/SRB2!1849
 2023-07-26 11:59:02 +00:00
Eidolon
101cdea022 cmake: Add optional clang-tidy integration 
clang-tidy performs static analysis over the compilation unit,
producing more comprehensive compile warnings than are normally
generated by the compiler. For example, it will trace branches in a
function to find the exact conditions in which a null dereference
can occur.

Note that this produces an absurd amount of warnings for our existing
C code, and significantly slows compile times. It is pretty effective
at its job though. I think it would be good to turn on by default for
upcoming C++ code.
 2023-07-26 07:58:31 -04:00
Sal
a52bccacc3 Merge branch 'cmake-enable-cxx' into 'next' 
Enable C++17, Catch2 unit testing

See merge request STJr/SRB2!1854
 2023-07-26 11:57:28 +00:00
Eidolon
12b6a7cabf Don't preproc. define inline in C++ 2023-07-26 07:56:22 -04:00
Eidolon
2a8dbed336 Redefine boolean for C++ compatibility 2023-07-26 07:56:22 -04:00
Eidolon
7639127003 cmake: Add Catch2 unit testing 2023-07-26 07:55:26 -04:00
Eidolon
0abe556197 cmake: Enable C++ 17 and C11 2023-07-26 07:55:26 -04:00
Sally Coolatta
dc9346a45d Add forwardmove rng backwards compat with demos 2023-07-26 07:50:47 -04:00
Sally Coolatta
29f7ecd460 Remove P_RandomFixed call when players are moving 
"Add some extra randomization" is not how RNG works
 2023-07-26 07:46:51 -04:00
Sal
6a0be65315 Merge branch 'brokenrecord' into 'next' 
Make reading and writing of all player stats to record attack demos precise (resolves #1048)

Closes #1048

See merge request STJr/SRB2!2045
 2023-07-26 11:43:32 +00:00
Sal
5eae98c829 Merge branch 'ra-file-list' into 'next' 
Allow Record Attack in modified games

See merge request STJr/SRB2!2064
 2023-07-26 11:35:31 +00:00
Lactozilla
e12288be3f Move these two lines after calculating the slopes 2023-07-26 00:19:55 -03:00
Lactozilla
c6c3cc3209 Drawseg clipping optimized, from prboom-plus 
Co-authored-by: Sally Coolatta <tehrealsalt@gmail.com>
 2023-07-26 00:06:52 -03:00
Sally Coolatta
10a8f2d05e Fix some minor warnings 
- Fix `lib_getSkinSprite` overshadowing `sprites` global
- Rename terrible result_e `ok` so it stops overshadowing crap
- Remove inlining from w_wad.c since it reached the inline limit (remember kids, your compiler knows better than you these days whenever or not to inline something)
- Remove unused variable in G_PlayerReborn
 2023-07-25 11:32:26 -04:00
Sal
7c26fbf09d Merge branch 'drawonlyforpx' into 'next' 
Add "drawonlyforplayer" and "dontdrawforviewmobj"

Closes #1009, #997, and #924

See merge request STJr/SRB2!2014
 2023-07-25 15:06:23 +00:00
Zwip-Zwap Zapony
0e2682d590 Add "drawonlyforplayer" and "dontdrawforviewmobj" 2023-07-25 11:05:29 -04:00
Sally Coolatta
dded352293 Harsher replay menu 
Don't allow loading demos with invalid file lists at all. If you insist on doing this, it has to be done from the command line now.
 2023-07-25 09:43:10 -04:00
Sally Coolatta
f99cf91d3d Promote file count to UINT16 2023-07-25 09:29:09 -04:00
Sally Coolatta
77576c3c5d Allow Record Attack in modified games 
Replays now store & validate the add-on list before loading them. Custom characters can now be allowed in Record Attack.
 2023-07-25 08:45:42 -04:00
Sally Coolatta
1a2f66acd9 Update .gitignore 2023-07-25 08:45:42 -04:00
Sal
1a209146d6 Merge branch 'spemblems' into 'next' 
Allow obtaining ring, time & grade emblems in regular gameplay

See merge request STJr/SRB2!1752
 2023-07-25 09:45:12 +00:00
Sal
ee67070547 Merge branch 'fix-no-sdl-build' into 'next' 
Fix build errors when building without SDL

See merge request STJr/SRB2!2062
 2023-07-25 09:44:33 +00:00
Sal
8cae5a9ff8 Merge branch 'fix-declaration-errors' into 'next' 
Fix errors due to declaring variables in switch bodies

See merge request STJr/SRB2!2063
 2023-07-25 09:43:53 +00:00
GoldenTails
4212035729 Fix errors due to declaring variables in switch bodies 2023-07-24 21:44:53 -05:00
Sal
3a52e6deb2 Merge branch 'waiting-players-intermission' into 'next' 
SRB2Kart netcode ports

See merge request STJr/SRB2!2019
 2023-07-24 18:03:45 +00:00
Sal
2e37995e89 Merge branch 'ping_lua' into 'next' 
Port player.ping from SRB2Kart

See merge request STJr/SRB2!2025
 2023-07-24 18:00:31 +00:00
Jisk
b36ca89e16 Port player.ping from SRB2Kart 2023-07-24 18:00:31 +00:00
Gustaf Alhäll
8bddf0f097
fixup! fixup! fixup! Fix build errors when building without SDL 2023-07-24 17:12:24 +02:00
Nev3r
4f97b7730b Merge branch '622-teamlives-hud' into 'next' 
Resolve "Display lives in the lower left if GTR_TEAMS|GTR_LIVES is set"

Closes #622

See merge request STJr/SRB2!1579
 2023-07-24 13:04:21 +00:00