Commit graph

28279 commits

Author SHA1 Message Date
Eidolon
d621e41596 vulkan: Define VK_NO_PROTOTYPES when linking Volk 2025-03-17 19:39:43 -05:00
Eidolon
d646e67f5f Actually load shaders.pk3 again 2025-03-16 23:48:15 -05:00
Eidolon
4e13f61de5 Merge branch 'new-data-structures' into 'master'
New data structures

See merge request kart-krew-dev/ring-racers-internal!2498
2025-03-16 19:36:05 -05:00
Eidolon
bd7646346b Use new containers and json 2025-03-16 18:45:11 -05:00
Eidolon
c58f2c7dbd Add nlohmann json replacement 2025-03-16 18:44:13 -05:00
Eidolon
6a122a7d34 Add srb2::String 2025-03-16 18:44:13 -05:00
Eidolon
cf6488c749 Add srb2::HashSet 2025-03-16 18:44:13 -05:00
Eidolon
00d60fca4f Add srb2::HashMap 2025-03-16 18:44:13 -05:00
Eidolon
8e7de22df5 Add srb2::Vector 2025-03-16 18:44:13 -05:00
Eidolon
28e4440bb0 Un-comment the mouse grab code
This was not supposed to be commented out, but given RR doesn't use
the mouse maybe I should just make a separate change to remove it all?
2025-03-16 16:41:56 -05:00
Eidolon
5f4298625c Merge branch 'map-ui-better' into 'master'
Show Medals/Spray Cans/Ancient Shrines more outside of Statistics

See merge request kart-krew-dev/ring-racers-internal!2500
2025-03-16 16:04:53 -05:00
Eidolon
70aa1f661c Merge branch 'pointless-prisons' into 'master'
Don't award Prison Eggs bopped after exiting

See merge request kart-krew-dev/ring-racers-internal!2501
2025-03-16 15:59:40 -05:00
Eidolon
f5702c73b7 Merge branch 'eid/new-shader-lookup' into 'master'
Decouple RHI shader loading from lump system

See merge request kart-krew-dev/ring-racers-internal!2507
2025-03-16 15:52:15 -05:00
Eidolon
7365443609 Use new shader lookup in RHI GL2 2025-03-16 15:39:32 -05:00
Eidolon
014ea281b6 Remove shaders.pk3 from wad list 2025-03-16 15:39:32 -05:00
Eidolon
faa0fbd31f Add W_InitShaderLookup, W_ReadShader
This manages a lump list of shader lumps from a shaders.pk3, separate
from the loaded wadlist, so that shaders do not participate in the
wadlist system at all.
2025-03-16 15:39:32 -05:00
Eidolon
0304e21301 Merge public master 2025-03-15 13:11:12 -05:00
Eidolon
9880643df1 Reduce distracting logging in CI 2025-03-15 12:45:55 -05:00
Eidolon
820fa9b647 Allow GL-specific memoized map properties in all comp modes 2025-03-12 22:16:10 -05:00
Eidolon
e4fc3cc5c2 Fix conditionals on rendermode to allow for more modes 2025-03-12 21:50:37 -05:00
Eidolon
12d83a26cd Add thirdparty library VulkanMemoryAllocator 3.2.1 2025-03-11 20:35:07 -05:00
Eidolon
72e8f9e3f4 Add thirdparty library volk 1.4.304 2025-03-11 20:35:07 -05:00
Eidolon
d6c00f4236 Add thirdparty library vulkan 1.4.304 2025-03-11 20:33:17 -05:00
Eidolon
a1d4bf6b22 Revert new libraries 2025-03-11 18:38:27 -05:00
Eidolon
501f9b6aed Add thirdparty library VulkanMemoryAllocator 3.2.1 2025-03-11 16:06:00 -05:00
Eidolon
fc736434a1 Add thirdparty library volk 1.4.304 2025-03-11 16:00:27 -05:00
Eidolon
e42888150a Merge branch 'stringargs-memory-corruption' into 'master'
Don't free stringargs during deep copy

See merge request kart-krew-dev/ring-racers-internal!2505
2025-03-10 13:20:22 -05:00
Eidolon
79ac5433a9 Merge branch 'fix-splat-draw-range' into 'master'
Fix write Y range for splat drawing

See merge request kart-krew-dev/ring-racers-internal!2504
2025-03-10 13:20:07 -05:00
Eidolon
47487b7610 Don't free stringargs during deep copy
spawnsectors is memcpy'd over just before the calls to copy_stringarg,
resulting in copy_stringarg Z_Free'ing the exact string it is about to
copy. This is a silent memory error, as the malloc block appears to
still be in a virtual-allocated page after the call to Z_Free.

