254 Commits

Author	SHA1	Message	Date
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