Commit graph

21189 commits

Author SHA1 Message Date
toaster
d2d7421072 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into acs
# Conflicts:
#	src/CMakeLists.txt
2023-01-21 15:32:13 +00:00
James R
ddb55c95c7 Merge branch 'split-menufunc' into 'master'
Move all specialized code out of k_menufunc.c

See merge request KartKrew/Kart!888
2023-01-20 03:16:00 +00:00
Oni
5488f723e1 Merge branch 'loud-ufo' into 'master'
Add UFO hum + hit reaction SFX

See merge request KartKrew/Kart!893
2023-01-20 01:59:58 +00:00
AJ Martinez
0eba5c5a74 Fix UFO hum level clamping 2023-01-19 15:56:36 -07:00
AJ Martinez
3165deb43b Clamp UFO hum SFX to safe values 2023-01-19 15:41:10 -07:00
AJ Martinez
eebce28b7e Fix bad loop on UFO pinch hit hums 2023-01-18 02:59:46 -07:00
AJ Martinez
5837f983e8 Add UFO hum + hit reaction SFX 2023-01-18 02:15:18 -07:00
Oni
892a19c85f Merge branch 'adjust-garden-top' into 'master'
Adjust Garden Top physics

See merge request KartKrew/Kart!890
2023-01-17 06:24:10 +00:00
Eidolon
128c3b063a Merge branch 'hwr2' into 'master'
Render Hardware Interface Part 1: A New Hope

See merge request KartKrew/Kart!891
2023-01-15 19:39:11 +00:00
toaster
8555c66d61 activator_t: Before Z_Freeing, consistently decrement refcount for activator->mo per review 2023-01-15 15:12:30 +00:00
toaster
083d3df96f d_main.c: Adjust shaders.pk3 handling per my comments 2023-01-15 14:00:43 +00:00
toaster
ad50e67ae9 r_data.c: Resolve defined-but-unused function warning intefering with compilation
Removes `R_Init8to16` and its inline helper, `makecol15`, the last bastion of an abandoned 16-bit drawer rework
2023-01-15 13:10:09 +00:00
James R
1ba7842068 hwr2 legacy opengl: restore fps counter etc 2023-01-14 18:57:45 -08:00
James R
8ff95af61d Disable Drop Dashing while on the Garden Top 2023-01-14 18:35:49 -08:00
Eidolon
7db8b7d20c hwr2 gl3core: Fix FBO depth attachment 2023-01-14 20:30:52 -06:00
Eidolon
095aa635b0 hwr: Store T in Slab directly 2023-01-14 20:27:56 -06:00
James R
610e2c66be Adjust Garden Top physics
- 110% -> 150% top speed
- no friction decrease if grinding
- 250% -> 300% gravity when grinding (for slope sliding)
- 275% -> 325% max boost when releasing grind
- 60% minimum boost speed when relasing grind
2023-01-14 18:11:46 -08:00
Eidolon
ccc10eadd0 hwr2: Reformat C++ code 2023-01-14 19:59:41 -06:00
Eidolon
fcb4dfe3d7 hwr2: Restore legacy OpenGL temporarily 2023-01-14 19:52:33 -06:00
Eidolon
b932607359 hwr2: Remove sw testing state from sdl video 2023-01-14 19:52:10 -06:00
Eidolon
286c96173a hwr2 gl3core: Implement render pass FBOs 2023-01-14 19:29:19 -06:00
Eidolon
01ddbf6dcf (WIP) hardware: add render hardware interface 2023-01-14 18:40:26 -06:00
toaster
cafe7603b8 Merge branch 'follower-hitlag' into 'master'
Follower hitlag

See merge request KartKrew/Kart!877
2023-01-14 12:28:52 +00:00
Oni
3d6b6a94b9 Merge branch 'fix-loopms' into 'master'
Fix songs that use LOOPMS not looping correctly

Closes #407

See merge request KartKrew/Kart!886
2023-01-14 03:50:10 +00:00
James R
b26cd786ec Move all specialized code out of k_menufunc.c
Adds new files:

- menus/extras-statistics.c
- menus/play-online-room-select.c
- menus/transient/cup-select.c
- menus/transient/explosions.c
- menus/transient/gametype.c
- menus/transient/message-box.c
- menus/transient/virtual-keyboard.c
2023-01-12 20:31:31 -08:00
James R
d5302d9e5d Merge branch 'clang-format-adjustments' into 'master'
cxx: clang-format adjustments

See merge request KartKrew/Kart!880
2023-01-12 19:09:41 -08:00
toaster
d5491612f2 Merge branch 'fix-curl-protocols-str' into 'master'
d_netfil.c: fix usage of CURLOPT_PROTOCOLS_STR

