Thomas Müller 1198705a6f Merge branch 'master' of github.com:ppy/osu into general-fixes ... # Conflicts: # osu.Game/Beatmaps/Beatmap.cs		2017-02-17 21:22:34 +01:00
..
Beatmaps	Merge branch 'master' of github.com:ppy/osu into general-fixes	2017-02-17 21:22:34 +01:00
Configuration	Visually disable options which aren't yet wired up.	2017-02-14 00:36:50 +09:00
Database	Remove unnecessary methods and local variables.	2017-02-13 18:30:51 +09:00
Graphics	Move other score components to centre alignment (and switch font).	2017-02-16 22:44:41 +09:00
Input	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
IPC	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
Modes	Update Health display design.	2017-02-16 22:44:21 +09:00
Online	Update framework.	2017-02-13 17:46:50 +09:00
Overlays	Replace all usage of SpriteText with OsuSpriteText.	2017-02-15 21:37:43 +09:00
Properties	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
Screens	Add better screen hierarchy and placeholder for dev build disclaimer.	2017-02-17 20:07:16 +09:00
Users	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
osu.Game.csproj	Add better screen hierarchy and placeholder for dev build disclaimer.	2017-02-17 20:07:16 +09:00
OsuGame.cs	Add better screen hierarchy and placeholder for dev build disclaimer.	2017-02-17 20:07:16 +09:00
OsuGameBase.cs	Add CJK support via font Noto Medium.	2017-02-09 10:35:25 +09:00
packages.config	Add/update license headers.	2017-02-14 18:17:35 +09:00