Commit graph

7930 commits

Author SHA1 Message Date
Latapostrophe
f33e4d62a0 Sort conflicts, fix misordered follower bubble states in dehacked 2020-06-05 02:33:39 +02:00
Latapostrophe
e64d004636 Merge branch 'master' of git.magicalgirl.moe:KartKrew/Kart into v2-master 2020-06-05 01:25:50 +02:00
Sally Coolatta
47d6fba4de Remove duplicate in CMakeLists 2020-06-04 17:48:18 -04:00
Sally Coolatta
3ae7c11cf1 Count the player's skin as used 2020-06-04 17:48:05 -04:00
Sally Coolatta
2a7f79b800 Merge branch 'grand-pricks' into nametags 2020-06-04 17:21:36 -04:00
Sally Coolatta
42419f7bc6 Add comments for functions 2020-06-04 17:14:14 -04:00
Sally Coolatta
d4153ca7aa Increase GP bonus points 2020-06-04 16:52:54 -04:00
Sally Coolatta
9603c5fea7 Revise rival score system, so that it's much more likely to make the rival status switch places 2020-06-04 16:52:24 -04:00
Sally Coolatta
4f0d49c87b Disable rubberbanding on acceleration
This makes hitting bots feel more meaningful, and makes bots with the accel stat not as obsolete when every bot's rubberbanding :p
2020-06-04 16:01:15 -04:00
Sally Coolatta
4005288d40 Adjust max/min rubberband multiplier with bot difficulty
Lv. 1: Ranges from x0.75 to x1.0 (never speeds up, only slows down)
Lv. 5: Ranges from x0.875 to x1.5 (completely average)
Lv. 9: Ranges from x1.0 to x2.0 (never slows down, only speeds up)
2020-06-04 15:59:51 -04:00
Sally Coolatta
889cf581d1 Fix bot air speed cap adjustments being reversed 2020-06-04 15:17:59 -04:00
Sally Coolatta
f4c0011a76 Merge branch 'master' into grand-pricks 2020-06-04 14:41:56 -04:00
Sryder
b7582007fa Merge branch 'gentlemen-ping-fix' into 'master'
Don't show ping if no one else is racing

See merge request KartKrew/Kart!277
2020-06-04 08:01:41 -04:00
Sal
d6806b863e Merge branch 'respawn-updates' into 'master'
Respawn updates

See merge request KartKrew/Kart!273
2020-06-04 02:55:58 -04:00
Sally Coolatta
2f0e11c7c5 Make more exaggurated 2020-06-04 01:40:44 -04:00
Sally Coolatta
2a37bca626 Merge branch 'master' into respawn-updates 2020-06-04 00:16:37 -04:00
Sally Coolatta
4fd9c89124 Use player object again for CHECK 2020-06-04 00:10:23 -04:00
Sally Coolatta
d10bfe1110 Encore mode support 2020-06-04 00:09:30 -04:00
Sally Coolatta
a3ec4f22a1 Finished nametags 2020-06-03 23:29:43 -04:00
Sal
03d56dcf1f Merge branch 'serialise_shadowscale' into 'master'
Serialise shadowscale.

See merge request KartKrew/Kart!272
2020-06-03 23:28:17 -04:00
Sal
fb17971b3f Merge branch 'water-sploosh' into 'master'
New water trail for skimming

See merge request KartKrew/Kart!278
2020-06-03 23:28:08 -04:00
Sryder
d13d923a92 New water trail for skimming
Out with the old splish splish. Bring on the SKKKKSSSSSSS
2020-06-04 01:47:56 +01:00
Sally Coolatta
390191c85a I swear to god please just push my entire merge 2020-06-03 20:19:47 -04:00
Sally Coolatta
120dc253af Merge remote-tracking branch 'origin/iwantmychat' into nametags 2020-06-03 20:19:26 -04:00
James R
e11101f69a Don't show ping if no one else is racing 2020-06-03 17:09:33 -07:00
Sally Coolatta
cdf4ad9f6b Draw nametag stem
(need to merge something in)
2020-06-03 20:03:17 -04:00
Sally Coolatta
3ca0e4a48b Proper object HUD tracking -- apply to CHECK and Rival tag 2020-06-03 19:49:21 -04:00
Sal
3f6e8aed39 Merge branch 'public-wasnt-merged-question-mark' into 'master'
Public merge (I got GCC 10 linking errors that I fixed, so then I wondered...)

See merge request KartKrew/Kart!276
2020-06-03 19:00:21 -04:00
James R
3162a203be Merge remote-tracking branch 'pub/master' into wtf 2020-06-03 15:57:09 -07:00
Sally Coolatta
fac8f7f538 You get 1ups for carrying rings to the goal 2020-06-03 16:34:23 -04:00
Sryder
a6fef70f75 Merge branch 'waypoint-radius-debug' into 'master'
Draw radius for waypoint debug on "best" waypoint.

See merge request KartKrew/Kart!275
2020-06-03 15:30:55 -04:00
Sryder
6620fa96f2 const pointer to waypoint 2020-06-03 20:30:01 +01:00
Sryder
648fa66d82 Add function comment 2020-06-03 20:29:13 +01:00
Sryder
0f9872fc27 Draw radius for waypoint debug on "best" waypoint.
Fix scale of waypoint connections on mapmobjscale maps
2020-06-03 20:26:52 +01:00
Sally Coolatta
30df376d04 Higher friction while rubberbanding
They are now x2 as difficult :)
2020-06-03 14:02:14 -04:00
Sally Coolatta
c2dd06e053 Add graphic for netplay bots 2020-06-03 11:06:27 -04:00
Latapostrophe
5412358fcf Fixed setting follower on title screen + mixed declarations 2020-06-03 01:23:32 +02:00
Latapostrophe
aba1ff72bc k_color.h is a thing now 2020-06-03 01:02:06 +02:00
Latapostrophe
6ac63cca7a Merge branch 'v2-master' into followme-internal 2020-06-02 22:21:16 +02:00
Latapostrophe
c866250544 Merge branch 'master' of git.magicalgirl.moe:KartKrew/Kart into v2-master 2020-06-02 22:19:05 +02:00
Sally Coolatta
e1d3111113 Remove &&
Not even sure how this compiled before :V
2020-06-02 13:32:51 -04:00
Sally Coolatta
ac1283bc9d Outdated comment 2020-06-02 13:30:36 -04:00
Sally Coolatta
d336f24860 Move kart .o 2020-06-01 15:49:51 -04:00
Sally Coolatta
086ea73c2f Merge branch 'master' into respawn-updates 2020-06-01 15:49:30 -04:00
Sally Coolatta
91b0246d99 Merge branch 'master' into grand-pricks 2020-05-31 15:53:31 -04:00
Sal
a21b235034 Merge branch 'remove-b_bot' into 'master'
Remove b_bot.c and b_bot.h from CMakeLists

See merge request KartKrew/Kart!271
2020-05-31 15:37:07 -04:00
toaster
eba79e77fc Serialise shadowscale. 2020-05-31 20:31:55 +01:00
lachwright
08a87d7e7e Remove b_bot.c and b_bot.h from CMakeLists 2020-05-31 18:31:33 +08:00
Sal
dcd2f790ba Merge branch 'pet-robo' into 'master'
This is my PET ROBO!

See merge request KartKrew/Kart!257
2020-05-29 13:27:28 -04:00
Sally Coolatta
285de3357d Add back to resynch & savegame, shorten names of a few variables 2020-05-29 13:12:07 -04:00