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
..
Beatmaps	Merge branch 'refs/heads/general-fixes' into beatmap_framework	2016-09-20 16:36:42 +09:00
Configuration	Add minimum resolution settings.	2016-09-01 22:47:48 +09:00
GameModes	Merge branch 'refs/heads/general-fixes' into beatmap_framework	2016-09-20 16:36:42 +09:00
Graphics	Merge branch 'refs/heads/general-fixes' into beatmap_framework	2016-09-20 16:36:42 +09:00
Online	Update font logic to override framework default.	2016-09-01 22:47:48 +09:00
Properties	License -> Licence.	2016-08-26 17:27:49 +09:00
Users	Add basic class structure for Beatmap/HitObject/SampleInfo/User.	2016-09-06 21:41:16 +09:00
osu.Game.csproj	Merge branch 'refs/heads/general-fixes' into beatmap_framework	2016-09-20 16:36:42 +09:00
OsuGame.cs	Merge branch 'refs/heads/general-fixes' into beatmap_framework	2016-09-20 16:36:42 +09:00
packages.config	Update nuget packages and framework reference once more.	2016-09-06 20:41:18 +09:00