1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 15:32:55 +08:00
Commit Graph

22429 Commits

Author SHA1 Message Date
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
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
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
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
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
576ca31499
Fix invalid cursor trail parts being drawn (#6256)
Fix invalid cursor trail parts being drawn
2019-09-25 16:42:05 +09:00
Dean Herbert
3bd0fc2947 Merge remote-tracking branch 'upstream/master' into android-build-automation 2019-09-25 16:33:36 +09:00
smoogipoo
74b2e99247 Fix invalid cursor trail parts being drawn 2019-09-25 16:25:15 +09:00
Dan Balasescu
fbf04e4129
Merge pull request #6243 from peppy/improve-carousel-tests
Update beatmap carousel tests code style
2019-09-25 16:14:32 +09:00
Dan Balasescu
0eff9aa5e9
Merge branch 'master' into improve-carousel-tests 2019-09-25 15:55:11 +09:00
Dan Balasescu
47a395d6f2
Merge pull request #6238 from peppy/abstract-update-manager
Move post-update notification logic to UpdateManager base class
2019-09-25 15:55:01 +09:00
Dan Balasescu
213488a25e
Merge branch 'master' into abstract-update-manager 2019-09-25 15:41:45 +09:00
Dean Herbert
8fd1a45a42 Change intro displayed for tests
As the triangles intro relies on the audio track's clock advancing, we can't use it just yet (CI server has no audio device). This is a temporary workaround for that shortcoming.
2019-09-25 15:29:02 +09:00
Dean Herbert
c83db94eb7 Use isolated storage/api 2019-09-25 15:00:08 +09:00
Dean Herbert
654b815b36 Merge remote-tracking branch 'upstream/master' into back-button-part-2 2019-09-25 14:38:39 +09:00
Dean Herbert
2089f6fc42 Fix potential test fail case 2019-09-25 14:28:35 +09:00
Dean Herbert
bb1289e83c
Merge branch 'master' into improve-carousel-tests 2019-09-25 14:24:28 +09:00
Dan Balasescu
e3be02a76b
Merge pull request #6249 from bdach/fix-beat-bar-alignment
Fix mania bar line alignment
2019-09-25 12:07:23 +09:00
Bartłomiej Dach
8efab559c8 Remove unused using directives 2019-09-25 01:13:42 +02:00
Bartłomiej Dach
9323df26a1 Decouple bar line hitobjects from generator
Introduce an IBarLine interface, which together with generic constraints
helps decouple BarLineGenerator from the actual hitobject types it
creates. Thanks to this, all rulesets that want bar lines can provide
an implementation of IBarLine that also derives from the base hitobject
class.

This allows DrawableBarLines in taiko and mania to be migrated back to
DrawableTaikoHitObject and DrawableManiaHitObject base classes
respectively. This in turn resolves #6215 without code duplication,
since the missing anchoring application is now done in mania's
DrawableBarLine through deriving from DrawableManiaHitObject.
2019-09-25 00:36:27 +02:00