RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
22,306 Commits 3 Branches 651 Tags 357 MiB
Commit Graph

22306 Commits

Author SHA1 Message Date
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 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 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
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 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
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
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