Commit graph

6436 commits

Author SHA1 Message Date
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
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
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
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
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
5738071100 Horizontal/diagonal springs use all object's speed, instead of only players 2019-09-15 00:49:10 -04:00
TehRealSalt
16bd11f53f Wrong var name 2019-09-15 00:32:58 -04:00
TehRealSalt
004bae45c5 Buff drift-steering during the grease period 2019-09-15 00:27:28 -04:00
TehRealSalt
0e35b65caa Spring Bullshit, part (?)
Who knows how many times I've had to rewrite this part but it FINALLY works properly for everything...
2019-09-14 23:47:08 -04:00
TehRealSalt
40c8081a1b Grease part 3 2019-09-12 19:26:00 -04:00
TehRealSalt
97b09ba9c1 Grease part 2 2019-09-12 14:23:45 -04:00
TehRealSalt
56c9641488 Back to old thrusts 2019-09-12 02:18:07 -04:00
TehRealSalt
5fd6d86b41 Merge branch 'rings_slopechange' into greased-horizontals 2019-09-12 02:01:52 -04:00
TehRealSalt
d3f1b4f82c Greased horizontals 2019-09-12 02:01:30 -04:00
TehRealSalt
d4d03f907b Remove commented out code 2019-09-12 00:32:47 -04:00
TehRealSalt
55caae6d1a Remove teleporting jank from springs, set angle when going directly against a horizontal/diagonal spring 2019-09-12 00:31:51 -04:00
TehRealSalt
abfc1915c5 Fixed horizontal springs having gravity 2019-09-12 00:10:06 -04:00
TehRealSalt
e0a177e612 Horizontal springs, bigger hitboxes, springs use the meatier Sonic 3 sound effect 2019-09-11 23:33:33 -04:00
James R
094c926fd0 Apply hud translucency to FREE PLAY 2019-08-11 13:09:03 -07:00
James R
63abd92a0e Apply HUD translucency to ping and FPS counters 2019-08-11 12:35:06 -07:00
James R
de8030bc2e Toggle ping and FPS counters with HUD 2019-08-11 12:32:57 -07:00
Sryder
0006ceac88 Remove stray CONS_Printf 2019-08-11 18:37:18 +01:00
Sryder
f7f27199a6 Merge branch 'no-credit-on-scores' into 'master'
Don't draw song credit over scores HUD

See merge request KartKrew/Kart!162
2019-07-17 16:46:24 -04:00
James R
14235ecb74 Really just the scores HUD 2019-07-17 13:41:43 -07:00
James R
1b74665259 Just don't draw song credit 2019-07-17 13:38:38 -07:00
Sryder
0767f4b8aa Merge branch 'public-master' into 'master'
Changes in public master

See merge request KartKrew/Kart!163
2019-07-17 16:27:32 -04:00
James R
374af9a322 Merge remote-tracking branch 'pub/master' into public-master 2019-07-17 12:33:20 -07:00
James R
e123b2acd7 Stop drawing after the scores hud 2019-07-17 12:29:10 -07:00
Sryder
316c7fe7ee Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into rings_slopechange 2019-07-17 20:23:30 +01:00
Sal
e9cd3073e0 Merge branch 'upside-down-rings' into 'master'
Correctly animate rings in reverse gravity

See merge request KartKrew/Kart!159
2019-07-17 15:15:41 -04:00
Sryder
ad034a083b Merge branch 'copy-slope-thing-spawning-backport' into 'master'
Copy slope thing spawning fix backport

See merge request KartKrew/Kart!160
2019-07-17 15:14:44 -04:00
Nev3r
35ebe947c4 Things spawning over copied slopes now properly align on the new plane
While I believe the opposite behavior was intentional at first, it has proven to be problematic and makes alignment a tedious task for copied planes.

Signed-off-by: Nev3r <apophycens@gmail.com>
2019-07-17 12:04:14 -07:00
James R
d82e86d4cd Declare z in scope under case 2019-07-16 20:06:26 -07:00
TehRealSalt
407157496a Fix colors looking washed-out on models 2019-07-16 16:03:31 -04:00
James R
7354ce200e Correct reverse gravity offsets
Woah reverse gravity sucks.
2019-07-12 13:28:25 -07:00
Sryder
d6382107d3 Hopefully better Jawz behaviour
Moved the movement code for it out of the thinker and into A_JawzChase to have it all in a consistent place.
2019-07-07 21:56:23 +01:00