Commit Graph

24820 Commits

Author SHA1 Message Date
e2a55b79ca Refactor scrolling hit object scene
To better demonstrate the desired effect of the fix introduced in
193e41f, refactor TestSceneScrollingHitObjects to contain two tests,
one of which contains the pre-existing controls to test scroll
algorithms, and the other aims to showcase the fix by setting scroll
parameters appropriately.
2019-12-27 16:52:07 +01:00
acef2b50e6 Merge branch 'master' into scrolling-container-origin-adjust 2019-12-27 09:29:06 +09:00
39cfe848e9 Improve notification overlay test robustness (#7368)
Improve notification overlay test robustness
2019-12-27 09:28:48 +09:00
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
193e41f878 Add origin adjustment for hitobject lifetime
Visual inspection of taiko gameplay has shown that hitobjects appeared
on screen only when the origin of the hitobject came into the bounds
of the screen, instead of appearing when any visible part of the
hitobject came into the screen bounds.

This behaviour was due to lifetime calculation being based on the origin
of the hitobject and not taking into account the actual object
dimensions. Adjust the lifetime start of the hitobject by subtracting
the time needed to show the part of the hitobject that should already
be visible on screen when the origin comes into frame.
2019-12-26 20:37:29 +01:00
005ec4b373 Demonstrate bug in scrolling container scene
Modify TestSceneScrollingHitObjects to showcase the effect of origin
choice on object lifetime for all four scrolling directions.
2019-12-26 20:37:06 +01:00
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
3d5561b02e Separate health and score processing components (#7358)
Separate health and score processing components
2019-12-26 23:48:55 +09:00
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
00a36c388c Fix tests 2019-12-26 19:18:39 +09:00
a041f32072 Use cleaner solution via cancellation of older schedule 2019-12-26 19:05:32 +09:00
f005784070 Merge pull request #7360 from huoyaoyuan/mod-typo
Fix name typo of OsuModObjectScaleTween
2019-12-26 18:29:10 +09:00
8903f286ef Fix escape not continuing to results screen 2019-12-26 18:27:48 +09:00
d45556eb6a Remove whitespace 2019-12-26 17:57:16 +09:00
9a013acb26 Fix name typo of OsuModObjectScaleTween 2019-12-26 14:25:41 +08:00
96a4f9ae53 Fix nub position getting offset by size changes 2019-12-26 15:14:19 +09:00
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
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
a47e5aeead Fix sample lookup not working correctly for custom rulesets 2019-12-26 00:51:44 +09:00
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
9b0af901ef Merge branch 'master' into remove-legacy-id 2019-12-25 21:25:33 +09:00
3862bbfa25 Allow ctrl-tabbing on more tab controls (#7319)
Allow ctrl-tabbing on more tab controls
2019-12-25 21:09:27 +09:00
9702cc9809 Merge branch 'master' into remove-legacy-id 2019-12-25 21:01:12 +09:00
41d99df73c Merge branch 'master' into allow-ctrl-tabbing-on-more-tab-controls 2019-12-25 20:49:45 +09:00
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
0e1eca6c0b Simplify/improve beatmap conversion precheck (#7328)
Simplify/improve beatmap conversion precheck
2019-12-25 20:08:47 +09:00
504a55e803 Merge branch 'master' into better-beatmap-conversion 2019-12-25 19:52:06 +09:00
871f594061 Update framework (#7342)
Update framework
2019-12-25 19:51:49 +09:00
4e419cabdc Merge branch 'master' into update-framework 2019-12-25 19:32:17 +09:00
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
81c330ec26 Update framework 2019-12-25 18:51:44 +09:00
38219255c7 Merge branch 'master' into settings-source-value-changed 2019-12-25 18:03:36 +09:00
6d89fe97e9 Merge pull request #7157 from LeNitrous/adjustable-map-settings
Add difficulty adjustment mod
2019-12-25 17:37:37 +09:00
a265a0c7c5 Merge branch 'master' into settings-source-value-changed 2019-12-25 17:23:08 +09:00
d84b319a3a Merge remote-tracking branch 'upstream/master' into adjustable-map-settings 2019-12-25 15:20:17 +09:00
911dc2d98d Fix code inspections 2019-12-25 15:20:10 +09:00
52ba0cd816 Rename method to be more appropriate
Also adds xmldoc.
2019-12-25 15:20:04 +09:00
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
3485ef33a7 Rename tests and add missing coverage 2019-12-25 15:05:08 +09:00
9090d13e05 Simplify tests 2019-12-25 15:01:05 +09:00
783159f7a0 Remove redundant logic 2019-12-25 14:55:22 +09:00
04cbdd9c6c Make test easier to visually examine 2019-12-25 14:55:13 +09:00
145ac8e0b5 Remove redundant setter 2019-12-25 14:55:05 +09:00
f84d98223f Merge branch 'master' into fallback-to-skin-combo-colours 2019-12-25 14:38:09 +09:00
e019ea408a Merge branch 'master' into adjustable-map-settings 2019-12-25 13:16:47 +09:00
89886ceb79 Fix incorrect dialog button animating on requesting quit twice (#7325)
Fix incorrect dialog button animating on requesting quit twice
2019-12-25 13:15:30 +09:00
a5e30859a9 Truncate rich presence status strings to 128 bytes (#7318)
Truncate rich presence status strings to 128 bytes

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-12-25 12:28:44 +09:00
1a7937bcf7 Apply suggested optimisations 2019-12-25 12:04:28 +09:00
36dd0e6998 Make ellipsis length into a static 2019-12-25 11:14:40 +09:00
2a5f661408 Merge branch 'master' into allow-ctrl-tabbing-on-more-tab-controls 2019-12-24 08:29:56 -08:00