Commit graph

25397 commits

Author SHA1 Message Date
toaster
9b77b2a720 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into tutorial-pass 2023-12-17 19:46:50 +00:00
toaster
347538c630 Merge branch 'fix-movie-cfg' into 'master'
Fix movie recorder config

Closes #798

See merge request KartKrew/Kart!1691
2023-12-17 19:45:26 +00:00
toaster
129fad2010 First pass at adding background to Goner Setup
Tails and Eggman talking to each other/Metal Sonic/the player.
2023-12-17 19:37:03 +00:00
Eidolon
0e0e6d4461 Merge branch 'gl-encoremap-leak-fix' into 'master'
Fix GLENCORE memory leak, re-enable

See merge request KartKrew/Kart!1688
2023-12-17 17:39:47 +00:00
Eidolon
c24b6e9f0e Fix movie recorder config 2023-12-17 11:15:40 -06:00
toaster
a15a836755 Minor phrasing updates to dialog 2023-12-17 13:18:58 +00:00
toaster
647a9d0a0e Goner setup music: Change behaviour
- Hook into M_PlayMenuJam, to reduce bespoke behaviour
- Use the finalised track string
- Play on the Sound Options menu
Also, use MAIN_Goner as reference for the password field's presence, because I lost like 30 minutes to a related bug
2023-12-17 13:18:35 +00:00
toaster
a4c91f66ec Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into tutorial-pass 2023-12-17 12:09:06 +00:00
Eidolon
baad413cc3 Remove unneeded memcpy in HWR_CacheTextureAsFlat 2023-12-16 19:10:23 -06:00
Eidolon
5e8da61e5e Encore colormap textures-as-flats in GL 2023-12-16 17:37:40 -06:00
toaster
714ea91c37 Merge branch 'fix-std-compliance' into 'master'
Fix language standard compliance

See merge request KartKrew/Kart!1690
2023-12-16 22:26:40 +00:00
toaster
436ba88220 readskincolor: sizeof is compile-time evaluated, literally why do we need to run the allocator for this 2023-12-16 22:00:58 +00:00
toaster
933faf1d9d Command_Addfile: Only allocate after argc is sanity checked 2023-12-16 21:55:42 +00:00
toaster
8bc610bf40 K_drawKartNameTags: Move to static sized array
We don't need to dedicate time to allocation - we know the upper bound to this array size, and it's not very much at all.
2023-12-16 21:51:36 +00:00
Eidolon
016cc1e95f Work around pointer-integer comparison in hw_cache 2023-12-15 11:19:34 -06:00
Eidolon
0ca9fca869 Pass _CRT_SECURE_NO_WARNINGS on MSVC 2023-12-14 23:29:30 -06:00
Eidolon
22809e928b Fix MSVC C++ warnings 2023-12-14 23:29:30 -06:00
Eidolon
4654bb43bb Workaround encore crash in HWR_GetMappedPatch 2023-12-14 23:05:17 -06:00
Eidolon
9147aeaac7 Add encoremap to textures-as-flats 2023-12-14 23:03:42 -06:00
Eidolon
b2b03ecbb5 Fix GLENCORE memory leak, re-enable 2023-12-14 23:03:42 -06:00
Eidolon
1db9898c42 Fix apple clang compilation issues 2023-12-14 22:45:53 -06:00
Eidolon
88ee385ee3 Enforce C11 standard compliance, -Werror=vla 2023-12-14 21:53:18 -06:00
Eidolon
bd8ebabfee Enforce C++17 standard compliance 2023-12-14 21:00:42 -06:00
Eidolon
66d3561fe8 Merge branch 'vcpkg' into 'master'
Switch from CPM to vcpkg

See merge request KartKrew/Kart!1684
2023-12-15 02:49:15 +00:00
Eidolon
2433d37d44 Switch from CPM to vcpkg 2023-12-15 02:49:15 +00:00
SteelT
6eb31a4ced Fix m_cond.c compiler error 2023-12-14 19:12:18 -05:00
Oni
d68b5e7e10 Merge branch 'intermission-grade' into 'master'
Show rank on intermission

See merge request KartKrew/Kart!1689
2023-12-14 23:31:28 +00:00
Sal
9a49013154 Merge branch 'gametype-change-fix' into 'master'
Don't show gametype was changed message if the same gametype

See merge request KartKrew/Kart!1686
2023-12-13 06:30:19 +00:00
Sally Coolatta
5eaf2613c6 Show rank on intermission 2023-12-13 01:28:22 -05:00
James R.
6e585aeb7a Merge branch 'wallspike-scale' into 'master'
Set default scale for wallspikes

