RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
11,307 Commits 3 Branches 651 Tags 355 MiB
Commit Graph

11307 Commits

Author SHA1 Message Date
Dean Herbert 63f0419d6a Apply minor fixes 2018-03-21 15:40:43 +09:00
Dean Herbert 9a5e464c99
Merge branch 'master' into beat-snap-divisor 2018-03-20 22:26:02 +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
Dan Balasescu 3151940435
Merge pull request #2231 from peppy/fix-catch-droplets 
Fix juice stream droplets spawning in incorrect locations
 2018-03-20 20:06:22 +09:00
smoogipoo 786e6242e1 Make bdl beat divisor nullable 2018-03-20 14:01:06 +09:00
smoogipoo 50192b21e3 Give DrawableBeatDivisor a ctor 2018-03-20 13:57:25 +09:00
smoogipoo fa5fd46f85 Clean up + rename testcase 2018-03-19 20:42:42 +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 46f10b392d Fix merge errors 2018-03-19 20:23:31 +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 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
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