Dean Herbert df65443f07 Merge branch 'master' ... Conflicts: osu-framework osu.Game/Screens/Play/Player.cs		2018-01-30 18:31:03 +09:00
..
Audio	Update licence headers	2018-01-05 20:21:19 +09:00
Beatmaps	fix storyboard path	2018-01-23 18:18:54 +08:00
Configuration	Make field readonly	2018-01-26 15:17:56 +09:00
Database	Fix incorrect initial migration	2018-01-25 23:41:03 +09:00
Graphics	Continue showing progress bar on direct panels when importing	2018-01-22 13:05:07 +09:00
Input	GlobalKeyBindingContainer -> GlobalActionContainer	2018-01-30 14:54:30 +09:00
IO	Update licence headers	2018-01-05 20:21:19 +09:00
IPC	Update licence headers	2018-01-05 20:21:19 +09:00
Migrations	Fix incorrect initial migration	2018-01-25 23:41:03 +09:00
Online	Update APi.Username in APIAccess intead of ignoring it.	2018-01-22 01:19:22 -05:00
Overlays	GlobalKeyBindingContainer -> GlobalActionContainer	2018-01-30 14:54:30 +09:00
Properties	Update licence headers	2018-01-05 20:21:19 +09:00
Rulesets	InputManager -> Container where KeyBindings are involved	2018-01-30 14:49:12 +09:00
Screens	Merge branch 'master'	2018-01-30 18:31:03 +09:00
Storyboards	Support HandleKeyboardInput, HandleMouseInput, CanReceiveKeyboardInput, CanReceiveMouseInput properties	2018-01-07 23:40:00 +03:00
Tests	Allow rulesets to create their own instantiation info	2018-01-10 17:04:07 +09:00
Users	enable query	2018-01-10 16:46:55 +01:00
app.config	CI fixing	2017-10-16 22:00:54 +09:00
OpenTK.dll.config	Update all dependencies in line with framework	2017-09-13 20:25:40 +09:00
osu!.res	And then everything became one	2017-09-19 16:06:58 +09:00
osu.Game.csproj	GlobalKeyBindingContainer -> GlobalActionContainer	2018-01-30 14:54:30 +09:00
osu.nuspec	Update license year.	2018-01-22 18:22:38 +01:00
OsuGame.cs	Merge branch 'master' into global-mod-binding	2018-01-29 15:18:11 +09:00
OsuGameBase.cs	GlobalKeyBindingContainer -> GlobalActionContainer	2018-01-30 14:54:30 +09:00
packages.config	Add Jetbrains.Annotations NuGet package	2018-01-26 12:46:28 +01:00