smoogipoo
|
fbc50d6030
|
Merge master into editor-clock
|
2018-04-12 13:35:53 +09:00 |
|
smoogipoo
|
248be8e35f
|
HitObjectComposer no longer needs a beat divisor
|
2018-04-06 18:21:45 +09:00 |
|
smoogipoo
|
c7abd56fc4
|
Give editor a custom clock to handle seeking
|
2018-04-06 18:11:37 +09:00 |
|
Huo Yaoyuan
|
b842f682eb
|
Use Linq.Append and Prepend.
|
2018-04-02 12:06:34 +08:00 |
|
smoogipoo
|
786e6242e1
|
Make bdl beat divisor nullable
|
2018-03-20 14:01:06 +09:00 |
|
smoogipoo
|
b1d09500f2
|
Integrate beat snap divisor into editor seeking
|
2018-03-19 20:42:06 +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 |
|
smoogipoo
|
6f7163769d
|
Adjust comment for readability
|
2018-03-16 19:57:14 +09:00 |
|
Dean Herbert
|
bca4b620b6
|
Merge branch 'master' into editor-wheel-movement
|
2018-03-16 15:56:51 +09:00 |
|
smoogipoo
|
fc15c63a88
|
Re-order methods
|
2018-03-15 18:28:08 +09:00 |
|
smoogipoo
|
c937ef5d24
|
Fix not being able to scroll before the first timing point
|
2018-03-15 18:26:53 +09:00 |
|
smoogipoo
|
c8f6a6980b
|
Move clock construction to Editor
|
2018-03-15 17:27:37 +09:00 |
|
smoogipoo
|
9e0aeec574
|
Use a decoupled clock for accurate clock times
|
2018-03-15 17:03:33 +09:00 |
|
smoogipoo
|
50f9d810dd
|
Add more testcases + fix up seeking a bit more
|
2018-03-15 15:40:52 +09:00 |
|
smoogipoo
|
0da3ae0944
|
Add some basic tests + fixes to seek/seekforward functionality
|
2018-03-14 20:52:48 +09:00 |
|
Dean Herbert
|
81f82d98a1
|
Rework a lot of naming and structure
|
2018-03-14 15:18:21 +09:00 |
|
smoogipoo
|
299de4b866
|
Rewrite seeking to better handle timing point boundaries
|
2018-03-13 16:54:34 +09:00 |
|
smoogipoo
|
df352c98d6
|
Change wheel direction to match stable
|
2018-03-13 14:30:50 +09:00 |
|
smoogipoo
|
e580819621
|
Rename to seekAmount
|
2018-03-13 14:08:43 +09:00 |
|
smoogipoo
|
6c148930b5
|
Don't skip beats when scrolling in the direction of the closest beat
|
2018-03-13 14:02:37 +09:00 |
|
smoogipoo
|
8acba47a2b
|
Implement mouse wheel movement in the editor
|
2018-03-13 11:23:44 +09:00 |
|
smoogipoo
|
8c4bcb4a04
|
Only accept drag movement on the overlays
|
2018-03-12 17:33:10 +09:00 |
|
smoogipoo
|
212142429f
|
Derive from IHasPosition
|
2018-03-12 17:25:34 +09:00 |
|
smoogipoo
|
4103c66cff
|
Move selection overlay to HitObjectOverlayLayer for extensibility
|
2018-03-10 00:48:57 +09:00 |
|
smoogipoo
|
0e8fbc47b7
|
Give HitObjectOverlayLayer full input state information
|
2018-03-10 00:03:02 +09:00 |
|
smoogipoo
|
376f6eec58
|
SetPosition -> OffsetPosition
|
2018-03-10 00:02:13 +09:00 |
|
smoogipoo
|
ad72d3816b
|
Allow dragging anywhere in a capture box to move objects
|
2018-03-09 23:43:50 +09:00 |
|
smoogipoo
|
4a48136e4f
|
Make hitobject positions adjustable
|
2018-03-09 23:12:34 +09:00 |
|
smoogipoo
|
3b766b8ec8
|
Make CaptureBox account for changes in hitobject states
|
2018-03-09 23:11:48 +09:00 |
|
smoogipoo
|
278b25bcbd
|
Fix border being the wrong size
|
2018-02-23 15:29:56 +09:00 |
|
smoogipoo
|
0cdf6fa7e2
|
Make HitObjectOverlay into an OverlayContainer
|
2018-02-22 14:36:58 +09:00 |
|
smoogipoo
|
45c579630d
|
Make selectionLayer handle input below object overlays
|
2018-02-22 14:34:37 +09:00 |
|
smoogipoo
|
07252254eb
|
Fix post-merge issues
|
2018-02-22 14:22:04 +09:00 |
|
smoogipoo
|
99e9eb81f2
|
Merge remote-tracking branch 'origin/master' into editor-hitobject-overlays
|
2018-02-22 14:16:01 +09:00 |
|
Dean Herbert
|
7c942eb592
|
Tidy up layer container logic
|
2018-02-22 13:42:36 +09:00 |
|
smoogipoo
|
4934ef7429
|
Add playfield aspect ratio + scaling modifications to composer layers
|
2018-02-21 11:07:42 +09:00 |
|
smoogipoo
|
7fe0989427
|
Merge branch 'general-slider-improvements' into editor-hitobject-overlays
|
2018-02-20 23:51:47 +09:00 |
|
smoogipoo
|
ad2f556133
|
Add hitobject overlays to selected hitobjects
|
2018-02-20 18:01:45 +09:00 |
|
smoogipoo
|
2a5bfdb4b8
|
Deselect hitobjects that are now not in the selection quad
|
2018-02-20 15:06:51 +09:00 |
|
smoogipoo
|
2f4925d031
|
Add some xmldocs
|
2018-02-20 15:06:14 +09:00 |
|
smoogipoo
|
285df52f43
|
Encapsulate logic for selecting/deselecting further
|
2018-02-20 14:54:45 +09:00 |
|
smoogipoo
|
995ecb7d94
|
Make selectedHitObjects into a HashSet for quick Contains checks
|
2018-02-20 14:48:35 +09:00 |
|
smoogipoo
|
87065a0b13
|
Rename + publicise DeselectAll
|
2018-02-20 14:38:57 +09:00 |
|
smoogipoo
|
423fe4eba8
|
Combine border radiuses of selection and capture boxes
|
2018-02-20 14:25:42 +09:00 |
|
smoogipoo
|
8f25a5da66
|
Add playfield aspect ratio + scaling modifications to composer layers
|
2018-02-20 14:01:33 +09:00 |
|
smoogipoo
|
cbac4de9c2
|
Expire + dispose CaptureBoxes
|
2018-02-15 19:11:29 +09:00 |
|
smoogipoo
|
ebcdb62570
|
Remove now unneeded hide
|
2018-02-15 19:10:55 +09:00 |
|
smoogipoo
|
9583191556
|
Dispose SelectionBoxes when they die
|
2018-02-15 19:08:03 +09:00 |
|
smoogipoo
|
4ac0c48ba6
|
Add fadein to SelectionBox
|
2018-02-15 19:07:53 +09:00 |
|
smoogipoo
|
dcbc8c3dcd
|
Remove animated capture boxes for now
|
2018-02-15 18:06:33 +09:00 |
|
smoogipoo
|
115484741d
|
Capture -> Select
|
2018-02-14 17:54:43 +09:00 |
|
smoogipoo
|
a9d14eadac
|
Add clearSelection method
|
2018-02-14 17:53:04 +09:00 |
|
smoogipoo
|
344da5965c
|
Add a CaptureBox that encloses hitobjects from the drag selection
|
2018-02-14 14:38:37 +09:00 |
|
smoogipoo
|
bfedd1cee0
|
Remove nested container
|
2018-02-12 19:01:50 +09:00 |
|
smoogipoo
|
c3212d36ef
|
Remove handles for now (will be re-implemented)
|
2018-02-12 18:36:16 +09:00 |
|
smoogipoo
|
e10bb2db05
|
Unify SelectionLayer and HitObjectCapturer, rename SelectionBox
|
2018-02-12 18:35:01 +09:00 |
|
smoogipoo
|
20c0dee17d
|
Remove SelectionInfo
|
2018-02-12 18:22:52 +09:00 |
|
smoogipoo
|
ee168f9a77
|
Split out drag selection box from post-capture box
Cleans up a lot of code, removes handles for now.
|
2018-02-12 18:20:05 +09:00 |
|
smoogipoo
|
1adbe3585c
|
HitObjectSelectionBox -> SelectionDragger
|
2018-02-12 16:03:59 +09:00 |
|
smoogipoo
|
cfb2b3f1e8
|
Rework SelctionLayer to support click-selections
|
2018-02-12 16:02:42 +09:00 |
|
TocoToucan
|
e88f514cf4
|
Resolve merge conflicts
|
2018-01-21 18:32:21 +03:00 |
|
TocoToucan
|
a81f32a388
|
PlayerGroup -> PlayerSettingsGroup
|
2018-01-15 20:52:52 +03:00 |
|
TocoToucan
|
43d2ae348a
|
Rename ReplaySomething -> PlayerSomething
|
2018-01-13 22:25:09 +03:00 |
|
TocoToucan
|
ae032cbf23
|
Support HandleKeyboardInput, HandleMouseInput, CanReceiveKeyboardInput, CanReceiveMouseInput properties
|
2018-01-07 23:40:00 +03:00 |
|
Dean Herbert
|
37d393bca0
|
Update licence headers
|
2018-01-05 20:21:19 +09:00 |
|
Dean Herbert
|
6f5f4f76e5
|
Use Logger.Error when exceptions are involved
|
2017-12-25 18:21:15 +09:00 |
|
Dean Herbert
|
051a3c4d47
|
Fix line endings
|
2017-12-18 21:51:00 +09:00 |
|
smoogipoo
|
fabf1bf60a
|
Make the captured objects not update for now
Since this is not the intended functionality.
|
2017-12-18 19:31:03 +09:00 |
|
smoogipoo
|
5493493f82
|
FinishCapture -> FinishDrag from Handles
|
2017-12-18 19:24:41 +09:00 |
|
smoogipoo
|
09c51df2bd
|
Marker* -> Handle
|
2017-12-18 19:21:26 +09:00 |
|
smoogipoo
|
3999940538
|
DragSelector -> HitObjectSelectionBox
|
2017-12-18 19:17:26 +09:00 |
|
Dan Balasescu
|
812181190e
|
Update SelectionLayer.cs
|
2017-12-18 14:10:14 +09:00 |
|
Dan Balasescu
|
17c58678cf
|
Update SelectionInfo.cs
|
2017-12-18 13:59:46 +09:00 |
|
smoogipoo
|
66b19b6c97
|
Expose selected objects from SelectionLayer
|
2017-12-15 14:48:24 +09:00 |
|
smoogipoo
|
3d51301e03
|
Add license headers
|
2017-12-11 22:21:33 +09:00 |
|
smoogipoo
|
666dcdbd62
|
Give HitObjectComposer a SelectionLayer
|
2017-12-11 22:20:02 +09:00 |
|
smoogipoo
|
a303bf71cf
|
Give control over screen space conversion to DrawableHitObject
|
2017-12-11 22:19:02 +09:00 |
|
smoogipoo
|
2f1063c5c0
|
Refactor into separate files + add xmldocs + rename some methods
|
2017-12-11 21:56:58 +09:00 |
|
smoogipoo
|
c12c241633
|
Implement hover colours
|
2017-12-11 21:27:19 +09:00 |
|
smoogipoo
|
25d80a36be
|
Finish up logical implementation of markers
|
2017-12-11 21:03:34 +09:00 |
|
smoogipoo
|
5147b342dc
|
More refactorings + add markers
Move
|
2017-12-11 19:07:40 +09:00 |
|
smoogipoo
|
4573cc3322
|
Refactor into a new DragBox class, representing a single drag
|
2017-12-11 17:45:03 +09:00 |
|
smoogipoo
|
5341e79102
|
Remove SelectionDragger for now
|
2017-12-08 17:51:15 +09:00 |
|
smoogipoo
|
faa921ba05
|
Fix up post-merge issues
|
2017-12-08 17:41:10 +09:00 |
|
smoogipoo
|
f41af191ed
|
Merge remote-tracking branch 'origin/master' into editor-selection-tool
|
2017-12-08 15:13:18 +09:00 |
|
smoogipoo
|
a80059032c
|
Remove PlayfieldOverlay
|
2017-12-02 20:24:10 +09:00 |
|
smoogipoo
|
5a7c4772bd
|
Remove PlayfieldUnderlay for now
|
2017-12-02 19:53:20 +09:00 |
|
smoogipoo
|
cf859a6cf2
|
Make the dragger attach to objects it surrounds
Plus a lot more implementation.
|
2017-12-02 00:26:02 +09:00 |
|
smoogipoo
|
f6591851c3
|
Implement a selection dragger box
|
2017-12-01 13:15:58 +09:00 |
|
smoogipoo
|
52ba68e25d
|
Add/fix up license headers
|
2017-11-30 22:21:02 +09:00 |
|
smoogipoo
|
c0c051aa32
|
Remove unused parameter for now
|
2017-11-30 21:58:41 +09:00 |
|
smoogipoo
|
e8cbde3ae1
|
Add overlay/underlay
|
2017-11-30 21:56:19 +09:00 |
|
smoogipoo
|
7e34b0f08d
|
Remove SelectionTool, make Select the default tool
|
2017-11-30 19:53:52 +09:00 |
|
smoogipoo
|
677f3653eb
|
Hide osu! playfield cursor
|
2017-11-30 19:19:34 +09:00 |
|
smoogipoo
|
efa39f38ca
|
CI fixes
|
2017-11-30 18:49:08 +09:00 |
|
smoogipoo
|
e5353bb53e
|
Add border to playfield, add shadow to toolbox buttons
|
2017-11-30 17:38:55 +09:00 |
|
smoogipoo
|
456bbe25f3
|
Implement toolbox into HitObjectComposer
|
2017-11-30 16:58:14 +09:00 |
|
smoogipoo
|
309eb4edd7
|
Integrate HitObjectComposer into Compose
Also removes the other rulesets' HitObjectComposers for now.
|
2017-11-29 17:46:21 +09:00 |
|
smoogipoo
|
8c30fd490c
|
Add HitObjectComposer class
|
2017-11-29 16:22:11 +09:00 |
|