Commit Graph

17229 Commits

Author SHA1 Message Date
63746876c2 typo 2018-07-02 16:09:33 +09:00
341ffa4667 Fix MenuCursor crash 2018-07-02 16:07:52 +09:00
7d256f6595 Merge pull request #2885 from peppy/non-null-ruleset
Make BindableRuleset non-null
2018-07-02 16:04:31 +09:00
e5947cc969 Merge branch 'master' into non-null-ruleset 2018-07-02 15:32:55 +09:00
90d90370c2 Use testcase ruleset 2018-07-02 15:25:37 +09:00
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
b61fe10f62 Adapt to IBindables 2018-07-02 15:07:18 +09:00
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
2c19790a97 Merge branch 'master' into fix-background-screen-crash 2018-07-02 15:01:59 +09:00
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
50f561fbc2 Merge branch 'master' into allow-back-in-player 2018-07-02 14:44:58 +09:00
c1b8799253 Add simple testcase 2018-07-02 14:40:43 +09:00
10eccfba39 Merge pull request #2882 from UselessToucan/null_coalescing_quickfix
Fix incorrect usages of null coalesce
2018-07-02 14:40:16 +09:00
189194ee8d Don't include empty namespace in sample lookup 2018-07-02 14:35:03 +09:00
7f832e34c0 Reorder sample bank property setters 2018-07-02 14:29:18 +09:00
831b11ff97 Remove unnecessary null checks 2018-07-02 14:28:56 +09:00
9a54bf6854 Revert unnecessary change 2018-07-02 14:27:42 +09:00
c04bfb96e1 Merge remote-tracking branch 'upstream/master' into UselessToucan-null_coalescing_quickfix 2018-07-02 14:26:41 +09:00
596787c941 Standardise input handling of popup dialogs 2018-07-02 14:25:12 +09:00
73fac2115a Implement hitobject sample files 2018-07-02 14:20:35 +09:00
310c4a7d6c Make SampleInfo choose its own lookup name 2018-07-02 14:18:41 +09:00
8b0c6a4c85 Make SampleControlPoint clone the existing SampleInfo 2018-07-02 14:17:19 +09:00
37495c34fa Fix possible nullreference 2018-07-02 13:51:47 +09:00
34f33a08cb Merge branch 'master' into Private_Messages 2018-07-02 06:47:33 +02:00
b664d3ef81 Fix time being a part of controlpoint change comparisons 2018-07-02 13:34:25 +09:00
c78bfbfa55 Fix failing json conversion testcases 2018-07-02 13:34:19 +09:00
aea50e770b Use .Equals everywhere 2018-07-02 13:34:14 +09:00
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
812929fa05 Merge remote-tracking branch 'upstream/master' into smoogipoo-beatmap-preprocess 2018-07-02 13:10:42 +09:00
b7893bc994 Remove unnecessary comments 2018-07-02 13:07:44 +09:00
4b89ae2390 Merge pull request #2925 from smoogipoo/bindable-maniaaction
Dependency inject the mania column keybind
2018-07-02 12:57:50 +09:00
9f85c55915 Merge remote-tracking branch 'origin/master' into legacy-custom-banks 2018-07-02 12:34:51 +09:00
f007e71c87 Retrieve the mania key action through DI 2018-07-02 12:31:41 +09:00
6a459efd8f Don't allow Key.Escape 2018-07-02 11:04:40 +09:00
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
2c597874bf Fix leaderboard showing placeholder briefly when entering song select 2018-07-01 18:17:02 +09:00
98fb2e03c0 Fix rulesets not loading in debug builds after running a release build 2018-07-01 18:03:15 +09:00
b1403d837e Add back support for closing focused overlays using back key 2018-07-01 15:52:47 +09:00
7028767e50 Fix regression in HoldFocus behaviour 2018-07-01 14:08:34 +09:00
4af45b7518 Do not display resolutions lower than 800x600 2018-06-30 20:06:11 +03:00
00fd5c8dbc Fix regression causing binding settings to fail 2018-06-30 23:51:27 +09:00
621f4218a3 Merge branch 'master' into Private_Messages 2018-06-30 16:17:56 +02:00
101f18821a Merge remote-tracking branch 'ppy/master' into select_resolution_in_fullscreen_mode 2018-06-30 17:05:25 +03:00
754e072e01 Don't handle all actions 2018-06-29 23:35:14 +09:00
fb90a4924b Only clear text in FocusedTextBox 2018-06-29 23:28:15 +09:00
7c0547b4ee Replace todo 2018-06-29 23:16:05 +09:00
b9b1e77172 Merge branch 'master' into allow-back-in-player 2018-06-29 21:54:18 +09:00
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
ad28f88498 Fix protection change 2018-06-29 21:25:51 +09:00
cd47bd2cf8 Update framework 2018-06-29 21:06:43 +09:00