smoogipooo a3299809fe Merge remote-tracking branch 'origin/master' into timingchange-rework ... # Conflicts: # osu.Game/Graphics/Containers/ReverseDepthFillFlowContainer.cs		2017-06-05 10:19:53 +09:00
..
Audio	Simplify constructor of SampleInfoList.	2017-05-08 19:30:55 +08:00
Beatmaps	Remove key/val in favor of local variables + method call.	2017-05-30 20:59:53 +09:00
Configuration	Changed default selection type and added suggestions from PR feedback	2017-06-01 08:54:48 +02:00
Database	CI fixes	2017-05-24 03:08:48 -03:00
Graphics	Merge remote-tracking branch 'origin/master' into timingchange-rework	2017-06-05 10:19:53 +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	Move RoomStatus to a class instead of enum	2017-05-22 21:13:57 -03:00
Overlays	Merge branch 'master' into async-channel-load	2017-06-05 10:02:01 +09:00
Properties	Remove all trailing whitespaces in this repo.	2017-04-06 16:21:18 +08:00
Rulesets	Merge remote-tracking branch 'origin/master' into timingchange-rework	2017-06-05 10:19:53 +09:00
Screens	Changed default selection type and added suggestions from PR feedback	2017-06-01 08:54:48 +02:00
Users	Fix potential nullref	2017-05-25 16:33:58 +09:00
osu.Game.csproj	Merge remote-tracking branch 'origin/master' into timingchange-rework	2017-06-05 10:19:53 +09:00
OsuGame.cs	Fix osu!direct hotkey overriding drawings hotkey (for now).	2017-05-27 20:24:23 +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