387 Commits

Author	SHA1	Message	Date
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
Drew DeVault	fa007e632d	Refactor colors to palette based design	2017-01-12 16:38:27 -05:00
Drew DeVault	c222be05c0	Add Color4.Opacity and OsuColor.Gray	2017-01-10 13:44:40 -05:00
Drew DeVault	70ecf48ca7	Add central color class ... I didn't move _every_ color here, but most of them. The ones I left behind are mostly just shades of gray. Closes #126	2017-01-09 17:20:31 -05:00
Huo Yaoyuan	6690d1bd72	Move logic into updateDisplay.	2017-01-04 02:12:18 +08:00
Huo Yaoyuan	794e4663d8	Fix PreferUnicode changing when nothing to play.	2017-01-04 01:00:08 +08:00
Huo Yaoyuan	3a4fb2ffed	IsEnabled property for drag bar of music controller.	2016-12-01 08:20:24 +08:00
Thomas Müller	b12b82fdd3	Fix depth values.	2016-11-29 20:50:12 +01:00
Dean Herbert	60d939f323	Use FillMode in more cases.	2016-11-23 13:18:22 +09:00
Dean Herbert	3bc38268a0	Make MusicController more async.	2016-11-22 20:47:28 +09:00
Dean Herbert	1f73bb4cf0	Set drag bar to correct orange.	2016-11-15 19:34:55 +09:00
Tom94	c860eb25f9	Migrate to new anchor system without x/y reversal.	2016-11-14 17:22:20 +01:00
Dean Herbert	dde3a68c8f	Account for anchor when dragging MusicController (fixes VisualTest).	2016-11-14 16:40:13 +09:00
Dean Herbert	eb32d842cc	Use switch instead of if-else.	2016-11-14 16:10:07 +09:00
Huo Yaoyuan	86a6c7641d	Make TransformDirection more clear.	2016-11-14 04:59:41 +08:00
Huo Yaoyuan	afab938794	Strongly typed TransformDirection for music controller.	2016-11-14 03:21:07 +08:00
Dean Herbert	cc0f61f545	Merge branch 'refs/heads/master' into dependency-injection ... # Conflicts: # osu-framework # osu.Game/GameModes/OsuGameMode.cs # osu.Game/GameModes/Play/Player.cs # osu.Game/OsuGame.cs # osu.Game/Overlays/MusicController.cs # osu.Game/Overlays/Options/EditorSection.cs # osu.Game/Overlays/Options/Input/MouseOptions.cs # osu.Game/Overlays/Options/Online/InGameChatOptions.cs # osu.Game/Overlays/Options/SkinSection.cs	2016-11-12 20:18:26 +09:00
Dean Herbert	3b99a8fd06	Add a shadow and bit of elasticity to MusicController.	2016-11-12 17:09:58 +09:00
Dean Herbert	b65eb33774	Fix weird artifacting when the MusicController fades in and out by using a buffered container.	2016-11-12 16:44:31 +09:00
Drew DeVault	d49b418449	Implement ShowUnicode option behavior	2016-11-10 21:35:58 -05:00
Drew DeVault	0d4560a054	Update to latest DI stuff	2016-11-10 17:40:42 -05:00
Huo Yaoyuan	ef5968e243	More robust metadata handling.	2016-11-07 23:12:49 +08:00
Huo Yaoyuan	fd977cacb3	Fix corner case when shuffling.	2016-11-07 23:06:14 +08:00
Huo Yaoyuan	02b903f1ea	Shuffle playlist.	2016-11-07 22:12:58 +08:00
Huo Yaoyuan	dc347a74f5	Don't play transition if audio equals.	2016-11-07 21:58:30 +08:00
Huo Yaoyuan	c59cad2478	AudioEquals method for BeatmapInfo.	2016-11-07 21:52:23 +08:00
Huo Yaoyuan	d1f64cfbfc	Make external changes into history.	2016-11-07 21:30:25 +08:00
Huo Yaoyuan	ad1dccf6ce	Use play history for back and forward.	2016-11-07 21:25:37 +08:00
Huo Yaoyuan	644e337cf6	Add a list for play history.	2016-11-07 20:57:33 +08:00
Huo Yaoyuan	c272041f37	Block click and drag at MusicController level.	2016-11-07 20:07:45 +08:00
Huo Yaoyuan	736079a60d	Update FontAwesome usage.	2016-11-07 19:00:20 +08:00
Huo Yaoyuan	c8a7bd2ece	Minor implementation changes.	2016-11-06 16:47:37 +08:00
Huo Yaoyuan	000c2218b8	Make background update happens in update thread, and thread-safer.	2016-11-06 16:34:47 +08:00
Huo Yaoyuan	d63e3b6724	Add fallback texture of beatmap when getting null;	2016-11-06 05:37:55 +08:00
Huo Yaoyuan	0c6825bb20	Adjust visual behavior.	2016-11-06 05:35:35 +08:00
Huo Yaoyuan	c53298a3b1	Update font size (*1.25) to follow the design image.	2016-11-06 01:53:10 +08:00
Huo Yaoyuan	74000f77ad	Set font in music controller.	2016-11-06 01:50:38 +08:00
Huo Yaoyuan	a19bb1270d	Async workflow on music controller.	2016-11-06 00:46:09 +08:00
Huo Yaoyuan	859a59a8ab	Set children in constructor.	2016-11-06 00:24:03 +08:00
Huo Yaoyuan	5eed07db57	Update access of WorkingBeatmap.	2016-11-06 00:13:45 +08:00
Huo Yaoyuan	f2a8cc0c29	Merge branch 'master'	2016-11-03 20:38:34 +08:00
Huo Yaoyuan	f1837b4822	Fix changed event and no longer auto play on load.	2016-10-28 21:57:23 +08:00
Huo Yaoyuan	7543d491ae	Add music controller into game.	2016-10-28 21:21:47 +08:00
Huo Yaoyuan	3858c77817	No longer holds OsuGame reference.	2016-10-28 20:47:27 +08:00
Huo Yaoyuan	9b76110605	Interaction with external changes.	2016-10-28 20:44:59 +08:00
Huo Yaoyuan	36cefcb956	Fix to work individually.	2016-10-28 20:34:22 +08:00
Huo Yaoyuan	aa107de162	Store a local copy of WorkingBeatmap.	2016-10-28 20:27:44 +08:00
Huo Yaoyuan	7d14e6e6cf	Make prev and next work again.	2016-10-28 20:08:27 +08:00
Huo Yaoyuan	7d6e4a8ad2	Make music controller uses WorkingBeatmap.	2016-10-28 19:39:02 +08:00
Huo Yaoyuan	eab8caaa0c	Ensure track is playing after seek.	2016-10-27 19:51:38 +08:00
Huo Yaoyuan	73d1eeb272	Update MusicController using DragBar.	2016-10-27 18:15:43 +08:00
Huo Yaoyuan	9c2d3990ce	Add spacing in code.	2016-10-27 17:04:41 +08:00
Huo Yaoyuan	3e30935d10	Allow to set database of music controller.	2016-10-27 16:58:40 +08:00
Huo Yaoyuan	6482184a09	Dispose ArchiveReader.	2016-10-27 13:34:54 +08:00
Huo Yaoyuan	fead1d4c6f	Seek by clicking and dragging on progress bar.	2016-10-27 13:34:53 +08:00
Huo Yaoyuan	d9fc04748e	Remove redundant class.	2016-10-27 13:34:52 +08:00
Huo Yaoyuan	0da78c19a2	TestCase reset.	2016-10-27 13:34:51 +08:00
Huo Yaoyuan	b671a33911	Transition fixes and clock for VisualTest.	2016-10-27 13:34:51 +08:00
Huo Yaoyuan	8e766a1f47	Show playing progress.	2016-10-27 13:34:50 +08:00
Huo Yaoyuan	1a3a5c544d	Button behavior fixes.	2016-10-27 13:34:49 +08:00
Huo Yaoyuan	a32f9eed51	Play control.	2016-10-27 13:34:48 +08:00
Huo Yaoyuan	d2495e34fb	Query from beatmap database.	2016-10-27 13:34:47 +08:00
Huo Yaoyuan	303bd41765	Background scale.	2016-10-27 13:34:46 +08:00
Huo Yaoyuan	b0d72c5f84	Button and text.	2016-10-27 13:34:45 +08:00
Huo Yaoyuan	0f2b5e8370	Layers.	2016-10-27 13:34:44 +08:00
Huo Yaoyuan	e1f6ab1a42	Create MusicController UI class and visual test.	2016-10-27 13:34:43 +08:00