1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 20:38:33 +08:00
Commit Graph

22644 Commits

Author SHA1 Message Date
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
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
Dean Herbert
0820e23097
Merge branch 'master' into dependabot/nuget/System.IO.Packaging-4.6.0 2019-09-24 11:17:07 +09:00
iiSaLMaN
18fd7aa805 Remove redundant using directive 2019-09-24 05:10:06 +03:00
iiSaLMaN
ba679684be Trim whitespaces 2019-09-24 04:59:57 +03:00
iiSaLMaN
143d7ab640 Add test scene for spinner rotation 2019-09-24 04:53:26 +03:00
Dean Herbert
8321ad13fc
Bump Microsoft.Win32.Registry from 4.5.0 to 4.6.0 (#6227)
Bump Microsoft.Win32.Registry from 4.5.0 to 4.6.0

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
2019-09-24 09:55:37 +09:00
LeNitrous
ec78889e94 remove unused dependencies 2019-09-24 08:14:20 +08:00
dependabot-preview[bot]
50dcb70342
Bump Microsoft.Win32.Registry from 4.5.0 to 4.6.0
Bumps [Microsoft.Win32.Registry](https://github.com/dotnet/corefx) from 4.5.0 to 4.6.0.
- [Release notes](https://github.com/dotnet/corefx/releases)
- [Commits](https://github.com/dotnet/corefx/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-23 21:04:20 +00:00
dependabot-preview[bot]
78ce62b187
Bump System.IO.Packaging from 4.5.0 to 4.6.0
Bumps [System.IO.Packaging](https://github.com/dotnet/corefx) from 4.5.0 to 4.6.0.
- [Release notes](https://github.com/dotnet/corefx/releases)
- [Commits](https://github.com/dotnet/corefx/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-23 20:29:36 +00:00
dependabot-preview[bot]
53603b5591
Bump System.ComponentModel.Annotations from 4.5.0 to 4.6.0
Bumps [System.ComponentModel.Annotations](https://github.com/dotnet/corefx) from 4.5.0 to 4.6.0.
- [Release notes](https://github.com/dotnet/corefx/releases)
- [Commits](https://github.com/dotnet/corefx/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-23 20:15:51 +00:00
Craftplacer
cca97c09d2 Merge branch 'muted-notification' of https://github.com/Craftplacer/osu into muted-notification 2019-09-23 16:50:30 +02:00
Craftplacer
8df77ffe92 Revert test scene changes 2019-09-23 16:48:30 +02:00
Andrei Zavatski
5c4dfe0809 Apply suggested change 2019-09-23 17:05:19 +03:00
Andrei Zavatski
ffbab25358 Fix incorrect icon margin in ChangelogOverlay 2019-09-23 16:12:43 +03:00