smoogipooo cd435f7ec6 Merge remote-tracking branch 'origin/master' into timingchange-rework ...

# Conflicts:
#	osu-framework
#	osu.Game.Rulesets.Mania/Timing/ControlPointContainer.cs

2017-06-09 03:37:55 +09:00

..

Audio

Simplify constructor of SampleInfoList.

2017-05-08 19:30:55 +08:00

Beatmaps

Fix Black Space after } and Symbol Spacing

2017-06-08 14:48:42 +08:00

Configuration

More Clean UP

2017-06-07 20:07:18 +08:00

Database

EOF remove blank spaces

2017-06-08 14:56:03 +08:00

Graphics

Merge remote-tracking branch 'origin/master' into timingchange-rework

2017-06-09 03:37:55 +09:00

Input/Handlers

Update framework

2017-05-11 21:25:43 +09:00

IO

Remove unused namespace.

2017-05-16 22:20:05 +08:00

IPC

Enforce readonly private members where possible.

2017-03-23 13:50:08 +09:00

Online

Fix Black Space after } and Symbol Spacing

2017-06-08 14:48:42 +08:00

Overlays

Merge remote-tracking branch 'upstream/master' into johnneijzen-master

2017-06-08 20:33:39 +09:00

Properties

Remove all trailing whitespaces in this repo.

2017-04-06 16:21:18 +08:00

Rulesets

More cleanup + xmldoc changes.

2017-06-09 03:36:15 +09:00

Screens

Merge remote-tracking branch 'upstream/master' into johnneijzen-master

2017-06-08 20:33:39 +09:00

Users

Fix Black Space after } and Symbol Spacing

2017-06-08 14:48:42 +08:00

osu.Game.csproj

Merge remote-tracking branch 'origin/master' into timingchange-rework

2017-06-09 03:37:55 +09:00

OsuGame.cs

Merge branch 'master' into master

2017-06-08 12:55:25 +09:00

OsuGameBase.cs

update osu to use the framework's TooltipContainer

2017-06-03 14:50:35 +02:00

packages.config

Update nuget packages.

2017-04-12 19:35:16 +09:00