Commit Graph

9600 Commits

Author SHA1 Message Date
171700cb91 Debounce editor summary timeline seeks 2018-11-05 15:59:40 +09:00
1fffa48aa0 Sort nested hitobjects post-creation 2018-11-05 12:15:45 +09:00
5006dc47a3 Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-11-04 02:26:17 +09:00
56ff2686ac Update osu-resources and osu-framework to use binary fonts 2018-11-03 18:09:11 +01:00
4c9dcdf156 hide seekbar when no song is playing 2018-11-02 19:04:30 -04:00
9f5546fd62 Fix API regression in direct 2018-11-02 21:13:46 +09:00
63cbc8e0e8 Merge branch 'master' into slider-placement 2018-11-02 19:45:34 +09:00
e6ee3dc73e Use framework helper functions for path approximation 2018-11-02 19:26:29 +09:00
7b9afe9cf7 Merge branch 'master' into fix-path-control-point-drag 2018-11-02 13:04:04 +09:00
173d2904b8 Merge branch 'master' into fix-disk-space-errors 2018-11-02 12:15:13 +09:00
b4809f4417 External link warning code cleanup 2018-11-01 23:52:07 +03:00
0a0023920f Fix not being able to drag control points mid-snake 2018-11-02 04:09:33 +09:00
1aae123ff5 Make approximators share an interface 2018-11-01 19:16:44 +09:00
c1304eca1b Merge remote-tracking branch 'upstream/master' into slider-placement 2018-11-01 17:59:37 +09:00
0f1ffe392f Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-11-01 17:52:24 +09:00
bb2f8deb18 ControlPoint -> PathControlPoint
Also Curve -> Path.
2018-11-01 03:56:51 +09:00
9cb4374b51 Merge branch 'master' into slider-controlpoint-masks 2018-11-01 02:37:31 +09:00
85a7325911 Fix placement masks handling scroll events 2018-10-31 17:23:27 +09:00
9aa88293e2 Use HResult 2018-10-31 17:07:05 +09:00
29a1d092fa Don't log disk space related IO errors 2018-10-31 16:43:35 +09:00
d38bf38606 Merge branch 'master' into slider-controlpoint-masks 2018-10-31 15:23:30 +09:00
d7f3e51050 Merge branch 'master' into editor-mask-placement 2018-10-31 15:00:38 +09:00
214ed43b81 Check if SongSelect is current screen before playing selected song 2018-10-30 23:47:54 -04:00
5eaf80ab76 Add missing newline 2018-10-31 12:07:06 +09:00
3207a585c6 Add missing xmldoc 2018-10-31 12:01:10 +09:00
b28c0cd128 Merge branch 'master' into editor-mask-placement 2018-10-31 06:46:48 +09:00
7e88b8b457 Merge branch 'master' into selection-mask-testcase 2018-10-31 06:14:33 +09:00
5f5e30c378 Merge branch 'master' into mask-separation 2018-10-31 05:59:07 +09:00
6f1ef3243d Proportionally adjust width in line with change 2018-10-31 02:56:25 +09:00
4502fa39e9 Merge remote-tracking branch 'upstream/master' into reduce-handle-height 2018-10-31 02:55:38 +09:00
4bc9161cd1 Leave bigger gap if replaying 2018-10-30 08:32:12 -04:00
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
0b534885b8 Update framework 2018-10-30 00:10:34 -07:00
113f80570b Merge remote-tracking branch 'upstream/master' into separate-slider-body 2018-10-30 00:07:29 -07:00
6d00aff9fd Add type parameter to IApplicableToBeatmap 2018-10-30 00:13:33 -04:00
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
acd703c27b Make sliders respond to control point changes 2018-10-29 15:36:43 +09:00
a9f1484e8b Fix some post-rebase issues 2018-10-29 15:26:28 +09:00
e964a555d0 Fix DummyWorkingBeatmap having unrealistic defaults 2018-10-29 15:26:28 +09:00
8b36d9b482 Remove SliderCurve.Offset (unused) 2018-10-29 15:26:07 +09:00
b3e105ba93 Make curve approximators implement common interface 2018-10-29 15:26:07 +09:00
619a0dfd59 Merge branch 'separate-slider-body' into editor-mask-placement
# Conflicts:
#	osu.Game.Rulesets.Osu/Edit/Layers/Selection/Overlays/SliderMask.cs
2018-10-29 15:24:15 +09:00
dd5a3ad59c Fix SliderMask not working 2018-10-29 15:17:45 +09:00
8f5e495585 Merge branch 'master' of https://github.com/ppy/osu into mania-dual-fix 2018-10-29 00:16:29 -04:00
c7e950af7f Remove EditSelected in favor in inlining beatmapNoDebounce in Edit 2018-10-29 00:04:51 -04:00
886dd0f0d4 Remove unneeded using directive 2018-10-28 13:21:12 -04:00
2b736c3cd6 Make beatmap edit button reload beatmap without mods 2018-10-28 13:04:45 -04:00
f8a8c7cb6b Stop transferring track when editing 2018-10-28 12:43:19 -04:00
8c4e08d280 Merge branch 'master' of https://github.com/qwewqa/osu into mania-dual-fix 2018-10-28 12:02:18 -04:00
4f65d67e2b Merge branch 'master' into skinnable-spritetext 2018-10-28 08:35:25 -07:00