h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 04:49:40 +08:00
Code Issues Releases Wiki Activity
8cd1353d74
osu-lazer/osu.Game/Modes/Objects/Drawables
History
smoogipooo 42da0f1a72 Merge remote-tracking branch 'origin/master' into generic_judgements_2 
Conflicts:
	osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs
	osu.Game.Modes.Catch/UI/CatchHitRenderer.cs
	osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs
	osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj
	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
	osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs
	osu.Game.Modes.Osu/UI/OsuHitRenderer.cs
	osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
	osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
	osu.Game/Modes/UI/HitRenderer.cs
	osu.Game/osu.Game.csproj
2017-03-15 21:36:43 +09:00
..
ArmedState.cs Add license headers. 2017-03-15 21:32:47 +09:00
DrawableHitObject.cs Merge remote-tracking branch 'origin/master' into generic_judgements_2 2017-03-15 21:36:43 +09:00
HitResult.cs Add license headers. 2017-03-15 21:32:47 +09:00
IDrawableHitObjectWithProxiedApproach.cs Remove unnecessary using statements 2017-02-23 21:38:10 +01:00