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

21958 Commits

Author SHA1 Message Date
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
3aa2ece49b Merge branch 'iskincomponent' into play-to-gameplay 2019-08-30 15:29:55 +09:00
Dean Herbert
fe90e194e3 Remove redundant qualifier 2019-08-30 15:29:44 +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
70e417533f Update naming 2019-08-30 15:13:29 +09:00
Dean Herbert
a7c94c3883 Simplify hit result lookups 2019-08-30 15:12:03 +09:00
Dean Herbert
a15828ab25 Introduce the concept of SkinComponents
Removes reliance on string lookups and better defines elements for introduction into database
2019-08-30 14:55:52 +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
Dean Herbert
493fc5d400 Bring back OsuPlayer test 2019-08-30 14:44:36 +09:00
Dean Herbert
8f9fe99237 Move SliderFollowCircle implementation 2019-08-30 14:40:36 +09:00
Dean Herbert
71192791d5 Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin 2019-08-30 14:12:56 +09:00
Dean Herbert
22e3ad8b9c Add skinning support to cursor test 2019-08-30 14:09:17 +09:00
Dean Herbert
c389a5c798 Move remaining osu-specific implementations to OsuLegacySkin 2019-08-30 13:42:29 +09:00
Dean Herbert
7bba8ca14b Split out nested classes 2019-08-30 13:04:11 +09:00
Dan Balasescu
03ce8da5dd
Merge pull request #5879 from peppy/add-legacy-default
Add "osu!classic" as a bundled skin choice
2019-08-30 13:00:38 +09:00
Dean Herbert
84e4748268 Remove duplicate getAnimation function and improve namespacing 2019-08-30 12:59:58 +09:00
Dean Herbert
dc1046bf0c Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin 2019-08-30 12:53:05 +09:00
Dean Herbert
9c622680e3 Update framework 2019-08-30 12:35:53 +09:00
Dean Herbert
8fe37d0c43 Update resources 2019-08-30 12:35:44 +09:00
Dean Herbert
d17cfe20c2 Merge remote-tracking branch 'upstream/master' into add-legacy-default 2019-08-30 11:54:49 +09:00
Dean Herbert
bfbec067b1 Remove remnants of user skin PR 2019-08-30 11:54:36 +09:00
Dean Herbert
451ae8fc73
Add EditorWorkingBeatmap to support reuse of the playable beatm… (#5881)
Add EditorWorkingBeatmap to support reuse of the playable beatmap

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-08-30 11:45:29 +09:00
Dean Herbert
3f500131d4 Add basic xmldoc 2019-08-30 11:33:50 +09:00
Dean Herbert
68aad832b0
Merge branch 'master' into editor-shared-beatmap 2019-08-30 00:46:51 +09:00
Dean Herbert
dbc598887a
Refactor HitObjectComposer for readability (#5880)
Refactor HitObjectComposer for readability
2019-08-30 00:46:37 +09:00
iiSaLMaN
06224a7d4e Fix build issue 2019-08-29 15:38:33 +03:00