Dean Herbert
236ddf2d06
Merge branch 'master' into iskincomponent
2019-08-30 19:47:10 +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
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
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
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
fe90e194e3
Remove redundant qualifier
2019-08-30 15:29:44 +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
smoogipoo
ae0a5504d7
Revert unnecessary change
2019-08-29 19:43:33 +09:00
smoogipoo
6641811125
Add EditorWorkingBeatmap for reuse of the playable beatmap
2019-08-29 19:41:12 +09:00
smoogipoo
6ab2b20c70
Add an interface for working beatmaps
2019-08-29 19:38:44 +09:00
Dan Balasescu
d8a48a37d1
Merge branch 'master' into editor-refactor
2019-08-29 18:22:42 +09:00
smoogipoo
714ee312da
Rename DrawableEditRuleset -> DrawableEditRulesetWrapper
2019-08-29 18:20:43 +09:00
Dean Herbert
98626018fd
Encapsulate editor hitobject additions/removals ( #5878 )
...
Encapsulate editor hitobject additions/removals
2019-08-29 18:20:24 +09:00
smoogipoo
87e28ab1f9
Remove non-generic DrawableEditRuleset
2019-08-29 18:12:29 +09:00
smoogipoo
59296d12f3
Refactor HitObjectComposer
2019-08-29 18:02:50 +09:00
smoogipoo
0fbdcabb6f
Re-use a single beatmap processor
2019-08-29 17:21:52 +09:00
smoogipoo
b40143cb73
Remove unnecessary comment
2019-08-29 17:18:34 +09:00
Dean Herbert
40c1c6072e
Add "osu!classic" as a bundled skin choice
2019-08-29 16:39:42 +09:00
smoogipoo
b04a8ae856
Add xmldocs
2019-08-29 16:31:43 +09:00
smoogipoo
dad0fa2dca
Bind disposal
2019-08-29 16:31:40 +09:00
smoogipoo
5db813b7a4
Add secondary interface for further abstraction
2019-08-29 16:26:39 +09:00
smoogipoo
7927b684d3
Hook up + use editor beatmap
2019-08-29 16:06:40 +09:00
smoogipoo
840f224619
Remove typed events to reduce complexity
2019-08-29 16:05:44 +09:00
smoogipoo
6949c96aaa
Add initial EditorBeatmap structure
2019-08-29 15:17:27 +09:00
Dan Balasescu
9bb96115bc
Merge pull request #5876 from peppy/fix-drag-outside-overlay
...
Fix drags outside of overlay container bounds not hiding overlay
2019-08-29 12:48:17 +09:00