Dean Herbert b6bbea392b Merge branch 'general-fixes' into beatmap_framework ...

Conflicts:
	osu-framework

2016-09-11 02:24:15 +09:00

..

Beatmaps

Add basic structure for catch mode objects.

2016-09-06 21:41:16 +09:00

Configuration

Add minimum resolution settings.

2016-09-01 22:47:48 +09:00

GameModes

Merge branch 'general-fixes' into beatmap_framework

2016-09-11 02:24:15 +09:00

Graphics

Merge branch 'general-fixes' into beatmap_framework

2016-09-11 02:24:15 +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

Add remaining HitRenderers.

2016-09-06 21:42:45 +09:00

OsuGame.cs

Merge branch 'general-fixes' into beatmap_framework

2016-09-11 02:24:15 +09:00

packages.config

Update nuget packages and framework reference once more.

2016-09-06 20:41:18 +09:00