1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 14:07:25 +08:00
osu-lazer/osu.Game
Dean Herbert d05b544d0d
Merge branch 'master' into audio-device-selection
# Conflicts:
#	osu-framework
#	osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs
2017-02-09 16:21:28 +09:00
..
Beatmaps Naming standardisation and enforcing. 2017-02-07 16:20:36 +09:00
Configuration Update and standardise license headers. 2017-02-07 14:27:41 +09:00
Database Update and standardise license headers. 2017-02-07 14:27:41 +09:00
Graphics Merge branch 'master' into audio-device-selection 2017-02-09 16:21:28 +09:00
Input Update and standardise license headers. 2017-02-07 14:27:41 +09:00
IPC Update and standardise license headers. 2017-02-07 14:27:41 +09:00
Modes Naming standardisation and enforcing. 2017-02-07 16:20:36 +09:00
Online Fix a potential crash due to API being too eager to declare online state. 2017-02-07 20:29:40 +09:00
Overlays Merge branch 'master' into audio-device-selection 2017-02-09 16:21:28 +09:00
Properties Update and standardise license headers. 2017-02-07 14:27:41 +09:00
Screens Correct masking layers on song select. 2017-02-08 20:39:17 +09:00
Users Update and standardise license headers. 2017-02-07 14:27:41 +09:00
osu.Game.csproj Merge branch 'master' into audio-device-selection 2017-02-09 16:21:28 +09:00
OsuGame.cs Handle toolbar offsets better. 2017-02-08 20:30:45 +09:00
OsuGameBase.cs Update and standardise license headers. 2017-02-07 14:27:41 +09:00
packages.config Add missing licence headers. 2016-12-06 19:07:15 +09:00