415 Commits

Author	SHA1	Message	Date
smoogipoo	0bd35ab7bb	Turn on warnings, resolve issues	2019-04-25 17:36:17 +09:00
smoogipoo	0222424aef	Make mods IReadOnlyList<Mod> gamewide ... Prevents potential multiple evaluations of enumerable.	2019-04-10 17:20:36 +09:00
smoogipoo	4310f07a5c	Rename SelectedMods -> Mods	2019-04-10 12:03:57 +09:00
smoogipoo	ad124bfeec	Reimplement select mod track adjustments	2019-04-09 12:59:32 +09:00
smoogipoo	772bef91fa	Merge remote-tracking branch 'Joehuu/master' into drawnode-composability ... # Conflicts: # osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs	2019-04-08 23:01:12 +09:00
Dean Herbert	f1952c0816	Update font awesome usage	2019-04-02 19:55:24 +09:00
smoogipoo	a56e29347f	Adjust namespaces	2019-04-02 14:51:28 +09:00
Dean Herbert	612db31c38	Apply newline additions	2019-04-01 12:16:32 +09:00
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
MrTheMake	8b07565025	Added test case usability, namings and bug fixes	2017-06-21 16:33:26 +02:00
Marco Stephan	8ffd7b313b	Merge branch 'master' into musiccontroller-canbeatmapchange	2017-06-21 12:23:38 +02:00
MrTheMake	7a9d430a28	Applied suggested changes	2017-06-21 12:17:59 +02:00
MrTheMake	70096b6c86	Bug fixes	2017-06-21 01:28:43 +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	1b95991e40	Extended condition	2017-06-19 19:05:09 +02:00
MrTheMake	b4437329cc	Removed redundant variable	2017-06-19 18:34:56 +02:00
MrTheMake	667e6a2d6b	Applied suggested changes	2017-06-19 18:06:39 +02:00
MrTheMake	8bee06943b	Removed ununsed variables	2017-06-19 16:33:08 +02:00
MrTheMake	cb8b3cb8fb	CI fix	2017-06-19 16:31:45 +02:00
MrTheMake	73f2709a2d	Move logic into PlaylistOverlay	2017-06-19 16:30:58 +02:00
MrTheMake	9cc5dc6c2b	Only disallow changing the current track, not pausing or seeking it	2017-06-19 15:03:07 +02:00
MrTheMake	13df0e0b04	Fixed test case	2017-06-19 14:52:36 +02:00
MrTheMake	5450499415	Implement OsuScreen::CanBeatmapChange and use it in the music controller	2017-06-19 14:32:53 +02:00
smoogipooo	ffbb46f668	Update in line with framework.	2017-06-12 12:48:47 +09:00
EVAST9919	e737ded382	Applied suggested changes	2017-05-30 12:23:53 +03:00
Dan Balasescu	6918368afc	Merge branch 'master' into ingame_options	2017-05-29 18:12:02 +09:00
MrTheMake	9de7e7bc40	Fixes	2017-05-25 17:49:47 +02:00
MrTheMake	c32d816f9c	Removed new line	2017-05-25 14:19:04 +02:00
MrTheMake	9ea70b849b	Fix initialize beatmap change animation of the music controller	2017-05-25 14:16:51 +02:00
EVAST9919	5fb8830e3a	Moved music controller buttons to it's own class	2017-05-17 10:36:24 +03:00
Dean Herbert	efab186384	Update namespaces in line with framework	2017-05-16 12:50:30 +09:00
Huo Yaoyuan	146d57953d	Use metadata field of WorkingBeatmap.	2017-05-06 14:57:11 +08:00
Dean Herbert	f1d0b77d10	Base the music controller transform direction on relative indices in playlist.	2017-05-02 16:40:29 +09:00
Dean Herbert	737ad78056	Set a sane default transform direction.	2017-05-01 20:10:19 +09:00
Dean Herbert	3943e4ae95	Fix comma.	2017-05-01 19:32:31 +09:00
Dean Herbert	580cf93147	Refactoring part 4.	2017-05-01 15:03:11 +09:00
Dean Herbert	97a7f16ab7	Refactoring part 3.	2017-05-01 13:41:22 +09:00
Dean Herbert	7c2e193db1	Refactoring part 2.	2017-05-01 13:25:32 +09:00
Dean Herbert	37944bb04e	Initial refactoring.	2017-05-01 13:01:08 +09:00
DrabWeb	9bdf462dd1	Possible null reference exception	2017-04-29 06:36:06 -03:00
DrabWeb	067b572245	Formatting	2017-04-29 06:28:57 -03:00
DrabWeb	ef811f3cf3	More formatting	2017-04-29 06:17:50 -03:00
DrabWeb	3f73799975	Formatting	2017-04-29 06:10:12 -03:00
DrabWeb	c193a90a16	Merge https://github.com/ppy/osu into playlist	2017-04-29 05:39:52 -03:00
Huo Yaoyuan	061c3cacbd	CI fixes.	2017-04-26 20:04:32 +08:00
Huo Yaoyuan	4cb18361c1	Use localisation engine for unicode text.	2017-04-26 19:50:38 +08:00
Dean Herbert	3c98170330	Use method group for MusicController fault.	2017-04-24 20:22:21 +09:00
ColdVolcano	6a05440e6c	Only schedule when faulted	2017-04-23 00:53:21 -05:00
ColdVolcano	1d254f4a56	Take MusicController back to life	2017-04-23 00:13:58 -05:00
DrabWeb	70756a069e	Unused usings	2017-04-09 07:52:26 -03:00
DrabWeb	67f1167172	Comments, play first song if current is nil and user presses play	2017-04-09 07:04:41 -03:00
DrabWeb	a88c82705b	Use playlist queue	2017-04-09 06:11:53 -03:00
DrabWeb	fe17cb924d	Cleanup	2017-04-09 04:50:35 -03:00
DrabWeb	7b5f8800bd	Reimplement with MusicController	2017-04-09 04:26:21 -03:00
DrabWeb	2d6a2f41aa	Reset MusicController	2017-04-09 04:12:30 -03:00
DrabWeb	963cd09bd0	Merge https://github.com/ppy/osu into playlist	2017-04-09 04:04:13 -03:00
DrabWeb	f65eaa6566	Show scroll dragger, change behaviour when selecting playing song	2017-04-09 03:52:48 -03:00
Dean Herbert	e1e9772d46	Flash buttons on click.	2017-04-08 19:28:29 +09:00
Dean Herbert	e40ad69a3b	Adjust icon scale of play button.	2017-04-08 19:25:40 +09:00
Thomas Müller	b99cbe6962	Add back nice scaling of music controller buttons	2017-04-08 19:17:20 +09:00
smoogipooo	a9d938e7ed	Fix brace style.	2017-04-07 15:57:00 +09:00
Dean Herbert	2c2a4169c6	Better structure for button layout.	2017-04-07 15:28:18 +09:00
Dean Herbert	361e187949	Temporarily disable button scaling.	2017-04-07 14:33:58 +09:00
Dean Herbert	fa28e7bdc3	Improve clickability and visuals of MusicController buttons.	2017-04-07 14:09:26 +09:00
Dean Herbert	7c9f30c288	MusicController regression fixes.	2017-04-07 13:15:57 +09:00
Dean Herbert	7c74951454	Update bindables. ... # Conflicts: # osu.Desktop.VisualTests/Tests/TestCaseResults.cs # osu.Game/Screens/Ranking/ResultModeButton.cs # osu.Game/Screens/Ranking/Results.cs	2017-04-04 11:34:13 +09:00
Dean Herbert	bfa2e68bfb	Container->Wrapper.	2017-04-02 16:17:13 +09:00
Dean Herbert	6f1fff4ee7	Update async load usage to new style.	2017-04-02 15:56:12 +09:00
Dean Herbert	f7dc7e9bb9	Update references.	2017-03-28 21:26:20 +09:00
Dean Herbert	4042b94e01	Use DelayedLoadContainer in more places.	2017-03-28 15:28:58 +09:00
DrabWeb	215b016f32	Initial implementation	2017-03-24 05:59:26 -03:00
Dean Herbert	54e1b24fe9	Enforce readonly private members where possible.	2017-03-23 13:50:08 +09:00
Thomas Müller	9af0104e3e	Fix NaN when dragging music controller ... When dragging music controller we divide by the dragged distance. When dragging to the origin of the drag this resulted in NaN. Now, we check for this and use 0 in this case.	2017-03-18 12:46:12 +01:00
Huo Yaoyuan	3913a0a9ee	Fix removal of the last one beatmap.	2017-03-14 05:35:58 +08:00
Dean Herbert	d7497330b2	Reduce warning/suggestion count to zero.	2017-03-09 15:52:40 +09:00
Dean Herbert	0cad5d7d41	Fix most warnings.	2017-03-07 13:05:57 +09:00
Thomas Müller	73fef85b12	Remove unnecessary usings	2017-03-04 19:43:59 +01:00
Thomas Müller	a14bdf8624	Use Color4Extensions from Framework and remove redundant Name	2017-03-04 19:42:37 +01:00
Andrey Zavadskiy	3487dfe236	Removed unused variables and parameters	2017-02-27 17:32:32 +03:00
Dean Herbert	686372a7f9	Update with framework structural changes.	2017-02-26 20:54:32 +09:00
Thomas Müller	1585ae842a	Update framework	2017-02-26 11:22:58 +09:00
Dean Herbert	6c3bda18b6	Add beatmap deletion support. ... Note that this is a very naive approach and will result in file access exceptions. This will be fixed in a further commit.	2017-02-24 14:37:54 +09:00
Dean Herbert	c5552dfb27	Merge remote-tracking branch 'upstream/master' into remove-usings	2017-02-24 11:29:34 +09:00
Thomas Müller	2689de0c0c	Update framework and add "Async" suffix to asynchronous methods	2017-02-23 22:32:10 +01:00
Thomas Müller	a5dfa7ab06	Remove unnecessary using statements	2017-02-23 21:38:10 +01:00
Dean Herbert	da2bfe6d3c	Framework updates.	2017-02-23 16:42:12 +09:00
Thomas Müller	2c4ecb990d	Remove line break in MusicController	2017-02-11 16:23:15 +01:00
Thomas Müller	b7fd65070e	Merge pull request #335 from peppy/overlay-improvements ... Overlay improvements	2017-02-09 08:43:58 +01:00
Dean Herbert	23bc84fa3c	Fix borked header.	2017-02-09 16:38:39 +09:00
Dean Herbert	30bec0876d	Make MusicController a focused overlay.	2017-02-09 13:57:49 +09:00
Dean Herbert	581ec765fb	Improve transitions of MusicController.	2017-02-09 13:57:47 +09:00
Dean Herbert	18bb61897f	Update overlay containers in lines with framework changes. ... Allows closing the MusicController using escape.	2017-02-09 13:57:44 +09:00
Dean Herbert	f6956fc51c	Fix MusicController doing work in the background when not visible.	2017-02-09 11:36:45 +09:00
Dean Herbert	50bd80cb0c	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
Dean Herbert	6b66ecc131	Global shadows and more sane font size setting.	2017-01-31 18:53:52 +09:00
Dean Herbert	74366c620b	Move login screen to toolbar and update design (still not fully implemented). ... # Conflicts: # osu.Game/Overlays/Options/General/LoginOptions.cs # osu.Game/Overlays/Toolbar/Toolbar.cs	2017-01-30 22:55:35 +09:00
Dean Herbert	cbd6fe3f36	Move definition of MusicController's position out of itself.	2017-01-30 22:54:33 +09:00
Dean Herbert	1853bbdda8	Move window/volume configuration to framework level.	2017-01-25 18:44:51 +09:00
Drew DeVault	f5f545df62	Refactor OsuColour into injected instance class ... Which should allow you to change the color palette in the future for skinning purposes.	2017-01-12 23:49:05 -05:00