1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 01:42:54 +08:00
Commit Graph

2357 Commits

Author SHA1 Message Date
Dean Herbert
92d8781bf0
Merge branch 'master' into beat-snap-divisor 2018-03-22 20:14:50 +09:00
smoogipoo
2b7d22c4ea Very slightly reduce size of slider bar to increase bottom padding 2018-03-22 20:11:55 +09:00
smoogipoo
090c78bf10 Merge remote-tracking branch 'origin/master' into fix-player-loader 2018-03-22 20:00:21 +09:00
Dan Balasescu
ab9505652b Merge branch 'master' into skin--completion 2018-03-22 16:44:00 +09:00
Dean Herbert
dade52d15d Fix vertical padding 2018-03-22 16:15:14 +09:00
Dean Herbert
a4804f47a9 Merge branch 'master' into beat-snap-divisor 2018-03-22 16:06:26 +09:00
Dean Herbert
5f1bb8d753
Merge branch 'master' into fix-player-loader 2018-03-22 15:46:37 +09:00
Dan Balasescu
13a3c728dc
Merge branch 'master' into fix-dummy-ruleset 2018-03-22 15:29:43 +09:00
smoogipoo
3f3f57e51e Use cached vertexbatch add delegate 2018-03-22 15:13:38 +09:00
Dean Herbert
917334a39a Move cancel code to exit paths for screen 2018-03-22 13:01:40 +09:00
Dean Herbert
e0b74a357a Fix osu! logo making hover beat sounds when not visible 2018-03-22 03:31:14 +09:00
Dean Herbert
8f71d53c17 Fix retry not allowing continuing beyond PlayerLoader
Resolves #2265.
2018-03-22 02:10:31 +09:00
Dean Herbert
62229300c4 Fix DummyRuleset getting selected
Resolves #2261.
2018-03-22 00:26:48 +09:00
Dean Herbert
271c082606 Adjust colour assignment 2018-03-21 16:25:32 +09:00
Dean Herbert
48142602ea Adjust text size to match design 2018-03-21 16:04:43 +09:00
Dean Herbert
63f0419d6a Apply minor fixes 2018-03-21 15:40:43 +09:00
Dean Herbert
8ac660b0c6 Fixes for keyboard handling and general code quality 2018-03-20 22:25:15 +09:00
Dean Herbert
aa8b0d017c Adjust colours and spacing 2018-03-20 21:59:56 +09:00
Dean Herbert
dac1ba21db Make keyboard control work 2018-03-20 21:38:22 +09:00
Dean Herbert
045610dbfe Adjust styling and colours 2018-03-20 21:31:17 +09:00
Dean Herbert
c2eb32c0e9 DrawableBeatDivisor -> BeatDivisorControl 2018-03-20 20:10:27 +09:00
Dean Herbert
6fd650777c Move value change logic to bindable
Also add drag support
2018-03-20 20:09:55 +09:00
Dean Herbert
9ad4e9284a Add skin source fallback chain 2018-03-20 16:40:11 +09:00
smoogipoo
50192b21e3 Give DrawableBeatDivisor a ctor 2018-03-20 13:57:25 +09:00
smoogipoo
b1d09500f2 Integrate beat snap divisor into editor seeking 2018-03-19 20:42:06 +09:00
smoogipoo
c5eab7a227 Actually rename to DrawableBeatDivisor... 2018-03-19 20:34:24 +09:00
smoogipoo
5ecbc5612c Integrate with dependency injection 2018-03-19 20:33:58 +09:00
smoogipoo
4c0ccffe08 Merge remote-tracking branch 'origin/master' into beat-snap-divisor 2018-03-19 20:23:15 +09:00
smoogipoo
df0b8a24c5 Rename + renamespace 2018-03-19 20:21:19 +09:00
smoogipoo
879dbc75b5 Nest TickContainer in BeatSnapVisualiser 2018-03-19 20:20:29 +09:00
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
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
6b035e8c53 Add basic structure/layout for the beat snap visualiser 2018-03-19 19:46:26 +09:00
Dean Herbert
4b812279bb
Merge branch 'master' into fix-editor-clocks 2018-03-19 19:06:38 +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
e25d1f6982 Pass down editor clocks through DI 2018-03-19 16:27:52 +09:00
Dean Herbert
4b83278cf4
Merge branch 'master' into fix-editor-clocks 2018-03-16 23:32:54 +09:00
Dean Herbert
4411758ff7
Merge branch 'master' into fix-autoplay-button-deselect 2018-03-16 17:31:14 +09:00
smoogipoo
b27b6c7eb7 Merge branch 'master' into cursor-trail 2018-03-16 14:43:27 +09:00
smoogipoo
d05947ef48 Pass adjustable clocks to components, rather than relying on the track 2018-03-15 18:19:28 +09:00
smoogipoo
c8f6a6980b Move clock construction to Editor 2018-03-15 17:27:37 +09:00
smoogipoo
5e742eb466 Move editor constructions to BDL load 2018-03-15 17:10:08 +09:00
Dean Herbert
cdf435aedd
Merge branch 'master' into DoNotMoveToPlayerWhileDragging 2018-03-15 11:14:30 +09:00
Dean Herbert
8d433cb4bf
Merge branch 'master' into cursor-trail 2018-03-15 11:14:21 +09:00
Dean Herbert
551b67ac16
Merge branch 'master' into fix-autoplay-button-deselect 2018-03-14 21:46:19 +09:00