1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-21 20:07:25 +08:00
Commit Graph

16973 Commits

Author SHA1 Message Date
Dean Herbert
deb0c06021
Merge pull request #4366 from andy840119/andy840119/_fix_duel_stage_beatmap
Add support for dual (co-op) mode in mania beatmap
2019-03-01 14:42:46 +09:00
smoogipoo
c722ea0299 Add space 2019-03-01 14:30:58 +09:00
Dan Balasescu
cf83be1cd0
Merge pull request #4373 from swoolcock/ensure-focused-overlay-dim
Ensure all OsuFocusedOverlayContainers contribute to screen fading
2019-03-01 13:39:52 +09:00
Dan Balasescu
952c435f3c
Merge branch 'master' into ensure-focused-overlay-dim 2019-03-01 13:31:56 +09:00
smoogipoo
7583279e08 Remove unnecessary precondition 2019-03-01 13:29:02 +09:00
Dean Herbert
06ae9d40cc
Merge pull request #4371 from nyquillerium/UserDimLogic
Fix song select blur potentially never being applied
2019-03-01 12:52:37 +09:00
Shane Woolcock
5d1eacf1c1 Ensure all OsuFocusedOverlayContainers contribute to screen fading 2019-03-01 12:20:31 +09:00
David Zhao
b97b12debf
Merge branch 'master' into UserDimLogic 2019-03-01 12:11:53 +09:00
David Zhao
f6303a2855 Fix songselect blur potentially never being applied 2019-03-01 11:52:51 +09:00
Dean Herbert
c237c94a76
Merge pull request #4317 from nyquillerium/UserIDDBStore
Add UserID for databased scores where possible
2019-03-01 11:15:19 +09:00
Dean Herbert
6bccdd50ef
Merge branch 'master' into UserIDDBStore 2019-03-01 11:07:30 +09:00
Dean Herbert
f4697a88e7
Merge pull request #4367 from swoolcock/show-supported-window-modes
Only display SupportedWindowModes in settings
2019-03-01 11:06:56 +09:00
andy840119
e634475bf4 IsDuel -> Dual 2019-02-28 23:40:03 +09:00
Dean Herbert
aad53fa861
Merge branch 'master' into show-supported-window-modes 2019-02-28 22:47:33 +09:00
Shane Woolcock
f1912a281c Use Count property 2019-02-28 21:46:49 +09:00
Shane Woolcock
dfb3fef9e1 Hide WindowMode dropdown if only one is selectable 2019-02-28 21:38:55 +09:00
Dean Herbert
c5646ece97
Merge pull request #4257 from nyquillerium/UserDimLogic
Move user dim logic into new UserDimContainer
2019-02-28 20:52:32 +09:00
Shane Woolcock
b159e3ec31 Fix headless tests 2019-02-28 20:39:55 +09:00
Dean Herbert
09e1e3bab6
Merge branch 'master' into UserDimLogic 2019-02-28 20:38:09 +09:00
Dean Herbert
30e820d107 Fix storyboard potentially being loaded many times 2019-02-28 20:36:00 +09:00
Dean Herbert
53eb0e7e4e More formatting fixes 2019-02-28 20:30:23 +09:00
Dean Herbert
86913e720f Remove extra space 2019-02-28 20:24:09 +09:00
Dean Herbert
6861163226 Remove pointless method 2019-02-28 20:21:27 +09:00
Shane Woolcock
94199e628c Only display SupportedWindowModes in settings 2019-02-28 20:20:12 +09:00
Dean Herbert
c5270dd577 Remove unnecessary using 2019-02-28 20:17:00 +09:00
Dean Herbert
a716e5b265
Merge pull request #4365 from nekodex/beatmapsetoverlay-bindables
Refactor BeatmapSetOverlay to use chained bindables
2019-02-28 20:08:44 +09:00
Dean Herbert
ace83da1c8
Merge pull request #4364 from smoogipoo/fix-potential-crossthread
Fix race condition during game load + disposal
2019-02-28 20:06:22 +09:00
David Zhao
e3338e94d1 Make test cases more compact, add two way toggles 2019-02-28 20:01:15 +09:00
Jamie Taylor
1f273a4c3a
Use local variables where appropriate 2019-02-28 19:58:48 +09:00
Dean Herbert
15c092b0dd
Merge branch 'master' into fix-potential-crossthread 2019-02-28 19:57:35 +09:00
為什麼
0e30bf902d
Merge branch 'master' into andy840119/_fix_duel_stage_beatmap 2019-02-28 18:23:16 +08:00
Dean Herbert
4ad3d76b13
Merge branch 'master' into beatmapsetoverlay-bindables 2019-02-28 19:19:36 +09:00
Dean Herbert
79ec85c7dd
Merge pull request #4353 from swoolcock/hide-desktop-only-elements
Conditionally add some UI elements only on desktop
2019-02-28 19:18:04 +09:00
andy840119
4b2be4612f support duel mode in mania beatmap 2019-02-28 19:07:43 +09:00
Dean Herbert
d10ad3c8a7 Fix warnings 2019-02-28 18:59:05 +09:00
Dean Herbert
5b53cf0961
Merge branch 'master' into hide-desktop-only-elements 2019-02-28 18:50:16 +09:00
Dean Herbert
48fcaf34e6 Update framework 2019-02-28 18:49:59 +09:00
Jamie Taylor
b7f7174055
Refactor BeatmapSetOverlay to use chained bindables instead of accessors to distribute changes 2019-02-28 18:46:28 +09:00
David Zhao
19d529c1c8 Move test steps into setup 2019-02-28 18:26:41 +09:00
Dan Balasescu
99812bd448
Apply suggestions from code review
Co-Authored-By: nyquillerium <nyquill@ppy.sh>
2019-02-28 18:25:58 +09:00
Dan Balasescu
bfe3d5708d
Merge pull request #4341 from nekodex/better-mp-songselect-deletion-handling
Better beatmap deletion handling while in multiplayer song select
2019-02-28 17:50:47 +09:00
Dan Balasescu
a37445a938
Merge branch 'master' into better-mp-songselect-deletion-handling 2019-02-28 17:35:08 +09:00
smoogipoo
921346d303 Rename a few more members 2019-02-28 17:27:28 +09:00
Dean Herbert
b2872b47d0
Merge branch 'master' into UserDimLogic 2019-02-28 17:18:04 +09:00
smoogipoo
951b95ff78 Fix potential race condition 2019-02-28 17:17:57 +09:00
David Zhao
9f9b2b1902 Remove redundant setters 2019-02-28 17:13:25 +09:00
Jamie Taylor
4c8aa65200
private + renaming 2019-02-28 17:02:45 +09:00
David Zhao
69b1c76dce Actually implement blurring fix 2019-02-28 16:51:17 +09:00
Dean Herbert
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
Dan Balasescu
1eafc9d4c1
Merge pull request #4362 from nekodex/fix-download-button
Fix download buttons displaying wrong state for deleted beatmapsets
2019-02-28 16:33:06 +09:00