See merge request KartKrew/Kart!1687
2023-12-12 09:36:44 +00:00
SteelT
05b2cced68 Set default scale for wallspikes 2023-12-11 21:33:58 -05:00
SteelT
5df44e4c70 Don't show gametype was changed message if the same gametype 2023-12-11 20:58:51 -05:00
toaster
be9f4327c6 Merge branch 'fix-pre-title-map-crash' into 'master'
Revert change to gamemap default value

Closes #792 and #788

See merge request KartKrew/Kart!1685
2023-12-11 11:02:43 +00:00
James R
acbb4cf912 Revert change to gamemap default value
- Some code assumes mapheaderinfo[gamemap-1] is valid
  before gamemap is set

blame 5d0c062785
2023-12-10 22:02:32 -08:00
toaster
75205e3f79 New ACS functions (resolves #697)
- For Tutorials specifically
    - void Dialogue_AutoDismiss(void)
        - Dismisses the current dialogue (including from other threads).
    - str CheckTutorialChallenge(void)
        - Returns special values depending on state relevant to the Tutorial Challenge.
            - Returns a blank string in netgames, or if none of the following are true.
            - Returns "Active" if the skip is in progress.
            - Returns "Failed" if the skip was just failed.
            - Returns "Locked" if not available with this gamedata.
- Other tiny check functions
    - bool PositionStart(void)
        - Returns true if leveltime < starttime.
    - bool FreePlay(void)
        - Returns true if in Free Play.
2023-12-10 18:23:57 +00:00
toaster
cdb2b44aa6 ACS-Dialogue interface: New threads with dialogue auto-skip previous threads with dialogue
If some dialogue needs to be never-missable, that's the mapper's responsibility - but now they won't get randomly interleaved if multiple are activated just by regular free driving, which was the worst kind of default
2023-12-10 16:10:45 +00:00
toaster
de7d53b4ea M_LevelListFromGametype: Fix invalid Tutorial-specific behaviour 2023-12-10 15:21:51 +00:00
toaster
97f39abef3 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into tutorial-pass 2023-12-09 17:33:47 +00:00
toaster
1505167422 Goner Setp: Add scroll 2023-12-09 17:32:15 +00:00
Oni
a07b54bc5c Merge branch 'fix-music-reset' into 'master'
Fix Sealed Star / Tutorial music overriding other levels

Closes #791

See merge request KartKrew/Kart!1683
2023-12-09 02:40:19 +00:00
Oni
df57953025 Merge branch 'hardcode-rocks' into 'master'
Hardcode Angel Island and Endless Mine

See merge request KartKrew/Kart!1680
2023-12-09 01:55:46 +00:00
James R
b68947e636 Hardcode Endless Mine faucet / rain
- Note: rain does not use the weather system
2023-12-08 17:42:17 -08:00
James R
69541b9422 Hardcode bustable rocks -- Angel Island + Endless Mine 2023-12-08 17:42:17 -08:00
James R
441d526a15 Hardcode Angel Island scenery objects 2023-12-08 17:42:17 -08:00
James R.
5233217b86 Merge branch 'hardcode-balloons' into 'master'
Hardcode Carnival Night balloon edits (also seen in Joypolis)

See merge request KartKrew/Kart!1682
2023-12-09 01:40:14 +00:00
James R
51d9e4bf4b P_Ticker: fix typo playing level music 2023-12-08 17:32:29 -08:00
toaster
c34b5f6034 SPB Capsule improvements
- Destroy all SPB Capsules in the stage when an SPB becomes relevant
    - When an SPB is put in a player's roulette
    - When an SPB is thrown
        - Automatically happens when SPB Capsule is touched
- Don't respawn a popped SPB Capsule while an SPB is out
2023-12-08 22:24:38 +00:00
toaster
ee0eff89b4 K_SPBInGame: Optimise to use trackercap instead of full thinkerlist romp 2023-12-08 22:19:06 +00:00
toaster
7d313af4db MT_ITEMCAPSULE: In GT_TUTORIAL, only respawn after 5 seconds 2023-12-08 22:18:13 +00:00
toaster
24b5bb8f86 Options menu pass 1
- Surface ReduceVFX and Tilting
- Group the Show FPS, Input Delay, and FOCUS LOST together on HUD options
- Reduce the importance of console
    - Console back colour now exclusively part of the Online Chat Options
    - Hide Console text size
- Move Chat Spam Protection to Server Options
- Improve some tooltips
     - Skyboxes
     - Message tint
- Remove embarassing waifu hidden text
2023-12-08 20:47:05 +00:00