Andrei Zavatski
3feaaa3e4d
Use FillMode.Fit for icons
2019-12-27 05:37:06 +03:00
Andrei Zavatski
dc720dd653
Bump ppy.osu.Game.Resources from 2019.1215.0 to 2019.1227.0
2019-12-27 05:27:36 +03:00
Andrei Zavatski
3ae0564db7
Merge master with conflicts resolved
2019-12-27 05:17:53 +03:00
Dean Herbert
66ae97709a
Update ScreenTitle in line with the new web design ( #7350 )
...
Update ScreenTitle in line with the new web design
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-12-27 11:10:46 +09:00
Dean Herbert
183307d636
Use circle instead of CircularContainer
2019-12-27 10:53:20 +09:00
Andrei Zavatski
bd6e603be3
Add icon for profile header
2019-12-27 04:01:33 +03:00
Andrei Zavatski
25f6517fba
Update dependency
2019-12-27 03:53:01 +03:00
Dean Herbert
39cfe848e9
Improve notification overlay test robustness ( #7368 )
...
Improve notification overlay test robustness
2019-12-27 09:28:48 +09:00
Bartłomiej Dach
fd8c5d7706
Improve notification overlay test robustness
...
Stress testing one of the notification overlay tests by running it 10000
times on repeat has shown that it is susceptible to intermittent
failures due to races between delays and asserts checking the number of
currently progressing notifications and the actual progress update,
which contains a random generation factor.
Replace step sequences checking for notification completion by waiting
and asserting with explicit until steps that don't terminate unless
there are zero progressing notifications.
2019-12-26 23:01:31 +01:00
Andrei Zavatski
3d7c7a1ced
Fix profile title wasn't in lowercase
2019-12-26 22:39:13 +03:00
Andrei Zavatski
e360aa4588
Fix TabControl wasn't on top of everything
2019-12-26 22:16:20 +03:00
Andrei Zavatski
a1c91af095
Update layout of every overlay using OverlayHeader
2019-12-26 22:09:06 +03:00
Andrei Zavatski
647c83e6c8
Add ability to not create content for headers
...
Rather than creating an empty container
2019-12-26 21:21:15 +03:00
Andrei Zavatski
ca3e8db79f
Merge dependency
2019-12-26 21:03:39 +03:00
Andrei Zavatski
2d32fe08ff
Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay_headers_update
2019-12-26 21:02:14 +03:00
Dean Herbert
033bb15500
Fix early-escape not continuing to results screen ( #7362 )
...
Fix early-escape not continuing to results screen
2019-12-26 23:50:21 +09:00
Dean Herbert
3d5561b02e
Separate health and score processing components ( #7358 )
...
Separate health and score processing components
2019-12-26 23:48:55 +09:00
Dean Herbert
8d79934d39
Fix nub position getting offset by size changes ( #7359 )
...
Fix nub position getting offset by size changes
2019-12-26 19:18:52 +09:00
smoogipoo
00a36c388c
Fix tests
2019-12-26 19:18:39 +09:00
Dean Herbert
a041f32072
Use cleaner solution via cancellation of older schedule
2019-12-26 19:05:32 +09:00
Dan Balasescu
f005784070
Merge pull request #7360 from huoyaoyuan/mod-typo
...
Fix name typo of OsuModObjectScaleTween
2019-12-26 18:29:10 +09:00
smoogipoo
8903f286ef
Fix escape not continuing to results screen
2019-12-26 18:27:48 +09:00
smoogipoo
d45556eb6a
Remove whitespace
2019-12-26 17:57:16 +09:00
Huo Yaoyuan
9a013acb26
Fix name typo of OsuModObjectScaleTween
2019-12-26 14:25:41 +08:00
smoogipoo
96a4f9ae53
Fix nub position getting offset by size changes
2019-12-26 15:14:19 +09:00
smoogipoo
7414a6aadd
Merge remote-tracking branch 'huoyaoyuan/master' into health-processor
...
# Conflicts:
# osu.Game.Rulesets.Catch/CatchRuleset.cs
# osu.Game.Rulesets.Mania/ManiaRuleset.cs
# osu.Game.Rulesets.Taiko/TaikoRuleset.cs
2019-12-26 14:56:54 +09:00
Dan Balasescu
5a11fe9a84
Merge pull request #7347 from peppy/fix-sample-lookup
...
Fix sample lookup not working correctly for custom rulesets
2019-12-26 12:40:55 +09:00
Andrei Zavatski
bb4d02a1f8
Fix incorrect icon offset
2019-12-25 22:09:14 +03:00
Andrei Zavatski
c77679e36c
Naming fixes for overlays using ScreenTitle
2019-12-25 21:57:22 +03:00
Andrei Zavatski
3e34155114
Update ScreenTitle with the new design
2019-12-25 21:56:43 +03:00
Dean Herbert
a47e5aeead
Fix sample lookup not working correctly for custom rulesets
2019-12-26 00:51:44 +09:00
Dan Balasescu
19ce3eba28
Merge pull request #7338 from peppy/remove-legacy-id
...
Fix missing ruleset IDs in non-legacy rulesets
2019-12-25 21:41:46 +09:00
Dean Herbert
9b0af901ef
Merge branch 'master' into remove-legacy-id
2019-12-25 21:25:33 +09:00
Dean Herbert
3862bbfa25
Allow ctrl-tabbing on more tab controls ( #7319 )
...
Allow ctrl-tabbing on more tab controls
2019-12-25 21:09:27 +09:00
Dan Balasescu
9702cc9809
Merge branch 'master' into remove-legacy-id
2019-12-25 21:01:12 +09:00
Dean Herbert
41d99df73c
Merge branch 'master' into allow-ctrl-tabbing-on-more-tab-controls
2019-12-25 20:49:45 +09:00
Dean Herbert
1b1c255394
Make the Easy mod's extra life count customizable ( #7331 )
...
Make the Easy mod's extra life count customizable
2019-12-25 20:19:08 +09:00
Dean Herbert
0e1eca6c0b
Simplify/improve beatmap conversion precheck ( #7328 )
...
Simplify/improve beatmap conversion precheck
2019-12-25 20:08:47 +09:00
Dean Herbert
504a55e803
Merge branch 'master' into better-beatmap-conversion
2019-12-25 19:52:06 +09:00
Dean Herbert
871f594061
Update framework ( #7342 )
...
Update framework
2019-12-25 19:51:49 +09:00
Dean Herbert
4e419cabdc
Merge branch 'master' into update-framework
2019-12-25 19:32:17 +09:00
Dan Balasescu
c63963fbd9
Merge pull request #7303 from peppy/settings-source-value-changed
...
Update song select statistics when mod changes settings
2019-12-25 19:16:42 +09:00
Dean Herbert
81c330ec26
Update framework
2019-12-25 18:51:44 +09:00
Dan Balasescu
38219255c7
Merge branch 'master' into settings-source-value-changed
2019-12-25 18:03:36 +09:00
Dean Herbert
6d89fe97e9
Merge pull request #7157 from LeNitrous/adjustable-map-settings
...
Add difficulty adjustment mod
2019-12-25 17:37:37 +09:00
Dan Balasescu
a265a0c7c5
Merge branch 'master' into settings-source-value-changed
2019-12-25 17:23:08 +09:00
Dean Herbert
d84b319a3a
Merge remote-tracking branch 'upstream/master' into adjustable-map-settings
2019-12-25 15:20:17 +09:00
Dean Herbert
911dc2d98d
Fix code inspections
2019-12-25 15:20:10 +09:00
Dean Herbert
52ba0cd816
Rename method to be more appropriate
...
Also adds xmldoc.
2019-12-25 15:20:04 +09:00
Dean Herbert
1455b9e796
Fallback to current skin combo colours if none provided on beat… ( #6449 )
...
Fallback to current skin combo colours if none provided on beatmap skin
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-12-25 15:19:24 +09:00
