Commit Graph

6608 Commits

Author SHA1 Message Date
c97ea3ed60 Post-process beatmap before applying defaults 2018-01-30 15:49:55 +09:00
b4cd8ea716 GlobalKeyBindingContainer -> GlobalActionContainer
Consitent with "FrameworkActionContainer".
2018-01-30 14:54:30 +09:00
ef3fb8c05a InputManager -> Container where KeyBindings are involved 2018-01-30 14:49:12 +09:00
2bae22999d Merge branch 'master' into global-mod-binding 2018-01-29 15:18:11 +09:00
6e0cb1adb3 Remove redundant arguments 2018-01-29 15:05:07 +09:00
ea0ef96557 Merge branch 'master' into global-mod-binding 2018-01-29 15:04:20 +09:00
0879366a30 Merge remote-tracking branch 'upstream/master' into add-r#-annotation-support 2018-01-29 13:52:21 +09:00
247833174c Fix incorrect case on migration file 2018-01-27 23:20:49 +09:00
8f0ab2040f Add Jetbrains.Annotations NuGet package 2018-01-26 12:46:28 +01:00
7852015db3 Remember mod selection when re-entering song select
Removes mod application when exiting back to main menu.

Alternative to #1968.
Closes #1961.
2018-01-26 19:32:57 +09:00
5742e61e68 Merge remote-tracking branch 'origin/master' into ruleset-configs 2018-01-26 15:39:09 +09:00
929a710dfc Merge remote-tracking branch 'peppy/databased-config' into ruleset-configs 2018-01-26 15:37:57 +09:00
81c759f1e1 Make field readonly 2018-01-26 15:17:56 +09:00
7a2420ead2 Fix a couple of regressions 2018-01-26 08:21:09 +09:00
03154dbc63 Fix incorrect initial migration
Also adds variant to settings
2018-01-25 23:41:03 +09:00
80b8780f56 Revert "Remove game-wise settings store for the time being"
This reverts commit 72df2c681b.
2018-01-25 18:08:50 +09:00
fd7d7c3953 Merge branch 'master' into MakeMusicControllerDraggableAgain 2018-01-25 09:01:54 +09:00
b06f60ac3f Merge branch 'master' into fix-settings 2018-01-25 07:17:21 +09:00
284ff226b1 Merge branch 'master' into local-name-fix 2018-01-25 06:50:28 +09:00
51e188401f Make MusicController draggable again 2018-01-25 00:38:22 +03:00
df43b7d84e Merge branch 'master' into fix-settings 2018-01-25 01:21:41 +09:00
1e80908022 Merge branch 'master' into fix-settings 2018-01-25 01:19:44 +09:00
b77f08941c Make mania play the next note's sounds if no note is hit
Fixes #1911.

This follows what osu!stable does, which is rather unfortunate, since it just plays _every_ sound for the note :|.
2018-01-24 20:05:37 +09:00
53c6526b22 Remove unused code file 2018-01-24 18:04:54 +09:00
72df2c681b Remove game-wise settings store for the time being 2018-01-24 18:01:39 +09:00
29e98a58f2 Combine Setting and DatabasedSetting 2018-01-24 17:59:49 +09:00
8d11596b2f Minor cleanups 2018-01-24 17:48:42 +09:00
aa913f6de5 Merge branch 'master' into ruleset-configs 2018-01-24 17:45:47 +09:00
5a00ae36d1 Add database-based configuration for rulesets 2018-01-24 17:45:28 +09:00
7f299b2533 Merge remote-tracking branch 'origin/master' into RefactorPlayerOverlaysInitialization 2018-01-24 17:44:28 +09:00
205d3ed896 fix settings not getting injected 2018-01-23 19:42:21 +01:00
6dfd0b5cc2 Unnecessary because of prior commit. 2018-01-23 10:55:22 -05:00
d12e18d59b merged with master 2018-01-23 10:50:57 -05:00
fa800f0977 fix storyboard path 2018-01-23 18:18:54 +08:00
b197cd56af Allow DI'd OnScreenDisplay to be null 2018-01-23 16:42:31 +09:00
c01f67b0d8 Merge remote-tracking branch 'upstream/master' into ruleset-configs 2018-01-23 16:23:25 +09:00
384dc162b3 Merge branch 'master' into fix-repeat-confusion 2018-01-23 16:06:07 +09:00
52805cd82b Merge branch 'master' into fix-repeat-confusion 2018-01-23 15:22:37 +09:00
fcea12f83d Merge branch 'master' into allow-quick-retry-key 2018-01-23 14:59:15 +09:00
b793c2ec93 Merge branch 'master' into bdl-cache-changes 2018-01-23 14:10:35 +09:00
d37844c068 Clean up off-by-one offsets from repeat-related properties 2018-01-23 13:37:25 +09:00
fa1f4304f6 Remove usings 2018-01-23 13:24:04 +09:00
f823650b10 Allow user choice of the quick retry hotkey 2018-01-23 13:05:07 +09:00
b799dac5ac Merge branch 'master' into mania_stage_fix 2018-01-23 10:55:33 +09:00
d294fcfb0b Merge branch 'master' of https://github.com/ppy/osu into license-year (AppVeyor?) 2018-01-22 18:42:03 +01:00
423559ec6c Update license year. 2018-01-22 18:22:38 +01:00
76eac9057d Merge branch 'master' into mania_stage_fix 2018-01-22 19:06:00 +09:00
95f941163b Merge branch 'master' into direct-show-deleted-sets 2018-01-22 17:08:10 +09:00
73799832ef Merge branch 'master' into direct-show-deleted-sets 2018-01-22 16:54:32 +09:00
a931d6e381 Merge branch 'master' into fix-user-download-cancel 2018-01-22 16:27:26 +09:00