Dean Herbert
|
9cb4374b51
|
Merge branch 'master' into slider-controlpoint-masks
|
2018-11-01 02:37:31 +09:00 |
|
smoogipoo
|
ffec532079
|
Fix segment control points not changing in unison
|
2018-10-31 19:02:47 +09:00 |
|
smoogipoo
|
d2fbf05137
|
Reduce size of control point
|
2018-10-31 18:01:53 +09:00 |
|
Dan Balasescu
|
4c358a3d4d
|
Merge pull request #3664 from peppy/fix-scroll-handling
Fix placement masks handling scroll events
|
2018-10-31 17:38:18 +09:00 |
|
Dean Herbert
|
85a7325911
|
Fix placement masks handling scroll events
|
2018-10-31 17:23:27 +09:00 |
|
Dean Herbert
|
9aa88293e2
|
Use HResult
|
2018-10-31 17:07:05 +09:00 |
|
Dean Herbert
|
29a1d092fa
|
Don't log disk space related IO errors
|
2018-10-31 16:43:35 +09:00 |
|
Dean Herbert
|
d38bf38606
|
Merge branch 'master' into slider-controlpoint-masks
|
2018-10-31 15:23:30 +09:00 |
|
Dean Herbert
|
f6666e6ecc
|
Merge pull request #3643 from smoogipoo/editor-mask-placement
Implement editor hitobject placement
|
2018-10-31 15:14:23 +09:00 |
|
Dean Herbert
|
d7f3e51050
|
Merge branch 'master' into editor-mask-placement
|
2018-10-31 15:00:38 +09:00 |
|
Dan Balasescu
|
a67abcaeb8
|
Merge pull request #3662 from qwewqa/editor-track-playing-fix
Fix track being played when entering editor
|
2018-10-31 14:21:49 +09:00 |
|
Kyle Chang
|
214ed43b81
|
Check if SongSelect is current screen before playing selected song
|
2018-10-30 23:47:54 -04:00 |
|
Dean Herbert
|
5eaf80ab76
|
Add missing newline
|
2018-10-31 12:07:06 +09:00 |
|
Dean Herbert
|
3207a585c6
|
Add missing xmldoc
|
2018-10-31 12:01:10 +09:00 |
|
Dean Herbert
|
b28c0cd128
|
Merge branch 'master' into editor-mask-placement
|
2018-10-31 06:46:48 +09:00 |
|
Dean Herbert
|
6851696f63
|
Merge pull request #3642 from smoogipoo/selection-mask-testcase
Add testcases for selection masks
|
2018-10-31 06:28:08 +09:00 |
|
Dean Herbert
|
7e88b8b457
|
Merge branch 'master' into selection-mask-testcase
|
2018-10-31 06:14:33 +09:00 |
|
Dean Herbert
|
72d0b5b46b
|
Merge pull request #3641 from smoogipoo/mask-separation
Separate hitobject mask visuals from selection logic
|
2018-10-31 06:14:14 +09:00 |
|
Dean Herbert
|
5f5e30c378
|
Merge branch 'master' into mask-separation
|
2018-10-31 05:59:07 +09:00 |
|
Dean Herbert
|
98633f02f3
|
Merge pull request #3611 from plankp/reduce-handle-height
Reduce height of song progress handle
|
2018-10-31 03:28:12 +09:00 |
|
Dean Herbert
|
6f1ef3243d
|
Proportionally adjust width in line with change
|
2018-10-31 02:56:25 +09:00 |
|
Dean Herbert
|
4502fa39e9
|
Merge remote-tracking branch 'upstream/master' into reduce-handle-height
|
2018-10-31 02:55:38 +09:00 |
|
Paul Teng
|
4bc9161cd1
|
Leave bigger gap if replaying
|
2018-10-30 08:32:12 -04:00 |
|
Dean Herbert
|
8efe115cdd
|
Merge pull request #3135 from miterosan/Cakefy_osu!
Use CakeBuild for building osu!
|
2018-10-30 17:18:43 +09:00 |
|
Dean Herbert
|
701a1ecb00
|
Merge branch 'master' into Cakefy_osu!
|
2018-10-30 00:48:54 -07:00 |
|
smoogipoo
|
71b6789136
|
Fix post-merge conflict
|
2018-10-30 16:47:39 +09:00 |
|
smoogipoo
|
5712a52817
|
Merge remote-tracking branch 'origin/master' into mask-separation
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Layers/Selection/Overlays/SliderMask.cs
|
2018-10-30 16:46:13 +09:00 |
|
Dean Herbert
|
517307f065
|
Merge pull request #3654 from smoogipoo/separate-slider-body
Separate snaking logic from base SliderBody
|
2018-10-30 00:28:52 -07:00 |
|
Dean Herbert
|
0b534885b8
|
Update framework
|
2018-10-30 00:10:34 -07:00 |
|
Dean Herbert
|
113f80570b
|
Merge remote-tracking branch 'upstream/master' into separate-slider-body
|
2018-10-30 00:07:29 -07:00 |
|
Dean Herbert
|
d173335b6d
|
Reword readme
|
2018-10-30 00:02:32 -07:00 |
|
Dean Herbert
|
b0ccd61480
|
Fix weird code formatting
|
2018-10-30 00:01:19 -07:00 |
|
Dan Balasescu
|
2485621384
|
Merge pull request #3649 from qwewqa/mania-dual-fix
Make mania dual stages mod properly apply two stages
|
2018-10-30 13:44:00 +09:00 |
|
Kyle Chang
|
6d00aff9fd
|
Add type parameter to IApplicableToBeatmap
|
2018-10-30 00:13:33 -04:00 |
|
miterosan
|
4d97b96705
|
Remove the framework settings. It is not used.
|
2018-10-29 18:49:31 +01:00 |
|
miterosan
|
ab276b5635
|
Merge branch 'Cakefy_osu!' of https://github.com/miterosan/osu into Cakefy_osu!
|
2018-10-29 18:45:53 +01:00 |
|
miterosan
|
bf83c1eb6a
|
Mention the bash script in the readme.
|
2018-10-29 18:45:08 +01:00 |
|
miterosan
|
ff47b2be7a
|
Create a simple bootstrapper in the bash script language
|
2018-10-29 18:42:35 +01:00 |
|
Dean Herbert
|
dbd5e6ea0e
|
Merge branch 'master' into Cakefy_osu!
|
2018-10-29 05:49:13 -07:00 |
|
smoogipoo
|
aec1d95f04
|
Implement spinner placement
|
2018-10-29 18:37:28 +09:00 |
|
smoogipoo
|
e04ad8357d
|
Make spinner piece respond to scale changes
|
2018-10-29 18:37:12 +09:00 |
|
smoogipoo
|
af1de01ed6
|
Add a spinner selection mask
|
2018-10-29 18:23:23 +09:00 |
|
smoogipoo
|
2ae7b42244
|
Fix control points disappearing if moved offscreen
|
2018-10-29 16:15:15 +09:00 |
|
smoogipoo
|
5998d6454b
|
Use ControlPointVisualiser instead of custom implementation
|
2018-10-29 15:56:17 +09:00 |
|
smoogipoo
|
08b16be3b8
|
Merge branch 'slider-controlpoint-masks' into slider-placement
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Masks/SliderMasks/Components/SliderBodyPiece.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
|
2018-10-29 15:55:38 +09:00 |
|
smoogipoo
|
c1fffde10d
|
Fix broken conditional
|
2018-10-29 15:52:28 +09:00 |
|
smoogipoo
|
acd703c27b
|
Make sliders respond to control point changes
|
2018-10-29 15:36:43 +09:00 |
|
smoogipoo
|
b0f5ace0e8
|
Implement slider control point visualisation
|
2018-10-29 15:29:34 +09:00 |
|
smoogipoo
|
660cd24750
|
Make sliders respond to scale changes
|
2018-10-29 15:26:28 +09:00 |
|
smoogipoo
|
a9f1484e8b
|
Fix some post-rebase issues
|
2018-10-29 15:26:28 +09:00 |
|