Commit graph

1411 commits

Author SHA1 Message Date
James R
7579cf1b10 Fix misc warnings for GCC 12 2022-05-11 12:21:18 -07:00
Sally Coolatta
090fc59d12 Merge branch 'master' into finish-update-optimize 2022-03-26 23:51:47 -04:00
Sally Coolatta
369d5398c5 Lots of FPS stuff
- Disabled VSync, due to the numerous problems it has.
- Instead, added an FPS cap.
- Frame interpolation is now tied to fpscap != 35.
- By default, the FPS cap is set to the monitor's refresh rate.
- Rewrote the FPS counter.
2022-03-26 23:48:08 -04:00
toaster
2a40ab39fa Made a HOSTTESTERS build for Tyron, fixed some stuff that came up:
* Grand Prix temp menu now won't open if there are no cups available
* No more Boss Missions entry on the menu, since that won't exist post-newmenus
2022-03-19 11:43:12 +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
b9acad707e Restore the v1 record attack critera (maps available by default), whilst also now allowing for specific maps to opt out. 2022-03-12 22:31:52 +00:00
toaster
31db72256d Merge branch 'master' into boss
# Conflicts:
#	src/y_inter.c
2022-03-12 19:24:23 +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
bf43784d22 This is a doozy...
HUD:
* Miniaturised Spheres and Emeralds HUD for 3P/4P.
* Repair 3P minimap.
* Move accessibility icons in 3P/4P to next to the lap/bumper sticker (currently only kickstartaccel exists)
* Change language on menu retry to be more generalised.
* Adjust HUD code structuring a bit.

MECHANICAL:
* Now correctly set number of bumpers in Break the Capsules to 1 (from 3).
* The above required reworking K_SpawnBattleCapsules into K_BattleInit, which is a good staging ground to handle more battle-specific setup in future.
* Do not spawn Emeralds or Sphereboxes in Break the Capsules.
* If everyone is WANTED... nobody is.
* Try to handle exceptions to timelimits a little more thoroughly (still not perfect).
* Disable pointlimits in bosses.
2022-03-05 22:31:43 +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
a6ec9faf93 pedantic: fix m_menu.c 2022-02-20 03:31:25 -08: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
a5d219ad6e More TESTERS guard 2022-01-02 21:38:06 -08:00
Sally Coolatta
8bb1fa57d4 Merge branch 'master' into 22-merge-again 2021-04-05 01:11:26 -04:00
Sal
07c8e803f7 Merge branch 'spindash-button' into 'master'
Spindash shortcut button

See merge request KartKrew/Kart!404
2021-04-01 20:02:50 -04:00
toaster
40cbc30bff Mammoth commit, sorry.
All my work thus far on solving the drawflag/renderflag/additive/subtractive conundrum.

Outstandng problems:
* Bad additive/subtractive tables means that they appear opaque except under certain conditions.
* No support for FOFs, Polyobjects, or linedefs in OpenGL yet.
* All OpenGL support mostly done blind, may or may not function in practice.

If nothing else, the hard engineering problems are solved and it's just bug hammering...
2021-03-31 22:46:23 +01:00
toaster
72defa325f * Add a seperate step for I_STARTUPSKINS - "Load characters" - since it takes a similar length to loading all other types of sprites.
* Adjust several loading strings, and left-align their rendering.
* Don't call HU_LoadGraphics() again (startup cached ALL FONTS twice).
* Adjust when some functions are called during loading to more effectively compartmentalise sections of loading that depend on each other.
    * LOADED_ISTARTUPGRAPHICS now comes after SCR_Startup, as we can explicitly guarantee the palette has been loaded after that function.
    * Make sure everything closely related to configurations (gamedata, console stuff, etc) which is not directly dependent on anything else is loaded under LOADED_CONFIG - "Load settings" (formerly LOADED_MINIT).
    * The `-warp` command line parameter is now checked alongside LOADED_DCHECKNETGAME.
* Don't attempt to draw the loading bar before LOADED_ISTARTUPGRAPHICS, as the palette is not loaded, which means you're wasting cycles on a white screen.
2021-03-29 17:02:08 +01:00
Sally Coolatta
8ebfb656cc Fuck the gamma shortcut, replace it with a fullscreen toggle 2021-03-11 15:03:30 -05:00
Sally Coolatta
0a10396c84 Spindash shortcut button 2021-03-09 17:28:20 -05:00
Sally Coolatta
0be122189f Remove turn easing code
Vanilla holdover lots of people complain about & tbh just doesn't need to exist
2021-03-01 12:39:42 -05:00
James R
71553a8ad0 Merge branch 'battle-rethink' into 'master'
Battle rethink

