1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 02:15:17 +08:00
Commit Graph

11719 Commits

Author SHA1 Message Date
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
cc70f7182a
Merge pull request #2320 from DrabWeb/beatmap-set-status
Add ranked status and video marker to beatmap overlay and panels
2018-03-30 21:07:05 +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
Dean Herbert
7b34c83916
Merge pull request #2333 from Joehuu/hr-on-mania-is-unranked
Revert changes on hard rock mod
2018-03-30 17:54:07 +09: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
smoogipoo
4ad776bfde Make slider circle masks not handle mouse input at all 2018-03-30 14:15:46 +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
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
miterosan
c937789684 Rename GetMessagesRequest to GetChannelMessagesRequest 2018-03-28 21:33:50 +02:00
miterosan
56de6c1067 Rename Channel to ChannelChat 2018-03-28 21:11:06 +02:00
Unknown
ce7000dd50 Merge remote-tracking branch 'origin/master' 2018-03-28 20:48:06 +02: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