smoogipoo
ff60f69f47
Explicitly construct local beatmaps rather than using GetBoundCopy
2018-06-06 20:19:30 +09:00
smoogipoo
72cc53aded
Rename GameBeatmap -> BindableBeatmap
2018-06-06 20:16:20 +09:00
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
smoogipoo
fb78854485
Fix audio playback getting paused if playlist changes beatmap
2018-05-23 19:41:13 +09:00
smoogipoo
8004b8af4d
Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
2018-05-23 17:38:02 +09:00
smoogipoo
6eb7590ab0
Make MusicController handle all movement to previous/next tracks
2018-05-14 17:42:01 +09:00
Dean Herbert
32a74f95a5
Normalize all the line endings
2018-04-13 18:26:38 +09:00
smoogipoo
b97c4e8b44
Fix all possible cases of crossthread import data races
2018-04-09 12:45:44 +09:00
Dean Herbert
d340509b1d
Move ArchiveReaders to a more global namespace
...
Also moves delete and action logic to a shared implementation
2018-02-15 14:22:39 +09:00
Dean Herbert
37d393bca0
Update licence headers
2018-01-05 20:21:19 +09:00
Dean Herbert
87e790080b
Remove manual audio thread synchronisation logic
...
No longer required as calls are blocking.
2017-12-21 22:22:28 +09:00
Dean Herbert
c1b607fed9
Wait until track has restarted before continuing operation
...
I removed this from my previous PR thinking it was not required, but it turned out to be required after all. Just isn't so noticeable when it fails.
2017-12-05 14:06:40 +09:00
Dean Herbert
caee6c1cf1
Use Restart instead of Start
2017-12-04 21:40:26 +09:00
Dean Herbert
a83add8540
Tidy up events
2017-12-04 20:30:56 +09:00
Aergwyn
14096c90cc
removed looping if only one song is in the list (temporarily)
...
It had one problem in relation to SongSelect disabling it when left and in general that topic belongs to another PR.
2017-12-03 16:41:21 +01:00
Aergwyn
9d13bf3602
remove redundant expression
2017-12-03 14:35:23 +01:00
Aergwyn
dfa7448716
use ?: expression
2017-12-03 14:25:12 +01:00
Aergwyn
0c9ebcd58c
fix possible NullRef
2017-12-03 14:15:08 +01:00
Aergwyn
a1dbd7916b
fixes MusicController constantly trying to start a track
...
In Detail:
It tried to start a track if the current one ended even if no BeatmapSets were present.
Also if only one BeatmapSet is present if will loop by itself now.
2017-12-03 14:03:43 +01:00
smoogipooo
3b575444be
Rewrite PlaylistList as CompositeDrawable and remove all backwards PlaylistList references
...
Now handles drag at a PlaylistList.ItemsScrollContainer level (private class), and PlaylistList itself is no longer a Container so it only supports adding BeatmapSets. Sorry for the rewrite x.x.
2017-09-04 13:12:12 +09:00
Kelvin
97ebf38288
Use PlaylistList to manage Prev/Next tracks
2017-08-28 00:56:03 -07:00
Dean Herbert
143ff695ef
Remove unused using statements
2017-08-15 17:44:04 +09:00
Dean Herbert
6ded194c53
Remove all usage of DI to retrieve InputManager
...
Uses GetContainingInputManager instead, as per framework changes.
2017-08-15 14:30:50 +09:00
MrTheMake
4d8e5898fd
Updates according to the framework and formatting
2017-08-01 17:28:18 +02:00
Dean Herbert
209d024caa
Merge branch 'master' into musiccontroller-canbeatmapchange
2017-08-01 11:54:05 +09:00
Dean Herbert
a55586f2ad
FIx potential sequence of execution issues in PlaylistOverlay
2017-07-28 15:04:58 +09:00
Dean Herbert
5f53426a9a
*Database -> *Store
...
Welcome back BeatmapManager
2017-07-27 16:56:41 +09:00
Dean Herbert
cbe7b08642
Make BeatmapStore's BeatmapDatabase private
2017-07-27 15:34:13 +09:00
Dean Herbert
96b08b8777
Simplify and document DatabaseStore API
2017-07-27 15:06:10 +09:00
Dean Herbert
9e20a02c0a
Split out BeatmapDatabase into BeatmapStore
...
Hide database functionality at a lower level in preparation from eventually making it private.
2017-07-26 16:31:34 +09:00
Dean Herbert
fce580d717
Reshuffle namespaces
2017-07-26 13:22:46 +09:00
Dean Herbert
750d96be8f
Merge branch 'master' into playlist-beatmaplist-sync
2017-07-24 14:12:04 +09:00
Ben Pig Chu
950c55d6d0
No need to dispose/unbind the delegates
2017-07-24 13:10:51 +08:00
Ben Pig Chu
76edcb4a67
Update playlist when adding or removing beatmap set
2017-07-23 14:21:10 +08:00
Thomas Müller
e68675f970
Rename EasingTypes to Easing
2017-07-22 20:53:53 +02:00
Thomas Müller
2cd8f6b30c
Merge branch 'master' of github.com:ppy/osu into better-transforms
...
# Conflicts:
# osu-framework
2017-07-21 11:15:26 +02:00
Dean Herbert
3bdd4d7d02
Centralise TrackManager.AddItem logic to avoid duplicate adds
2017-07-20 17:46:33 +09:00
Dean Herbert
67b95926c4
Remove usage of SetExclusive
...
Also immediately disposes WorkingBeatmaps on ValueChanged.
2017-07-20 16:45:44 +09:00
Thomas Müller
c4619f614a
Merge branch 'master' of github.com:ppy/osu into better-transforms
...
# Conflicts:
# osu-framework
2017-07-19 19:15:51 +02:00
MrTheMake
6ff2b73c30
Merge branch 'master' of https://github.com/ppy/osu into musiccontroller-canbeatmapchange
2017-07-19 16:50:29 +02:00
Dean Herbert
59416584c1
Don't show theme song in playlist
2017-07-19 15:16:35 +09:00
Thomas Müller
a5e610a7ba
Update framework and fix compilation
...
Most issues were related to BeginLoopedSequence usage and lack of
"this." in front of transform helpers.
2017-07-14 19:18:12 +03:00
Marco Stephan
8ffd7b313b
Merge branch 'master' into musiccontroller-canbeatmapchange
2017-06-21 12:23:38 +02:00
MrTheMake
edd7fd585c
Disable beatmap changing buttons when entering a screen that disallows changing the beatmap
2017-06-21 00:51:32 +02:00
MrTheMake
354f516779
Moved load condition and simplify list selection
2017-06-20 15:19:59 +02:00
paparony03
62dee59672
Shapes namespace
...
Depends on https://github.com/ppy/osu-framework/pull/837
2017-06-20 15:54:23 +10:00
MrTheMake
03c13620c8
Filter the playlist overlay's beatmap list
2017-06-20 02:12:05 +02:00
MrTheMake
b9cf0e47ee
CI fix
2017-06-19 18:12:26 +02:00
MrTheMake
667e6a2d6b
Applied suggested changes
2017-06-19 18:06:39 +02:00
MrTheMake
aec46a57c8
Restart the current track when pressing PREVIOUS or NEXT rather than doing nothing
2017-06-19 17:33:58 +02:00
