Commit graph

1339 commits

Author SHA1 Message Date
Sally Coolatta
c0678e5016 Check FPS cap further in the main loop
This allows map changes to properly run. (I also seem to be able to hit the framerate cap slightly more often ... maybe placebo lol)
2022-03-27 13:17:26 -04:00
SteelT
dbdaebbb04 Merge branch 'droptarget' into 'master'
"Drop Target" item

See merge request KartKrew/Kart!562
2022-03-22 03:33:54 +00:00
toaster
52d2472ed7 "Drop Target" item initial commit.
Most of the way there, but still a bit left to do.
2022-03-21 23:40:30 +00:00
toaster
f073218532 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart.git into boss
# Conflicts:
#	src/m_menu.c
2022-03-18 09:07:13 +00:00
James R
821fd41d70 Merge branch 'c99-pedantic' into 'master'
Switch compiler mode C90 to C99; enforce stricter standard conformance

See merge request KartKrew/Kart!554
2022-03-18 02:41:57 +00:00
toaster
8de92e8dca Merge branch 'master' into boss
# Conflicts:
#	src/k_bot.c
2022-03-17 16:58:42 +00:00
toaster
fcb6a4e1ab Disable the vanilla-sourced "keepbody" (rejointimeout) feature. 2022-03-14 16:33:03 +00:00
toaster
31db72256d Merge branch 'master' into boss
# Conflicts:
#	src/y_inter.c
2022-03-12 19:24:23 +00:00
toaster
b3c9b8f94e Merge branch 'votefree' into 'master'
:votefree: (resolves #217)

Closes #217

See merge request KartKrew/Kart!542
2022-03-12 18:49:45 +00:00
toaster
65feacc16c Merge branch 'musicataparty' into 'master'
Music at a party

See merge request KartKrew/Kart!543
2022-03-12 18:40:03 +00:00
toaster
f794908430 Merge branch 'followtweak' into 'master'
Follower adjustments

Closes #202

See merge request KartKrew/Kart!514
2022-03-12 18:37:15 +00:00
toaster
5c77516aab Cleanup of boss info in anticipation of merger.
* Actually add descriptions for the boss-related functions into k_boss.h.
* Introduce K_ResetBossInfo, an internal-only function for handling situations where it needs to be cleared.
* Fix a bug where bossinfo wasn't reset when using the map command to go to a battle map after having been in a boss.
* Fix some bugs where you could provide magnitudes out of the desired range to K_InitBossHealthBar and K_UpdateBossHealthBar.
2022-03-07 13:08:46 +00:00
toaster
dc2936de42 Make the map command from the title screen *actually work*, and make a best-guess attempt at determining the necessary setup to play each particular map in a Single Player context (such as grandprixinfo for TOL_RACE, a little cleanup for TOL_BATTLE, and bossinfo for TOL_BOSS).
This will be necessary when newmenus comes around and it is no longer advantageous to have a menu for testing bosses, given they won't be a headline feature in v2 or accessible via multiplayer at this time.
2022-03-05 22:17:06 +00:00
toaster
17e5f71b5d * Re-enable sphere HUD in bosses.
* Do a little more anti-overtime checking for bosses. (This *really* requires a refactor at some point, but not right now)
2022-02-27 17:48:04 +00:00
toaster
c1f3237157 Boss API + assorted relevant bugfixes, will go over the featureset of this branch with a fine toothed comb when it's time to write the merge request description so this is all you're getting right now 2022-02-24 21:19:03 +00:00
James R
82f4364eb4 pedantic: fix misc leniencies and GNU-isms 2022-02-20 03:28:22 -08:00
SinnamonLat
1789dd1255 Rudimentary start on profiles 2022-02-14 23:14:25 +01:00
James R
5d5e71beda Fix compiler warning 2022-02-14 14:30:39 +01:00
toaster
cac833e324 Guard IsPlayerAdmin in testers/hosttesters 2022-02-14 14:30:38 +01:00
toaster
00484b4d7c Revert "Disable player admins"
This reverts commit 4d2793918c.
2022-02-14 14:30:38 +01:00
James R
71b6b816da Disable player admins 2022-02-14 14:29:55 +01:00
toaster
f0587ac389 Readd CV_SAVE per Oni request in vc (and also my desires)
Made using web IDE
2022-02-14 14:29:55 +01:00
James R
ef21be39b9 Enable percentage speedometer by default; do not save 2022-02-14 14:29:55 +01:00
Sally Coolatta
fd7c377043 Force shrink can be toggled individually online
In preparation for a "make yourself small by default" cheat on the char select like SMK.
2022-02-14 14:29:50 +01:00
AJ Martinez
3fcea2a37e my workflow is beyond your understanding 2022-02-14 14:27:12 +01:00
AJ Martinez
1d4a99b6a8 very small tiny fixes 2022-02-14 14:27:12 +01:00
James R
5ed55aca3d Disable wad loading in TESTERS build 2022-02-14 14:22:29 +01:00
toaster
006b6f00ac Rewrite the awayview reset for both Got_Teamchange and P_SpectatorJoinGame. 2022-02-11 12:09:00 +00:00
toaster
7508e0e198 P_IsLocalPlayer changes
This is the function that controls whether a bunch of music-related function (and also whether certain error messages get printed).

* P_IsLocalPlayer now supports party players (currently untested, but the code is pretty airtight).
* P_IsLocalPlayer now always returns false in replays.
* P_IsMachineLocalPlayer now exists for the one situation the game determines local players that actually has a net-related function (kicking illegal character changes).
* Invincibility/grow sfx now operates based on whether the player is NOT local (it used to be whether it was NOT a displayplayer).
* Refactored P_SpectatorJoinGame to make future team support easier, and also reset the relevant camera focus, rather than always the consoleplayer's.
* Fix viewpoints on non-local players having overlapping viewpoint text.
2022-01-24 22:03:40 +00:00
toaster
4b1cef0f20 Merge branch 'testers' into 'master'
Allow TESTERS builds to be made for any branch

See merge request KartKrew/Kart!529
2022-01-23 22:48:48 +00:00
toaster
2df53dd5a5 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart.git into votefree 2022-01-23 22:46:11 +00:00
toaster
f69f002d17 Merge branch 'speedometer-default' into 'master'
Turn on speedometer by default

Closes #218

See merge request KartKrew/Kart!539
2022-01-23 22:43:49 +00:00
AJ Martinez
ef6ff846d3 Merge branch 'master' into 'director-cam'
# Conflicts:
#   src/d_netcmd.h
2022-01-23 15:38:14 -06:00
toaster
1ae256887e Readd CV_SAVE per Oni request in vc (and also my desires)
Made using web IDE
2022-01-23 20:49:29 +00:00
toaster
8c3fad058d * Fix the Z_Free double-free issue (in two different ways, one ifdef'd out) that can sometimes occur on the vote screen.
* Fix a technically invalid read in D_SetupVote.
* If the third map on the voting screen has a different gametype, don't interact with the buffer.
* Fix the inttime 0 setting, since I was in y_inter.c and testing quick map changes.
2022-01-23 20:33:27 +00:00
James R
223ef50acb Enable percentage speedometer by default; do not save 2022-01-20 20:07:52 -08:00
AJ Martinez
24b05451f6 my workflow is beyond your understanding 2022-01-20 03:39:00 -06:00
AJ Martinez
1e4bc482d0 very small tiny fixes 2022-01-20 02:07:48 -06:00
James R
7e709cd018 Fix compiler warning 2022-01-16 17:35:47 -08:00
toaster
4cff27797c Guard IsPlayerAdmin in testers/hosttesters 2022-01-17 01:22:10 +00:00
toaster
6980975f11 Revert "Disable player admins"
This reverts commit 4d2793918c.
2022-01-17 01:19:13 +00:00
Sally Coolatta
c606e1e96b Force shrink can be toggled individually online
In preparation for a "make yourself small by default" cheat on the char select like SMK.
2022-01-09 04:08:26 -05:00
toaster
60f08f2380 Defines per Sal request 2022-01-04 23:02:09 +00:00
toaster
316cd61d9f * Fix follower colour being limited to UINT8.
* Fix follower colour not being set in offline mode (based on Steel's fix but no UINT8).
2022-01-04 22:41:35 +00:00
James R
4d2793918c Disable player admins 2022-01-02 21:58:18 -08:00
James R
72f9121f5d Disable wad loading in TESTERS build 2022-01-02 21:50:23 -08:00
Sally Coolatta
92aff0b57c Finish some unused SDL hat input support to use events rather than polling all of the time 2021-12-28 08:02:32 -05:00
Sally Coolatta
479292543a Let me get in game in single player
For testing... please...
2021-12-28 05:09:57 -05:00
Sally Coolatta
e628894b47 Merge branch 'new-menus' into profiles 2021-12-25 06:09:53 -05:00
SinnamonLat
7c9f3385d4 Merge branch 'master' into new-menus 2021-12-17 12:32:01 +01:00