Dean Herbert
|
cc0f61f545
|
Merge branch 'refs/heads/master' into dependency-injection
# Conflicts:
# osu-framework
# osu.Game/GameModes/OsuGameMode.cs
# osu.Game/GameModes/Play/Player.cs
# osu.Game/OsuGame.cs
# osu.Game/Overlays/MusicController.cs
# osu.Game/Overlays/Options/EditorSection.cs
# osu.Game/Overlays/Options/Input/MouseOptions.cs
# osu.Game/Overlays/Options/Online/InGameChatOptions.cs
# osu.Game/Overlays/Options/SkinSection.cs
|
2016-11-12 20:18:26 +09:00 |
|
Dean Herbert
|
a39d28efe2
|
Merge pull request #159 from SirCmpwn/platform-options
Remove certain options when not running on Windows
|
2016-11-12 16:05:47 +09:00 |
|
Drew DeVault
|
d36c8e9203
|
Remove certain options when not running on Windows
|
2016-11-10 21:54:01 -05:00 |
|
Drew DeVault
|
0d4560a054
|
Update to latest DI stuff
|
2016-11-10 17:40:42 -05:00 |
|
Drew DeVault
|
676cdc44b2
|
Add expanding options sidebar
|
2016-11-08 23:36:06 -05:00 |
|
Drew DeVault
|
3ad633f363
|
Wire up all of the boolean options
|
2016-11-08 23:17:08 -05:00 |
|
Drew DeVault
|
cbbac0565f
|
Remove unused using statements
|
2016-11-07 21:28:06 -05:00 |
|
Drew DeVault
|
1ce6a7285a
|
Rearrange options namespaces
|
2016-11-07 21:24:41 -05:00 |
|