Dean Herbert
069d48ac14
Remove unused variable
2018-04-15 15:29:00 +09:00
TocoToucan
671de4f6c2
Resolve merge conflicts
2018-04-14 15:11:28 +03:00
FreezyLemon
3ece54e1c3
make buttons only accept input when expanded
...
both other states are "inactive"/invisible so should never accept keyboard input
2018-04-14 00:08:54 +02:00
tgi74000
73ba8e1c87
CI: remove unused directive
2018-04-13 16:10:01 +02:00
tgi74000
b23b0a445b
Add support for replay mods
2018-04-13 15:41:35 +02:00
smoogipoo
fe77417e03
Merge remote-tracking branch 'origin/master' into ignored_input_handler
2018-04-13 22:23:33 +09:00
Dan Balasescu
258e17566c
Merge branch 'master' into update-nunit-3.10.1
2018-04-13 22:05:26 +09:00
Dean Herbert
a0f9f8d512
Update frramework again
2018-04-13 21:47:50 +09:00
smoogipoo
cf65833572
Reword xmldoc
2018-04-13 21:15:08 +09:00
smoogipoo
733f70cbd5
Merge remote-tracking branch 'origin/master' into instant-hide-screenshot
2018-04-13 21:13:09 +09:00
smoogipoo
34adb2527c
A lot more protection from outsiders
2018-04-13 21:12:33 +09:00
smoogipoo
cd594ce12b
BDL cache screenshot manager
2018-04-13 20:46:01 +09:00
FreezyLemon
4b3a129738
bump NUnit to version 3.10.1
2018-04-13 13:19:52 +02:00
Dean Herbert
9f5a52b641
Merge remote-tracking branch 'upstream/master' into UselessToucan-ignored_input_handler
2018-04-13 19:54:15 +09:00
Dean Herbert
81f0649e44
Merge remote-tracking branch 'origin/master' into tgi74-rightclickscrolling
2018-04-13 19:50:44 +09:00
tgi74000
1a2b1d4c98
Use the already existent RightMouseScrollbar field
2018-04-13 11:32:33 +02:00
Dean Herbert
32a74f95a5
Normalize all the line endings
2018-04-13 18:26:38 +09:00
tgi74000
e3cd0ef200
Add right click scrolling in song select (and its option)
2018-04-13 11:09:49 +02:00
Dean Herbert
a1a7e63646
Merge branch 'master' into ignored_input_handler
2018-04-13 18:05:12 +09:00
Endrik Tombak
d9f587edff
Merge remote-tracking branch 'upstream/master' into alt-eagerselect
2018-04-13 11:55:35 +03:00
smoogipoo
0235eba9de
Make TakeScreenshotAsync await on the internal task
2018-04-13 17:51:09 +09:00
smoogipoo
2e5bbe7074
Don't expose CursorOverrideContainer via DI + internalise access
2018-04-13 17:36:38 +09:00
smoogipoo
826a8552e5
Reword options item to include "screenshot"
2018-04-13 17:30:02 +09:00
smoogipoo
ebe36f0612
Instantly hide cursor for required frames while taking screenshot
2018-04-13 17:27:10 +09:00
Dean Herbert
f7c50dee65
Merge branch 'master' into beatmap_set_overlay_difficulties_ordering
2018-04-13 16:48:43 +09:00
Dan Balasescu
2699ad8c89
Merge branch 'master' into lowercase-back-button
2018-04-13 14:14:18 +09:00
Joehu
128446e51d
Remove composer from player loader
2018-04-12 16:46:46 -07:00
TocoToucan
9acea6eab0
Order beatmap difficulty icons correctly
2018-04-12 19:33:30 +03:00
Joehu
61d6f52a53
Lowercase back button
2018-04-12 08:26:25 -07:00
Joehu
463b189d2f
Remove unused using directives
2018-04-12 08:13:24 -07:00
Joehu
df4b64effc
Rename rankStatus to searchCategory
2018-04-12 08:03:19 -07:00
Joehu
f18594887b
Move enum to SearchBeatmapSetsRequest
2018-04-12 07:49:23 -07:00
TocoToucan
7c3441e2d0
ActiveInputHandlers -> IgnoredInputHandler
2018-04-12 17:06:35 +03:00
Dean Herbert
127f0d7b01
Fix smoogipoo's comments
2018-04-12 21:17:17 +09:00
Dean Herbert
0ca703beaa
Add some missing xmldoc
2018-04-12 21:04:45 +09:00
Dean Herbert
b50bad0072
Merge branch 'master' into editor-clock
2018-04-12 19:29:58 +09:00
Dean Herbert
3ddf00ee74
Merge branch 'master' into high-level-xmldoc
2018-04-12 19:05:10 +09:00
Joehu
461e063f19
Rename RankStatus to BeatmapSearchCategory
2018-04-11 22:50:39 -07:00
smoogipoo
baae4427ff
Move string-token property to OAuth
2018-04-12 14:30:28 +09:00
smoogipoo
e007365916
Save OAuth token to config on every token change
2018-04-12 14:23:49 +09:00
smoogipoo
6e35910419
Remove start/stop clock logic
...
Beatmap track shouldn't be start/stopped anyway - the IAdjustableClock should be DI'd in to perform the functionality.
2018-04-12 14:06:36 +09:00
smoogipoo
a2484fbf56
Move back to DI-ing adjustable clock into SummaryTimeline
2018-04-12 13:37:02 +09:00
smoogipoo
fbc50d6030
Merge master into editor-clock
2018-04-12 13:35:53 +09:00
Dan Balasescu
9e2494c57b
Merge branch 'master' into high-level-xmldoc
2018-04-12 12:59:37 +09:00
DrabWeb
0bede52381
Move the waves portion of WaveOverlayContainer to WaveContainer to allow usage in other places.
2018-04-11 16:22:27 -03:00
TocoToucan
d7812ab12e
CursorOverrideContainer.ShowMenuCursor
2018-04-11 21:22:52 +03:00
TocoToucan
6a8f568f66
BeatmapContainer -> beatmapContainer
2018-04-11 16:32:58 +03:00
TocoToucan
6cdfaffcf7
PaginatedBeatmapContainer.BeganPlayingPreview
2018-04-11 16:19:21 +03:00
Dean Herbert
903dd7a015
Fix regression causing hard crash
...
Regressed in #2373 . My bad.
2018-04-11 19:24:19 +09:00
naoey
d851446aca
Remove redundant anchor and use Show/Hide instead of FadeIn/Out.
2018-04-10 19:15:37 +05:30
Joseph Madamba
767ecb4422
Fix rank status
2018-04-10 00:11:53 -07:00
Dean Herbert
c33cb9c02e
Merge branch 'master' into show-beatmap-id
2018-04-10 16:05:32 +09:00
UselessToucan
9225c06872
Merge branch 'master' into hide_menu_cursor
2018-04-09 21:41:54 +03:00
smoogipoo
b97c4e8b44
Fix all possible cases of crossthread import data races
2018-04-09 12:45:44 +09:00
Dean Herbert
421e9e0641
Add xmldoc to some high-level classes to explain their separation
2018-04-08 12:58:34 +09:00
TocoToucan
640be621ac
Handle multiple song previews playing in different beatmap categories on profile
2018-04-07 13:29:46 +03:00
Dean Herbert
c2a2457160
Merge branch 'master' into manual-input-test-case
2018-04-06 20:42:08 +09:00
Dan Balasescu
1895111c75
Merge branch 'master' into dynamic-assembly-update
2018-04-06 20:16:13 +09:00
Dean Herbert
6bc319caae
Merge branch 'master' into manual-input-test-case
2018-04-06 20:07:07 +09:00
Dean Herbert
cd48cb1887
Add comment
2018-04-06 19:53:23 +09:00
smoogipoo
070e68f235
Give the test case clock an accurate IsRunning value
2018-04-06 19:14:04 +09:00
smoogipoo
e59124962c
Remove re-instantiation of clock in EditorClockTestCase
2018-04-06 18:38:44 +09:00
Endrik
c7440201fb
Merge branch 'master' into alt-eagerselect
2018-04-06 12:37:16 +03:00
smoogipoo
b238130fe4
DI beat divisors to test cases with editor clocks
2018-04-06 18:23:22 +09:00
smoogipoo
9e8490735f
Fix Compose not binding to the editor's beat divisor
2018-04-06 18:22:24 +09:00
smoogipoo
248be8e35f
HitObjectComposer no longer needs a beat divisor
2018-04-06 18:21:45 +09:00
smoogipoo
fdb3227fd7
Fix + cleanup testcases
2018-04-06 18:12:44 +09:00
smoogipoo
c7abd56fc4
Give editor a custom clock to handle seeking
2018-04-06 18:11:37 +09:00
Dean Herbert
768a5e5383
Create ManualInputManagerTestCase
...
A base class for running more input-driven tests.
2018-04-06 15:23:30 +09:00
Dean Herbert
acbdbcc3df
Update AssemblyInfo in line with framework changes
2018-04-06 13:17:26 +09:00
Dean Herbert
5426432e46
Fix drag select crashing
2018-04-06 11:47:21 +09:00
Dean Herbert
32e8d93596
Fix selection changing when clicking overlapping hitobjects
2018-04-06 11:22:36 +09:00
Dean Herbert
24b9a8c983
Allow HitObjectMasks to handle drag events directly
2018-04-06 10:29:34 +09:00
Dean Herbert
5749e71560
Apply review fixes
2018-04-05 21:06:48 +09:00
Dean Herbert
345cfb077d
No need to sort list any more
2018-04-05 21:03:39 +09:00
Dean Herbert
1a6dfcbc1c
Merge branch 'master' into selectionlayer-rewrite
2018-04-05 21:03:29 +09:00
Dean Herbert
37fb207abd
Remove TestTestCase
...
No longer necessary as we have restructured tests considerably.
2018-04-05 16:01:33 +09:00
Dean Herbert
0ad4b8a6f8
Remove TestTestCase
...
No longer necessary as we have restructured tests considerably.
2018-04-05 15:55:47 +09:00
naoey
ca4299c6fe
Remove unused using and fix possible nullref.
2018-04-04 22:07:24 +05:30
naoey
7482d5986a
Add a loading state to BeatmapSetOverlay.
...
- Handle null value in header and info sections
- Add item to context menu for carousel beatmaps to show details
2018-04-04 21:46:31 +05:30
naoey
c304c1eecf
Make LinkFlowContainer handle beatmap id lookup in game.
2018-04-04 21:23:51 +05:30
Dean Herbert
6c125683d4
Merge branch 'master' into selectionlayer-rewrite
2018-04-04 20:47:36 +09:00
Dean Herbert
216c4629e0
Fix dragging backwards not deselecting pending selection
2018-04-04 20:44:22 +09:00
Dean Herbert
b7325d73e8
Don't inherit VisbilityContainer
2018-04-04 20:44:11 +09:00
Dean Herbert
94c3f38541
Pass down input state instead of parent lookup
2018-04-04 20:06:45 +09:00
Dean Herbert
2b15555ede
Remove MaskContainer dependency in MaskSelection
2018-04-04 20:05:01 +09:00
Dean Herbert
5c036b966b
Formatting fixes
2018-04-04 20:04:54 +09:00
Dean Herbert
a997ec6139
Fix ShouldBeAlive state
2018-04-04 19:51:56 +09:00
Dean Herbert
31a7db0a35
Fix drag mishaps
2018-04-04 19:42:59 +09:00
Dean Herbert
bce114a37b
Make AliveMasks private
2018-04-04 18:55:17 +09:00
Dean Herbert
4d71f2084c
Move individual mask selection logic out of MaskSelection
2018-04-04 18:29:53 +09:00
Dean Herbert
b6b8c51657
Remove DragLayer dependency on MaskContainer
2018-04-04 18:20:32 +09:00
Dean Herbert
c2d371797e
Fix unbind failure
2018-04-04 17:38:34 +09:00
Dean Herbert
c712b29b5b
Rename dragBox to dragLayer
2018-04-04 16:24:27 +09:00
Dean Herbert
4196bb8c24
Move selection logic to MaskContainer
2018-04-04 16:24:13 +09:00
Dean Herbert
d453c2589a
Add an explanatory comment for weird override
2018-04-04 16:02:20 +09:00
Dean Herbert
788bfde002
Merge branch 'master' into selectionlayer-rewrite
2018-04-04 15:38:27 +09:00
Dan Balasescu
d418a4803f
Merge branch 'master' into colours-for-judgements
2018-04-04 15:13:52 +09:00
Dan Balasescu
bed46b1f7e
Split local variable assignment from construction of children
2018-04-04 15:13:42 +09:00
Dan Balasescu
9df525a38d
Remove extra whitespace
...
In general we don't really do this elsewhere in the codebase.
2018-04-04 15:11:16 +09:00
DrabWeb
65f0e91734
Use Interpolation function directly for resizing tab strips.
2018-04-04 03:04:26 -03:00
Dan Balasescu
b5d7a5df00
Merge branch 'master' into colours-for-judgements
2018-04-04 15:02:03 +09:00
Dan Balasescu
6dfca4b2fa
Merge branch 'master' into osu-tab-strip
2018-04-04 14:20:06 +09:00
smoogipoo
4f19059e55
DragBox -> DragLayer
2018-04-03 21:29:49 +09:00
Dean Herbert
ddba7254ca
Merge remote-tracking branch 'upstream/master' into linq
2018-04-03 13:05:08 +09:00
Dean Herbert
d40ccbd70a
Merge branch 'master' into selectionlayer-rewrite
2018-04-03 12:03:11 +09:00
Dean Herbert
77189073b2
Merge branch 'master' into scalablecontainer-size-fix
2018-04-03 11:29:36 +09:00
Dean Herbert
57b4cdaf85
Merge branch 'master' into selectionlayer-rewrite
2018-04-03 03:05:42 +09:00
smoogipoo
fd9480cfb6
Handle timingpoint FormatException
2018-04-02 20:08:40 +09:00
smoogipoo
d24d81d8a9
De-pluralize some methods
2018-04-02 20:07:18 +09:00
smoogipoo
69e2d4fd22
Make CarouselRoot a nested class
2018-04-02 15:24:08 +09:00
Dan Balasescu
6f88a80bde
Merge branch 'master' into alt-eagerselect
2018-04-02 15:18:22 +09:00
smoogipoo
82a847b820
Extract random selection logic into CarouselRoot
2018-04-02 15:16:10 +09:00
Dan Balasescu
83dcff2907
Merge branch 'master' into fix-songselect-exit-notimplemented
2018-04-02 13:54:06 +09:00
Dan Balasescu
32832304a7
Merge branch 'master' into fix-songselect-exit-notimplemented
2018-04-02 13:53:41 +09:00
Dan Balasescu
323534c721
Merge branch 'master' into fix-file-extension-matching
2018-04-02 13:27:14 +09:00
Huo Yaoyuan
b842f682eb
Use Linq.Append and Prepend.
2018-04-02 12:06:34 +08:00
smoogipoo
551ba6ac4b
Fix ScalableContainer irrepairably altering content size
2018-04-02 13:06:06 +09:00
Ali Rizvi
7fed8d64de
Implement Judgement Colours
2018-03-31 04:59:08 +09:00
Dean Herbert
cf3cafd9a9
Merge branch 'master' into beatmap-set-status
2018-03-30 20:55:36 +09:00
Dean Herbert
c39f056b3b
Fix skin path being ignored in extension agnostic lookups
...
Closes #2295 .
2018-03-30 18:06:18 +09:00
Endrik Tombak
7e30375443
Use selectNextRandom instead
2018-03-30 10:46:46 +03:00
Dan Balasescu
824201336a
Merge branch 'master' into hr-on-mania-is-unranked
2018-03-30 16:35:00 +09:00
smoogipoo
f1f7d978ec
Add some comments
2018-03-30 16:28:59 +09:00
smoogipoo
69a7ddbf1e
Fix ordering of display/input of HitObjectMasks
2018-03-30 16:28:49 +09:00
smoogipoo
53541a5c8d
Add license header
2018-03-30 15:53:31 +09:00
smoogipoo
5d0a636cc4
Rename SelectionBox -> Selection
2018-03-30 15:51:38 +09:00
smoogipoo
1dca1663c3
Handle all selection events within SelectionBox (incl. single-mask)
2018-03-30 15:50:55 +09:00
smoogipoo
082e5e4949
Reduce iterations of DragBox
2018-03-30 15:06:52 +09:00
Dean Herbert
31ade986a7
Scren async changes in line with framework changes
...
Makes editor not stutter on load, amongst other screens.
2018-03-30 14:58:11 +09:00
Joseph Madamba
0887dafa2c
Revert changes on hard rock mod
2018-03-29 20:36:52 -07:00
Dean Herbert
e1123c5a95
Merge branch 'master' into selectionlayer-rewrite
2018-03-30 12:29:58 +09:00
Endrik Tombak
3f65e3a7e3
Make selection at random when last was null
2018-03-30 00:15:32 +03:00
DrabWeb
e3218250d5
Fix tab strip in BreadcrumbControl, allow strip height to be overriden.
2018-03-29 15:41:27 -03:00
DrabWeb
3d05798d80
Change SearchableListOverlay to use OsuTabControl strip.
2018-03-29 15:34:53 -03:00
DrabWeb
f43b009b96
Add optional strip to OsuTabControl.
2018-03-29 15:29:45 -03:00
smoogipoo
6b2ca36657
Add license header
2018-03-29 22:52:42 +09:00
smoogipoo
6767dd3d4a
Fix hitobject masks dying with no recovery
2018-03-29 22:42:42 +09:00
smoogipoo
d9c5a0c6d1
Fix position editing not working
2018-03-29 22:38:44 +09:00
smoogipoo
4446aeaa0d
Commenting + cleanup of HitObjectMask/HitObjectMaskLayer
2018-03-29 22:38:28 +09:00
smoogipoo
d8f26f2260
Make HitObjectMaskLayer not iterate through all masks when deselecting
2018-03-29 22:22:42 +09:00
smoogipoo
1018711cc9
Cleanup SelectionBox
2018-03-29 22:20:56 +09:00
smoogipoo
346de77776
Cleanup DragBox
2018-03-29 22:13:28 +09:00
smoogipoo
04874bcda4
"overlay" -> "mask"
2018-03-29 22:09:22 +09:00
smoogipoo
6d4f94756e
Rewrite the way drag + click selections happen
...
The general idea here is that we need the masks to handle mouse down events, as they need to handle the drag (mousedown -> drag immediately).
I've rewritten the editor selections to use events, as there are some 3 different components that handle/trigger selections in different ways.
1. All selections/deselections now propagate through `HitObjectMask.Select()`/`HitObjectMask.Deselect()`.
2. Components that react to changes in the selection bind to the masks' `Selected`/`Deselected` events, and track them/change their states locally.
3. Masks provide a `SingleSelectionRequested` event which is invoked on the mouse-down event. Various components bind to this event to perform state changes locally in this scenario.
4. `DragBox` now handles all drag input locally. It triggers `Select`/`Deselect` on the masks it needs to.
5. `SelectionBox` handles the display of itself locally.
6. `SelectionBox` handles movement of groups of masks locally.
7. `HitObjectMasks` handles movement of itself locally.
2018-03-29 22:07:23 +09:00
smoogipoo
57e4281601
Make HitObjectMasks VisibilityContainers
2018-03-29 18:44:15 +09:00
smoogipoo
6314694557
Make HitObjectMaskLayer always create masks for all objects
2018-03-29 17:13:45 +09:00
smoogipoo
187a025d36
Make hitobjects sorted by their start times
2018-03-29 16:07:31 +09:00
Dean Herbert
9aae568bbe
Tidy up csproj further
2018-03-28 15:19:56 +09:00
Dean Herbert
94b1d3e4af
Make VisualTests/nUnit work again
2018-03-28 12:33:01 +09:00