See merge request KartKrew/Kart!335
2020-11-29 19:13:38 -05:00
toaster
6f6e87f9df Fix replays not being accessible via menus. 2020-11-27 17:32:04 +00:00
Sally Coolatta
91ed67bece Start on Chaos Emeralds
Functional! However, you don't drop them yet.
2020-11-01 23:44:54 -05:00
Sally Coolatta
afbbfc9b1f Fix cvars
My wrist burns...
2020-10-24 21:32:07 -04:00
Sally Coolatta
ddf466d61f Fix compile errors 2020-10-24 19:52:09 -04:00
Sally Coolatta
fda698a290 Merge master 2020-10-24 18:34:07 -04:00
SteelT
6f98694f6e Fix going to opengl options crashing the game when starting in software mode
Yes I know it's pointless, but still...
2020-09-26 17:16:59 -04:00
Sally Coolatta
2d4818a9fc Fix mid-game render switch 2020-09-25 12:20:08 -04:00
Sally Coolatta
b5fcd74ef9 Merge master
Slopes in a few maps are really broken ... think it's anchors, I'm gonna leave that to jart :V
2020-09-25 12:00:50 -04:00
James R
ce4dc9fbc9 Adjust volumes by 5% in menu 2020-09-25 02:29:40 -07:00
James R
997d142cb5 SPLITSCREEN FOV
Object tracking is off, but it was off before so I don't know if I actually
broke it. Minor refactoring in HWR_RenderPlayerView and HWR_RenderSkyboxView.
2020-09-23 17:50:47 -07:00
toaster
23faef24d7 * Introduce SPR2_XTRA for face graphics, since the current system is prone to plenty of conflicts with modders if you're not careful.
* Fixed a bug where you'd see :nick: on the current character selection screen if you didn't have many skins loaded.
* Fixed a bug where character skins loaded in PK3s would attempt to load every single lump of the PK3, even if it wasn't in the same subfolder as the original S_SKIN, as a sprite into the player struct. Could stand to be ported to vanilla.

Requires new chars.kart, which was created using the help of the indev 2.2-based Kartmaker update which will be available shortly.
2020-09-23 23:46:54 +01:00
SteelT
50fe3a728c Fix M_DrawSetupMultiPlayerMenu crashing trying to draw null face graphics. 2020-09-22 23:03:00 -04:00
James R
ef108cbb36 Merge remote-tracking branch 'pub/next' 2020-09-20 14:07:54 -07:00
Sally Coolatta
9f775a169d Rename the "small" variable to "isSmall"
Reported by MK, apparently "small" is considered a data type for some systems. After a little bit of research, apparently it can happen when including <windows.h>... whatever, just rename the variable :p
2020-09-14 12:47:55 -04:00
James R
7b1f974397 Basically, update master server code to v2
Removes rooms, replaced with cv_advertise and "Advertise" on the host menu.

According to the new API, SRB2APPLICATION is sent instead of MODID. A contact
field was added, but there is no means of accessing it or setting it.

As a slight change, the server list will be populated even on an outdated
version of the game. (The new API was designed with this in mind.) The update
alert is still presented first of course.
2020-09-11 06:11:41 -07:00
Sally Coolatta
b8f1842855 Use ENTER and ESC
A and B are v2 terminology
2020-08-30 21:42:04 -04:00
Sally Coolatta
d755a7ae6c Fix skincolor selection 2020-08-23 14:51:02 -04:00
James R
688adb2055 Make join requests options on pause menu selectable even if you're already in the menu 2020-08-22 17:16:49 -07:00
Sally Coolatta
8c79d62b22 Merge remote-tracking branch 'public/next' into discord-rpc-support 2020-08-22 07:28:21 -04:00
Sally Coolatta
26295bb793 Ask to join is a menu option, rather than trying to replace your menu temporarily. 2020-08-22 07:16:52 -04:00
lachwright
0a32babc25 Compile m_menu.c without HAVE_DISCORDRPC 2020-08-22 16:58:59 +08:00
Sally Coolatta
1899b31fa7 Add envelope icon, add sounds 2020-08-22 04:54:08 -04:00
Sally Coolatta
5cab1b7b23 Menu is pretty now 2020-08-22 03:52:07 -04:00
Sally Coolatta
b761349076 Add some options, maxplayer/allownewplayer dont need to be netvars anymore 2020-08-22 01:53:27 -04:00
Sally Coolatta
42ac955584 Don't reset menu in drawing function 2020-08-21 04:17:36 -04:00
Sally Coolatta
734b099202 Invite menu started
Functions! Is not pretty yet!
2020-08-21 04:14:33 -04:00
SteelT
27945cfad0 Fix being unable to add Lua scripts from the addons menu 2020-08-18 17:55:49 -04:00
Sally Coolatta
1d5251e1f1 Fix ZONE being all caps, standardize the function comments 2020-08-17 06:13:32 -04:00