1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 18:52:56 +08:00
Commit Graph

123 Commits

Author SHA1 Message Date
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
Dean Herbert
bcdbd97da9
Merge branch 'master' into fix-playlist-pause 2018-05-27 11:00:50 +09:00
Dean Herbert
568d4882c6
Remove unnecessary null coalesce 2018-05-25 11:00:56 +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
f894d73501 Fix possible MusicController nullref 2018-05-23 14:36:09 +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
smoogipoo
78d73d4c11 Additional fixes for flow ordering after framework changes 2018-03-06 17:20:58 +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
f4ddc0717b Fix incorrect PlaylistItem drag handling 2018-02-13 20:08:59 +09:00
Aergwyn
ae1adfd2f2 remove unnecessary empty lines
codefactor.io \(o.o)/
also one unnecessary semicolon
2018-01-12 19:30:34 +01: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
Dean Herbert
4f6263ef86 Make many internal classes and methods public
This is important when using dynamic compiling to rapidly iterate. Until we actually split projects out into pieces (like the abstract ruleset project we have talked about) there is no advantage to using internal in the osu! game code.
2017-11-21 12:06:16 +09:00
MrTheMake
89b5a6670e Changed type of IHasFilterTerms.FilterTerms according to framework update 2017-09-13 16:18:02 +02:00
smoogipooo
1904b5edfe Only store native position instead of input state. 2017-09-05 10:38:19 +09:00
smoogipooo
e9f0762440 Don't query GetContainingInputManager every Update. 2017-09-05 10:29:51 +09:00
smoogipooo
ad966f41f5 Fix CI error. 2017-09-04 15:26:09 +09:00
smoogipooo
722b7419d6 Clamp at the end points. 2017-09-04 15:06:21 +09:00
smoogipooo
04c3801fcc Add scrolling points so items can be dragged beyond the list. 2017-09-04 14:58:28 +09:00
smoogipooo
2ed20f5a6f Add better fix for items swapping erratically. 2017-09-04 14:20:40 +09: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
smoogipooo
9b0309e683 Use TakeWhile instead of reversing the list. 2017-09-04 11:28:15 +09:00
smoogipooo
9078444a62 Fix items jumping between two indices in the edge case, use a linear search for now. 2017-09-04 11:03:53 +09:00
smoogipooo
c72a9b1301 Merge remote-tracking branch 'origin/master' into pr/n1202_2yangk23 2017-09-04 09:42:24 +09:00
Kelvin
0e363fce1e Try to fix stuttering behavior 2017-08-29 22:26:06 -07:00
Dean Herbert
39b5b04700 Don't use Bindable for AccentColour
Implements IHasAccentColour for conformity to rest of project. Also fixes a nullref when opening the login menu.
2017-08-29 18:17:01 +09:00
Kelvin
e5bf3f6a6a Fix out of bounds 2017-08-29 00:46:11 -07:00
Kelvin
1eb31afd14 Get destination index using binarysearch 2017-08-29 00:39:17 -07:00
Kelvin
458c3a355f Rearrange dragging using cheeseburger icon only 2017-08-28 23:28:58 -07:00
Kelvin
636492b9cf Rearrange tracks in OnDrag 2017-08-28 22:59:28 -07:00
Kelvin
12be5b417d Use MathHelper.Clamp
- Fix formatting
2017-08-28 22:51:26 -07:00
Kelvin
2f5d8a7f88 Fixed code style errors 2017-08-28 01:08:51 -07:00
Kelvin
97ebf38288 Use PlaylistList to manage Prev/Next tracks 2017-08-28 00:56:03 -07:00
Kelvin
5c3b7ac12c Allow rearranging playlist tracks 2017-08-28 00:29:44 -07:00
smoogipooo
e83a554ffc Update CollectionsDropdown in line with framework 2017-08-25 15:58:09 +09: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