Thomas Müller fec127eb8c Merge branch 'master' of github.com:ppy/osu into unified_shader ...

# Conflicts:
#	osu-framework
#	osu.Game/Overlays/Options.cs

2016-10-16 15:17:24 +02:00

..

Beatmaps

Merge pull request #71 from huoyaoyuan/tidy-up

2016-10-14 18:57:42 +09:00

Configuration

Add basic VolumeControl and saving of volume to config.

2016-10-08 15:54:00 +09:00

Database

Converted all .cs files to use CRLF line endings.

2016-10-13 23:33:58 -04:00

GameModes

Remove implementation of WedgedBox and use Shear transformation instead.

2016-10-16 14:10:24 +02:00

Graphics

Revert all counter commits. Requires much further review.

2016-10-13 14:45:41 +09:00

Input

Add in-game chat display, along with a global hotkey handling method.

2016-10-08 19:23:21 +09:00

Online

Update framework.

2016-10-16 14:10:06 +02:00

Overlays

Merge branch 'master' of github.com:ppy/osu into unified_shader

2016-10-16 15:17:24 +02: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

Use OverlayContainer in framework.

2016-10-16 17:14:17 +08:00

OsuGame.cs

Replace Console.WriteLine with Logger.Log.

2016-10-15 06:13:50 +03:00

OsuGameBase.cs

Improve the initialisation logic of OsuGameBase.

2016-10-16 17:33:53 +09:00

packages.config

Implement OszArchiveReader

2016-10-12 11:32:40 -04:00

VolumeControl.cs

Change the way VolumeControl handles global input.

2016-10-16 21:57:15 +09:00

VolumeMeter.cs

Update framework.

2016-10-16 14:10:06 +02:00