Sal
ec13738233
Merge branch 'bad-merge' into 'master'
...
Fix bad merge of !298 (CRLF)
See merge request KartKrew/Kart!300
2020-07-21 20:08:57 -04:00
Sally Coolatta
7b42027af8
Show nametags in replays, fix in splitscreen
2020-07-21 17:09:17 -07:00
James R
c2cb91e3ae
Correct CRLF
2020-07-21 17:08:20 -07:00
James R
1c51b93d0e
Revert "Merge branch 'nametags-in-replays' into 'master'"
...
This reverts commit 43e7e9ee7e315e808634
2020-07-21 17:05:35 -07:00
Sal
43e7e9ee7e
Merge branch 'nametags-in-replays' into 'master'
...
Show nametags in replays
See merge request KartKrew/Kart!298
2020-07-21 01:46:52 -04:00
Sally Coolatta
7a5d923eab
Merge branch 'master' into nametags-in-replays
2020-07-21 01:42:52 -04:00
Sal
315e808634
Merge branch 'draw-flags' into 'master'
...
Seperate MF2_DONTDRAW and MF2_SHADOW into it's own varied set of flags -- drawflags.
See merge request KartKrew/Kart!167
2020-07-21 01:26:45 -04:00
Sally Coolatta
c7f19a4b83
Lazy synch drawflags on join
2020-07-20 17:49:56 -04:00
Sally Coolatta
ca6ccca594
Add drawflags to Lua
2020-07-20 17:33:13 -04:00
Sally Coolatta
509f085d46
This should be a proper diff for k_kart's drawflags stuff
2020-07-20 17:22:07 -04:00
Sally Coolatta
d649be4554
revert back to master
...
yay i get to MANUALLY redo everything.
2020-07-20 16:57:25 -04:00
Sally Coolatta
5e4be346d4
Ring sting debt indicator properly supports splitscreen
2020-07-20 16:16:56 -04:00
Sally Coolatta
3190edd666
Show nametags in replays, fix in splitscreen
2020-07-20 16:02:46 -04:00
Sally Coolatta
643a63e1e6
Finish merge
2020-07-20 13:39:05 -04:00
Sally Coolatta
ef2579f2b3
Merge branch 'master' into draw-flags
2020-07-20 13:38:48 -04:00
Sal
17b244969b
Merge branch 'driftboost' into 'master'
...
Drift boost effects
See merge request KartKrew/Kart!297
2020-07-20 03:11:58 -04:00
James R
93e0872d9a
Merge remote-tracking branch 'origin/master' into driftboost
2020-07-19 22:19:59 -07:00
James R
5efc34e43b
Cleanup code and reverse gravity
2020-07-19 22:18:56 -07:00
James R
37aedad288
Sounds for big blue boost and bullet clip bouncing
2020-07-19 21:49:23 -07:00
James R
b23581ac38
The drift boost clip is fatter
2020-07-19 21:05:29 -07:00
James R
280791a832
Drift Boost Plumes, play every other frame of Drift Boost Explosion (normally flicker frames)
2020-07-19 19:11:19 -07:00
James R
3ff00e851e
Better spawning for the clip spark
2020-07-19 18:09:52 -07:00
James R
f8b19a239f
Drift Boost Clip, bounces on floor and sparks, then flickers until it dies
2020-07-19 18:04:11 -07:00
James R
1dae3d196b
Who said anything about a 5th frame?
2020-07-18 14:52:30 -07:00
James R
59c0f99865
5th frame + rainbow colors cycle on the drift explody
2020-07-17 23:44:00 -07:00
Sryder
f1ba06351c
Merge branch 'float-in-mobjscale' into 'master'
...
Rings float height is not mobjscaled!
See merge request KartKrew/Kart!295
2020-07-14 07:54:29 -04:00
James R
716898ebf6
Probably a good idea to flip with mobjscaled height
2020-07-13 19:58:00 -07:00
James R
f348cd0f1f
Multiply ring float height by mobjscale
2020-07-13 19:55:00 -07:00
James R
56da04bdec
Merge branch 'compiler-error' into 'master'
...
Compiler warnings
See merge request KartKrew/Kart!293
2020-07-10 21:32:26 -04:00
Sryder
ae249b2f67
Merge branch 'pathfind-shadowed-declaration' into 'master'
...
Fix shadowed declaration in pathfind code
See merge request KartKrew/Kart!294
2020-07-10 09:14:19 -04:00
James R
65550cc9b7
Make drift explode animation LONGER
2020-07-09 18:03:27 -07:00
Sryder
376f4d3116
Fix shadowed declaration in pathfind code
2020-07-10 01:32:46 +01:00
James R
dc83e6ee0b
Merge remote-tracking branch 'origin/master' into driftboost
2020-07-09 16:48:33 -07:00
James R
856eda9f95
Don't scale drift explosion
2020-07-09 16:48:21 -07:00
James R
f1648fbf5c
Followers compiler warnings
2020-07-09 16:39:47 -07:00
James R
8399079f35
Merge branch 'followme-internal' into 'master'
...
Followers
See merge request KartKrew/Kart!252
2020-07-09 19:15:37 -04:00
Latapostrophe
fb978f9b91
Merge branch 'v2-master' into followme-internal
2020-07-09 23:34:24 +02:00
Sryder
7d17046942
Merge branch 'flameshield-dist' into 'master'
...
Fix Flameshield in mapobjectscale maps.
See merge request KartKrew/Kart!292
2020-07-09 12:59:17 -04:00
Sryder
c6c81c7fab
Fix Flameshield in mapobjectscale maps.
...
FixedMul instead of FixedDiv
2020-07-09 17:54:28 +01:00
Sal
e81c192a9f
Merge branch 'replay-hut-addon-crash-fix' into 'master'
...
Fix replay hut menu crashing when trying to display missing skins 2 electric boogaloo
See merge request KartKrew/Kart!291
2020-07-09 02:05:13 -04:00
James R
e250796886
WIP "Drift explosion"
2020-07-08 21:30:34 -07:00
SteelT
d67ad1a08f
Fully fix replay hut crashing if addons isn't loaded.
2020-07-09 00:29:46 -04:00
James R
47a7c285de
Merge branch 'pathfind-realloc-fix' into 'master'
...
Pathfinding reallocation fix
See merge request KartKrew/Kart!290
2020-07-08 22:05:18 -04:00
Sal
5397594ceb
Merge branch 'i-am-jimita' into 'master'
...
Line feeds don't work when drawing strings
See merge request KartKrew/Kart!289
2020-07-08 18:54:01 -04:00
Sryder
87069a86d8
Fix the cause of the waypoint debug message spam in Canyon Rush.
...
Not calling the indexchanged callback here meant that if K_BHeapSortDown didn't make any changes, the item at index 0 would never call the callback despite changing position.
2020-07-08 21:36:28 +01:00
Sryder
c7a00d4800
Update pointers to nodes when the nodesarray is reallocated.
...
Fixes crash in Gust Planet.
2020-07-08 18:01:47 +01:00
James R
1af2ecdf15
Wow!
...
(cherry picked from commit be01a5917639f4b05de99ef92bdafb50a204ee56)
2020-07-05 18:40:37 -07:00
Latapostrophe
01ecc8573a
Actually use the proper player for followercolor, for real this time
2020-06-14 17:06:46 +02:00
Latapostrophe
6d07126283
Use the proper player to save followercolor in replays this time around
2020-06-14 16:59:46 +02:00
Latapostrophe
4eac7f8366
Merge branch 'v2-master' into followme-internal
2020-06-10 23:38:19 +02:00
