Dean Herbert
|
c070c69522
|
Update framework
|
2018-02-22 15:01:53 +09:00 |
|
Dean Herbert
|
ac99ca6881
|
Merge pull request #2100 from Joehuu/sign-in-edits
Reword instances of "login" to "sign in"
|
2018-02-22 14:59:42 +09:00 |
|
smoogipoo
|
0cdf6fa7e2
|
Make HitObjectOverlay into an OverlayContainer
|
2018-02-22 14:36:58 +09:00 |
|
Dean Herbert
|
871bcb4142
|
Merge branch 'master' into sign-in-edits
|
2018-02-22 14:35:29 +09:00 |
|
smoogipoo
|
45c579630d
|
Make selectionLayer handle input below object overlays
|
2018-02-22 14:34:37 +09:00 |
|
Dan Balasescu
|
6cc54a464c
|
Merge branch 'master' into editor-hitobject-overlays
|
2018-02-22 14:25:27 +09:00 |
|
smoogipoo
|
844e87aafe
|
Use the true head position rather than capturing current position
|
2018-02-22 14:25:10 +09:00 |
|
Dean Herbert
|
94b0a7cff8
|
Merge pull request #2091 from smoogipoo/fix-editor-osu-scale
Remove osu! playfield scale from the editor
|
2018-02-22 14:24:30 +09:00 |
|
smoogipoo
|
07252254eb
|
Fix post-merge issues
|
2018-02-22 14:22:04 +09:00 |
|
Dean Herbert
|
ee9a45cc45
|
Merge branch 'master' into sign-in-edits
|
2018-02-22 14:18:49 +09:00 |
|
Dean Herbert
|
f2b3d9a0e8
|
Change some missed instances
|
2018-02-22 14:17:35 +09:00 |
|
smoogipoo
|
99e9eb81f2
|
Merge remote-tracking branch 'origin/master' into editor-hitobject-overlays
|
2018-02-22 14:16:01 +09:00 |
|
Dean Herbert
|
a3336f2577
|
Merge branch 'master' into fix-editor-osu-scale
|
2018-02-22 14:14:41 +09:00 |
|
Dean Herbert
|
8111d7b2bd
|
Merge pull request #2090 from smoogipoo/editor-hitobject-movement
Fix editor layers not respecting playfield aspect ratios + scales
|
2018-02-22 14:12:35 +09:00 |
|
smoogipoo
|
604b0fa20a
|
Fix post-merge issues
|
2018-02-22 14:11:06 +09:00 |
|
smoogipoo
|
ded2644df8
|
Merge branch 'master' into editor-hitobject-overlays
|
2018-02-22 14:08:36 +09:00 |
|
Joseph Madamba
|
3d4bed462b
|
Reword sign in text
|
2018-02-21 20:54:47 -08:00 |
|
Dean Herbert
|
7c942eb592
|
Tidy up layer container logic
|
2018-02-22 13:42:36 +09:00 |
|
Dean Herbert
|
b74cfffc6f
|
Merge branch 'master' into editor-hitobject-movement
|
2018-02-22 13:19:39 +09:00 |
|
Dean Herbert
|
cc3546f907
|
Merge pull request #2094 from smoogipoo/general-slider-improvements
Expose SliderBody's snaking and border colour
|
2018-02-22 13:10:42 +09:00 |
|
Dean Herbert
|
3b4e4bd110
|
Merge remote-tracking branch 'upstream/master' into general-slider-improvements
|
2018-02-22 12:28:33 +09:00 |
|
Dean Herbert
|
8ffb5e2aa7
|
Merge pull request #2097 from smoogipoo/fix-slider-stacking
Fix stacking not working with sliders
|
2018-02-22 11:42:52 +09:00 |
|
Dean Herbert
|
c84ded258f
|
Reset mouse confine mode on input setting reset hotkey
|
2018-02-22 10:08:56 +09:00 |
|
tgi74000
|
426343f136
|
Fix legacy Taiko replays having reversed inputs
|
2018-02-21 15:05:51 +01:00 |
|
smoogipoo
|
5faec5c2f1
|
Add a separate property to control playfield area
|
2018-02-21 20:54:33 +09:00 |
|
smoogipoo
|
6757be2007
|
Fix incorrect RelativeChildSize in Catch
|
2018-02-21 20:15:51 +09:00 |
|
Dan Balasescu
|
671f6233c0
|
Merge branch 'master' into fix-slider-stacking
|
2018-02-21 18:26:34 +09:00 |
|
Dan Balasescu
|
e097d8dcd3
|
Merge branch 'master' into general-slider-improvements
|
2018-02-21 18:04:26 +09:00 |
|
smoogipoo
|
08e52e8c15
|
Remove unnecessary schedules
|
2018-02-21 18:02:52 +09:00 |
|
smoogipoo
|
9cd9c83f2c
|
Allow changing accentcolour/bordercolour post-load
|
2018-02-21 18:00:46 +09:00 |
|
Dan Balasescu
|
7e8b677e17
|
Merge pull request #2096 from peppy/update-framework
Fix some common CI unit test failure causes
|
2018-02-21 17:59:17 +09:00 |
|
smoogipoo
|
0d60a65c94
|
Fix OsuAutoGenerator not considering stacking
|
2018-02-21 17:53:16 +09:00 |
|
smoogipoo
|
f903e6d241
|
Fix stacking not working with sliders
Fixes #2093.
|
2018-02-21 17:46:45 +09:00 |
|
smoogipoo
|
f012cce668
|
Rewrite some xmldocs to make methods easier to understand
|
2018-02-21 17:33:22 +09:00 |
|
smoogipoo
|
f877b642da
|
Clean up and document better what "progress" means
|
2018-02-21 17:10:18 +09:00 |
|
Dean Herbert
|
31edcfa35c
|
Attempt to fix beatmap carousel test failures
As seen here: https://ci.appveyor.com/project/peppy/osu/build/master-7260#L1164
Potentially was continuing operation too early.
|
2018-02-21 16:14:45 +09:00 |
|
Dean Herbert
|
cb1ed2fb89
|
Update framework
|
2018-02-21 16:14:39 +09:00 |
|
Dan Balasescu
|
e7d17b9578
|
Merge branch 'master' into editor-hitobject-overlays
|
2018-02-21 12:48:14 +09:00 |
|
Dean Herbert
|
50d0278cbd
|
Merge branch 'master' into general-slider-improvements
|
2018-02-21 11:28:45 +09:00 |
|
smoogipoo
|
9a9f53ddfd
|
Remove 0.75 scale from osu! playfield in the editor
|
2018-02-21 11:10:43 +09:00 |
|
smoogipoo
|
4934ef7429
|
Add playfield aspect ratio + scaling modifications to composer layers
|
2018-02-21 11:07:42 +09:00 |
|
smoogipoo
|
6b8b39abc5
|
Rewrite SelectionLayer testcase to construct an entire HitObjectComposer
|
2018-02-21 11:07:42 +09:00 |
|
smoogipoo
|
7fd7dc1538
|
Extract playfield scaling into a separate class
And make it more general.
|
2018-02-21 11:07:42 +09:00 |
|
Dean Herbert
|
b3424c14f1
|
Merge pull request #2088 from smoogipoo/osu-rulesetcontainer-aspect
Move manual OsuPlayfield aspect adjustment into the RulesetContainer method
|
2018-02-21 11:05:03 +09:00 |
|
Dean Herbert
|
ba10eb5e50
|
Merge branch 'master' into osu-rulesetcontainer-aspect
|
2018-02-21 10:13:44 +09:00 |
|
smoogipoo
|
7fe0989427
|
Merge branch 'general-slider-improvements' into editor-hitobject-overlays
|
2018-02-20 23:51:47 +09:00 |
|
smoogipoo
|
ee055b8e5c
|
Allow customizing the snake-ability of sliders
|
2018-02-20 20:53:06 +09:00 |
|
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 |
|