Dean Herbert e0c06a4f19 Merge branch 'refs/heads/general-fixes' into beatmap_framework ... # Conflicts: # osu-framework # osu.Game/GameModes/FieldTest.cs # osu.Game/GameModes/FontTest.cs # osu.Game/GameModes/Menu/ButtonSystem.cs # osu.Game/Graphics/UserInterface/TextBox.cs # osu.Game/OsuGame.cs # osu.Game/osu.Game.csproj		2016-09-20 16:36:42 +09:00
..
Objects	Merge branch 'refs/heads/general-fixes' into beatmap_framework	2016-09-20 16:36:42 +09:00
Samples	Add more timing and sample related classes.	2016-09-06 21:41:16 +09:00
Timing	Add more timing and sample related classes.	2016-09-06 21:41:16 +09:00
Beatmap.cs	HitObject -> HitBase. Also add BaseHits for each game mode.	2016-09-06 21:41:16 +09:00
BeatmapSet.cs	Move beatmap metadata to separate class.	2016-09-06 21:41:16 +09:00
Metadata.cs	Merge branch 'refs/heads/general-fixes' into beatmap_framework	2016-09-20 16:36:42 +09:00