307 Commits

Author	SHA1	Message	Date
Dean Herbert	95bf0b9ed6	Merge remote-tracking branch 'upstream/master' into fix-music-controller-offset	2019-03-29 13:57:02 +09:00
Joehu	bdb39a79a9	Fix offset of music controller when toolbar is hidden	2019-03-27 20:27:26 -07:00
Dean Herbert	de80fc0eac	Update icon usage to match framework changes	2019-03-27 19:29:27 +09:00
Dan Balasescu	fd147dae21	Merge branch 'master' into fix-disabled-set-crash	2019-03-05 17:25:13 +09:00
smoogipoo	1006c539be	Fix looping not being checked	2019-02-27 17:03:09 +09:00
smoogipoo	30815ace62	Fix crossthread operations due to Track.Completed	2019-02-27 16:52:34 +09:00
Dean Herbert	56697339b3	Merge branch 'master' into fix-disabled-set-crash	2019-02-27 11:14:42 +09:00
Dean Herbert	2fbb0b4e6f	Don't use this	2019-02-25 19:34:03 +09:00
Dean Herbert	ed10024b22	Fix some formatting / variable naming	2019-02-25 19:29:09 +09:00
Dean Herbert	80737b9ef8	Remove "silent" parameter; consolidate import logic	2019-02-25 18:24:06 +09:00
Roman Kapustin	8b4aa708fa	Resolve merge conflict	2019-02-22 23:04:45 +03:00
Dean Herbert	3015d40f8f	Merge branch 'master' into osu-fontusage	2019-02-22 18:09:23 +09:00
smoogipoo	d8c55bc729	Adjust namespaces	2019-02-21 19:05:52 +09:00
smoogipoo	bca347427f	Update with framework bindable changes	2019-02-21 18:56:34 +09:00
smoogipoo	dbfa95b9e7	Made medium the default font weight	2019-02-20 16:52:36 +09:00
smoogipoo	0693ab8e7d	Merge remote-tracking branch 'origin/master' into osu-fontusage ... # Conflicts: # osu.Game/Screens/Multi/Components/BeatmapTitle.cs	2019-02-20 15:04:08 +09:00
smoogipoo	a2aa3ec5cb	Adjust sprite texts in-line with framework changes	2019-02-20 15:03:20 +09:00
Roman Kapustin	71efbcf603	Merge remote-tracking branch 'ppy/master' into notify_track_completion_failure	2019-02-03 16:14:04 +03:00
Dean Herbert	ca5c8d37d1	Use leased bindables	2019-02-01 16:44:06 +09:00
Dean Herbert	8617aaa2a7	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
smoogipoo	a8ad7d4670	Add silent import parameter	2018-11-30 18:27:13 +09:00
smoogipoo	a88b69ec43	Notify of existing imports	2018-11-28 20:19:35 +09:00
Dean Herbert	61fdfe39fd	Add comment	2018-11-22 19:21:32 +09:00
smoogipoo	5caa67d735	Hide playlist when MusicController is hidden	2018-11-22 12:12:34 +09:00
Dean Herbert	7755242a43	Merge branch 'master' into osuTK	2018-11-21 18:53:11 +09:00
smoogipoo	5ad96afea0	Fix crashes when importing/deleting from model managers	2018-11-20 18:09:23 +09:00
smoogipoo	f27bd3ef3e	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
Roman Kapustin	c4fc87b69a	Move to next track on Completed event	2018-11-17 15:39:40 +03:00
Dean Herbert	b9278b3488	Fix brackets	2018-11-14 12:05:07 +09:00
Dean Herbert	c77412992e	Merge conditionals	2018-11-14 11:53:34 +09:00
gotopie	4c9dcdf156	hide seekbar when no song is playing	2018-11-02 19:04:30 -04:00
smoogipoo	ccb6723711	Debounce music controller seeks	2018-10-09 16:50:29 +09:00
ekrctb	50091252e2	Adapt signature change of event handlers	2018-10-02 12:02:55 +09:00
ekrctb	99fc04c8af	Change signature to new event handler	2018-10-02 12:02:47 +09:00
smoogipoo	28f31540c4	Apply changes in-line with framework localisation changes	2018-09-19 14:07:46 +09:00
Dean Herbert	03084aa04b	Revert async changes	2018-08-31 07:07:10 +09:00
smoogipoo	1b279d383f	Use GetAsync on all textures	2018-08-27 17:26:44 +09:00
smoogipoo	464333cf0b	Merge remote-tracking branch 'origin/master'	2018-07-26 21:28:31 +09:00
Dean Herbert	0f37758314	Update framework	2018-07-21 16:21:53 +09:00
Dean Herbert	ee2c7c50ad	Tidy up button hierarchy	2018-07-13 16:28:18 +09:00
Jacob Odgård Tørring	2979cb96a6	attemptSeek accesses beatmap Disabled directly	2018-07-04 21:09:28 +02:00
Dean Herbert	285062d93e	Merge branch 'master' into master	2018-06-21 11:40:37 +09:00
Dean Herbert	1c27ef644a	Fix music controller drag activating from anywhere on the screen	2018-06-15 16:12:11 +09:00
Dean Herbert	475fb06559	Use new bind method	2018-06-07 16:46:54 +09:00
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	8004b8af4d	Privatise the OsuGame beatmap, add local beatmap to OsuTestCase	2018-05-23 17:38:02 +09:00
Jacob Odgård Tørring	5e0bbe7d0a	Merge branch 'master' into master	2018-05-18 10:19:16 +02:00
smoogipoo	027f6c3fa4	Fix instant movement not doing anything	2018-05-14 17:47:38 +09:00
smoogipoo	4ceae6ba1f	Inline method	2018-05-14 17:45:11 +09:00
smoogipoo	6eb7590ab0	Make MusicController handle all movement to previous/next tracks	2018-05-14 17:42:01 +09:00
Jacob Odgård Tørring	861a8cf9a7	Fixes capitalization of enableSeek	2018-05-12 23:10:03 +02:00
Jacob Odgård Tørring	a7e7c3a74a	Enables/Disables seek and Play/Resume on call to beatmapDisabledChanged	2018-05-12 11:55:52 +02:00
Jacob Odgård Tørring	c55d47ff10	Converts OnSeek assignment to method group	2018-05-11 09:56:36 +02:00
Jacob Odgård Tørring	a877855fc6	Changes conditionSeek return type to void	2018-05-11 09:39:55 +02:00
Jacob Odgård Tørring	d54a7295f6	Adds DisableSeek property to MusicController	2018-05-10 13:20:04 +02:00
Jacob Odgård Tørring	5b99d8df62	Fixes private method name capitalization	2018-05-10 11:29:19 +02:00
Jacob Odgård Tørring	bb6478cdc3	Adds a check to disable music controller's seek	2018-05-10 10:15:47 +02:00
Dean Herbert	32a74f95a5	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Dean Herbert	e2d11af4ef	Fix incorrect MusicController drag handling	2018-02-13 20:08:59 +09:00
TocoToucan	51e188401f	Make MusicController draggable again	2018-01-25 00:38:22 +03:00
Dean Herbert	37d393bca0	Update licence headers	2018-01-05 20:21:19 +09:00
Dean Herbert	e332683d18	Fix music controller draggability	2017-12-30 21:10:40 +09:00
Dean Herbert	442a649c63	Make all FocusedOverlays hide on clicks outside of themselves ... Also allows wheel events to pass through around them.	2017-12-30 20:45:41 +09:00
Aergwyn	e629cebe31	fix MusicController ignoring Looping property of a Track ... my fix to prevent the MusicController from constantly trying to restart a track before accidentally removed this	2017-12-10 13:22:46 +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	553a7947d7	Remove AsyncLoadWrapper dependence in MusicController	2017-11-21 12:42:28 +09:00
smoogipoo	9cb9151811	Move origin + anchor outside of ctor	2017-10-10 16:00:11 +09:00
Dean Herbert	8d919e42c9	Fix nullref when loading MusicController VisualTest after Player VisualTest	2017-09-11 11:18:53 +09:00
smoogipooo	57678a13d9	Update in-line with framework changes.	2017-09-04 09:32:35 +09:00
Dean Herbert	67b3cbce2f	Fix beatmap background being disposed too early ... Causes weird transitions on the music controller	2017-08-25 13:04:32 +09:00
Dean Herbert	36629f5207	Make ProgressBar usable in more places than just MusicController	2017-08-24 18:51:34 +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	fce580d717	Reshuffle namespaces	2017-07-26 13:22:46 +09:00
Thomas Müller	e68675f970	Rename EasingTypes to Easing	2017-07-22 20:53:53 +02:00
MrTheMake	6ff2b73c30	Merge branch 'master' of https://github.com/ppy/osu into musiccontroller-canbeatmapchange	2017-07-19 16:50:29 +02:00
Thomas Müller	4d8261fe0b	Merge branch 'master' of https://github.com/ppy/osu into better-transforms ... # Conflicts: # osu-framework # osu.Game/Graphics/Cursor/OsuTooltipContainer.cs # osu.Game/Overlays/DragBar.cs	2017-07-18 15:16:02 +03:00
Dean Herbert	4b4b03756a	Don't use dodgy OnLoaded "event"	2017-07-18 15:37:58 +09:00
Dean Herbert	82217be988	Fix dodgy event clearing ... Also use local ariables where possible.	2017-07-18 15:24:52 +09:00
Dean Herbert	c5d23daa6b	Merge remote-tracking branch 'upstream/master' into remove-dragbar ... # Conflicts: # osu.Game/Overlays/DragBar.cs	2017-07-18 13:44:23 +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
MrTheMake	c0fd4a765e	Removed unused variable	2017-07-14 12:46:07 +02:00
MrTheMake	d2c18026f2	Removed unnecessary variables	2017-07-14 12:45:24 +02:00
MrTheMake	a95339dc1d	Removed the reopening of the playlist overlay	2017-07-14 12:37:56 +02:00
MrTheMake	c053733ea9	Updated to use ppy's implementation	2017-07-14 12:09:55 +02:00
MrTheMake	8e0d59bfed	Updated to use ppy's implementation	2017-07-14 12:08:56 +02:00
Dean Herbert	773ef26ce3	Make MusicController support disabled beatmap bindable	2017-07-11 18:38:49 +09:00
Dean Herbert	311c2aec1c	Fix next track not automatically playing when music controller is not visible	2017-07-11 17:53:36 +09:00
Thomas Müller	178685292a	Merge branch 'master' of https://github.com/ppy/osu into better-fill-mode	2017-07-08 12:25:08 +03:00
Jai Sharma	6eaeba5a92	Merge branch 'master' into remove-dragbar	2017-07-06 20:14:08 +01:00
Dean Herbert	28f0da606a	Add OsuFocusedOverlayContainer with predefined sounds.	2017-06-28 10:18:12 -07:00
Thomas Müller	40225238d9	Set RelativeSizeAxes for updated FillMode behavior	2017-06-28 12:24:23 +03:00
MrTheMake	0e1b49dff9	Applied suggested changes	2017-06-25 20:56:22 +02:00
Jai Sharma	e16b646014	Add readonly to fill	2017-06-24 09:14:55 +01:00
Jai Sharma	a327f49d68	Updating progressBar.EndTime is more thread safe	2017-06-23 18:24:46 +01:00
Jai Sharma	62aae899fa	Fixed non-assigned MaxValue	2017-06-22 19:03:31 +01:00
Jai Sharma	73c004fb71	Removed DragBar from song progress	2017-06-22 17:42:29 +01:00
Jai Sharma	ce2242a979	Removed dragbar from MusicController	2017-06-22 16:32:50 +01:00
MrTheMake	3b2df5fa0f	Renaming and smaller optimizations	2017-06-21 16:46:30 +02:00