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

11131 Commits

Author SHA1 Message Date
smoogipoo
8270e4d758 Add BorderColour to SliderBody 2018-02-20 20:51:28 +09:00
smoogipoo
ad2f556133 Add hitobject overlays to selected hitobjects 2018-02-20 18:01:45 +09:00
Dean Herbert
e1a6017df9
Merge pull request #2092 from smoogipoo/fix-selection-border-radius
Combine border radiuses of selection and capture boxes
2018-02-20 16:00:07 +09:00
Dean Herbert
cce7855bf9
Merge branch 'master' into fix-selection-border-radius 2018-02-20 15:28:51 +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
Dan Balasescu
80e6d4fbe4
Merge pull request #2075 from peppy/api-interface
Improve testability of API
2018-02-20 14:46:59 +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
Dan Balasescu
3d7f998c9b
Merge branch 'master' into osu-rulesetcontainer-aspect 2018-02-20 14:07:04 +09:00
smoogipoo
4da93e8f1d Merge remote-tracking branch 'origin/master' into editor-hitobject-movement 2018-02-20 14:03:47 +09:00
smoogipoo
8f25a5da66 Add playfield aspect ratio + scaling modifications to composer layers 2018-02-20 14:01:33 +09:00
smoogipoo
2c37a7e19f Rewrite SelectionLayer testcase to construct an entire HitObjectComposer 2018-02-20 13:50:55 +09:00
smoogipoo
4a5cd6520c Extract playfield scaling into a separate class
And make it more general.
2018-02-20 13:50:31 +09:00
Dean Herbert
835136aecb
Merge branch 'master' into api-interface 2018-02-20 09:33:53 +09:00
Dean Herbert
63c8b11c2c
Merge pull request #2058 from smoogipoo/editor-hitobject-movement
Rewrite editor hitobject selections
2018-02-19 18:23:31 +09:00
Dean Herbert
f41a40be15
Merge branch 'master' into editor-hitobject-movement 2018-02-19 17:59:50 +09:00
Dean Herbert
d434852fe6
Merge pull request #2073 from peppy/storyboard-improvements
Give storyboards a BeatmapInfo to reduce weird method calls
2018-02-19 17:59:29 +09:00
Dean Herbert
fae6ea1ee2
Merge branch 'master' into storyboard-improvements 2018-02-19 17:28:53 +09:00
Dan Balasescu
6cad316d69
Merge pull request #2087 from peppy/fix-replay-import
Fix replay import
2018-02-19 17:28:26 +09:00
smoogipoo
4898c321f8 Merge branch 'osu-rulesetcontainer-aspect' into editor-hitobject-movement 2018-02-19 17:07:03 +09:00
smoogipoo
b7be162f28 Remove AspectAdjust property (override GetAspectAdjustedSize instead) 2018-02-19 17:05:10 +09:00
smoogipoo
cd2c9a9de6 Adjust xmldoc and rename to GetAspectAdjustedSize 2018-02-19 17:04:18 +09:00
smoogipoo
ef11ce3dd1 Remove Size override from OsuPlayfield 2018-02-19 17:02:27 +09:00
Dean Herbert
d70d40e3b8 Add back forgotten score store to valid importers 2018-02-19 15:52:14 +09:00
Dan Balasescu
34f76a4136
Merge branch 'master' into storyboard-improvements 2018-02-19 15:40:09 +09:00
Dan Balasescu
999d0f99a6
Merge pull request #2070 from peppy/abstract-model-managers
Abstract away model-filemodel and add mutable stores
2018-02-19 15:25:42 +09:00
Dan Balasescu
80010dd845
Merge branch 'master' into api-interface 2018-02-19 15:24:50 +09:00
Dan Balasescu
5401b0dfcd
Merge branch 'master' into abstract-model-managers 2018-02-19 14:56:21 +09:00
Dean Herbert
7c43a3b4c0
Merge branch 'master' into storyboard-improvements 2018-02-19 14:54:12 +09:00
Dean Herbert
57e61b0b0e Update xmldoc 2018-02-19 14:50:42 +09:00
Dan Balasescu
8d61f60388
Merge pull request #2074 from peppy/visual-settings-improvements
Collapse visual settings by default in player
2018-02-19 14:31:08 +09:00
Dean Herbert
8b89735e9e Improve xmldoc for DatabaseContextFactory.Get 2018-02-19 14:17:41 +09:00
Dean Herbert
a7915e7041 Fix typo 2018-02-19 14:00:48 +09:00
Dean Herbert
e0faf14a3e Actually consume ReplacesBackground 2018-02-19 12:33:07 +09:00
Dean Herbert
58af66bfc0 Merge branch 'master' into editor-hitobject-movement 2018-02-16 13:59:11 +09:00
Dean Herbert
75dcf72520 Improve testability of API 2018-02-16 13:57:39 +09:00
Dean Herbert
29adedfa96 Collapse visual settings by default in player 2018-02-16 12:47:32 +09:00
Dean Herbert
21b641b302 Give storyboards a BeatmapInfo to reduce weird method calls
Also removes unnecessary background texture (the actual storyboard background spec wasn't implemented correctly anyway).
2018-02-16 12:09:23 +09:00
Dean Herbert
9760f30ce9 Tidy things up to make more sense 2018-02-16 12:08:36 +09:00
Dean Herbert
f22f9b5de0
Merge branch 'master' into PlayerBase 2018-02-16 11:26:57 +09:00
Dean Herbert
ddf49c2e65 Fix intro not being replaced by a playable song when entering song select 2018-02-16 10:45:15 +09:00
TocoToucan
c57e8785e2 Move all storyboard loading to Player itself 2018-02-15 23:57:53 +03:00
Dean Herbert
9ea7f12f8d
Merge branch 'master' into abstract-model-managers 2018-02-15 20:39:08 +09:00
Dean Herbert
e1f81488cd
Merge pull request #2071 from peppy/fix-textboxes
Update framework (and fix left/right arrow control of textboxes)
2018-02-15 20:28:33 +09:00
Dean Herbert
96c23d2a62 Add override to fix left/right arrow control 2018-02-15 19:41:15 +09:00
Dean Herbert
e2421ffe31 Update framework 2018-02-15 19:41:03 +09:00
smoogipoo
cbac4de9c2 Expire + dispose CaptureBoxes 2018-02-15 19:11:29 +09:00