Commit Graph

10719 Commits

Author SHA1 Message Date
1871e8bb2c Merge branch 'master' into master 2019-03-01 21:22:34 +09:00
c01990d005 Fix callback potentially not getting fired 2019-03-01 20:52:34 +09:00
431d439500 Make attribute public 2019-03-01 20:15:09 +09:00
9885913fff Fix iOS builds not being able to read their deploy version 2019-03-01 20:01:16 +09:00
19ce1f2869 Remove second conditional 2019-03-01 13:43:16 +09:00
952c435f3c Merge branch 'master' into ensure-focused-overlay-dim 2019-03-01 13:31:56 +09:00
7583279e08 Remove unnecessary precondition 2019-03-01 13:29:02 +09:00
5d1eacf1c1 Ensure all OsuFocusedOverlayContainers contribute to screen fading 2019-03-01 12:20:31 +09:00
b97b12debf Merge branch 'master' into UserDimLogic 2019-03-01 12:11:53 +09:00
f6303a2855 Fix songselect blur potentially never being applied 2019-03-01 11:52:51 +09:00
6bccdd50ef Merge branch 'master' into UserIDDBStore 2019-03-01 11:07:30 +09:00
49cbaecf4c Update licence header 2019-03-01 10:52:53 +09:00
0300f0d665 Ensure deletions are correct without relying on FK cascade rule 2019-03-01 10:47:45 +09:00
d4041d5d42 Automate includes of files in ArchiveModelManager use cases 2019-03-01 10:25:21 +09:00
acc2113027 Make operation run asynchronously 2019-03-01 10:09:03 +09:00
798bc1306b Merge remote-tracking branch 'upstream/master' into m2307-master
# Conflicts:
#	osu.Game/Screens/Select/SongSelect.cs
2019-03-01 10:08:35 +09:00
80b5f1c523 Fix code formatting issues 2019-03-01 09:49:36 +09:00
67928ac1fe Remove pointless check 2019-03-01 09:49:11 +09:00
aad53fa861 Merge branch 'master' into show-supported-window-modes 2019-02-28 22:47:33 +09:00
f1912a281c Use Count property 2019-02-28 21:46:49 +09:00
dfb3fef9e1 Hide WindowMode dropdown if only one is selectable 2019-02-28 21:38:55 +09:00
b159e3ec31 Fix headless tests 2019-02-28 20:39:55 +09:00
09e1e3bab6 Merge branch 'master' into UserDimLogic 2019-02-28 20:38:09 +09:00
30e820d107 Fix storyboard potentially being loaded many times 2019-02-28 20:36:00 +09:00
53eb0e7e4e More formatting fixes 2019-02-28 20:30:23 +09:00
86913e720f Remove extra space 2019-02-28 20:24:09 +09:00
6861163226 Remove pointless method 2019-02-28 20:21:27 +09:00
94199e628c Only display SupportedWindowModes in settings 2019-02-28 20:20:12 +09:00
c5270dd577 Remove unnecessary using 2019-02-28 20:17:00 +09:00
a716e5b265 Merge pull request #4365 from nekodex/beatmapsetoverlay-bindables
Refactor BeatmapSetOverlay to use chained bindables
2019-02-28 20:08:44 +09:00
e3338e94d1 Make test cases more compact, add two way toggles 2019-02-28 20:01:15 +09:00
1f273a4c3a Use local variables where appropriate 2019-02-28 19:58:48 +09:00
15c092b0dd Merge branch 'master' into fix-potential-crossthread 2019-02-28 19:57:35 +09:00
4ad3d76b13 Merge branch 'master' into beatmapsetoverlay-bindables 2019-02-28 19:19:36 +09:00
d10ad3c8a7 Fix warnings 2019-02-28 18:59:05 +09:00
5b53cf0961 Merge branch 'master' into hide-desktop-only-elements 2019-02-28 18:50:16 +09:00
48fcaf34e6 Update framework 2019-02-28 18:49:59 +09:00
b7f7174055 Refactor BeatmapSetOverlay to use chained bindables instead of accessors to distribute changes 2019-02-28 18:46:28 +09:00
99812bd448 Apply suggestions from code review
Co-Authored-By: nyquillerium <nyquill@ppy.sh>
2019-02-28 18:25:58 +09:00
a37445a938 Merge branch 'master' into better-mp-songselect-deletion-handling 2019-02-28 17:35:08 +09:00
921346d303 Rename a few more members 2019-02-28 17:27:28 +09:00
b2872b47d0 Merge branch 'master' into UserDimLogic 2019-02-28 17:18:04 +09:00
951b95ff78 Fix potential race condition 2019-02-28 17:17:57 +09:00
9f9b2b1902 Remove redundant setters 2019-02-28 17:13:25 +09:00
4c8aa65200 private + renaming 2019-02-28 17:02:45 +09:00
69b1c76dce Actually implement blurring fix 2019-02-28 16:51:17 +09:00
93a4229ba6 Merge pull request #4357 from Joehuu/toquantity-1
Use ToQuantity instead for words with number prefixes
2019-02-28 16:37:36 +09:00
8cf83e2f4a Fix the check of beatmapset local availability 2019-02-28 16:14:50 +09:00
3a1066ff02 Merge branch 'master' into toquantity-1 2019-02-28 15:57:51 +09:00
6e821a426d Fix restoration of enabled mods when cancelling song select 2019-02-28 15:06:11 +09:00