Commit graph

7044 commits

Author SHA1 Message Date
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
TehRealSalt
594e1cb41a rotate flag applies to all springs 2019-09-23 03:48:50 -04:00
TehRealSalt
9d8cb5247a Special effects!
Tire grease waves, colored stars
2019-09-23 03:15:08 -04:00
TehRealSalt
54066cc9fc compile 2019-09-22 22:44:15 -04:00
TehRealSalt
b8a752e40a Merge master 2019-09-18 21:47:11 -04:00
TehRealSalt
9e17484c7f OGL flipped skies 2019-09-18 21:22:50 -04:00
TehRealSalt
20663affc0 Flip sky direction 2019-09-18 19:46:59 -04:00
TehRealSalt
47da526313 Use texture names instead of predesignated sky numbers 2019-09-18 19:29:28 -04:00
TehRealSalt
5023abd279 Blue springs are Chaotix strong, grey springs are stronger & have diagonal/horizontal types, spring doomednums are reorganized 2019-09-18 02:26:14 -04:00
Sal
c7ed907e81 Merge branch 'rings_slopechange' into 'master'
Slippery Slopes

See merge request KartKrew/Kart!161
2019-09-17 00:47:53 -04:00
TehRealSalt
22ccce6f24 Modify angle offset with your speed vs the spring's speed
Blue springs will send you more at a reflected momentum angle, while red springs will send you more straight
2019-09-16 20:47:13 -04:00
TehRealSalt
26e34a1fa1 Use maps.pk3 2019-09-16 03:04:26 -04:00
TehRealSalt
b174f15260 Waiting for the roulette gives you Orbinaut x3 instead of just one
Should reduce the amount of waiting, and make banana vs orbis more of a decision
2019-09-15 23:40:50 -04:00
TehRealSalt
88578f0534 Moving capsules 2019-09-15 23:36:55 -04:00