Dean Herbert
a6516e3be5
Merge branch 'master' into scroll-to-20
2021-01-21 14:28:17 +09:00
Andrei Zavatski
65ece1aa72
Mark OverlayHeader as NotNull in FullscreenOverlay
2021-01-21 07:50:41 +03:00
Dean Herbert
7c4a072568
Merge branch 'master' into scroll-to-20
2021-01-21 13:48:26 +09:00
Andrei Zavatski
da0066e7b0
Merge master with conflicts resolved
2021-01-21 07:30:47 +03:00
Dan Balasescu
c3675293fa
Merge branch 'master' into beatmapset-refactor
2021-01-21 12:38:34 +09:00
Dan Balasescu
95f52ae054
Merge pull request #11536 from rednir/sort-skins-alphabetically
...
Sort SkinSection in alphabetical order
2021-01-20 21:49:31 +09:00
Dan Balasescu
455383c3c0
Merge pull request #11528 from peppy/fix-autoplay-in-multiplayer
...
Fix multiplayer mod select showing autoplay as a choice
2021-01-20 21:49:16 +09:00
Dan Balasescu
12f2067357
Merge branch 'master' into sort-skins-alphabetically
2021-01-20 21:15:16 +09:00
Andrei Zavatski
2ca3ccad06
Move all the content to BeatmapSetHeaderContent drawable
2021-01-20 04:56:46 +03:00
Andrei Zavatski
94fee3800d
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmapset-refactor
2021-01-20 04:32:56 +03:00
Bartłomiej Dach
3b49b7461e
Schedule entire operation for safety
...
Also removes a redundant list copy.
2021-01-19 19:35:53 +01:00
Bartłomiej Dach
78e590d25d
Refactor skin sorting method
...
* Rename to `sortUserSkins` to convey meaning better.
* Sort in-place instead of slicing the list.
* Change to `void` to avoid misleading users that the method returns
a new list instance.
* Fix typo in comment.
2021-01-19 18:36:42 +01:00
Bartłomiej Dach
b00c6a1d60
Make first non-default skin index a property
...
The previous code was very brittle - it was not always updating
properly, and seems to have worked either by a carefully crafted set of
circumstances, or just plain coincidence.
Having this be a get-only property avoids potential error in the future
caused by not updating the index properly, at the expense of an added
linear lookup.
2021-01-19 18:31:37 +01:00
rednir
206a0b8bac
Fix firstNonDefault staying as -1
2021-01-19 16:55:50 +00:00
rednir
a880b8d21d
Satisfy AppVeyor
2021-01-19 16:11:16 +00:00
rednir
b265d2dab4
Remove another whitespace
2021-01-19 14:16:22 +00:00
rednir
1d4c813ff6
Merge branch 'sort-skins-alphabetically' of https://github.com/rednir/osu into sort-skins-alphabetically
2021-01-19 14:03:31 +00:00
rednir
31e61326e1
Only user skins are sorted
2021-01-19 14:00:17 +00:00
rednir
f1894a8bac
fixed itemUpdated()
2021-01-19 12:17:56 +00:00
smoogipoo
de9d075f94
Initial sample + samplechannel rework
2021-01-19 17:11:40 +09:00
Andrei Zavatski
f0add0a7cf
Make BeatmapSetOverlay use OverlayHeader
2021-01-19 01:34:37 +03:00
rednir
0b65c0cd25
Remove whitespace
2021-01-18 20:17:42 +00:00
rednir
da89426a3b
Merge branch 'master' of https://github.com/ppy/osu into sort-skins-alphabetically
2021-01-18 20:09:15 +00:00
rednir
7476cb3047
Sort SkinSection in alphabetical order
2021-01-18 19:51:42 +00:00
Andrei Zavatski
c6b0f3c247
Implement TabbableOnlineOverlay component
2021-01-18 21:22:50 +03:00
Dean Herbert
0560eb4120
Reduce final fill alpha of main menu confirm-to-exit
2021-01-18 18:22:21 +09:00
Dean Herbert
0b165dce4b
Fix multiplayer mod select showing autoplay as a choice
2021-01-18 17:50:32 +09:00
Andrei Zavatski
6e34ab5d15
Rename WebOverlay to OnlineOverlay
2021-01-18 11:13:38 +03:00
Andrei Zavatski
b27b18f70f
Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-header-refactor
2021-01-18 11:10:55 +03:00
Salman Ahmed
bd44bf8c0b
Extract disabling progress bar user-interactivity
2021-01-18 10:51:39 +03:00
Andrei Zavatski
27ffc98445
Implement WebOverlay component
2021-01-18 10:48:12 +03:00
Dean Herbert
1364de1166
Merge branch 'master' into beatmap-colour-setting
2021-01-18 16:07:46 +09:00
Salman Ahmed
d93a853dfd
Enforce float type in the download progress path instead
2021-01-17 21:16:48 +03:00
Dean Herbert
5278cad393
Reword setting to make more sense
2021-01-17 22:42:48 +09:00
Dean Herbert
5fd644fc57
Unify variable names
2021-01-17 22:42:48 +09:00
Dean Herbert
addd463d26
Merge branch 'master' into explicit-search-control
2021-01-17 21:44:25 +09:00
Dean Herbert
edb6d3907b
Merge pull request #11472 from frenzibyte/explicit-beatmap-markers
...
Add explicit content markers to beatmap panels and overlay
2021-01-17 21:44:10 +09:00
Bartłomiej Dach
816cc7a59b
Adjust explicit label spacing on beatmap set overlay
2021-01-17 00:35:23 +01:00
Salman Ahmed
adb2605d5d
Enforce double type in the download progress path
...
Wasn't sure where to exactly put this, or whether to split it, but it's very small change to worry about, so I guess it's fine being here
2021-01-17 00:12:14 +03:00
Dean Herbert
b5e784ed42
Fix possibility of crash when selecting a random skin during skin import
2021-01-15 16:34:28 +09:00
Salman Ahmed
dc8e38cf4d
Remove pointless inline comment
2021-01-15 07:20:13 +03:00
Salman Ahmed
6281c1086a
Space out explicit marker in beatmap overlay
2021-01-14 05:41:09 +03:00
Salman Ahmed
abf718242b
Make explicit marker font semi-bold
2021-01-14 05:40:43 +03:00
Salman Ahmed
1f12b2bd09
Rename download state Downloaded to Importing
2021-01-13 18:04:53 +03:00
Salman Ahmed
43daa7c7c0
Use Colour2 of orange theme for explicit pill
2021-01-13 17:07:42 +03:00
Salman Ahmed
e275dd02e0
Create static colour properties for now
2021-01-13 17:07:11 +03:00
Salman Ahmed
9d59d784f8
Add Colour{1-4} properties to OverlayColourProvider
2021-01-13 17:06:44 +03:00
Salman Ahmed
a5f99ed8e6
Merge branch 'explicit-beatmap-markers' into explicit-search-control
2021-01-13 12:53:57 +03:00
Salman Ahmed
78631323ba
Add explicit pill to beatmap overlay
2021-01-13 12:13:14 +03:00
Salman Ahmed
f6637eec36
Add explicit pill to beatmap panels
2021-01-13 12:13:14 +03:00
