1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-09 03:37:33 +08:00
Commit Graph

11692 Commits

Author SHA1 Message Date
miterosan
525e50e8dd Merge remote-tracking branch 'origin/master' into Private_Messages 2018-04-08 15:23:09 +02:00
miterosan
f1696eae92 Use IEnumable instead of List 2018-04-08 15:01:14 +02:00
Dean Herbert
81981acc68
Merge pull request #2354 from peppy/manual-input-test-case
Create ManualInputManagerTestCase
2018-04-06 20:52:07 +09:00
Dean Herbert
c2a2457160
Merge branch 'master' into manual-input-test-case 2018-04-06 20:42:08 +09:00
Dean Herbert
596b63f7df
Merge pull request #2353 from peppy/dynamic-assembly-update
Update AssemblyInfo in line with framework changes
2018-04-06 20:41:51 +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
b91f538d5d
Merge pull request #2329 from smoogipoo/selectionlayer-rewrite
Rewrite editor selections to better handle selection and movement logic
2018-04-06 20:06:49 +09:00
smoogipoo
c80c1071e8 Update framework 2018-04-06 19:54:19 +09:00
Dean Herbert
ae2dce254a Rename TestCase 2018-04-06 19:53:34 +09:00
Dean Herbert
cd48cb1887 Add comment 2018-04-06 19:53:23 +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
714326b606 Fix TestCase not working with dynamic compilation 2018-04-06 13:16:27 +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
b87a92dbf8
Merge branch 'master' into selectionlayer-rewrite 2018-04-05 21:09:04 +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
Dan Balasescu
e120b0edae
Merge pull request #2352 from peppy/remove-test-testcase
Remove TestTestCase
2018-04-05 17:13:15 +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
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
0b7432d3db
Merge pull request #2348 from smoogipoo/fix-catch-auto
Fix osu!catch autoplay missing starts/ends of JuiceStreams
2018-04-04 19:02:11 +09:00
Dean Herbert
bce114a37b Make AliveMasks private 2018-04-04 18:55:17 +09:00
Dean Herbert
e69951b59f Rename test to signify it's got auto enabled 2018-04-04 18:48:24 +09:00
Dean Herbert
13747966a0
Merge branch 'master' into fix-catch-auto 2018-04-04 18:30:55 +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
ad10bbe0ef
Merge pull request #2349 from smoogipoo/editor-no-judgements
Don't display judgements in OsuEditPlayfield
2018-04-04 17:23:03 +09:00
smoogipoo
d4cb00e08f Don't display judgements in OsuEditPlayfield 2018-04-04 17:12:41 +09:00
Dan Balasescu
9558554ab9
Merge pull request #2336 from Frontear/colours-for-judgements
Implement Judgement Colours
2018-04-04 16:30:52 +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
smoogipoo
364c3bca06 Fix osu!catch autoplay missing starts/ends of JuiceStreams
Fixes #2328.

Would only happen when ticks and ends were spaced too far apart (or there were no ticks in a juicestream).
2018-04-04 16:24:03 +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
fc09970bc5
Merge pull request #2331 from DrabWeb/osu-tab-strip
Tab strip
2018-04-04 15:12:44 +09:00