Dean Herbert
|
0f4538f69f
|
Rename GameModes namespace to Screens.
|
2016-11-14 17:23:33 +09:00 |
|
Dean Herbert
|
f6b13bc322
|
Update framework.
|
2016-11-14 16:50:27 +09:00 |
|
Dean Herbert
|
0b203a7bf4
|
Move enum to end of file.
|
2016-11-14 16:50:17 +09:00 |
|
Dean Herbert
|
dde3a68c8f
|
Account for anchor when dragging MusicController (fixes VisualTest).
|
2016-11-14 16:40:13 +09:00 |
|
Dean Herbert
|
1d51e6af2a
|
Merge pull request #168 from huoyaoyuan/fixes
Fixes for music controller
|
2016-11-14 16:11:31 +09:00 |
|
Dean Herbert
|
eb32d842cc
|
Use switch instead of if-else.
|
2016-11-14 16:10:07 +09:00 |
|
Dean Herbert
|
9cb9f3eb08
|
Merge pull request #165 from Tom94/options-improvements
Options improvements
|
2016-11-14 16:04:15 +09:00 |
|
Dean Herbert
|
57c4314cae
|
Merge remote-tracking branch 'refs/remotes/upstream/master' into options-improvements
|
2016-11-14 16:00:06 +09:00 |
|
Dean Herbert
|
c37afd7a81
|
Merge pull request #166 from Tom94/various-improvements
Various improvements
|
2016-11-14 15:59:17 +09:00 |
|
Dean Herbert
|
464c29ab5e
|
Update framework.
|
2016-11-14 15:56:22 +09:00 |
|
Huo Yaoyuan
|
86a6c7641d
|
Make TransformDirection more clear.
|
2016-11-14 04:59:41 +08:00 |
|
Huo Yaoyuan
|
aac968eec8
|
Update res file with latest manifest.
|
2016-11-14 04:47:08 +08:00 |
|
Huo Yaoyuan
|
7c8ef2a82b
|
Select and unselect BeatmapPanel when selecting BeatmapGroup.
|
2016-11-14 04:22:06 +08:00 |
|
Huo Yaoyuan
|
33a35ca711
|
Do not set WorkingBeatmap explicitly in mode stack.
|
2016-11-14 04:01:48 +08:00 |
|
Huo Yaoyuan
|
afab938794
|
Strongly typed TransformDirection for music controller.
|
2016-11-14 03:21:07 +08:00 |
|
Thomas Müller
|
ac99e2d488
|
Avoid using load to construct the drawable hierarchy whereever possible.
|
2016-11-12 18:34:36 +01:00 |
|
Thomas Müller
|
16dc74df5b
|
Avoid stack overflow when trying to push a not-yet async loaded background.
|
2016-11-12 18:33:47 +01:00 |
|
Thomas Müller
|
1fb3c47646
|
Merge branch 'master' of github.com:ppy/osu into options-improvements
|
2016-11-12 14:53:16 +01:00 |
|
Thomas Müller
|
be319707cf
|
Merge pull request #152 from SirCmpwn/options-sidebar-tracking
Track the visible section in options
|
2016-11-12 14:35:00 +01:00 |
|
Dean Herbert
|
75be78752b
|
Merge remote-tracking branch 'refs/remotes/upstream/master' into options-sidebar-tracking
# Conflicts:
# osu.Game/osu.Game.csproj
|
2016-11-12 22:30:15 +09:00 |
|
Thomas Müller
|
6355c8bd45
|
Hide scrolldragger in options.
|
2016-11-12 13:10:53 +01:00 |
|
Thomas Müller
|
1c47773e0d
|
Make sidebar behaviour feel a bit nicer.
|
2016-11-12 13:08:34 +01:00 |
|
Thomas Müller
|
e923da1998
|
Fix lastKnownScroll never being written to.
|
2016-11-12 12:30:12 +01:00 |
|
Thomas Müller
|
98b69bc6c6
|
Merge branch 'master' of github.com:ppy/osu into SirCmpwn/options-sidebar-tracking
# Conflicts:
# osu.Game/osu.Game.csproj
|
2016-11-12 12:24:02 +01:00 |
|
Thomas Müller
|
c7f8d2450a
|
Merge pull request #130 from SirCmpwn/dependency-injection
Dependency injection
|
2016-11-12 12:21:29 +01:00 |
|
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
|
646fe5c5f4
|
Merge pull request #155 from peppy/player-improvements
Introduce back the concept of Rulesets.
|
2016-11-12 18:34:32 +09:00 |
|
Dean Herbert
|
fde9879a8b
|
Merge pull request #163 from peppy/music-player-improvements
Add a shadow and bit of elasticity to MusicController.
|
2016-11-12 18:32:43 +09:00 |
|
Dean Herbert
|
f7aabd0ce0
|
Update framework.
|
2016-11-12 18:31:57 +09:00 |
|
Dean Herbert
|
80f146e4bd
|
Fix a locally set beatmap getting overridden by the game-global one.
|
2016-11-12 18:26:27 +09:00 |
|
Dean Herbert
|
099b309645
|
Introduce back the concept of Rulesets.
|
2016-11-12 18:26:21 +09:00 |
|
Dean Herbert
|
16a0be44df
|
Add local InputManager to Player; handle Z and X.
|
2016-11-12 18:26:14 +09:00 |
|
Dean Herbert
|
18c0e431c1
|
Fix some nullrefs.
|
2016-11-12 18:25:58 +09:00 |
|
Dean Herbert
|
3b99a8fd06
|
Add a shadow and bit of elasticity to MusicController.
|
2016-11-12 17:09:58 +09:00 |
|
Dean Herbert
|
b65eb33774
|
Fix weird artifacting when the MusicController fades in and out by using a buffered container.
|
2016-11-12 16:44:31 +09:00 |
|
Dean Herbert
|
8d56a881d0
|
Merge pull request #157 from SirCmpwn/string-options
Add TextBoxOption and wire it up
|
2016-11-12 16:11:09 +09:00 |
|
Dean Herbert
|
12bc259071
|
Merge pull request #158 from SirCmpwn/implement-options
Implement ShowUnicode option behavior
|
2016-11-12 16:10:27 +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
|
00cc4278da
|
Split off SidebarButton
|
2016-11-12 01:53:20 -05:00 |
|
Drew DeVault
|
d346e49c4f
|
Update framework
|
2016-11-12 01:44:26 -05:00 |
|
Drew DeVault
|
a8bba445db
|
Move scroll logic into Update
|
2016-11-12 01:44:26 -05:00 |
|
Drew DeVault
|
32196c57af
|
Track the visible section in options
|
2016-11-12 01:44:11 -05:00 |
|
Drew DeVault
|
e535681bb5
|
Update framework
|
2016-11-11 00:21:59 -05:00 |
|
Dean Herbert
|
226d1aa0da
|
Merge pull request #160 from peppy/general-fixes
Update framework.
|
2016-11-11 13:37:56 +09:00 |
|
Dean Herbert
|
ff67b77c5b
|
Merge pull request #154 from peppy/sidebar-toolbar-coexistence
Make options overlay coexist with toolbar.
|
2016-11-11 13:34:08 +09:00 |
|
Dean Herbert
|
27542d9747
|
Merge pull request #151 from SirCmpwn/options-sidebar
Expand the options sidebar on hover
|
2016-11-11 13:33:10 +09:00 |
|
Dean Herbert
|
a0e1513df6
|
Merge branch 'refs/heads/master' into sidebar-toolbar-coexistence
# Conflicts:
# osu.Game/OsuGame.cs
|
2016-11-11 13:30:57 +09:00 |
|
Dean Herbert
|
d589542fc6
|
Update framework.
|
2016-11-11 13:28:51 +09:00 |
|
Drew DeVault
|
d36c8e9203
|
Remove certain options when not running on Windows
|
2016-11-10 21:54:01 -05:00 |
|
Drew DeVault
|
d49b418449
|
Implement ShowUnicode option behavior
|
2016-11-10 21:35:58 -05:00 |
|