deepcopy is not able to properly free the target array's tree of objects
if the target already exists, so that will need future work.
2025-03-10 12:54:27 -05:00
Eidolon
e85c91c3d8 Fix write Y range for splat drawing
Fixes a silent memory error during splat drawing when splats cross the
bottom of the screen.
2025-03-10 12:54:27 -05:00
Eidolon
44131bb9a7 Add libopus to macOS CI 2025-03-10 12:30:02 -05:00
Eidolon
d33a995db3 Merge public master 2025-03-10 03:05:17 -05:00
Eidolon
b9c372312e Merge branch 'fixmovingpolyobjectplatforms' into 'master'
Remove erroneous define breaking PolyObject player carrying

Closes #197

See merge request KartKrew/RingRacers!97
2025-03-10 08:01:15 +00:00
Eidolon
9c3b776511 Merge branch 'fixghostflag' into 'master'
Fix MF2_OBJECTFLIP being applied to flags instead of flags2 in P_SpawnGhostMobj

Closes #327

See merge request KartKrew/RingRacers!98
2025-03-10 07:59:31 +00:00
Eidolon
eb4116f042 Merge branch 'legacyglcliprectchatfix' into 'master'
Fix legacyGL chat rendering bug

See merge request KartKrew/RingRacers!96
2025-03-10 07:57:42 +00:00
Eidolon
6fc6e8336c Merge public master 2025-03-09 21:00:08 -05:00
Eidolon
49e0429819 Merge branch 'srb2ci-2025-03' into 'master'
merge changes to make vcpkg caches smaller

See merge request KartKrew/RingRacers!99
2025-03-10 01:39:35 +00:00
Logan Aerl Arias
d0e1dfe526 merge changes to make vcpkg caches smaller 2025-03-10 01:39:35 +00:00
Nep2Disk
751418845d This should be flags2 2025-03-01 15:22:54 +00:00
Nep2Disk
514dc44f75 Remove erroneous define breaking PolyObject player movement
there are no other #ifdef POLYOBJECTS defines in source so this was left by accident I assume?
2025-02-26 21:03:56 +00:00
toaster
b5fd26777c Don't award Prison Eggs bopped after exiting
- Short-circuits P_AddBrokenPrison if EVERYONE is exiting
    - Still calls P_DoAllPlayersExit to catch spectators with respect to server softlock
- Don't run K_SpawnBattlePoints if the recipient is exiting
    - Also re-arranges K_GivePointsToPlayer just in case the score addition ends the round
2025-02-23 14:39:37 +00:00
toaster
a831fc3592 Adjust shade of no-Can dot to avoid matching any 2x2 region on the existing sprite 2025-02-22 23:28:08 +00:00
toaster
5fad786b8f Second pass at representing stacked information
Lots of internal discussion on my last approach, so here's a cleaner alternative
- No more offset with two complex flickering graphics on top of each other
- Instead, "less common" secondary info is represented by a coloured dot overlaid on the primary icon
    - Red for SPB Attack, Turquoise for Mystic Melody
- Only show Spray Can/Mystic Melody for Race-compatible courses
- Show courses where you haven't picked up a Spray Can with a dot
2025-02-22 22:32:15 +00:00
Nep2Disk
05de187667 Fix patches being turned inside-out by cliprect in GL
Turns out the reason the chat looks strange in LegacyGL is because of cliprect.
This is a fix that was done by GenericHeroGuy for one of my other projects.
2025-02-22 18:08:13 +00:00
toaster
89afe780df Cup Select preview: Draw Spray Can (+ Ancient Shrine) list in Match Race
Expansion of previously implemented UI for Time Attack, but for showing gotten cans/shrines only.

Also:
- Halved flicker rate for SPB attack medals
- Made invalid cups not display Lost & Found's associated medals OR cans/shrines
2025-02-20 22:32:22 +00:00
toaster
beacbca72a M_EmblemMapNum: Free medal string once no longer relevant 2025-02-19 15:46:06 +00:00
toaster
405c6cb3e2 M_GetConditionString, UC_EMBLEM: Prevent Medal ID out-of-bounds 2025-02-19 15:46:06 +00:00
toaster
7e484150bd Cup Select preview: Draw strongly abbreviated Medal list in Time Attack 2025-02-19 15:46:06 +00:00
toaster
43f2dbe786 Level Select block: Draw relevant Medals on map thumbnail
- Medals in Time Attack
- Spray Can & Ancient Shrine in Match Race
2025-02-19 15:46:06 +00:00
Eidolon
b5483faecf Merge public master 2025-02-15 12:44:40 -06:00