Thomas Müller 4d8261fe0b Merge branch 'master' of https://github.com/ppy/osu into better-transforms ...

# Conflicts:
#	osu-framework
#	osu.Game/Graphics/Cursor/OsuTooltipContainer.cs
#	osu.Game/Overlays/DragBar.cs

2017-07-18 15:16:02 +03:00

..

Audio

Simplify constructor of SampleInfoList.

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

Beatmaps

Update framework and fix compilation

2017-07-14 19:18:12 +03:00

Configuration

More Clean UP

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

Database

Merge branch 'master' into fix-track-rotation

2017-07-14 19:25:54 +10:00

Graphics

Merge branch 'master' of https://github.com/ppy/osu into better-transforms

2017-07-18 15:16:02 +03: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

Merge branch 'master' into profile

2017-07-14 22:52:19 +08:00

Overlays

Merge branch 'master' of https://github.com/ppy/osu into better-transforms

2017-07-18 15:16:02 +03:00

Properties

Remove all trailing whitespaces in this repo.

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

Rulesets

Get rid of raw AddDelay calls within osu.Game

2017-07-17 16:51:21 +03:00

Screens

Merge branch 'master' of https://github.com/ppy/osu into better-transforms

2017-07-18 15:16:02 +03:00

Users

Merge branch 'master' of https://github.com/ppy/osu into better-transforms

2017-07-18 15:16:02 +03:00

osu.Game.csproj

Merge branch 'master' of https://github.com/ppy/osu into better-transforms

2017-07-18 15:16:02 +03:00

OsuGame.cs

Merge branch 'master' of https://github.com/ppy/osu into better-transforms

2017-07-18 15:16:02 +03:00

OsuGameBase.cs

Use tooltip and context menu containers as newly required

2017-07-06 15:15:12 +03:00

packages.config

Update nuget packages

2017-06-13 11:50:46 +09:00