Commit graph

7141 commits

Author SHA1 Message Date
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
TehRealSalt
d907158b12 Revert this 2019-09-27 15:12:55 -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
TehRealSalt
dbb6f9ca11 use MF2_AMBUSH for backandforth 2019-09-27 04:20:09 -04:00
TehRealSalt
22796b7633 Merge master 2019-09-27 03:44:37 -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
93e844ecd2 Merge master
(We're still being haunted by whatever happened to make the entire k_kart.c file conflict every single time...)
2019-09-25 10:04:27 -04:00
TehRealSalt
bca4f30ee3 Use defines here instead
I got a "initializer element is not constant" error when compiling. From a quick Google search, it seems that const-type variables aren't totally considered constants in C. There may be a better way to fix this error.
2019-09-25 07:17:14 -04:00
TehRealSalt
9cb834b004 Capsule counter, map change when spawning capsules mid-game 2019-09-24 11:24:01 -04:00
TehRealSalt
e84c618da8 Rudimentary Record Attack support 2019-09-24 07:17:05 -04:00
TehRealSalt
74552f9ee5 Merge branch 'master' into targets 2019-09-24 05:05:08 -04:00
TehRealSalt
7b484e9d75 Merge branch 'master' into versus-record 2019-09-24 02:47:00 -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
TehRealSalt
3321b68fbb Merge branch 'master' into versus-record 2019-09-23 21:29:08 -04:00
TehRealSalt
f75392109d Forgotten include 2019-09-23 21:28:45 -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
45fd60a4ab Master Server scary 2019-09-23 20:26:47 -04:00
TehRealSalt
e502a74a3f Use memset 2019-09-23 20:19:57 -04:00
TehRealSalt
8dc946e6bb Yup, 1 more batch of magic numbers 2019-09-23 09:02:23 -04:00
TehRealSalt
53848bd5fa commit throwdir fix
I did a bunch of other demo-related cleanup in this branch so I'm throwing it in here too
2019-09-23 08:51:49 -04:00
TehRealSalt
a46036e489 Last few magic numbers I could find 2019-09-23 08:50:59 -04:00
TehRealSalt
9072f233eb Remove a few more magic numbers 2019-09-23 08:31:36 -04:00
TehRealSalt
38bb44e732 Separate into k_pwrlv.c, add defines to reduce amount of magic numbers 2019-09-23 08:26:42 -04:00
TehRealSalt
9e587f4d0d Put prints behind CONS_Debug 2019-09-23 07:26:36 -04:00
TehRealSalt
77aeb4663b Merge branch 'master' into versus-record 2019-09-23 07:03:56 -04:00
TehRealSalt
932f8a1f61 Update demos to save power levels 2019-09-23 07:03:00 -04:00
TehRealSalt
4054c4ad11 Merge branch 'master' into new-springs 2019-09-23 06:37:47 -04:00
TehRealSalt
bc7673f2da Update Spring Shells, add color modulo check 2019-09-23 06:29:30 -04:00