1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 17:32:54 +08:00
osu-lazer/osu.Game.Rulesets.Catch/Objects
smoogipoo c9581a2d56 Merge remote-tracking branch 'origin/master' into catch_star_rating
# Conflicts:
#	osu-framework
#	osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
#	osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
2018-06-21 12:15:25 +09:00
..
Drawable Fix droplets not bouncing off catcher's plate immediately 2018-06-15 15:44:47 +09:00
BananaShower.cs Normalize all the line endings 2018-04-13 18:26:38 +09:00
CatchHitObject.cs We need DistanceToHyperDash for star rating calculation 2018-05-21 09:58:46 +08:00
Droplet.cs Normalize all the line endings 2018-04-13 18:26:38 +09:00
Fruit.cs Normalize all the line endings 2018-04-13 18:26:38 +09:00
JuiceStream.cs Fix combos ending with JuiceStreams never leaving the catcher's plate 2018-06-14 16:39:31 +09:00
TinyDroplet.cs Normalize all the line endings 2018-04-13 18:26:38 +09:00