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

22432 Commits

Author SHA1 Message Date
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
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
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
smoogipoo
6b702eb6de Update with generic labelledcomponent 2019-09-24 18:25:17 +09:00
smoogipoo
5212c50654 Merge branch 'generic-labelledcomponent' into labelled-textbox-improvements 2019-09-24 18:23:01 +09:00
smoogipoo
df692b091c Make LabelledComponent generic 2019-09-24 18:22:02 +09:00
Dean Herbert
84d9f98ff1 fixup! Move post-update notification logic to UpdateManager base class 2019-09-24 18:15:57 +09:00
Dean Herbert
07ec163daa Fix version fallback logic 2019-09-24 18:12:04 +09:00
Dean Herbert
1c474de0ed Move post-update notification logic to UpdateManager base class 2019-09-24 18:03:05 +09:00
Dean Herbert
c6fe8587e3 Read build from VersionCode 2019-09-24 17:45:45 +09:00
Dan Balasescu
79b64bdaa1
Merge pull request #6211 from peppy/tournament-setup
Add an onboarding screen for tournament client
2019-09-24 17:44:45 +09:00
Dan Balasescu
45015fc4ba
Merge branch 'master' into tournament-setup 2019-09-24 17:27:17 +09:00
smoogipoo
4abe0473b9 Fix relative beat length not considering slider multiplier 2019-09-24 16:49:42 +09:00
smoogipoo
af0c15a93c Fix initial hitobject states not being recomputed correctly 2019-09-24 16:48:39 +09:00
smoogipoo
75cceb9e30 Fix LifetimeChanged being invoked before lifetime is set 2019-09-24 16:47:34 +09:00
Dean Herbert
315dcc8158 Update fastlane 2019-09-24 16:42:05 +09:00
Dean Herbert
d08fc56370 Add apk download link in README 2019-09-24 16:33:48 +09:00
Dean Herbert
9ea876eb36 Merge remote-tracking branch 'upstream/dependabot/nuget/ppy.osu.Framework-2019.924.0' into update-framework 2019-09-24 16:23:06 +09:00
Dean Herbert
6b4d45c36a Merge remote-tracking branch 'upstream/dependabot/nuget/ppy.osu.Framework.Android-2019.924.0' into update-framework 2019-09-24 16:22:54 +09:00
Dean Herbert
1860c2f9ce Update framework 2019-09-24 16:22:30 +09:00
Dean Herbert
60c9519095 Add proper signing and github release support 2019-09-24 16:21:37 +09:00
Dean Herbert
e97aa60487 Merge remote-tracking branch 'upstream/master' into android-build-automation 2019-09-24 16:18:35 +09:00
dependabot-preview[bot]
50efb4414f
Bump ppy.osu.Framework.Android from 2019.921.0 to 2019.924.0
Bumps [ppy.osu.Framework.Android](https://github.com/ppy/osu-framework) from 2019.921.0 to 2019.924.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.921.0...2019.924.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-24 06:35:31 +00:00
dependabot-preview[bot]
6e619fbd71
Bump ppy.osu.Framework from 2019.921.0 to 2019.924.0
Bumps [ppy.osu.Framework](https://github.com/ppy/osu-framework) from 2019.921.0 to 2019.924.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.921.0...2019.924.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-24 06:35:04 +00:00
Dan Balasescu
9219aadf76
Merge pull request #6210 from peppy/menu-key-support
Allow top-level menu key pressed to progress the osu! logo
2019-09-24 15:21:34 +09:00
Dan Balasescu
b67b594036
Merge branch 'master' into menu-key-support 2019-09-24 15:09:38 +09:00
smoogipoo
4555ecc5e0 Check for exact key 2019-09-24 15:09:08 +09:00
Dan Balasescu
ac1abfc9c5
Merge pull request #6220 from EVAST9919/fix-changelog-margin
Fix incorrect icon margin in ChangelogOverlay
2019-09-24 13:49:28 +09:00
Dan Balasescu
615e300bc9
Merge branch 'master' into fix-changelog-margin 2019-09-24 13:39:17 +09:00
Dan Balasescu
13f922211f
Merge branch 'master' into decrease-disc-rotation-on-rewind 2019-09-24 12:58:27 +09:00
Dean Herbert
4705b5aff8
Bump System.IO.Packaging from 4.5.0 to 4.6.0 (#6225)
Bump System.IO.Packaging from 4.5.0 to 4.6.0

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-09-24 12:15:43 +09:00
Dean Herbert
b63a3dc2f8
Merge pull request #6222 from ppy/dependabot/nuget/System.ComponentModel.Annotations-4.6.0
Bump System.ComponentModel.Annotations from 4.5.0 to 4.6.0
2019-09-24 12:15:13 +09:00
iiSaLMaN
267e12ce3c Add sample usage to the session statics 2019-09-24 05:45:47 +03:00