TehRealSalt
64a3d133b4
Cleanup & bug-fixin
2019-10-15 20:56:28 -04:00
TehRealSalt
cf8a77cfd6
Cup icon drawing
2019-10-05 23:11:31 -04: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
TehRealSalt
37009ac9b0
A few stashed fixes that didn't make it to the branches somehow
2019-10-03 10:31:34 -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
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
James R
03b3d61fd1
Add TESTERS build flag to Makefile
2019-09-27 19:21:18 -07:00
James R
246280045c
Fix crash in TESTERS build if you try to record demo anyway
2019-09-27 19:20:55 -07:00
James R
8cbdc999f4
Block playing by yourself in TESTERS build with le funni message
...
SV_SpawnServer is called in instances other than joining
a server or watching a replay. How convenient, huh?
2019-09-27 19:19:04 -07:00
TehRealSalt
9a9a1c1374
This shouldn't be merged
2019-09-27 15:31:57 -04:00
Sal
dca76c3f08
Merge branch 'whitespace' into 'master'
...
Remove trailing whitespace
See merge request KartKrew/Kart!175
2019-09-27 14:37:40 -04:00
TehRealSalt
6a1e49a91c
Fixed some instances that weren't writing TRANSPARENTPIXEL
2019-09-27 14:34:17 -04:00
Sal
38112a5577
Merge branch 'no-files-crash' into 'master'
...
Don't crash if you can't find a pwad or it's already loaded or etc
See merge request KartKrew/Kart!177
2019-09-27 12:17:00 -04:00
TehRealSalt
2635d1b810
Fix SPB target not being merged
2019-09-27 06:46:10 -04:00
TehRealSalt
06d27ae36e
Merge branch 'master' into fortnite
2019-09-27 06:36:11 -04:00
TehRealSalt
92022be254
Don't crash if you can't find a pwad or it's already loaded or etc
2019-09-27 06:28:26 -04:00
Sal
ed3ef6601e
Merge branch 'abs' into 'master'
...
Remove unncessary operations
See merge request KartKrew/Kart!176
2019-09-27 03:10:59 -04:00
Sal
a313e4c33e
Merge branch 'world-tour' into 'master'
...
Flush random map pool after all but 3 are played
See merge request KartKrew/Kart!170
2019-09-27 03:07:04 -04:00
Sal
39115db560
Merge branch 'sky-improvements' into 'master'
...
Sky improvements
See merge request KartKrew/Kart!174
2019-09-27 03:06:51 -04:00
Sal
542c4a3306
Merge branch 'new-springs' into 'master'
...
New springs
See merge request KartKrew/Kart!171
2019-09-27 03:06:29 -04:00
James R
739d602c84
Addition unecessary as ruled out by if condition
2019-09-26 16:41:02 -07:00
James R
971eed8d97
abs is unnecessary on unsigned types
2019-09-26 16:35:41 -07:00
James R
1d59d8305d
Remove trailing whitespace
2019-09-26 14:39:23 -07:00
James R
7a6a2f248e
Remove trailing whitespace
2019-09-26 14:32:25 -07:00
Sal
921409224c
Merge branch 'model-gradients' into 'master'
...
Model gradients + model tilt adjustments
See merge request KartKrew/Kart!157
2019-09-25 21:53:21 -04:00
TehRealSalt
cb355e7e8f
Merge branch 'master' into new-springs
2019-09-24 02:46:35 -04:00
Sal
002eecea47
Merge branch 'maps-pk3' into 'master'
...
Use maps.pk3
See merge request KartKrew/Kart!173
2019-09-24 02:46:10 -04:00
TehRealSalt
60b0df0330
Did not mean to commit this eons ago... :V
2019-09-24 02:01:27 -04:00
TehRealSalt
7cfcb2f61a
Don't select items in the air or with the Ambush flag for overtime
2019-09-24 02:00:27 -04:00
Sal
3eef46b06c
Merge branch 'showhud' into 'master'
...
Treat ping and FPS counters like HUD
See merge request KartKrew/Kart!168
2019-09-23 20:32:27 -04:00
TehRealSalt
4054c4ad11
Merge branch 'master' into new-springs
2019-09-23 06:37:47 -04:00