Commit graph

22050 commits

Author SHA1 Message Date
Sally Coolatta
1dccf5dfea Remove spectator crap again
welp...
2023-03-06 01:21:32 -05:00
James R
28f2f4a51a k_menufunc.c: fix -Wunused-variable 2023-03-05 21:02:32 -08:00
Eidolon
8106afe823 Merge branch 'fix-menu-controllers' into 'master'
Fix controller delay in menus

Closes #397

See merge request KartKrew/Kart!1019
2023-03-05 22:22:04 +00:00
Eidolon
4bb0c39133 Fix controller delay in menus
M_UpdateMenuCMD only needs to be called once per tick per player.
It was being called for every event, which really mangled the repeat
delays as more attached controllers sent axis events.
2023-03-05 16:07:17 -06:00
toaster
1e67f75f14 P_Ticker: Adjust bracketing of Gamedata save conditional to handle deferred saves even during intro turnaround 2023-03-05 21:00:27 +00:00
toaster
60968b2f08 UC_AND, UC_COMMA: Fix not combining with UCRP_REQUIRESPLAYING
Fixes
2023-03-05 20:59:56 +00:00
toaster
87b80a62f2 SPB Attack: Integrate into conditions-cascading affairs
- All `cv_dummyspbattack`-related material is now gated with the assistance of SECRET_SPBATTACK.
    - SPB_ATTACK
- Add UC_MAPSPBATTACK condition.
    - Both this and emblems with MV_SPBATTACK have the string "SPB ATTACK: Conquer [LEVEL NAME]", compared to the regular round completion conditions having "Finish a round on [LEVEL NAME]".
        - If SPBATTACK is not unlocked, shows ???: Conquer [LEVEL NAME] instead
2023-03-05 20:48:31 +00:00
Sally Coolatta
2b706fb95b G_PlayerReborn jointime betweenmaps
Fixes newly created bots having 0 rings.
2023-03-05 15:00:05 -05:00
Sally Coolatta
9c264b3736 K_UpdateAllPlayerPositions
Call this whenever we need accurate player positions. In addition to before player think, is now being used for exiting as well as immediately when the player is spawned.
2023-03-05 14:59:11 -05:00
toaster
99b5fe7bf4 M_EraseData: Fix va() being passed to va() 2023-03-05 19:56:52 +00:00
toaster
0f715454fa Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into conditions-cascading 2023-03-05 19:51:48 +00:00
toaster
80555e3738 P_Ticker: Do not evaluate interesting player conditions during introtime 2023-03-05 19:51:33 +00:00
Sally Coolatta
28c2ff9668 Force GT_RACE before podium map loads 2023-03-05 14:12:25 -05:00
Sally Coolatta
34112be38e Move bot updates before P_InitPlayers 2023-03-05 14:12:03 -05:00
toaster
b005649d71 Copyright notices update regarding the author of this commit
- For cross-file consistency in the author of this commit's name and username
- To note that the author of this commit performed significant work on code that would eventually be compiled into r_skins.c on several occasions since 2016 up to the present day
- To catch work performed by the author of this commit in 2023
2023-03-05 18:13:39 +00:00
toaster
0c75c40060 Rework how Bots handle their skin availabilities
Before we can add extra unlock features, we need to make sure we're not building on a house of sand.
- R_SkinUsable: Use Net Unlock system if playernum is -1
- R_BotDefaultSkin: Move to r_skins.c, cache skin search
- R_GetSkinAvailabilities: Use Net Unlock when called for bots (and always permit R_BotDefaultSkin)
- Got_AddBot: Call R_GetSkinAvailabilities for summoned bots to guarantee sync status of available skins
- K_UpdateMatchRaceBots: Tidy up to match grand prix bot skin selection system, hiding server-locked skins and defaulting to R_BotDefaultSkin if you don't have enough unlocked for the remaining player slots
2023-03-05 18:06:09 +00:00
James R
2ebf8ebb8c Don't skip spectators when searching for Podium starts
There shouldn't be any spectators in Podium anyway. But
there are if you come here from a Sealed Star because bots
get spectated in those. The bots are still spectators
until they spawn (after G_FindPodiumStart).
2023-03-05 00:41:20 -08:00
James R
d45ba09ac0 Merge branch 'spb-attack' into 'master'
SPB Attack

