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

21553 Commits

Author SHA1 Message Date
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
StanR
c1c1c7874b Nullcheck 2019-08-29 13:25:05 +03:00
StanR
68ee7346b2 Remove usings 2019-08-29 12:49:44 +03:00
StanR
d303083179 Update to match api 2019-08-29 12:29:31 +03: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
StanR
3347ee8170 Merge branch 'master' into beatmapset-genre-language 2019-08-29 09:57:53 +03: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
Dean Herbert
03a4acaf4c Fix drags outside of overlay container bounds not hiding overlay 2019-08-29 12:07:58 +09:00
Dean Herbert
67151afa9a
Merge pull request #5836 from smoogipoo/relative-beat-lengths
Implement relative timing point scaling for scrolling rulesets

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-08-28 22:32:57 +09:00
Dean Herbert
6295fb4171 Merge remote-tracking branch 'upstream/master' into relative-beat-lengths 2019-08-28 22:11:27 +09:00
Dean Herbert
c6e757fdae Remove redundant qualifier 2019-08-28 22:11:23 +09:00
Dean Herbert
3c03d36694
Merge pull request #5530 from nyquillerium/humanizer-fallback
Add a fallback for humanizer localization lookup failures
2019-08-28 21:45:01 +09:00
Dean Herbert
1597cf874e
Merge branch 'master' into relative-beat-lengths 2019-08-28 20:26:20 +09:00
Dean Herbert
720908ba22
Merge pull request #5865 from peppy/fix-osu-hitobject-fade-in
Fix osu! approach circles fading in too late
2019-08-28 20:25:49 +09:00
Dean Herbert
f6ad95018a Centralise default beat length specification 2019-08-28 20:22:16 +09:00
Dean Herbert
ecfcbe3723 Merge remote-tracking branch 'upstream/master' into relative-beat-lengths 2019-08-28 20:21:56 +09:00