Commit graph

6568 commits

Author SHA1 Message Date
TehRealSalt
be74c5217e Merge branch 'master' into new-menus 2019-10-27 15:50:40 -04:00
TehRealSalt
a7dac9d04b Implement images 2019-10-27 15:50:22 -04:00
TehRealSalt
addb0d0a66 Fix time limit 2019-10-25 23:35:31 -04:00
Sal
671602f5aa Merge branch 'vr-auto-fix' into 'master'
Try fixing Auto causing desyncs

See merge request KartKrew/Kart!187
2019-10-22 16:44:03 -04:00
James
d306df81c8 Merge branch 'master' into new-menus 2019-10-19 19:56:34 -04:00
James
fc862c999d Bad parathesis 2019-10-19 01:48:56 -04:00
TehRealSalt
9777489bb8 debug prints 2019-10-18 19:09:10 -04:00
TehRealSalt
c963a49542 Try fixing Auto causing desyncs
- Move K_SetPowerLevelScrambles to G_DoCompleted
- Fix wrong gamespeed being displayed in strings
- Add defines for kartspeed values
- Disable Easy scrambles again
- Corrupt gamedata if pwrlv is in invalid range (gets corrected in-game, and doesn't really matter to anyone who knows what you're doing, but it'll stop at least the most basic script kiddie)

Replay menu will still display wrong speed name, but it's fine in the replay itself.
2019-10-17 23:43:06 -04:00
TehRealSalt
64a3d133b4 Cleanup & bug-fixin 2019-10-15 20:56:28 -04:00
Sal
9d1dce0ab8 Merge branch 'fix-ring-drain' into 'master'
Fix Ring Drain sectors

See merge request KartKrew/Kart!184
2019-10-07 00:56:38 -04:00
TehRealSalt
cf8a77cfd6 Cup icon drawing 2019-10-05 23:11:31 -04:00
Sal
8ac88fb79c Merge branch 'really-upside-down-rings' into 'master'
Use K_MatchGenericExtraFlags for reverse gravity rings

See merge request KartKrew/Kart!183
2019-10-05 22:18:47 -04:00
wolfy852
027dec6702 Fix Ring Drain sectors for v2 rings 2019-10-05 19:07:26 -05:00
James R
675c896417 Nevermind the FixedMul 2019-10-05 12:46:24 -07:00
James R
f1e5f64e66 Use K_MatchGenericExtraFlags for reverse gravity rings
Also corrected a mistaken usage of scale.
2019-10-05 12:38:44 -07:00
TehRealSalt
32bdd10dbf Cup definitions, updated menu to use them 2019-10-04 22:44:19 -04:00
TehRealSalt
94e8fddd46 Time Attack screen
No functionality ported yet
2019-10-04 13:27:09 -04:00
TehRealSalt
67e63442da Start on Cup/Level selects 2019-10-04 00:18:34 -04:00
TehRealSalt
2324282569 Merge master 2019-10-03 12:16:24 -04:00
Sal
fec68fd91c Merge branch 'versus-record' into 'master'
Power Levels

See merge request KartKrew/Kart!152
2019-10-03 12:04:43 -04:00
TehRealSalt
03ec42da6d Back to 1000 2019-10-03 11:46:00 -04:00
TehRealSalt
706c6be627 Wrong var name 2019-10-03 11:37:58 -04:00
TehRealSalt
bcd142c2a0 Start at 5000, rebalance scrambles 2019-10-03 11:36:35 -04:00
TehRealSalt
d10e4aebac Fix a few messups due to the merged cvars 2019-10-03 11:22:58 -04:00
TehRealSalt
4e0a8ef9d8 Merge branch 'master' into versus-record 2019-10-03 10:35:17 -04:00
TehRealSalt
37009ac9b0 A few stashed fixes that didn't make it to the branches somehow 2019-10-03 10:31:34 -04:00
TehRealSalt
3d5676d4d6 atoi 2019-10-03 10:16:10 -04:00
TehRealSalt
12829743ae Add easy scrambles to the list now that easy is playable 2019-10-03 01:54:52 -04:00
TehRealSalt
a5ea6a9799 Merge speed/encore scrambles into the normal cvars as an "auto" option 2019-10-03 01:48:16 -04:00
TehRealSalt
c6566ec31a Merge branch 'master' into versus-record 2019-10-03 01:32:59 -04:00
Sal
8338d3e71c Merge branch 'fortnite' into 'master'
Battle sudden death

See merge request KartKrew/Kart!166
2019-10-03 01:27:09 -04:00
Sal
eb7f662654 Merge branch 'genesis-wipe' into 'master'
Genesis-style wipes

See merge request KartKrew/Kart!164
2019-10-03 01:10:33 -04:00
TehRealSalt
7f6d825809 Remove unused GENESIS_WIPE define 2019-10-03 01:10:10 -04:00
TehRealSalt
7d8a512d2a Several minor fixes & tweaks for character select 2019-10-03 00:13:09 -04:00
TehRealSalt
dae7dd003a More complete character select 2019-10-02 19:13:56 -04:00
Sal
93f9a9e62c Merge branch 'testers' into 'master'
TESTERS macro and compile flag to disable playing by yourself

See merge request KartKrew/Kart!179
2019-10-02 17:00:29 -04:00
James R
1b0ba7768c False instead of 0, a little clearer 2019-10-02 13:57:14 -07:00
TehRealSalt
7433becd7a Move map loaded failure error from the deleted backwards compat code 2019-10-02 12:07:37 -04:00
TehRealSalt
217f61897f K_PlayerForfeit on I_Quit
(I believe these are the only i_systems that matter?)
2019-10-02 11:47:56 -04:00
Sal
d5bb5c3a25 Merge branch 'ring-tweaks' into 'master'
Ring tweaks

See merge request KartKrew/Kart!180
2019-10-02 11:39:31 -04:00
TehRealSalt
ca83b06d93 Fuckhuge restructuring
- m_menu.c and m_menu.h are dead. Everything has now been moved to k_menudef.c, k_menufunc.c, k_menudraw.c, and k_menu.h.
- Expanded menu_t and menuitem_t to add transitions and tooltips
- Early character select screen
- Removed almost all menu definitions, I'll be reimporting them as they are needed
2019-10-02 11:31:11 -04:00
TehRealSalt
bb809d2d2a Merge branch 'master' into new-menus 2019-09-29 06:57:11 -04:00
TehRealSalt
7c40a1c07b Make sure it doesn't divide by 0 2019-09-28 15:18:01 -04:00
TehRealSalt
8fa5ada23d Allow ring usage during Shrink 2019-09-28 15:16:08 -04:00
TehRealSalt
7321a95a65 Ring respawn timer is based on lap count (proportional to 3 laps) 2019-09-28 15:14:52 -04:00
Sal
1fa417f561 Merge branch 'more-transparent-pixel' into 'master'
Fixed some instances that weren't using TRANSPARENTPIXEL

See merge request KartKrew/Kart!178
2019-09-28 13:06:23 -04:00
James R
e5b6ebaa4e Disable unused functions in TESTERS build 2019-09-27 20:00:46 -07:00
James R
5ceff36ac1 Hide Multiplayer hosting options and Offline Mode 2019-09-27 19:58:55 -07:00
James R
7a201ea993 Hide Unlockables 2019-09-27 19:56:41 -07:00
James R
b64dccd498 Hide Record Attack in TESTERS build 2019-09-27 19:56:18 -07:00