1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 09:27:23 +08:00
Commit Graph

22572 Commits

Author SHA1 Message Date
Bartłomiej Dach
2487d4f0f2 Migrate beatmap carousel test to AddUntilStep
Due to non-deterministic test failures in TestSceneBeatmapCarousel,
migrate the checkSelected helper step from AddAssert to AddUntilStep.
This adds more leniency for performance-related issues while still
checking the desired behaviour.
2019-09-28 11:58:27 +02:00
Andrei Zavatski
a8eef0d0c4 Merge remote-tracking branch 'refs/remotes/ppy/master' into bot-profile 2019-09-28 12:34:16 +03:00
Dean Herbert
bfa858c663
Merge pull request #6297 from ppy/dependabot/nuget/Humanizer-2.7.9
Bump Humanizer from 2.7.2 to 2.7.9
2019-09-28 15:09:23 +08:00
iiSaLMaN
fb9f21237e Reset track adjustments on resuming from another screen 2019-09-28 04:18:16 +03:00
dependabot-preview[bot]
3af7c910fb
Bump Humanizer from 2.7.2 to 2.7.9
Bumps [Humanizer](https://github.com/Humanizr/Humanizer) from 2.7.2 to 2.7.9.
- [Release notes](https://github.com/Humanizr/Humanizer/releases)
- [Changelog](https://github.com/Humanizr/Humanizer/blob/master/release_notes.md)
- [Commits](https://github.com/Humanizr/Humanizer/compare/v2.7.2...v2.7.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-27 19:09:07 +00:00
Dan Balasescu
5405102393
Merge pull request #6270 from iiSaLMaN/improve-hold-button-text
Replace menu button text with "press for menu" on 0ms activation delay
2019-09-27 17:47:15 +09:00
Dan Balasescu
8b7f558728
Merge branch 'master' into improve-hold-button-text 2019-09-27 17:35:03 +09:00
Craftplacer
f6b0e46fcd Merge branch 'muted-notification' of https://github.com/Craftplacer/osu into muted-notification 2019-09-27 09:19:48 +02:00
Craftplacer
06c32d52dc Change wrong volume bindable used in test 2019-09-27 09:19:39 +02:00
Andrei Zavatski
4908cb826b Fix line breaks 2019-09-27 09:46:11 +03:00
Andrei Zavatski
475455d7cd Add missing line breaks 2019-09-27 09:32:46 +03:00
Andrei Zavatski
94eacbca5d Fix Bot users have all the profile sections in ProfileOverlay 2019-09-27 09:22:25 +03:00
iiSaLMaN
67bed57cbd Bind value changed event of cursor trail appearence outside BDL
https://github.com/ppy/osu/pull/6270#discussion_r328899728
2019-09-27 08:46:49 +03:00
Dean Herbert
f4f5a7e9c8 Fix test regressions 2019-09-27 13:20:17 +08:00
Dean Herbert
b50ef8ffa4 Allow null NotificationManager 2019-09-27 13:15:33 +08:00
iiSaLMaN
2670a23e6f Assign to field and move to load complete 2019-09-27 08:15:24 +03:00
iiSaLMaN
7904f77cd5 Bind event to activation delay change 2019-09-27 02:59:42 +03:00
Craftplacer
9a31ccd2e3 Add missing test cases for master, track and mute button
This also modifies the reset player method to make it possible to set something before the player is loaded but after the container has loaded.
2019-09-26 14:05:43 +02:00
Dean Herbert
12b027f2c3
Merge pull request #6275 from smoogipoo/comboinformation-bindables
Add bindable versions of IHasComboInformation properties
2019-09-26 19:04:25 +09:00
smoogipoo
e4e6634432 Add slider combo change test 2019-09-26 17:39:26 +09:00
smoogipoo
45f2bcc440 Fix combo bindings not being bound to nested hitobjects 2019-09-26 17:39:19 +09:00
smoogipoo
ea76dd6a9e Add test scene for hitcircles and combo changes 2019-09-26 17:18:16 +09:00
smoogipoo
706e884cc0 Update accent colour on combo index change 2019-09-26 17:13:13 +09:00
smoogipoo
3155a90501 Use bindables for displayed circle piece numbers 2019-09-26 16:58:20 +09:00
smoogipoo
bbf0544a8d Add bindables for IHasComboInformation properties 2019-09-26 16:55:08 +09:00
Dan Balasescu
78503987d8
Merge pull request #6040 from iiSaLMaN/decrease-disc-rotation-on-rewind
Decrease Spinner Disc Rotation on Rewind
2019-09-26 15:59:30 +09:00
Salman Ahmed
0b2a025cb9
Merge branch 'master' into decrease-disc-rotation-on-rewind 2019-09-26 04:52:11 +03:00
iiSaLMaN
c57868795e Remove redundant using directive 2019-09-26 04:38:57 +03:00
iiSaLMaN
d773f0cce1 Override autoplay bool instead of adding it 2019-09-26 04:38:20 +03:00
iiSaLMaN
186ea98217 Wait for track to start running instead 2019-09-26 02:23:18 +03:00
iiSaLMaN
911094e790 Replace menu button text with "press for menu" on 0ms activation delay 2019-09-26 01:42:56 +03:00
Dan Balasescu
3907d859f5
Merge pull request #5501 from nyquillerium/back-button-part-2
Fix BackButton handling input before all other UI elements
2019-09-25 23:36:25 +09:00
Dean Herbert
e2744054c7
Merge branch 'master' into back-button-part-2 2019-09-25 22:46:08 +09:00
Dean Herbert
7d5544460b
Fix mania scrolling speed not including beatmap slider multipli… (#6236)
Fix mania scrolling speed not including beatmap slider multiplier

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-09-25 22:34:46 +09:00
Dean Herbert
45f833ceea Add invocation null checks for safety 2019-09-25 22:14:42 +09:00
Salman Ahmed
3aa9a172d8
Merge branch 'master' into introduce-session-statics 2019-09-25 16:14:39 +03:00
Dean Herbert
42fd323020 Move protected method 2019-09-25 22:13:49 +09:00
Dean Herbert
8c01677e0b Merge remote-tracking branch 'upstream/master' into back-button-part-2 2019-09-25 22:12:00 +09:00
iiSaLMaN
8844d567cb Use bindable setting instead 2019-09-25 15:56:47 +03:00
smoogipoo
244627ff10 Add comment + test for slider multiplier 2019-09-25 20:12:01 +09:00
smoogipoo
ccb5623487 Fix test name 2019-09-25 20:03:03 +09:00
Dean Herbert
f11156c2dc Fix tests not working correctly 2019-09-25 19:30:25 +09:00
smoogipoo
9f77a1ef35 Adjust namespaces 2019-09-25 17:53:08 +09:00
smoogipoo
d32a0acd10 Merge remote-tracking branch 'origin/master' into labelled-switch-button 2019-09-25 17:51:12 +09:00
smoogipoo
c9e39c124e Add a labelled switch button 2019-09-25 17:42:35 +09:00
smoogipoo
261ba5c80a Fix button not transforming correctly in some cases 2019-09-25 17:42:27 +09:00
Dean Herbert
c10c0b960a
Add android build automation via fastlane (#5793)
Add android build automation via fastlane

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-09-25 17:14:14 +09:00
Dan Balasescu
4d1a0d0848
Merge branch 'master' into android-build-automation 2019-09-25 16:56:38 +09:00
Dean Herbert
ff9033f9ac Merge remote-tracking branch 'upstream/master' into muted-notification 2019-09-25 16:47:56 +09:00
Dean Herbert
576ca31499
Fix invalid cursor trail parts being drawn (#6256)
Fix invalid cursor trail parts being drawn
2019-09-25 16:42:05 +09:00