Jorolf 2ccd6c6128 Merge branch 'master' of git://github.com/ppy/osu into caps-warning ...

# Conflicts:
#	osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs

2017-08-22 13:29:42 +02:00

..

Audio

Simplify constructor of SampleInfoList.

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

Beatmaps

Fix dofficulty calculators not working and make mania set the correct key count for non-mania specific maps.

2017-08-22 14:07:39 +09:00

Configuration

More Clean UP

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

Database

Optimise file lookups and other database operations

2017-08-01 17:37:21 +09:00

Graphics

Merge branch 'master' of git://github.com/ppy/osu into caps-warning

2017-08-22 13:29:42 +02:00

Input

Update volume control logic to use key bindings

2017-08-22 14:48:04 +09:00

IO

Add difficulty application mods

2017-08-07 08:54:54 +09:00

IPC

*Database -> *Store

2017-07-27 16:56:41 +09:00

Online

Remove unnecessary using

2017-08-21 23:41:51 +09:00

Overlays

Tidy up conditionals

2017-08-22 18:21:00 +09:00

Properties

Remove all trailing whitespaces in this repo.

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

Rulesets

Merge branch 'master' into mania-key-conversion

2017-08-22 20:08:39 +09:00

Screens

Remove permitNulls

2017-08-22 18:28:32 +09:00

Users

Allow Rulesets to create a non-FontAwesome icon

2017-08-03 14:36:21 +09:00

osu.Game.csproj

Merge branch 'master' into chat-local-echo-v2

2017-08-21 18:27:32 +09:00

OsuGame.cs

Merge branch 'master' into volume-control-fixes

2017-08-22 18:59:02 +09:00

OsuGameBase.cs

Merge branch 'master' into master

2017-08-22 12:35:36 +09:00

packages.config

Update nuget packages

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