Dan Balasescu
|
e99c05c85e
|
Merge branch 'master' into fix-dialog-popups
|
2018-07-02 17:41:16 +09:00 |
|
Dan Balasescu
|
8f6ec0e7b1
|
Merge pull request #2690 from peppy/add-scroll-speed-keybinds
Add key bindings for scroll speed
|
2018-07-02 17:40:16 +09:00 |
|
Dan Balasescu
|
6abb3fa62c
|
Merge branch 'master' into add-scroll-speed-keybinds
|
2018-07-02 17:26:05 +09:00 |
|
Dan Balasescu
|
0123c76b3d
|
Merge pull request #2924 from peppy/fix-leaderboard-placeholder
Fix leaderboard showing placeholder briefly when entering song select
|
2018-07-02 17:25:31 +09:00 |
|
smoogipoo
|
f0ec117bcb
|
Merge remote-tracking branch 'origin/master' into add-scroll-speed-keybinds
# Conflicts:
# osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
|
2018-07-02 17:21:18 +09:00 |
|
Dan Balasescu
|
118366303c
|
Merge branch 'master' into fix-leaderboard-placeholder
|
2018-07-02 17:17:40 +09:00 |
|
Dean Herbert
|
7c5ad43d22
|
Merge pull request #2934 from smoogipoo/fix-skin-crash
Fix crash if the skin stored in the config doesn't exist anymore
|
2018-07-02 17:07:47 +09:00 |
|
smoogipoo
|
9f405b0894
|
Don't hard-bail if config skin doesn't exist anymore
|
2018-07-02 16:49:07 +09:00 |
|
Dan Balasescu
|
7d256f6595
|
Merge pull request #2885 from peppy/non-null-ruleset
Make BindableRuleset non-null
|
2018-07-02 16:04:31 +09:00 |
|
Dan Balasescu
|
e5947cc969
|
Merge branch 'master' into non-null-ruleset
|
2018-07-02 15:32:55 +09:00 |
|
smoogipoo
|
90d90370c2
|
Use testcase ruleset
|
2018-07-02 15:25:37 +09:00 |
|
Dan Balasescu
|
2b33a3b2eb
|
Merge pull request #2842 from peppy/fix-background-screen-crash
Fix background screens not supporting early-exit condition
|
2018-07-02 15:17:14 +09:00 |
|
smoogipoo
|
b61fe10f62
|
Adapt to IBindables
|
2018-07-02 15:07:18 +09:00 |
|
smoogipoo
|
4070c1a888
|
Merge remote-tracking branch 'origin/master' into non-null-ruleset
# Conflicts:
# osu.Game/Screens/Select/FilterControl.cs
|
2018-07-02 15:05:34 +09:00 |
|
Dan Balasescu
|
2c19790a97
|
Merge branch 'master' into fix-background-screen-crash
|
2018-07-02 15:01:59 +09:00 |
|
Dan Balasescu
|
154e30fe64
|
Merge pull request #2769 from Aergwyn/allow-back-in-player
Standardise handling of "Back" key binding
|
2018-07-02 15:01:23 +09:00 |
|
Dan Balasescu
|
50f561fbc2
|
Merge branch 'master' into allow-back-in-player
|
2018-07-02 14:44:58 +09:00 |
|
Dean Herbert
|
10eccfba39
|
Merge pull request #2882 from UselessToucan/null_coalescing_quickfix
Fix incorrect usages of null coalesce
|
2018-07-02 14:40:16 +09:00 |
|
Dean Herbert
|
831b11ff97
|
Remove unnecessary null checks
|
2018-07-02 14:28:56 +09:00 |
|
Dean Herbert
|
9a54bf6854
|
Revert unnecessary change
|
2018-07-02 14:27:42 +09:00 |
|
Dean Herbert
|
c04bfb96e1
|
Merge remote-tracking branch 'upstream/master' into UselessToucan-null_coalescing_quickfix
|
2018-07-02 14:26:41 +09:00 |
|
Dean Herbert
|
596787c941
|
Standardise input handling of popup dialogs
|
2018-07-02 14:25:12 +09:00 |
|
Dean Herbert
|
6fe768366f
|
Merge pull request #2916 from smoogipoo/beatmap-preprocess
Extend BeatmapProcessor to allow processing hitobjects prior to ApplyDefaults
|
2018-07-02 13:20:54 +09:00 |
|
Dean Herbert
|
812929fa05
|
Merge remote-tracking branch 'upstream/master' into smoogipoo-beatmap-preprocess
|
2018-07-02 13:10:42 +09:00 |
|
Dean Herbert
|
b7893bc994
|
Remove unnecessary comments
|
2018-07-02 13:07:44 +09:00 |
|
Dean Herbert
|
4b89ae2390
|
Merge pull request #2925 from smoogipoo/bindable-maniaaction
Dependency inject the mania column keybind
|
2018-07-02 12:57:50 +09:00 |
|
smoogipoo
|
f007e71c87
|
Retrieve the mania key action through DI
|
2018-07-02 12:31:41 +09:00 |
|
Dean Herbert
|
6a459efd8f
|
Don't allow Key.Escape
|
2018-07-02 11:04:40 +09:00 |
|
Dan Balasescu
|
6ff18bb142
|
Merge pull request #2923 from peppy/fix-ruleset-debug-load
Fix rulesets not loading in debug builds after running a release build
|
2018-07-02 09:42:28 +09:00 |
|
Dean Herbert
|
2c597874bf
|
Fix leaderboard showing placeholder briefly when entering song select
|
2018-07-01 18:17:02 +09:00 |
|
Dean Herbert
|
98fb2e03c0
|
Fix rulesets not loading in debug builds after running a release build
|
2018-07-01 18:03:15 +09:00 |
|
Dean Herbert
|
b1403d837e
|
Add back support for closing focused overlays using back key
|
2018-07-01 15:52:47 +09:00 |
|
Dean Herbert
|
7028767e50
|
Fix regression in HoldFocus behaviour
|
2018-07-01 14:08:34 +09:00 |
|
Dean Herbert
|
00fd5c8dbc
|
Fix regression causing binding settings to fail
|
2018-06-30 23:51:27 +09:00 |
|
Dean Herbert
|
754e072e01
|
Don't handle all actions
|
2018-06-29 23:35:14 +09:00 |
|
Dean Herbert
|
fb90a4924b
|
Only clear text in FocusedTextBox
|
2018-06-29 23:28:15 +09:00 |
|
Dean Herbert
|
7c0547b4ee
|
Replace todo
|
2018-06-29 23:16:05 +09:00 |
|
Dean Herbert
|
b9b1e77172
|
Merge branch 'master' into allow-back-in-player
|
2018-06-29 21:54:18 +09:00 |
|
Dean Herbert
|
109649aa52
|
Merge pull request #2884 from peppy/di-backed-ruleset
Use dependency injection to access the current ruleset
|
2018-06-29 21:35:34 +09:00 |
|
Dean Herbert
|
ad28f88498
|
Fix protection change
|
2018-06-29 21:25:51 +09:00 |
|
Dean Herbert
|
cd47bd2cf8
|
Update framework
|
2018-06-29 21:06:43 +09:00 |
|
Dean Herbert
|
6a80a21078
|
Tidy up escape handling
|
2018-06-29 21:06:38 +09:00 |
|
smoogipoo
|
6d6436c8d3
|
Fix ruleset not getting updated if changed
|
2018-06-29 20:50:39 +09:00 |
|
smoogipoo
|
9187eb8626
|
SongSelect needs to recache as IBindable
|
2018-06-29 20:50:30 +09:00 |
|
Dean Herbert
|
8cf1553fd5
|
Merge remote-tracking branch 'upstream/master' into Aergwyn-allow-back-in-player
|
2018-06-29 20:30:42 +09:00 |
|
Dean Herbert
|
06bd3d4815
|
Use IBindable where possible
|
2018-06-29 20:28:28 +09:00 |
|
Dean Herbert
|
0e649b8866
|
Change logic
|
2018-06-29 20:16:24 +09:00 |
|
Dean Herbert
|
34fef3caba
|
Update exception type
|
2018-06-29 20:13:29 +09:00 |
|
Dean Herbert
|
9fce4eaccf
|
Merge branch 'master' into di-backed-ruleset
|
2018-06-29 19:33:12 +09:00 |
|
Dean Herbert
|
1c32951d4b
|
Ensure toolbar triggers updates to SongSelect's ruleset
|
2018-06-29 19:32:42 +09:00 |
|