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

21560 Commits

Author SHA1 Message Date
Dean Herbert
ee4869647f
Merge pull request #5910 from peppy/fix-legacy-skin-text
Fix legacy skin text reading from the wrong source
2019-08-31 21:51:26 +09:00
Dean Herbert
691b89ae19
Merge pull request #5911 from peppy/fix-skin-configuration-fallback
Fix ruleset skins incorrectly providing configuration defaults
2019-08-31 21:50:14 +09:00
smoogipoo
cbbc6aad6e Make method static 2019-08-31 21:32:02 +09:00
Dean Herbert
3da5eb6c8b Add source lookups for safety 2019-08-31 16:56:32 +09:00
Dean Herbert
2988624f1f Add fallback for safety 2019-08-31 16:52:41 +09:00
Dan Balasescu
7406e00bfc
Merge branch 'master' into fix-legacy-skin-text 2019-08-31 16:31:57 +09:00
Dan Balasescu
f908771d6e
Merge pull request #5909 from peppy/fix-hit-meter-valign
Fix vertical alignment of hit error display ticks
2019-08-31 16:29:59 +09:00
Dean Herbert
d2a3e0581b Fix legacy decoder using wrong configuration 2019-08-31 13:27:03 +09:00
Dean Herbert
12eeec36fc Fix ruleset skins incorrectly providing configuration defaults 2019-08-31 12:33:29 +09:00
Dean Herbert
f89981e1a3 Fix legacy skin text reading from the wrong source
Regressed with ruleset legacy skin implementation.
2019-08-31 12:23:15 +09:00
Dean Herbert
1ddf292ad6 Fix vertical alignment of hit error display ticks
Wasn't correctly centered before.
2019-08-31 12:20:50 +09:00
Dean Herbert
49fb21ffa9
Merge pull request #5899 from ppy/dependabot/nuget/NUnit3TestAdapter-3.15.1
Bump NUnit3TestAdapter from 3.15.0 to 3.15.1
2019-08-30 22:54:14 +09:00
dependabot-preview[bot]
2876588193
Bump NUnit3TestAdapter from 3.15.0 to 3.15.1
Bumps [NUnit3TestAdapter](https://github.com/nunit/nunit3-vs-adapter) from 3.15.0 to 3.15.1.
- [Release notes](https://github.com/nunit/nunit3-vs-adapter/releases)
- [Commits](https://github.com/nunit/nunit3-vs-adapter/compare/V3.15...V3.15.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-30 13:36:31 +00:00
Dean Herbert
d68d9c0ba8
Merge pull request #5753 from EVAST9919/accuracy-bar
Add hit error display

Co-authored-by: Dean Herbert <pe@ppy.sh>
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-08-30 21:07:08 +09:00
Dean Herbert
8f5dc06d55 Merge remote-tracking branch 'upstream/master' into accuracy-bar 2019-08-30 20:18:25 +09:00
Dean Herbert
f1db6c7039 Fix likely nullref 2019-08-30 20:18:21 +09:00
smoogipoo
fc813347ac Make JudgementLine private 2019-08-30 19:54:36 +09:00
smoogipoo
dfccc60361 Reorder HitErrorDisplay 2019-08-30 19:53:38 +09:00
smoogipoo
6fb8a6cdbe Fix testcases not working for OD10 2019-08-30 19:53:38 +09:00
smoogipoo
8b4976ad92 Remove unnecessary intermediate OD tests 2019-08-30 19:53:38 +09:00
smoogipoo
fab12fa9cd Centre align the icons
Seems to look better this way.
2019-08-30 19:53:38 +09:00
Dean Herbert
a5126fd79b
Merge pull request #5833 from peppy/add-ruleset-legacy-skin
Add ruleset-level legacy skin provider

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-08-30 19:41:05 +09:00
Dean Herbert
665fc95d49 Handle no hitobjects / no hitwindows (osu!catch) 2019-08-30 19:37:20 +09:00
Dean Herbert
394208afc5 Merge remote-tracking branch 'upstream/master' into accuracy-bar 2019-08-30 19:27:35 +09:00
Dan Balasescu
ff599ba623
Merge branch 'master' into add-ruleset-legacy-skin 2019-08-30 19:23:34 +09:00
Dean Herbert
3036f2c2bf
Merge pull request #5897 from ppy/dependabot/nuget/ppy.osu.Framework.Android-2019.830.1
Bump ppy.osu.Framework.Android from 2019.830.0 to 2019.830.1
2019-08-30 19:16:56 +09:00
Dean Herbert
51842d0111
Bump ppy.osu.Framework.iOS from 2019.830.0 to 2019.830.1 (#5896)
Bump ppy.osu.Framework.iOS from 2019.830.0 to 2019.830.1

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-08-30 19:16:40 +09:00
Dean Herbert
42a2668d75
Merge branch 'master' into dependabot/nuget/ppy.osu.Framework.iOS-2019.830.1 2019-08-30 19:16:16 +09:00
Dean Herbert
bba7343e1d
Bump ppy.osu.Framework from 2019.830.0 to 2019.830.1 (#5895)
Bump ppy.osu.Framework from 2019.830.0 to 2019.830.1

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
2019-08-30 19:15:25 +09:00
Dean Herbert
80671cefd7 Final visual polish 2019-08-30 19:14:07 +09:00
dependabot-preview[bot]
815220de03
Bump ppy.osu.Framework.Android from 2019.830.0 to 2019.830.1
Bumps [ppy.osu.Framework.Android](https://github.com/ppy/osu-framework) from 2019.830.0 to 2019.830.1.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.830.0...2019.830.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-30 10:01:35 +00:00
dependabot-preview[bot]
b639ce8e5d
Bump ppy.osu.Framework.iOS from 2019.830.0 to 2019.830.1
Bumps [ppy.osu.Framework.iOS](https://github.com/ppy/osu-framework) from 2019.830.0 to 2019.830.1.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.830.0...2019.830.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-30 10:01:16 +00:00
Dean Herbert
c3abf0ccb7 Improve visuals 2019-08-30 18:50:38 +09:00
dependabot-preview[bot]
171f88da40
Bump ppy.osu.Framework from 2019.830.0 to 2019.830.1
Bumps [ppy.osu.Framework](https://github.com/ppy/osu-framework) from 2019.830.0 to 2019.830.1.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.830.0...2019.830.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-30 09:47:18 +00:00
Dean Herbert
8fc177b743 Fix namespacing and hitwindow source 2019-08-30 18:46:42 +09:00
Dean Herbert
741bd0a5cf Fix incorrect colour sizes and simplify alignment specification 2019-08-30 18:35:17 +09:00
smoogipoo
40729356fa Move beat divisor colour retrieval to BindableBeatDivisor 2019-08-30 17:34:58 +09:00
Dean Herbert
54696eef39 Reverse display, add animation and reduce width 2019-08-30 17:06:23 +09:00
Dean Herbert
a73d672c2f Tidy up judgement line logic (and fix it displaying at the wrong place) 2019-08-30 16:40:39 +09:00
Dean Herbert
5f3e638499 Make test useful 2019-08-30 16:40:24 +09:00
Andrei Zavatski
72dbeaec16 Fix the comment 2019-08-30 10:26:11 +03:00
Andrei Zavatski
71c844facd Remove unwanted spacings 2019-08-30 10:22:49 +03:00
Andrei Zavatski
b03b520818 Move Absing from the APIKudosuHistory 2019-08-30 10:13:21 +03:00
Andrei Zavatski
b7a75ef5e1 Merge remote-tracking branch 'refs/remotes/ppy/master' into kudosu-info 2019-08-30 10:09:00 +03:00
Dean Herbert
6640161bc1 Simplify event propagation 2019-08-30 15:51:36 +09:00
Dean Herbert
bdbfa7bd2f Fix class naming 2019-08-30 15:32:47 +09:00
Dean Herbert
835ee0aa2f Code quality fixes 2019-08-30 15:29:13 +09:00
Dean Herbert
1d77e3764d
Merge branch 'master' into accuracy-bar 2019-08-30 15:21:32 +09:00
Dean Herbert
ae05faa6d2 Fix indentation 2019-08-30 14:54:46 +09:00
Dean Herbert
c3fb4b9099 Fix test failing 2019-08-30 14:51:47 +09:00