See merge request KartKrew/Kart!992
2023-03-05 01:26:32 +00:00
James R
f94559a24e Merge branch 'replay-tooltip-buttons' into 'master'
Update replay save prompts to use the new button graphics (resolves #458)

Closes #458

See merge request KartKrew/Kart!1015
2023-03-05 01:24:18 +00:00
James R
27a4f96d13 Merge branch 'fix-avrecorder-wipe-capture' into 'master'
Fix white flash in webm videos when fades start

See merge request KartKrew/Kart!1013
2023-03-05 01:22:46 +00:00
toaster
1ae5df651d UC_ADDON
- If you add a file (and you've unlocked Addons on non-DEVELOP builds) this gets achieved
- Also, Custom # of Rounds Played conditions will show "Custom" only if Addons are loaded
2023-03-04 21:36:58 +00:00
toaster
f7617e7530 Clear records, stats, and secrets on new in-SOC gamedata creation
- Pre-emptive sanity check to some impending work
- Move M_UpdateUnlockablesAndExtraEmblems out of M_ClearSecrets
2023-03-04 21:11:13 +00:00
toaster
5296ab1397 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into conditions-cascading 2023-03-04 20:09:48 +00:00
toaster
e994b920c6 gamedata->roundsplayed: Split into multiple roughly-gametype-aligned categories
- Race, Capsule, Battle, Special, Custom
- All categories can now be used for Rounds Played condition
- UCRP_SEALEDSTAR now hides if you haven't beaten a single Sealed Star yet
In addition, introduce M_ClearStats
- As more statistics get added, clearing them manually in G_LoadGameData and M_EraseDataResponse is just going to get annoying
- Change around the options on the Erase Data screen to
    - Make it clear that erasing all game data won't clear your Profiles
    - Add an option to clear stats by themselves, rather than only permitting via complete gamedata wipe
    - Move to the "Challenges" terminology over SRB2's "Secrets" terminology
- Move some entries that were previously handled in M_ClearSecrets into M_ClearStats
2023-03-04 20:09:29 +00:00
Sally Coolatta
b84383bd8d Free the special map strings 2023-03-04 13:50:15 -05:00
Sally Coolatta
4961a585a7 Add ceremony to twodee wipedefs tables 2023-03-04 13:49:07 -05:00
Sally Coolatta
664fb02229 Remove exitlevel wonround
Don't care enough to fix it right now.
2023-03-04 13:32:06 -05:00
toaster
22f9467e71 M_ClearConditionSet: fix memory leak 2023-03-04 17:33:56 +00:00
AJ Martinez
4121b4c385 SPB Attack: fix double cvar callback 2023-03-04 06:43:52 -07:00
AJ Martinez
320685cf97 SPB Attack: review fixup omnibus 2023-03-04 06:41:44 -07:00
Sally Coolatta
04525f2fb5 G_FindPodiumStart
Since G_FindRaceStart doesn't use regular position stuff, it needs to do this. Seems to fix the weird bug people were running into in the VC, but it also seemed kinda wishy-washy
2023-03-04 01:30:49 -05:00
SteelT
65e8315bd9 Update thin strings to use V_6WIDTHSPACE 2023-03-04 01:02:21 -05:00
SteelT
e8d6d7f632 Fix missing draw call for DSM_NOTSAVING 2023-03-03 23:43:06 -05:00
SteelT
31e2c1567e Update replay save prompts to use the new button graphics
- A K_drawButtonAnim function is also provided for convince, since I figured it would have more future uses
- This also makes all of the button patches global, in addition
2023-03-03 23:19:46 -05:00
Sally Coolatta
839650968d Make podium end use G_EndGame 2023-03-03 22:29:20 -05:00
Sally Coolatta
89276c5900 Fade-in the tint behind podium ranking 2023-03-03 22:17:05 -05:00
Sally Coolatta
ea4ff616a9 Fix broken float flag 2023-03-03 22:16:30 -05:00
Sal
0fa1e99a82 Merge branch 'fix-twodee-dedicated' into 'master'
Fix dedicated server crashes + disable GP

See merge request KartKrew/Kart!1009
2023-03-04 02:59:03 +00:00
James R
17bf7d0935 Do not start dedicated server in GP if -warp is used 2023-03-03 18:56:07 -08:00
James R
5efce73680 Do not run ST_Ticker if dedicated 2023-03-03 18:56:07 -08:00
James R
546f8d88c3 Do not reset twodee context if dedicated server 2023-03-03 18:56:05 -08:00
Sally Coolatta
1f00e3fc3f A_SetScale: Scale by mapthing scale 2023-03-03 18:03:03 -05:00
toaster
eeb6e40909 Add totalrings to gamedata
- Added to Statistics screen
- Caps at "999,999,999+".
- Controls UC_TOTALRINGS condition
- Improve description for UC_MATCHESPLAYED condition
    - Says "Rounds" now
- Improve Statistics text for playtime
    - Dynamically changes visible units of time (seconds, minutes, hours, days.......)
2023-03-03 22:35:28 +00:00
Sally Coolatta
c4525a61a2 Add results screen 2023-03-03 17:30:35 -05:00
Sally Coolatta
35d0cb8eaa Move podium code to its own file 2023-03-03 16:10:05 -05:00
Sally Coolatta
a1976aa43d Fixes for podium bots loading
- Handle bot spectator on spawn purely in P_SpawnPlayer from now on
- Don't give podium players flashing tics
- Don't call P_MovePlayerToStarpost during podium. (Needs further fixing in another branch, since this also apparently affects bot spawning in all maps.)
- Update mobj_t pointers in CL_ClearPlayer if G_GamestateUsesLevel()
- Forcefully set initial podium waypoint if jointime <= 1
- Use G_SpawnPlayer consistently in P_InitPlayers for podium
2023-03-03 16:10:05 -05:00
Sally Coolatta
2dae6833c2 Fix camera jitter when changing waypoints 2023-03-03 16:10:04 -05:00
Sally Coolatta
0f9f10d90f Add PodiumPosition ACS function
Returns the best position of all non-CPU players.
2023-03-03 16:10:04 -05:00
Sally Coolatta
9073d5bd17 Add CameraWait ACS function
Pauses a script until the tagged camera has no more waypoints to follow.
2023-03-03 16:10:03 -05:00
Sally Coolatta
9b18ce7849 Remove magic camera follow numbers, add 2nd and 3rd follow options 2023-03-03 16:10:03 -05:00