1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 01:03:02 +08:00
Commit Graph

10 Commits

Author SHA1 Message Date
smoogipoo
a3470f9ec3 Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
# Conflicts:
#	osu.Game/Overlays/Music/PlaylistOverlay.cs
#	osu.Game/Screens/OsuScreen.cs
2018-05-28 18:01:15 +09:00
AlFasGD
a54bda6ce1 Apply requested changes 2018-05-21 13:23:39 +03:00
AlFasGD
2a90686da6 Simplify expression 2018-05-12 15:09:53 +03:00
AlFasGD
e44062b77a Fix tests and implementation 2018-05-08 16:37:06 +03:00
AlFasGD
dd9b9a18ac Prevent user from scrolling outside the timeline in the editor 2018-05-08 16:21:54 +03:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
Dean Herbert
127f0d7b01 Fix smoogipoo's comments 2018-04-12 21:17:17 +09:00
Dean Herbert
0ca703beaa Add some missing xmldoc 2018-04-12 21:04:45 +09:00
smoogipoo
e59124962c Remove re-instantiation of clock in EditorClockTestCase 2018-04-06 18:38:44 +09:00
smoogipoo
c7abd56fc4 Give editor a custom clock to handle seeking 2018-04-06 18:11:37 +09:00