See merge request KartKrew/Kart!887
2023-01-12 16:12:54 +00:00
James R
e194353da9 d_netfil.c: fix usage of CURLOPT_PROTOCOLS_STR
blame be7cabc50
2023-01-12 07:55:42 -08:00
James R
dbdda14061 Fix LOOPMS loop point for OGG player 2023-01-12 04:36:44 -08:00
Oni
78f04f8c71 Merge branch 'bot-realtime-fix' into 'master'
Bot `realtime` fix

See merge request KartKrew/Kart!874
2023-01-12 00:35:08 +00:00
James R
bdbcceb212 Merge branch 'fix-audio-null-deref' into 'master'
audio: conditionally shutdown SFX/Music players

See merge request KartKrew/Kart!881
2023-01-11 03:01:11 +00:00
James R
fc6c83577c Merge branch 'fix-curlopt-deprecated' into 'master'
Fix libcurl deprecation warnings in d_netfil.c

See merge request KartKrew/Kart!882
2023-01-11 02:56:46 +00:00
James R
567bd2a84a d_netfil: use CURLOPT_XFERINFOFUNCTION
Fixes deprecated warning since libcurl 7.32.0 (2013-08-12).
2023-01-09 19:34:15 -08:00
James R
be7cabc50f d_netfil: use CURLOPT_PROTOCOLS_STR if libcurl >= 7.85.0 (2022-08-31) 2023-01-09 19:30:23 -08:00
James R
19a85c25e2 Merge branch 'fix-spectator-offroad' into 'master'
Fix spectators spawning offroad particles

Closes #394

See merge request KartKrew/Kart!865
2023-01-10 02:45:04 +00:00
James R
344cc2ced4 Merge branch 'split-menudef' into 'master'
Split k_menudef.c into menus folder

See merge request KartKrew/Kart!873
2023-01-10 02:40:52 +00:00
Eidolon
f43de07fd1 cxx: clang-format adjustments 2023-01-09 20:02:19 -06:00
Eidolon
9f649d7701 audio: conditionally shutdown SFX/Music players
Fixes a potential segfault during startup where the sound hasn't been
initialized yet, but an I_Error occurs while loading data.
2023-01-09 14:58:59 -06:00
Eidolon
c5ecec1523 Merge branch 'overload-visitor' into 'master'
cxx: Add srb2::Overload for using std::visit

See merge request KartKrew/Kart!879
2023-01-09 20:33:53 +00:00
Eidolon
1b859f5073 cxx: Add srb2::Overload for using std::visit 2023-01-09 13:05:35 -06:00
Eidolon
5fe4e299c9 Merge branch 'convert-sdl-i-video' into 'master'
cxx: Convert sdl/i_video.cpp

See merge request KartKrew/Kart!872
2023-01-09 18:27:49 +00:00
toaster
ba3a3f4203 Follower hitlag
- If a player enters hitlag, put their follower in hitlag too
- If a follower exists and is in hitlag, don't update it in K_HandleFollower
2023-01-08 16:51:58 +00:00
toaster
2aa43f04b2 Additional memory safety for follower handling 2023-01-08 16:48:43 +00:00
toaster
3d9137a9cf Pre-emptively fixes a possible issue where a player who is exiting would have their realtime adjusted on respawn, affecting final results. 2023-01-08 14:02:02 +00:00
toaster
9980631e2f Fix bots' realtime not ticking upwards when all human players have exited
This corrects the issue where bots have the same time on exit as the last human player, and therefore tie with them, with disastrous consequences for GP.
2023-01-08 13:58:14 +00:00
James R
9be7563353 sdl/i_video.cpp: fix -Wsign-compare 2023-01-07 07:51:54 -08:00
James R
0b3d04bbfd Split k_menudef.c into menus subdirectory
- src/menu contains files for each menu's definitions.
- src/menu/transient contains menus which are reused in
many places or are separate from Main Menu entirely.

File names ending in "-1" are menus which contain
a submenu. The suffix is added so that the parent menu
sorts before all its children in directory lists.

It's also done so Tab completion doesn't stop such that
a hyphen (-) would need to be typed.

For example (this is how I auto complete file names):

"ex" <TAB> completes to "extras" because the choices are
"extras.c" or "extras-addons.c" etc. Now you need to reach
away from the home row of a keyboard to type a "-" in
order to complete any of the submenu file names.

VS

"ex" <TAB> completes to "extras-". You only need to reach
to type a "1" for one menu. There may be more than one
submenu and submenu names start with letters, which are
closer to the home row.
2023-01-07 07:40:45 -08:00
Sally Coolatta
fdbd1a5f62 Merge branch 'master' into acs 2023-01-07 03:12:39 -05:00
Sally Coolatta
bc3d9d9cf7 Add string comparison funcs for ACS 2023-01-07 03:09:41 -05:00
Eidolon
b57c92efd3 cxx: Convert sdl/i_video.cpp 2023-01-07 01:24:55 -06:00