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 |
|
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
|
30de2671fd
|
Merge pull request #2340 from huoyaoyuan/linq
Use Linq.Append and Prepend.
|
2018-04-03 13:14:18 +09:00 |
|
Dean Herbert
|
ddba7254ca
|
Merge remote-tracking branch 'upstream/master' into linq
|
2018-04-03 13:05:08 +09:00 |
|
Dean Herbert
|
0065724992
|
Update framework
|
2018-04-03 13:05:01 +09:00 |
|
Dean Herbert
|
d40ccbd70a
|
Merge branch 'master' into selectionlayer-rewrite
|
2018-04-03 12:03:11 +09:00 |
|
Dean Herbert
|
8eefddd475
|
Merge pull request #2339 from smoogipoo/scalablecontainer-size-fix
Fix ScalableContainer irrepairably altering content size
|
2018-04-03 12:02:56 +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 |
|
Dean Herbert
|
25524bf24f
|
Merge pull request #2342 from smoogipoo/fix-formatexception-beatmap
Handle possible FormatException when parsing timing points
|
2018-04-02 20:20:35 +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 |
|
Dan Balasescu
|
ad4f38f109
|
Merge pull request #2308 from johnneijzen/Small-Clean-Up
Set Correct values for addDelayedMovements() function
|
2018-04-02 14:33:20 +09:00 |
|
Dan Balasescu
|
d7b61b3c09
|
Merge branch 'master' into Small-Clean-Up
|
2018-04-02 14:13:15 +09:00 |
|
Dan Balasescu
|
7a2345959e
|
Merge pull request #2288 from FreezyLemon/fix-songselect-exit-notimplemented
Fix Player trying to load DummyWorkingBeatmap and failing
|
2018-04-02 14:07:40 +09:00 |
|
Dan Balasescu
|
83dcff2907
|
Merge branch 'master' into fix-songselect-exit-notimplemented
|
2018-04-02 13:54:06 +09:00 |
|
Dan Balasescu
|
7bcb86dc3c
|
Merge pull request #2335 from peppy/fix-file-extension-matching
Fix skin path being ignored in extension agnostic lookups
|
2018-04-02 13:53:54 +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
|
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 |
|