1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 19:47:24 +08:00
Commit Graph

21455 Commits

Author SHA1 Message Date
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
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
smoogipoo
348d88846d Add IBeatmap<T> interface for typed hitobject retrieval 2019-08-28 20:19:22 +09:00
Dean Herbert
8b42890644 Fix unnecessary null check 2019-08-28 20:19:19 +09:00
Dean Herbert
dfdf3f5e96 Merge remote-tracking branch 'upstream/master' into humanizer-fallback 2019-08-28 20:15:32 +09:00
Dean Herbert
c7e20b34ba Cleanup 2019-08-28 20:15:28 +09:00
Dean Herbert
01aede3e29 Add comprehensive skin fallback integration testing 2019-08-28 19:57:17 +09:00
Dean Herbert
4c2a6b755f Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin 2019-08-28 18:44:23 +09:00
Dean Herbert
a91dbe4a50
Make taiko proxy containers use LifetimeManagementContainer (#5863)
Make taiko proxy containers use LifetimeManagementContainer

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-08-28 18:35:15 +09:00
Dean Herbert
74b5ad9c49
Merge branch 'master' into taiko-proxy-optimisation 2019-08-28 18:25:46 +09:00
Dean Herbert
ac0628d832
Update in line with framework changes (#5856)
Update in line with framework changes
2019-08-28 18:23:47 +09:00
Dean Herbert
9a98f39f06 Share logic with other rulesets (and make default) 2019-08-28 18:12:47 +09:00
Dean Herbert
9752dbf950 Fix osu! approach circles fading in too late 2019-08-28 18:10:58 +09:00
Dean Herbert
fcf770c744 Merge branch 'master' into update-framework 2019-08-28 17:04:44 +09:00
Dean Herbert
70da25cfca Update framework 2019-08-28 17:03:54 +09:00
Dean Herbert
7ea55a5cdd Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin 2019-08-28 16:36:20 +09:00
Dan Balasescu
af7b2190c1
Merge pull request #5858 from EVAST9919/simplify-paginated-container
Refactor PaginatedContainer to avoid code duplication
2019-08-28 13:50:17 +09:00
Dean Herbert
bef44b8e58 item -> model 2019-08-28 13:31:12 +09:00
Dean Herbert
3942c83c18 Simplify schedule layout 2019-08-28 13:28:57 +09:00