1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 06:57:39 +08:00
osu-lazer/osu.Game/Beatmaps
Dean Herbert 4430255ec4
Merge remote-tracking branch 'upstream/master' into replay
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
#	osu.Desktop/OsuGameDesktop.cs
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
#	osu.Game/Database/BeatmapDatabase.cs
#	osu.Game/Graphics/Cursor/OsuCursorContainer.cs
#	osu.Game/IPC/BeatmapImporter.cs
#	osu.Game/Modes/Mod.cs
#	osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
#	osu.Game/Modes/UI/Playfield.cs
#	osu.Game/Screens/Play/Player.cs
#	osu.Game/Screens/Play/PlayerInputManager.cs
2017-03-07 13:50:08 +09:00
..
Drawables Fix most warnings. 2017-03-07 13:05:57 +09:00
Events Remove unnecessary using statements 2017-02-23 21:38:10 +01:00
Formats Fix most warnings. 2017-03-07 13:05:57 +09:00
IO Remove unnecessary using statements 2017-02-23 21:38:10 +01:00
Samples Update and standardise license headers. 2017-02-07 14:27:41 +09:00
Timing Fix most warnings. 2017-03-07 13:05:57 +09:00
Beatmap.cs Fix even more test regressions. 2017-02-27 20:39:04 +09:00
DifficultyCalculator.cs Fix most warnings. 2017-03-07 13:05:57 +09:00
WorkingBeatmap.cs Make Mods IEnumerable. 2017-03-06 15:20:55 +09:00