Commit Graph

21365 Commits

Author SHA1 Message Date
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
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
42a2668d75 Merge branch 'master' into dependabot/nuget/ppy.osu.Framework.iOS-2019.830.1 2019-08-30 19:16:16 +09:00
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
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
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
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
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
9c622680e3 Update framework 2019-08-30 12:35:53 +09:00
8fe37d0c43 Update resources 2019-08-30 12:35:44 +09:00
d17cfe20c2 Merge remote-tracking branch 'upstream/master' into add-legacy-default 2019-08-30 11:54:49 +09:00
bfbec067b1 Remove remnants of user skin PR 2019-08-30 11:54:36 +09:00
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
3f500131d4 Add basic xmldoc 2019-08-30 11:33:50 +09:00
68aad832b0 Merge branch 'master' into editor-shared-beatmap 2019-08-30 00:46:51 +09:00
dbc598887a Refactor HitObjectComposer for readability (#5880)
Refactor HitObjectComposer for readability
2019-08-30 00:46:37 +09:00
ae0a5504d7 Revert unnecessary change 2019-08-29 19:43:33 +09:00
6641811125 Add EditorWorkingBeatmap for reuse of the playable beatmap 2019-08-29 19:41:12 +09:00
6ab2b20c70 Add an interface for working beatmaps 2019-08-29 19:38:44 +09:00
d8a48a37d1 Merge branch 'master' into editor-refactor 2019-08-29 18:22:42 +09:00
714ee312da Rename DrawableEditRuleset -> DrawableEditRulesetWrapper 2019-08-29 18:20:43 +09:00
98626018fd Encapsulate editor hitobject additions/removals (#5878)
Encapsulate editor hitobject additions/removals
2019-08-29 18:20:24 +09:00
87e28ab1f9 Remove non-generic DrawableEditRuleset 2019-08-29 18:12:29 +09:00
59296d12f3 Refactor HitObjectComposer 2019-08-29 18:02:50 +09:00
0fbdcabb6f Re-use a single beatmap processor 2019-08-29 17:21:52 +09:00
b40143cb73 Remove unnecessary comment 2019-08-29 17:18:34 +09:00
40c1c6072e Add "osu!classic" as a bundled skin choice 2019-08-29 16:39:42 +09:00
b04a8ae856 Add xmldocs 2019-08-29 16:31:43 +09:00
dad0fa2dca Bind disposal 2019-08-29 16:31:40 +09:00
5db813b7a4 Add secondary interface for further abstraction 2019-08-29 16:26:39 +09:00
7927b684d3 Hook up + use editor beatmap 2019-08-29 16:06:40 +09:00
840f224619 Remove typed events to reduce complexity 2019-08-29 16:05:44 +09:00
6949c96aaa Add initial EditorBeatmap structure 2019-08-29 15:17:27 +09:00
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
03a4acaf4c Fix drags outside of overlay container bounds not hiding overlay 2019-08-29 12:07:58 +09:00
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
6295fb4171 Merge remote-tracking branch 'upstream/master' into relative-beat-lengths 2019-08-28 22:11:27 +09:00
c6e757fdae Remove redundant qualifier 2019-08-28 22:11:23 +09:00
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
1597cf874e Merge branch 'master' into relative-beat-lengths 2019-08-28 20:26:20 +09:00
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
f6ad95018a Centralise default beat length specification 2019-08-28 20:22:16 +09:00
ecfcbe3723 Merge remote-tracking branch 'upstream/master' into relative-beat-lengths 2019-08-28 20:21:56 +09:00
348d88846d Add IBeatmap<T> interface for typed hitobject retrieval 2019-08-28 20:19:22 +09:00
dfdf3f5e96 Merge remote-tracking branch 'upstream/master' into humanizer-fallback 2019-08-28 20:15:32 +09:00
c7e20b34ba Cleanup 2019-08-28 20:15:28 +09:00
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
74b5ad9c49 Merge branch 'master' into taiko-proxy-optimisation 2019-08-28 18:25:46 +09:00
ac0628d832 Update in line with framework changes (#5856)
Update in line with framework changes
2019-08-28 18:23:47 +09:00
9a98f39f06 Share logic with other rulesets (and make default) 2019-08-28 18:12:47 +09:00