thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
8290 commits 1 branch 12 tags 205 MiB
Commit graph

1501 commits

Author SHA1 Message Date
Sally Cochenour
266ad99374 Add new item sprites 2020-03-30 06:57:42 -04:00
Sally Cochenour
9e2c119b56 Merge branch 'master' into pet-robo 2020-03-29 20:44:13 -04:00
Sally Cochenour
774c85d660 Rudimentary item usage code 2020-03-29 19:56:05 -04:00
Sally Cochenour
0ef12d3cce Properly use bot movement when exiting 2020-03-29 17:59:26 -04:00
Latapostrophe
4c8d373962 Fix followers in anti gravity 2020-03-29 16:40:21 +02:00
Latapostrophe
4c1459cd4e Chaos Conflicts 2020-03-29 12:14:27 +02:00
Sally Cochenour
ff621d3e46 Skins, rudimentary ticcmd building for bots 2020-03-28 12:39:27 -04:00
Latapostrophe
8960152a7c Merge branch 'v2-master' into spb-waypoints 2020-03-28 15:12:38 +01:00
Sally Cochenour
657a15fae2 Merge branch 'master' into new-items 2020-03-28 00:23:39 -04:00
Sally Cochenour
d1580a5b42 More Flame Shield visuals 2020-03-26 08:48:02 -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
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
Latapostrophe
6d0513aa9a Fix conflict 2020-03-25 23:31:53 +01: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
572bf314e5 Merge remote-tracking branch 'origin/master' into resume 2020-03-22 19:01:05 -07:00
James R
abcba53781 Merge remote-tracking branch 'origin/master' into parties 2020-03-22 18:28:07 -07: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
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
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
cbd4693de7 Merge remote-tracking branch 'origin/master' into parties 2020-03-22 14:34:29 -07: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
Latapostrophe
80e04a2035 Use proper respawn check, don't cancel spinout, but prevent dropdashing when respawning with spinout 2020-03-22 11:32:55 +01:00
James R
5e671b3483 Don't reset special music in P_RestoreMusic 
Because that resets Grow music when you stack Grow over Invincibility, and
Invincibility ends. (Also Megamix Themes.)

Thanks Snu, for calling P_RestoreMusic every tic!
 2020-03-21 22:34:27 -07:00
Sryder
2be2277f4b Fix the merge confluct I SOMEHOW missed 2020-03-22 00:44:28 +00:00
James R
310a9cd09c Merge remote-tracking branch 'origin/master' into parties 2020-03-21 17:22:57 -07:00
Sryder
da2f1fc972 Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints 
# Conflicts:
#	src/k_kart.c
 2020-03-21 23:27:55 +00:00
Sryder
e874af3e43 Very minor fix to WRONG WAY 
More opaque waypoint markers for kartdebugwaypoints
Looks like whitespace got murdered in k_kart.c again
 2020-03-21 23:24:04 +00:00
Sal
bda7dc9ddf Merge branch 'colors-yet-again' into 'master' 
Another round of small color tweaks

See merge request KartKrew/Kart!208
 2020-03-21 19:03:27 -04:00
Sal
9d35d0f5d8 Merge branch 'driftspark-update' into 'master' 
Yellow drift sparks & new drift spark effects

See merge request KartKrew/Kart!211
 2020-03-21 19:02:48 -04:00
James R
c3b967468a Revert "Remove kartdebugitem" 
This reverts commit 803884c55a.
 2020-03-21 15:56:40 -07:00
James R
4a973e2906 Revert "...Also remove kartdebugamount" 
This reverts commit 22cb7451e9.
 2020-03-21 15:56:38 -07:00
Sal
cbfce16dcc Merge branch 'done-with-spikeballs' into 'master' 
Slow down backwards spikeballs (again)

See merge request KartKrew/Kart!212
 2020-03-21 18:49:02 -04:00
Sally Cochenour
668f80a8ea Properly scale... 2020-03-21 18:47:44 -04:00
Sally Cochenour
46364422d9 Real dumb bug 2020-03-21 05:58:42 -04:00
Latapostrophe
366fff9942 Red rings, fuse, and spb game speed support 2020-03-20 21:58:14 +01:00