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

22585 Commits

Author SHA1 Message Date
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
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
Joehu
102dbd85bd Fix CI errors 2019-09-24 16:48:22 -07:00
Joehu
9861b21440 Remove unnecessary padding/margin 2019-09-24 16:28:40 -07:00
Joehu
cc6030ca14 Update beatmap info wedge tests 2019-09-24 16:23:36 -07:00
Joehu
8efba255c3 Add truncation test 2019-09-24 16:21:08 -07:00
Bartłomiej Dach
8efab559c8 Remove unused using directives 2019-09-25 01:13:42 +02:00
Joehu
7fab1a4337 Truncate long metadata on beatmap info wedge 2019-09-24 16:06:33 -07: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
iiSaLMaN
cde7f49db1 Use direct get and set instead 2019-09-25 01:26:02 +03:00
iiSaLMaN
d013b73d33 Move in-memory logic to a base class 2019-09-25 01:25:05 +03:00
Bartłomiej Dach
09864d7f0e Add bar line visual check in taiko playfield test
Add a step checking alignment of a centre and a bar line in taiko
playfield. Purely visual test without asserts.
2019-09-24 23:02:39 +02:00
Bartłomiej Dach
56b460365b Add bar line anchoring checks in mania test stage
Add steps checking bar line anchoring in the mania Stage visual test
to reproduce the regression in #6215 and prevent it from happening in
the future.
2019-09-24 20:34:09 +02:00
Dean Herbert
4a59e3351e Update beatmap carousel tests code style
Also fixes one issue I spotted in BeatmapCarousel related to incorrectly holding a selection after new sets are loaded.
2019-09-25 02:42:12 +09:00
Dean Herbert
714727dec9
Merge branch 'master' into decrease-disc-rotation-on-rewind 2019-09-24 22:47:25 +09:00
Dean Herbert
03ec0fb27d
Merge branch 'master' into fix-mania-scrolling-speed 2019-09-24 22:20:19 +09:00
Dean Herbert
4271b3bb50
Mark configuration lookup test headless (#6240)
Mark configuration lookup test headless
2019-09-24 19:50:19 +09:00
Dean Herbert
d2b76ec688
Make LabelledTextBox use the new LabelledComponent class (#6188)
Make LabelledTextBox use the new LabelledComponent class

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-09-24 19:37:12 +09:00
Dean Herbert
e78f134b90 Mark configuration lookup test headless 2019-09-24 19:35:42 +09:00
Dean Herbert
f493f1c71d Move new components to v2 namespace 2019-09-24 19:00:26 +09:00
Dean Herbert
551b66ccec
Update framework (#6234)
Update framework

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-09-24 18:54:47 +09:00
Dean Herbert
4dde0e172d
Merge branch 'master' into labelled-textbox-improvements 2019-09-24 18:54:02 +09:00
Dean Herbert
9c4ff6d935
Make LabelledComponent generic (#6237)
Make LabelledComponent generic
2019-09-24 18:52:02 +09:00
smoogipoo
028c958431 Initial implementation of a switch button 2019-09-24 18:39:11 +09:00
Dean Herbert
42b6041763 Move post-update notification logic to UpdateManager base class 2019-09-24 18:37:05 +09:00
Dean Herbert
c226d52b53 Don't automatic download for now 2019-09-24 18:34:54 +09:00
Dan Balasescu
1e70b83fd3
Merge branch 'master' into update-framework 2019-09-24 18:27:38 +09:00