Commit graph

6927 commits

Author SHA1 Message Date
Sally Cochenour
657a15fae2 Merge branch 'master' into new-items 2020-03-28 00:23:39 -04:00
Sally Cochenour
2ca00cf2e9 Try to prevent bubble from going out of bounds 2020-03-28 00:21:41 -04:00
Sally Cochenour
d1580a5b42 More Flame Shield visuals 2020-03-26 08:48:02 -04:00
Sally Cochenour
8a3c7ad2fb Add fire trail to flame shield 2020-03-26 03:13:49 -04:00
Sally Cochenour
7ec398e579 Slow down animation speed, fix meter bugs 2020-03-26 03:13:10 -04:00
Sally Cochenour
bf221c7afa Another bugfix for hyu stuff 2020-03-26 01:16:04 -04:00
Sally Cochenour
4ddf1e4280 Don't allow k_flamedash to damage without flame shield 2020-03-26 01:14:57 -04:00
Sally Cochenour
b6c282ec12 Move Eggman item code to k_collide 2020-03-26 00:47:30 -04:00
Sally Cochenour
985aa44c95 Flame shield destroys items while being used 2020-03-26 00:47:03 -04:00
Sally Cochenour
6333dc4737 Thrust slightly when used in the air 2020-03-26 00:07:03 -04:00
Sally Cochenour
46209a96cf Double leniency period 2020-03-25 23:52:45 -04:00
Sally Cochenour
81fa5d7f51 Start on new flame shield dash visuals 2020-03-25 23:49:39 -04:00
Sally Cochenour
14fdc8a90a Savegame is a stupid term for this 2020-03-25 05:36:46 -04:00
Sal
dc9ce7bc20 Merge branch 'power-level-tweak' into 'master'
Power level tweak

See merge request KartKrew/Kart!219
2020-03-25 04:06:30 -04:00
Sally Cochenour
0051655c62 Merge branch 'master' into power-level-tweak 2020-03-25 02:04:53 -04:00
Sally Cochenour
88709aafaa Fix eggman items having no collision 2020-03-24 12:55:48 -04:00
Sal
b54531c9f6 Merge branch 'gentlemen-no-spectators' into 'master'
Ignore spectators for gentlemen's ping

See merge request KartKrew/Kart!221
2020-03-23 16:10:47 -04:00
Sal
8d763afae6 Merge branch 'map-features' into 'master'
Minor but handy new mapping features

See merge request KartKrew/Kart!218
2020-03-23 00:44:18 -04:00
Sal
14bd304b06 Merge branch 'parties' into 'master'
Parties (Online Splitscreen Mk. II)

See merge request KartKrew/Kart!198
2020-03-23 00:43:33 -04:00
Sally Cochenour
4e63b39ccb Firery shield 2020-03-22 23:27:27 -04:00
Sally Cochenour
e5a59c28d1 Use smaller value 2020-03-22 22:09:32 -04:00
Sally Cochenour
227a4dcbd3 Flame Shield improvin's 2020-03-22 22:01:40 -04:00
James R
90d415ccc0 Ignore spectators for gentlemen's ping 2020-03-22 18:55:28 -07:00
James R
abcba53781 Merge remote-tracking branch 'origin/master' into parties 2020-03-22 18:28:07 -07:00
Sally Cochenour
ec7528a333 Merge branch 'master' into new-items 2020-03-22 21:17:43 -04:00
Sally Cochenour
464e3273a9 Missing include 2020-03-22 21:16:55 -04:00
Sally Cochenour
8a5d00d1c7 Increase distance for natural spb 2020-03-22 20:52:54 -04:00
Sally Cochenour
9379202dc4 Dumb mistake 2020-03-22 20:52:20 -04:00
Sally Cochenour
7690eeab2b Merge branch 'new-items-blah' into new-items 2020-03-22 20:51:16 -04:00
Sally Cochenour
25bc236bde Merge branch 'master' into new-items 2020-03-22 20:50:28 -04:00
Sally Cochenour
a638054332 Bad whoopsie 2020-03-22 20:37:20 -04:00
Sal
82a39f6c85 Merge branch 'kill-whitespace' into 'master'
Kill CRLF and trailing whitespace

See merge request KartKrew/Kart!216
2020-03-22 20:31:08 -04:00
Sal
d64f77cf06 Merge branch 'welcome-to-errormode' into 'master'
abs on unsigned does nothing

See merge request KartKrew/Kart!220
2020-03-22 20:30:47 -04:00
Sal
fe9927fbd8 Merge branch 'targets' into 'master'
Break the Capsules

See merge request KartKrew/Kart!172
2020-03-22 20:30:20 -04:00
Sally Cochenour
53df47b4fe toaster suggestions 2020-03-22 20:29:58 -04:00
Sally Cochenour
013aa22c16 Minor item calculation fixes 2020-03-22 17:53:11 -04:00
James R
c74cea6d5d abs on unsigned does nothing 2020-03-22 14:47:12 -07:00
James R
0ee7456708 Fix shit 2020-03-22 14:45:21 -07:00
James R
2491efed20 EXTERN 2020-03-22 14:39:16 -07:00
James R
dda610fbd4 Merge remote-tracking branch 'origin/master' into kill-whitespace 2020-03-22 14:36:21 -07:00
James R
cbd4693de7 Merge remote-tracking branch 'origin/master' into parties 2020-03-22 14:34:29 -07:00
Sally Cochenour
7f07fa9b2d Move item box counter stuff into k_battle 2020-03-22 16:23:56 -04:00
Sally Cochenour
198b9770f7 Apply to any break the capsules, instead of only time attack 2020-03-22 16:14:53 -04:00
Sally Cochenour
8d91ff1e1c No time limit in capsules 2020-03-22 16:13:41 -04:00
Sally Cochenour
b18df427dd Break the Capsules ends when you lose bumpers 2020-03-22 16:07:25 -04:00
Sally Cochenour
601ab839f0 Set bumpers to 1 in Break the Capsules 2020-03-22 14:55:47 -04:00
Sally Cochenour
b1ec5654bc Merge branch 'master' into targets 2020-03-22 14:31:17 -04:00
Sal
6e02982e7d Merge branch 'air-spark-experiment' into 'master'
Air spark experiment

See merge request KartKrew/Kart!217
2020-03-22 14:26:33 -04:00
Sally Cochenour
7f1d55421a Merge branch 'master' into new-items 2020-03-22 14:23:51 -04:00
Sal
7ce109249a Merge branch 'antigrav-waypoints' into 'master'
Fix antigrav respawn, no respawn flag, and remove spinout when respawning

See merge request KartKrew/Kart!213
2020-03-22 14:23:21 -04:00