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
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
3129c2cc75
Fix slider circle masks blocking input for now
2018-03-29 22:41:49 +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
Dan Balasescu
33b38b68cc
Merge pull request #2326 from peppy/rider-configuration
...
Add rider run/debug configurations
2018-03-29 19:27:48 +09:00
Dean Herbert
ce6a61a5b7
Update framework
2018-03-29 18:56:36 +09:00
Dean Herbert
487c25c3dd
Merge remote-tracking branch 'upstream/master' into rider-configuration
2018-03-29 18:55:59 +09:00
smoogipoo
57e4281601
Make HitObjectMasks VisibilityContainers
2018-03-29 18:44:15 +09:00
Dean Herbert
4cc478d9f7
Merge pull request #2325 from smoogipoo/fix-mania-sounds
...
Fix mania playing the wrong/duplicated sounds on playfield keypress
2018-03-29 17:46:29 +09:00
smoogipoo
4bdfc9dca9
Fix testcase
2018-03-29 17:19:14 +09:00
Dean Herbert
173f79f7b6
Force build before run
2018-03-29 17:17:33 +09:00
smoogipoo
6314694557
Make HitObjectMaskLayer always create masks for all objects
2018-03-29 17:13:45 +09:00
Dean Herbert
49c8bc44ad
Remove silly stuff
2018-03-29 17:08:06 +09:00
Dean Herbert
5c4b0c2b8d
Add rider run/debug configurations
2018-03-29 16:55:38 +09:00
smoogipoo
bb7618eb0c
FIx mania playfield playing the wrong/duplicated sounds
...
Fixes #2266 .
2018-03-29 16:13:31 +09:00
smoogipoo
187a025d36
Make hitobjects sorted by their start times
2018-03-29 16:07:31 +09:00
Dan Balasescu
fcf0b25fa0
Merge pull request #2321 from peppy/fix-visual-tests
...
Make VisualTests/nUnit work again
2018-03-29 12:58:56 +09:00
smoogipoo
cc35b1ab64
Update framework
2018-03-29 12:47:24 +09:00
smoogipoo
687c889345
Add back osu.Desktop versions (used in deploy)
2018-03-29 12:47:17 +09:00
smoogipoo
d83e4dfd24
Add .vscode configurations for ruleset test projects
2018-03-29 12:26:32 +09:00
Dean Herbert
01116a73a3
Update framework
2018-03-28 18:09:18 +09:00
Dean Herbert
e47276c6b0
Remove VisualTests solution configuration
2018-03-28 16:17:04 +09:00
Dean Herbert
59df02da00
Update test projects to actually load in visual studio
2018-03-28 16:12:25 +09:00
Dean Herbert
9aae568bbe
Tidy up csproj further
2018-03-28 15:19:56 +09:00
Dean Herbert
81a8385c8c
Remove lingering reference to tests
2018-03-28 15:17:09 +09:00
Dean Herbert
9667d54ecb
Add missing licence headers
2018-03-28 14:48:08 +09:00
Dean Herbert
093bd7db3c
Update vscode build configurations
2018-03-28 14:41:37 +09:00
Dean Herbert
0026b94cd3
Consolidate and move ruleset test projects
2018-03-28 14:41:25 +09:00
Dean Herbert
c355a0794c
Let appveyor do its own discovery
2018-03-28 13:12:32 +09:00
Dean Herbert
4907f14dbe
Add back resources
2018-03-28 13:00:18 +09:00
Dean Herbert
94b1d3e4af
Make VisualTests/nUnit work again
2018-03-28 12:33:01 +09:00
DrabWeb
84bb96740f
Fix merge error.
2018-03-27 18:27:30 -03:00
DrabWeb
19bc6b9168
Merge https://github.com/ppy/osu into beatmap-set-status
2018-03-27 18:13:58 -03:00
DrabWeb
506e27a30e
Cleanup.
2018-03-27 17:59:58 -03:00
Dean Herbert
306ff09792
Merge pull request #2305 from smoogipoo/update-netstandard
...
Switch to .NET Standard 2.0
2018-03-27 22:55:38 +09:00
Dean Herbert
d47d7a3dd4
Update submodules
2018-03-27 22:47:01 +09:00
Dean Herbert
efac68a8f5
Update deploy script
2018-03-27 22:36:43 +09:00
Dean Herbert
d76bc1a8ad
Revert "Move NoWarns"
...
This reverts commit 75a413a40e
.
2018-03-27 21:13:06 +09:00
Dean Herbert
524044d487
Add licence header to SquirrelUpdateManager
2018-03-27 19:19:28 +09:00