1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 22:02:54 +08:00
Commit Graph

11703 Commits

Author SHA1 Message Date
smoogipoo
b25c564ecb Integrate into editor's compose screen 2018-03-19 20:14:58 +09:00
smoogipoo
32fecc6ff4 Adjust icon scale + text 2018-03-19 20:14:34 +09:00
smoogipoo
e96dad441d Offset the icon buttons a little bit to look a bit more centered
Maybe it's just me, but this is really triggering me.
2018-03-19 20:14:13 +09:00
Dean Herbert
7272ba2f1b Add migration for skins which didn't get a proper name assigned
Also correctly imports new skins
2018-03-19 20:06:44 +09:00
Dean Herbert
ec851648da Add better ToString output from SkinInfo 2018-03-19 20:06:44 +09:00
Dean Herbert
397b06283a Add basic skin configuration decoding support 2018-03-19 20:06:44 +09:00
Dean Herbert
8e52d91180 Handle missing files without hard failure
Also adds support for lookups with file extensions
2018-03-19 20:06:44 +09:00
Dean Herbert
62e908e22c Add default separator character 2018-03-19 20:06:44 +09:00
Dean Herbert
c4f5b46d72 Add basic structure for skin configurations 2018-03-19 20:06:44 +09:00
smoogipoo
c86ddb7ee3 Add slight easing to marker movements 2018-03-19 19:57:02 +09:00
smoogipoo
fbc92bfa01 Add previous/next divisor button actions 2018-03-19 19:55:49 +09:00
smoogipoo
070db63157 Privatise tick to TickContainer 2018-03-19 19:52:22 +09:00
smoogipoo
7182442b21 Add divisor text 2018-03-19 19:49:57 +09:00
smoogipoo
66e4e45882 Offset test case a little bit for dynamic compilation message 2018-03-19 19:49:46 +09:00
Dean Herbert
f8886c5472
Merge branch 'master' into fix-catch-droplets 2018-03-19 19:48:24 +09:00
smoogipoo
6b035e8c53 Add basic structure/layout for the beat snap visualiser 2018-03-19 19:46:26 +09:00
Dean Herbert
4e4f3fc039
Merge pull request #2226 from smoogipoo/fix-editor-clocks
Rewrite the way clocks are handled in the Editor
2018-03-19 19:19:59 +09:00
Dean Herbert
4b812279bb
Merge branch 'master' into fix-editor-clocks 2018-03-19 19:06:38 +09:00
Dean Herbert
caa2827581
Merge pull request #2243 from smoogipoo/fix-selectionbox-crash
Fix crash when attempting to select objects that don't have masks
2018-03-19 18:58:56 +09:00
smoogipoo
8d4c9eda48 Fix attempting to add selection boxes with no selection
E.g. because DrawableSpinner doesn't (currently) create an overlay, SelectionBox was being constructed with 0 hitobjects and then calculating a non-finite size for itself.
2018-03-19 18:00:11 +09:00
smoogipoo
193142e901 Fix missed BDL case 2018-03-19 16:44:46 +09:00
smoogipoo
e25d1f6982 Pass down editor clocks through DI 2018-03-19 16:27:52 +09:00
Dean Herbert
2c7a18984e
Merge branch 'master' into fix-catch-droplets 2018-03-19 00:36:05 +09:00
TocoToucan
245200d3ee Add simple screenshot notification 2018-03-16 21:25:00 +03:00
TocoToucan
8429408974 Change screenshot file name 2018-03-16 21:05:25 +03:00
TocoToucan
604e725f3f Remove redundant code 2018-03-16 20:42:05 +03:00
smoogipoo
abb5dcf678 Fix null-refing testcase
This would also be fixed with BDL loading children after we're fully loaded ;).
2018-03-16 23:53:55 +09:00
Dean Herbert
4b83278cf4
Merge branch 'master' into fix-editor-clocks 2018-03-16 23:32:54 +09:00
Dean Herbert
cbe2de33c5
Merge pull request #2225 from smoogipoo/editor-wheel-movement
Implement mousewheel time scrolling in the editor
2018-03-16 23:31:45 +09:00
smoogipoo
6f7163769d Adjust comment for readability 2018-03-16 19:57:14 +09:00
Dean Herbert
7c7f2e2dce
Merge branch 'master' into fix-catch-droplets 2018-03-16 19:05:58 +09:00
Dean Herbert
e8f7f2c8ab
Merge branch 'master' into editor-wheel-movement 2018-03-16 18:19:42 +09:00
Dean Herbert
1b2e4bb8f7
Merge pull request #2207 from FreezyLemon/fix-autoplay-button-deselect
Fix autoplay button wrongly being active after a Ctrl-Enter play
2018-03-16 18:01:55 +09:00
Dean Herbert
4411758ff7
Merge branch 'master' into fix-autoplay-button-deselect 2018-03-16 17:31:14 +09:00
Dean Herbert
8d790e180d Fix juice stream droplets spawning in incorrect locations
Closes #2149.
2018-03-16 17:03:38 +09:00
Dan Balasescu
18615ce8fd
Merge pull request #2223 from peppy/drawable-composite-hit-object
Make DrawableHitObject a CompositeDrawable
2018-03-16 16:24:26 +09:00
smoogipoo
20acc601bb Fix up breaking taiko changes 2018-03-16 16:10:09 +09:00
Dean Herbert
bca4b620b6
Merge branch 'master' into editor-wheel-movement 2018-03-16 15:56:51 +09:00
Dean Herbert
7e7f8ed7a2
Merge branch 'master' into drawable-composite-hit-object 2018-03-16 15:53:16 +09:00
Dean Herbert
f640b874df
Merge pull request #2219 from Joehuu/mod-fixes
Improve mods description and adjust multipliers to match stable
2018-03-16 15:53:04 +09:00
Dean Herbert
23ffee3d38
Merge branch 'master' into drawable-composite-hit-object 2018-03-16 15:38:52 +09:00
Dean Herbert
46f5c0fc19
Merge branch 'master' into mod-fixes 2018-03-16 15:38:41 +09:00
Dan Balasescu
39bf393682
Merge pull request #2218 from peppy/api-as-component
Consolidate API into its own component
2018-03-16 15:38:17 +09:00
smoogipoo
2ba2556d2a Update submodules 2018-03-16 15:24:47 +09:00
smoogipoo
aa82393824 Merge master into api-as-component 2018-03-16 15:22:48 +09:00
Dan Balasescu
41036ab79e
Merge pull request #2215 from peppy/fix-combo-colours
Fix beatmap combo colours not being applied
2018-03-16 15:19:43 +09:00
Dan Balasescu
cdc61d5f0d
Merge branch 'master' into fix-combo-colours 2018-03-16 14:59:45 +09:00
Dan Balasescu
e406cf2207
Merge pull request #2170 from peppy/cursor-trail
Make gameplay cursor vs skip button feel nice again
2018-03-16 14:57:00 +09:00
smoogipoo
b27b6c7eb7 Merge branch 'master' into cursor-trail 2018-03-16 14:43:27 +09:00
smoogipoo
7ded1635fa Update submodules 2018-03-16 14:43:14 +09:00