RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
26,046 Commits 3 Branches 659 Tags 364 MiB
Commit Graph

689 Commits

Author SHA1 Message Date
Dean Herbert e31d69c749 Add commit status to EndPlacement; call BeginPlacement on initial movement 2020-02-07 18:02:48 +09:00
smoogipoo 6ae0efa40d Fix adjustment not working when dragged before object 2020-02-06 14:47:43 +09:00
smoogipoo c138e3907e Move methods below ctor 2020-02-06 14:35:45 +09:00
Dean Herbert f5edad16e6 Improve visuals 2020-02-05 19:43:13 +09:00
Dean Herbert 98ab1f9862 Fix negative spinners 2020-02-05 18:35:31 +09:00
Dean Herbert 3d42973764 Allow scrolling via drag while dragging a hold note handle 2020-02-05 18:35:31 +09:00
Dean Herbert cef45afbc8 Add a simple hover state 2020-02-05 18:35:31 +09:00
Dean Herbert d56accaef1 Disallow negative / zero repeat counts (and fix off-by-one) 2020-02-05 18:35:31 +09:00
Dean Herbert d04cc0123d Initial implementation of timeline blueprint dragbars 2020-02-05 18:35:31 +09:00
Dean Herbert 96986bf5fc Remove beat divisor from ctor and use DI instead 2020-02-05 17:48:21 +09:00
Dean Herbert 63c595ed97 Make EditorBeatmap a component and move UpdateHitObject to it 2020-02-05 17:48:21 +09:00
Dean Herbert 90caa61245
Reverse comparison for readability 
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
 2020-02-01 02:05:26 +09:00
Dean Herbert f51cfa2220 Fix too many ticks being displayed on beatmaps with multiple timing sections 
Closes https://github.com/ppy/osu/issues/7681.
 2020-01-31 00:24:00 +09:00
Dan Balasescu 66b8d38d42
Merge branch 'master' into selection-composition-conformity 2020-01-29 16:52:45 +09:00
Dan Balasescu e553a9b9e0
Merge branch 'master' into distance-snap-grid-correct-colouring 2020-01-29 16:09:35 +09:00
Dan Balasescu 63501c188a
Merge pull request #7644 from peppy/standardise-zoom-levels 
Standardise editor timeline zoom across maps of all lengths
 2020-01-29 16:04:25 +09:00
Dan Balasescu 018c005c71
Merge branch 'master' into distance-snap-grid-correct-colouring 2020-01-29 15:33:07 +09:00
Dan Balasescu 0d6fd0a54a
Merge branch 'master' into standardise-zoom-levels 2020-01-29 15:32:57 +09:00
Dan Balasescu 65ac412ff8
Merge branch 'master' into fix-beat-snap 2020-01-29 15:32:27 +09:00
smoogipoo 391681b7af Separate calculation to follow other examples 2020-01-29 15:16:48 +09:00
Dean Herbert 7d05840ee0
Merge branch 'master' into select-tool 2020-01-29 15:04:22 +09:00
smoogipoo 9a47428bfd Remove out of date comment 2020-01-29 14:40:42 +09:00
Dean Herbert 40379a5e22 Use foreach 2020-01-28 16:04:13 +09:00
Dean Herbert 8e2159e4eb Ensure selection tool correctly matches selection state 
- When a selection is made (via the timeline) the selection tool should become the select tool.
- When the selection tool is changed to anything *but* the select tool, the selection should be cleared.
 2020-01-28 15:13:12 +09:00
Dean Herbert e81d3c51ed Move select tool to an actual tool implementation 
Also tidies up radio button action firing so calling Select actually fires the associated action in all cases.
 2020-01-28 15:05:29 +09:00
Dean Herbert 596a01661c Remove 1ms offset and update tests 2020-01-28 13:42:22 +09:00
Dean Herbert 4bb33046ca Standardise editor timeline zoom across maps of all lengths 2020-01-28 13:03:06 +09:00
Dean Herbert 58654f28b6 Fix beat snap implementation being incorrect 2020-01-28 12:48:24 +09:00
Dean Herbert 29daabb40a Fix distance snap grid showing incorrect colouring 
Now matches timeline colours (based on timing point).
 2020-01-28 11:59:21 +09:00
Dean Herbert d5fda053f4 Use centre origin/anchors 2020-01-27 18:09:54 +09:00
Dean Herbert 493390b750 Rename class to TimelineTickDisplay 2020-01-27 18:08:01 +09:00
Dean Herbert 084fa2f04a Add timeline beat display 2020-01-27 17:38:50 +09:00
Dean Herbert e24c4ab901 Adjust zoom defaults for timeline to be more useful 2020-01-27 17:34:40 +09:00
Dean Herbert df665c3a3c Move beat index colour retrieval to static function 2020-01-27 17:34:40 +09:00
Dean Herbert 508b92e611 Update beat divisor colours to be more distinguishable 
Close to osu-stable
 2020-01-27 17:34:40 +09:00
Dan Balasescu 368587fc06
Merge branch 'master' into timeline-maybe 2020-01-24 18:08:29 +09:00
smoogipoo 811ddb02a4 General refactoring 2020-01-24 17:50:36 +09:00
smoogipoo 28727bbafd Fix crash when deselecting via ctrl+click 2020-01-24 17:30:37 +09:00
Dean Herbert e4702ffe9e Fix editor rate adjustment polluting global beatmap rate 2020-01-24 13:10:02 +09:00
Dean Herbert 5646f7777e Add comment about custom SelectionHandler 2020-01-23 16:23:42 +09:00
Dean Herbert 5cadbb1ffb Move timeline blueprint to own class 2020-01-23 16:22:43 +09:00
Dean Herbert 9d90799447 Remove useless container 2020-01-23 16:20:42 +09:00
Dean Herbert 143d47ec93
Merge pull request #7538 from peppy/decouple-blueprint-container 
Decouple blueprint container to allow usage in timeline
 2020-01-23 16:13:51 +09:00
Dean Herbert 02ae92418f Merge remote-tracking branch 'upstream/master' into decouple-blueprint-container 2020-01-23 15:54:46 +09:00
Dean Herbert 289be7a17b Merge branch 'i-beat-snapping' into timeline-maybe 2020-01-23 15:45:33 +09:00
Dean Herbert ccf911884b Remove passed in BaetDivisor 2020-01-23 15:31:56 +09:00
Dean Herbert 098d643955 Move beat snapping to its own interface 2020-01-23 14:39:56 +09:00
Dean Herbert 56c044c44a Move beat snapping to its own interface 2020-01-23 14:30:25 +09:00
Dean Herbert cb09c2e144 Add support for dragging outside visible extents 2020-01-23 14:30:25 +09:00
Dean Herbert 477e1b7d27 Rename TimelineHitObjectDisplay to TimelineBlueprintContainer 2020-01-23 14:30:25 +09:00