6476 Commits

Author	SHA1	Message	Date
Huo Yaoyuan	59d1fdb032	Simplify ModSection.	2017-03-07 00:12:06 +08:00
Dean Herbert	dcc7386609	Add option toggle for debug cached setting.	2017-03-06 22:07:46 +09:00
Huo Yaoyuan	564b3f0706	Refactor icon management of ModButton.	2017-03-06 19:03:26 +08:00
Huo Yaoyuan	a91d897282	Handle left and right mouse button only.	2017-03-06 18:02:51 +08:00
Huo Yaoyuan	f6f20cafd3	Merge remote-tracking branch 'peppy/less-mods-enum' into modselect	2017-03-06 17:35:15 +08:00
Dean Herbert	12a3b1414f	Add sane defaults for abstract Mod class and remove remaining use of enum.	2017-03-06 18:29:19 +09:00
Dean Herbert	45f500920c	Don't use Mods enum for handling incompatible mods.	2017-03-06 18:29:17 +09:00
Huo Yaoyuan	ad75ead665	selectedMod -> selectedIndex	2017-03-06 17:21:25 +08:00
Huo Yaoyuan	c2cf5242e1	Remove one-entry backing fields.	2017-03-06 17:14:41 +08:00
Dean Herbert	463c887879	Fix WaveOverlayContainer staying visible when hidden.	2017-03-06 17:32:13 +09:00
Dean Herbert	b5aff9df5f	Add options footer.	2017-03-06 17:30:46 +09:00
Dean Herbert	e356758a7d	Don't expicitly set origin of TextAwesome.	2017-03-06 17:06:48 +09:00
Huo Yaoyuan	a34e6453bf	Simplify SelectedMods.	2017-03-06 15:39:27 +08:00
Dean Herbert	2de25c23b4	Make Mods IEnumerable.	2017-03-06 15:20:55 +09:00
Dean Herbert	4e4408cd20	Merge branch 'master' into replay ... # Conflicts: # osu.Desktop.VisualTests/Tests/TestCasePlayer.cs	2017-03-05 17:45:03 +09:00
DrabWeb	9cde20ffc7	Merge https://github.com/ppy/osu into leaderboards	2017-03-04 22:33:05 -04: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
Dean Herbert	e12d89529c	Merge remote-tracking branch 'upstream/master' into update-flow	2017-03-04 23:28:39 +09:00
Dean Herbert	00fdffe9c8	Update framework (and fix non-conforming anchors in FillFlowContainers).	2017-03-04 23:24:13 +09:00
Dean Herbert	a8deb4ff50	Fix WaveOverlayContainer always being visible.	2017-03-04 19:02:13 +09:00
Thomas Müller	a2317e5a1e	Update usage of FillDirection	2017-03-04 11:00:17 +01:00
DrabWeb	a112b354f0	Basic implementation of score UI	2017-03-04 03:37:34 -04:00
Thomas Müller	c44bf5291c	Merge branch 'master' into mod-select-performance	2017-03-04 07:35:40 +01:00
DrabWeb	9141d244bf	Focus trigger in WaveOverlayContainer	2017-03-03 18:05:43 -04:00
DrabWeb	5a83687a27	Small cleanups	2017-03-03 18:02:31 -04:00
Thomas Müller	aff9e3617d	Massively improves fill-rate of mod select screen ... This is done by masking away the parts of WaveOverlayContainer that are behind the content.	2017-03-03 20:42:03 +01:00
Dean Herbert	6f3b59268a	Merge pull request #385 from DrabWeb/mod-overlay ... Mod select	2017-03-03 21:09:08 +09:00
Dean Herbert	dc6a728cce	Merge branch 'master' into tournament_drawings	2017-03-03 20:48:07 +09:00
Dean Herbert	2ac248c7d0	Use OsuSpriteText.	2017-03-03 20:29:39 +09:00
Dean Herbert	71534b3e13	Fix incorrect triangle density on first display.	2017-03-03 18:09:16 +09:00
Seth	fde509ab1d	Merge branch 'master' into mod-overlay	2017-03-03 04:12:42 -04:00
Seth	1891bdf51e	Merge branch 'master' into mod-overlay	2017-03-03 01:11:15 -04:00
John Leuenhagen	417c7e341a	Password textbox now performs login on enter	2017-03-02 22:41:14 -05:00
Dean Herbert	3a8246f56d	Move PauseOverlay to correct namespace.	2017-03-03 10:17:39 +09:00
DrabWeb	536925c77a	Comply to naming conventions	2017-03-02 09:15:53 -04:00
Dean Herbert	ef8a35f5cc	Fix Toolbar's mode changer not working correctly.	2017-03-02 22:01:24 +09:00
Dean Herbert	e399d6c6d1	Use bindable for PlayMode.	2017-03-02 21:16:58 +09:00
Dean Herbert	471b9daa93	Merge branch 'master' into mod-overlay ... # Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj # osu.Game/Screens/Select/PlaySongSelect.cs # osu.Game/osu.Game.csproj	2017-03-02 20:27:04 +09:00
Dean Herbert	435e845067	Merge branch 'master' into DrabWeb/song-progress-graph ... # Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj # osu.Game/Overlays/Pause/PauseProgressBar.cs # osu.Game/Overlays/Pause/PauseProgressGraph.cs # osu.Game/osu.Game.csproj	2017-03-02 20:20:27 +09:00
Dean Herbert	963117f07d	Fix incorrect event order.	2017-03-02 17:41:33 +09:00
Dean Herbert	68857b573d	More code tidying.	2017-03-02 17:14:05 +09:00
Dean Herbert	c4871bbbf3	Tidy up code. ... The triggered bool is not even necessary because input is no longer handled after the OverlayContainer's state is set to hidden.	2017-03-02 17:08:00 +09:00
Dean Herbert	d1cd077e0d	Post-merge fixes.	2017-03-02 16:54:55 +09:00
Dean Herbert	ff5f0af2d3	Merge branch 'master' into popup-dialog	2017-03-02 16:42:20 +09:00
DrabWeb	37ed1b3d09	Moved key press select mods to ModSection	2017-03-02 01:24:32 -04:00
DrabWeb	1eee587c18	CreateModSections -> GetModsFor(PlayMode), fixed deselect not working in ModSelectOverlay, added MultiMod for multiple mods in one mod, fixed issues with SelectedColour in ModSection	2017-03-02 01:07:28 -04:00
DrabWeb	6c680825ed	ModSections in Ruleset, fixed toolbar play mode changed not firing	2017-03-01 22:05:52 -04:00
DrabWeb	bb12463ae4	Working on better way to handle mods	2017-03-01 20:57:33 -04:00
DrabWeb	befdf68abe	Made DialogOverlay use PopupDialog's direct valfixed last dialogs not expiring, DialogOverlay actually hides now, fixed an issue where multiple buttons could be pressed at once	2017-03-01 18:41:00 -04:00
Thomas Müller	4d28696479	FlowDirection -> FillDirection	2017-03-01 20:15:38 +01:00
Thomas Müller	9c853b0465	Update framewörk	2017-03-01 19:33:01 +01:00
Thomas Müller	d46e68b36b	Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor ... # Conflicts: # osu-framework # osu.Game/Beatmaps/Drawables/BeatmapGroup.cs	2017-03-01 18:05:58 +01:00
DrabWeb	c3a81127f2	Updated to work with latest framework	2017-02-28 02:25:38 -04:00
DrabWeb	570c95cb98	Merge https://github.com/ppy/osu into mod-overlay	2017-02-28 02:22:59 -04:00
DrabWeb	ce1798b8bc	DialogManager -> DialogOverlay, cleaned up how BeatmapDeletDialog works, added global DialogOverlay	2017-02-28 02:09:36 -04:00
DrabWeb	50d172be39	Added DialogManager(not wired up for desktop project yet)	2017-02-28 00:59:36 -04:00
DrabWeb	bc7fd3bd39	Remove uneccesary cast, move enter OK button to one liner	2017-02-27 22:38:44 -04:00
DrabWeb	94f34b985b	Forgot returns	2017-02-27 22:32:30 -04:00
DrabWeb	0ce8fff666	Enter key presses first OK button, 1-9 presses button at number	2017-02-27 22:31:23 -04:00
DrabWeb	e8cae3b45e	Remove new override in DialogButton	2017-02-27 21:38:25 -04:00
DrabWeb	164f205ee5	Remove SpaceTextOnHover	2017-02-27 21:30:10 -04:00
DrabWeb	b3a231185b	Conform to naming conventions	2017-02-27 20:55:10 -04:00
DrabWeb	34ba3129a3	Removed background triangles	2017-02-27 20:44:27 -04:00
DrabWeb	64d036fe81	Update to work with latest framework	2017-02-27 16:41:45 -04:00
DrabWeb	3094c01a40	Merge https://github.com/ppy/osu into popup-dialog	2017-02-27 16:40:04 -04:00
default0	03889e6ca6	Update References to FlowStrategies ... References now use the Create*-names instead of the outdated Get*-names to create instances of FlowStrategies.	2017-02-27 16:55:55 +01:00
Andrey Zavadskiy	9444ffd849	Removed redundant qualifiers	2017-02-27 17:37:38 +03:00
Andrey Zavadskiy	3487dfe236	Removed unused variables and parameters	2017-02-27 17:32:32 +03:00
DrabWeb	d78dca3d85	New design	2017-02-26 23:35:13 -04:00
default0	8d91519d59	Update usage of FlowContainer and its subclasses	2017-02-26 21:32:43 +01:00
Dean Herbert	686372a7f9	Update with framework structural changes.	2017-02-26 20:54:32 +09:00
Dean Herbert	9f5518312d	Add missing file.	2017-02-26 18:28:01 +09:00
Dean Herbert	79993a576f	Add basic GC options.	2017-02-26 18:06:59 +09:00
Thomas Müller	1585ae842a	Update framework	2017-02-26 11:22:58 +09:00
DrabWeb	a009268370	Merge https://github.com/ppy/osu into popup-dialog	2017-02-25 21:22:47 -04:00
DrabWeb	bd6ca99246	Even faster	2017-02-24 16:48:30 -04:00
DrabWeb	42b26a4c2f	Speedup triangles	2017-02-24 16:41:10 -04: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
DrabWeb	c94da4fcf0	Added popup dialog	2017-02-24 00:05:37 -04:00
Dean Herbert	c5552dfb27	Merge remote-tracking branch 'upstream/master' into remove-usings	2017-02-24 11:29:34 +09:00
Thomas Müller	37bc75a7b6	Remove unused variables	2017-02-23 22:32:49 +01: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
Seth	b4b88712ad	Merge branch 'master' into mod-overlay	2017-02-23 08:00:24 -04:00
DrabWeb	a67bfacb19	Made requested changes	2017-02-23 07:57:58 -04:00
DrabWeb	e1c4abd8c5	Cleaned ModSelectOverlay	2017-02-23 07:36:31 -04:00
Kelvin	fd622286fe	Enable Tabbing in LoginOptions	2017-02-23 00:50:09 -08:00
Dean Herbert	f1538791c3	Correctly hook up window mode dropdown.	2017-02-23 17:35:14 +09:00
Dean Herbert	da2bfe6d3c	Framework updates.	2017-02-23 16:42:12 +09:00
Dean Herbert	c683cdbb1d	Derive from FocusedOverlayContainer and remove custom focus logic.	2017-02-23 12:51:32 +09:00
Dean Herbert	cee1c14557	Clean-up code.	2017-02-23 12:48:24 +09:00
Dean Herbert	8d1498a8db	Fix initial state and shorten disappear animation.	2017-02-23 12:47:20 +09:00
Dean Herbert	b33627a750	Make transitions better.	2017-02-23 12:42:31 +09:00
Dean Herbert	8787b0dc90	Remove a lot of constants (use object initialisers instead).	2017-02-23 12:17:59 +09:00
Dean Herbert	521a9b7728	Remove need for waves array; use generic container.	2017-02-23 11:26:50 +09:00
Dean Herbert	d154cf7938	Abstract wave logic to class.	2017-02-23 11:22:01 +09:00
Dean Herbert	9f367bcc0e	Fix line endings.	2017-02-23 11:16:23 +09:00
DrabWeb	79ff96de0d	Typo	2017-02-22 16:38:36 -04:00
DrabWeb	a58a0a4edf	Fix transition stutter	2017-02-22 16:37:58 -04:00
DrabWeb	cf5258ceb0	Thanks refactoring	2017-02-22 13:17:06 -04:00
DrabWeb	bf1d13e734	Comply to formatting style	2017-02-22 13:12:39 -04:00
DrabWeb	8cd7ebcb43	readonly -> const	2017-02-22 13:03:19 -04:00
DrabWeb	416772e96f	Update to work with latest framework	2017-02-22 12:46:38 -04:00
DrabWeb	99f1f88c75	Merge https://github.com/ppy/osu into mod-overlay	2017-02-22 12:35:55 -04:00
DrabWeb	bac0431102	Fixed build failing	2017-02-22 12:28:34 -04:00
DrabWeb	cc956bc8ec	Newline	2017-02-22 12:23:46 -04:00
DrabWeb	584a514267	Cleanup part 2	2017-02-22 12:22:29 -04:00
DrabWeb	4821f323b8	Cleanup	2017-02-22 12:12:41 -04:00
DrabWeb	337a1004d3	Made mod disabling better	2017-02-22 11:34:22 -04:00
Thomas Müller	44bedb5407	Merge branch 'master' into chat-improvement	2017-02-22 07:36:42 +01:00
Dean Herbert	190bed8939	Add top padding.	2017-02-22 13:38:22 +09:00
Dean Herbert	b7a9fd85ea	Assert single channel support for now.	2017-02-22 13:38:10 +09:00
Dean Herbert	cbd061d573	Improve appearance of notifications.	2017-02-21 13:52:37 +09:00
Dean Herbert	6a83620589	Add better focus handling and padding/margin updates.	2017-02-20 21:11:09 +09:00
Dean Herbert	e3fa49dda7	Naively "send" messages that the user types (doesn't arrive yet).	2017-02-20 21:10:43 +09:00
Dean Herbert	7a2eedbd7e	Add message batching per-channel.	2017-02-20 21:09:34 +09:00
Dean Herbert	de87141e90	Remove unused using statements.	2017-02-19 18:39:54 +09:00
Dean Herbert	aac4ba2baa	Add input box to ChatOverlay.	2017-02-19 18:02:25 +09:00
Dean Herbert	0da0ef5a1b	Fix padding, fonts and alignment of chat display.	2017-02-19 17:06:41 +09:00
DrabWeb	3f5d155583	Added DeselectAll	2017-02-18 11:40:05 -04:00
DrabWeb	a024353574	Wave animation fine tuning	2017-02-18 11:21:41 -04:00
Dean Herbert	ebc38917dc	Fix options sidebar not displaying correclty.	2017-02-18 22:29:20 +09:00
DrabWeb	d1af050355	Fixed typo, made mod select take focus when visible	2017-02-18 07:50:22 -04:00
DrabWeb	006fb5502d	ModSelect -> ModSelectOverlay, + WaveOverlayContainer, + ModButton selected colours, made song select OnExit not handle closing mod select	2017-02-18 07:28:22 -04:00
Dean Herbert	32ce8cf723	Audio class renames in line with framework changes.	2017-02-18 17:35:04 +09:00
Thomas Müller	4b0d6cd26b	Don't rely on default relative size of ScrollContainer.	2017-02-17 20:08:28 +01:00
DrabWeb	4ccfa380f5	Added high/low multiplier indication	2017-02-16 19:09:18 -04:00
DrabWeb	e0dab3490f	Added toggling mods with keys	2017-02-16 19:00:18 -04:00
DrabWeb	9fc3726925	ModSelector -> ModSelect, added mod descriptions, added per-mode mod selection, changed animations and made the wave mask properly	2017-02-16 18:32:27 -04:00
DrabWeb	0a58fc62db	Added mod selection overlay	2017-02-16 16:05:03 -04:00
Dean Herbert	67105e6dfd	Replace all usage of SpriteText with OsuSpriteText.	2017-02-15 21:37:43 +09:00
Jorolf	d42c5481b0	Make mode selector selected line non-relative. (#352) ... * mode selector line has the correct length now * calculation is now a 'one-liner' * Line length is absolute now * Line length is calculated inline	2017-02-15 13:48:49 +09:00
Dean Herbert	13ed7db361	Merge branch 'master' into general-fixes	2017-02-15 01:14:25 +09:00
Dean Herbert	f207da6041	Add/update license headers.	2017-02-14 18:17:35 +09:00
Dean Herbert	4f9d1a6c39	Visually disable options which aren't yet wired up.	2017-02-14 00:36:50 +09:00
Thomas Müller	aaaf7163e0	Update framework.	2017-02-13 17:46:50 +09:00
Dean Herbert	e32ccb6153	Move scene graph init to ctors.	2017-02-12 19:39:54 +09:00
Dean Herbert	ac548dc9ec	Rework notifications to be more flexible.	2017-02-12 14:50:42 +09:00
Dean Herbert	a14b7eb598	NotificationManager should become visible when receiving a notification (until we implement toasts).	2017-02-12 14:50:02 +09:00
Thomas Müller	d3380631e8	Handle preferred audio device correctly when it is unavailable ... This commit allows loading, storing, and displaying a preferred audio device from config even when it is unavailable.	2017-02-11 16:33:54 +01:00
Thomas Müller	d79c8b9695	Update AudioDevicesOptions when devices are found or lost ... This commit hooks up AudioDevicesOptions to the new events exposed by the AudioManager of osu-framework. The device list is now updated when new devices become available or are lost.	2017-02-11 16:29:33 +01:00
Thomas Müller	8394e2ff38	Update OptionDropDown value when items change ... Items of OptionDropDown could previously already be changes on-the-fly, but the selected value was not correctly updated (it kept the same index). This commit addresses this problem.	2017-02-11 16:27:15 +01:00
Thomas Müller	2c4ecb990d	Remove line break in MusicController	2017-02-11 16:23:15 +01:00
Dean Herbert	398ac6f459	Add assert to ensure complete is only called once.	2017-02-10 16:58:40 +09:00
Dean Herbert	dd8ec70bd5	Remove excess newline.	2017-02-10 16:57:49 +09:00
Dean Herbert	2da5628184	Merge remote-tracking branch 'upstream/master' into notifications-manager	2017-02-10 16:54:56 +09:00
Dean Herbert	8ec927899f	Implement notifications.	2017-02-10 16:30:23 +09:00
DrabWeb	7fea233181	Removed gradient from test case, modified DragBar to allow access to what's needed in the progress bar, styled the progress bar	2017-02-09 16:28:40 -04:00
Andrey Zavadskiy	e06aa44c4c	Warning Fixes	2017-02-09 16:18:08 +03:00
Dean Herbert	d73093867d	Merge pull request #320 from default0/audio-device-selection ... Audio device selection	2017-02-09 16:45:29 +09: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	d05b544d0d	Merge branch 'master' into audio-device-selection ... # Conflicts: # osu-framework # osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs	2017-02-09 16:21:28 +09:00
Dean Herbert	0937424e0c	Add base.PopOut calls to allow for passing away focus.	2017-02-09 13:57:52 +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	b6398a1c77	Centralise toolbar size variables and adjust to design.	2017-02-08 20:30:45 +09:00
Dean Herbert	143cfae93a	Login overlay should disappear when toolbar is hidden.	2017-02-08 20:30:45 +09:00
Dean Herbert	a7dac15d05	Toolbar is now toggled by the main menu.	2017-02-08 20:30:45 +09:00
Dean Herbert	2e119cd74f	Handle toolbar offsets better.	2017-02-08 20:30:45 +09:00
Dean Herbert	5eb3ef3948	Make LoginOverlay and OptionsOverlay focused containers.	2017-02-08 15:13:32 +09:00
Dean Herbert	a6f02106a4	Use new placeholder logic.	2017-02-08 14:08:01 +09:00
Dean Herbert	446b277972	Don't allow clicks/hover events to pass through the options overlay.	2017-02-07 20:29:40 +09:00
Dean Herbert	6b011a50d2	Naming standardisation and enforcing.	2017-02-07 16:20:36 +09:00
Dean Herbert	50bd80cb0c	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
Dean Herbert	756fd78a88	Fix incorrect line endings.	2017-02-07 13:52:19 +09:00
DrabWeb	7c83dc8aed	Merge https://github.com/ppy/osu into song-progress-graph	2017-02-06 20:40:49 -04:00
Danil Yarancev	c222ce4403	Fix name	2017-02-06 21:19:27 +03:00
Dean Herbert	9b9ed32245	Remove all @2x references, updates resource and framework.	2017-02-06 22:19:47 +09:00
default0	6add77c30b	Rename Standard device option to Default ... Changed the name of the option for using the default audio device to "Default" for consistency with english windows. Also changed the "" value to string.Empty for consistency with the Frameworks treatment of this special value.	2017-02-06 12:26:32 +01:00
default0	ae03ef0787	Allow audio device selection in settings	2017-02-06 01:22:37 +01:00
default0	b4f30dd417	Rework OptionDropdowns to be more versatile ... The existing OptionDropdown only supported enums and was thus renamed to OptionEnumDropDown. A new OptionDropdown has been created in its place to allow binding to arbitrary values, with a set of user-provided items.	2017-02-06 01:21:26 +01:00
Thomas Müller	91f0951255	Handle OnMouseDown in PauseOverlay such that players can not click circles through the overlay while paused.	2017-02-05 20:17:29 +01:00
Thomas Müller	0f72ef7dc2	Make pause buttons OnClick and not OnMouseDown.	2017-02-05 20:17:02 +01:00
Thomas Müller	c56478e154	Add missing license header.	2017-02-05 20:16:40 +01:00
Thomas Müller	d291103d22	Avoid triangle bleeding by masking the triangle container without smoothness.	2017-02-05 16:34:47 +01:00
Thomas Müller	a69c306334	Merge branch 'master' of github.com:ppy/osu into fix-login-button	2017-02-05 15:28:44 +01:00
Thomas Müller	ba38a27274	Fix incorrect sizing of login button. ... When logging in or out the size of the login button would not correctly update, resulting in a messed-up flow of toolbar buttons. This branch fixes the problem by avoiding an invalidation-chain-breaking override of Size. Instead, the loginOverlay bypasses auto sizing by using a new framework feature.	2017-02-05 15:17:54 +01:00
Andrey Zavadskiy	43dcf0bbc1	PauseButton Triangles	2017-02-05 13:47:37 +03:00
Dean Herbert	714c94b7a8	Fix toolbar sizing hackiness.	2017-02-04 22:27:05 +09:00
Dean Herbert	57d97ba2e9	Make triangles look better in many cases.	2017-02-04 22:09:44 +09:00
Dean Herbert	0fefa50b54	Add padding beneath sliders in options.	2017-02-04 20:57:08 +09:00
Thomas Müller	1913ec659a	Merge branch 'master' of github.com:ppy/osu into better-option-sliders	2017-02-04 12:07:21 +01:00
Thomas Müller	6db70f8850	Use MaskingSmoothness to make masked diagonal edges smoother.	2017-02-04 11:06:26 +01:00
Thomas Müller	0edc64a08c	Re-use checkbox nub for option sliders and slightly re-structure.	2017-02-04 09:50:58 +01:00
DrabWeb	0d8815bd37	Added back current work	2017-02-03 15:22:02 -04:00
Dean Herbert	4504440f80	Fix much dropdown shit.	2017-02-03 19:13:10 +09:00
Dean Herbert	fc9badf20f	Fix autosize issues.	2017-02-03 15:22:00 +09:00
Dean Herbert	16a01abc4d	Merge remote-tracking branch 'upstream/master' into options-refactor ... # Conflicts: # osu.Game/Beatmaps/Drawables/BeatmapPanel.cs # osu.Game/Graphics/UserInterface/BackButton.cs # osu.Game/Screens/Play/KeyCounter.cs	2017-02-03 13:16:07 +09:00
Dean Herbert	a6fd7f46c3	Merge remote-tracking branch 'upstream/master' into login-updates	2017-02-03 12:48:52 +09:00
Drew DeVault	52fb345e79	Merge branch 'master' into song-select-filtering	2017-02-02 09:25:27 -08:00
Dean Herbert	aec84ae725	Fix laggy animations, incorrect hiding logic.	2017-02-02 19:24:14 +09:00
Dean Herbert	90fd9d9132	Merge branch 'master' into options-refactor	2017-02-01 14:07:49 +09:00
Dean Herbert	e94c92b920	Merge branch 'master' into login-updates	2017-02-01 13:23:22 +09:00
DrabWeb	0d53d3c4ff	Fixed quitting not working	2017-01-31 22:33:28 -04:00
Dean Herbert	ea204ad606	Merge pull request #301 from DrabWeb/pause-overlay ... Pause overlay	2017-02-01 10:07:12 +09:00
DrabWeb	91a5d0b3cf	Made requested changes	2017-01-31 09:17:47 -04:00
DrabWeb	bf54ae86ea	Added flash when clicking a PauseButton	2017-01-31 08:07:05 -04:00
Dean Herbert	6803b1a8db	Sidebar button style pass.	2017-01-31 19:58:38 +09:00
Dean Herbert	86b61cab8e	Pink -> Yellow.	2017-01-31 19:58:22 +09:00
Dean Herbert	a2cd829a2c	Colour conformity pass.	2017-01-31 19:40:02 +09:00
Dean Herbert	0d529cb636	General tidy-ups.	2017-01-31 19:23:52 +09:00
Dean Herbert	a723e6ee9c	Chevron size adjustment for dropdown items.	2017-01-31 19:19:11 +09:00
Dean Herbert	a2dd5f09d3	Fix subsection headers not being displayed in many cases. + spacing tweaks.	2017-01-31 19:19:01 +09:00
Dean Herbert	6b66ecc131	Global shadows and more sane font size setting.	2017-01-31 18:53:52 +09:00
Dean Herbert	9e5000d448	Remove (soon-to-be) redundant labels.	2017-01-31 18:40:18 +09:00
Dean Herbert	6ca974bf0c	Re-namespace options, adjust font sizes + more.	2017-01-31 18:37:11 +09:00
Dean Herbert	20ee1872b4	Broaden invalidation.	2017-01-31 17:15:46 +09:00
Dean Herbert	6cd9f93fb5	Adjust transitions slightly.	2017-01-31 17:05:42 +09:00
Dean Herbert	62c5ad907a	Merge remote-tracking branch 'upstream/master' into login-updates ... # Conflicts: # osu.Game/Overlays/Options/General/LoginOptions.cs	2017-01-31 17:05:33 +09:00
Dean Herbert	22ef576c64	Make LoginOverlay mask better.	2017-01-31 16:59:38 +09:00
Dean Herbert	3476abc38b	Add proper masking support to the login overlay.	2017-01-31 16:42:46 +09:00
DrabWeb	fe09bab78f	Removed empty ctor in PauseProgressGraph	2017-01-30 16:18:34 -04:00
DrabWeb	9d4a14074f	Woops forgot to add PauseButton	2017-01-30 16:18:11 -04:00
Dean Herbert	4cf2993db1	Fix lack of visibility check causing weird hover regions.	2017-01-30 23:25:37 +09:00
Dean Herbert	2aa924c104	Fix global hover regression.	2017-01-30 23:24:30 +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	b2ec3508d5	Add shadow to opaque toolbar elements.	2017-01-30 22:54:36 +09:00
Dean Herbert	cbd6fe3f36	Move definition of MusicController's position out of itself.	2017-01-30 22:54:33 +09:00
DrabWeb	2f2f0ed9a3	Fixed an issue with PauseButton's glow not fading in	2017-01-30 09:26:24 -04:00
DrabWeb	740f6e5595	Moved delaying resuming to Player	2017-01-30 09:06:26 -04:00
Dean Herbert	bdbe8501d3	Merge branch 'master' into add-flash-effects ... # Conflicts: # osu.Game/Overlays/Options/General/LoginOptions.cs	2017-01-30 21:47:05 +09:00
DrabWeb	af8294f02c	Renamed/removed various private constants	2017-01-30 08:45:10 -04:00
DrabWeb	dbb9078e30	Fixed glow on PauseButton not updating	2017-01-30 08:19:44 -04:00
DrabWeb	ed3ed8251f	Made styling PauseButtons public, Resume/Retry/Quit buttons changed to subclasses	2017-01-30 08:04:39 -04:00
Dean Herbert	26e9533ff0	Add custom implementation of TextBox.	2017-01-30 20:29:04 +09:00
DrabWeb	dcb02eff65	Cleared out PauseProgressGraph	2017-01-30 07:19:14 -04:00
DrabWeb	015832f242	Changed PauseOverlay to layout with FlowContainers and not positioning, made the retry counter in PauseOverlay have the number bolded, made it so if the player presses escape before the clock is started in Player then Exit is called instead of Pause	2017-01-30 06:14:28 -04:00
DrabWeb	62282076c7	Changes on PauseButton to match design closer	2017-01-30 05:04:57 -04:00
DrabWeb	f8cbc35f8e	Small cleanups	2017-01-30 04:43:06 -04:00
DrabWeb	d70cbd37dd	Made the pause progress graph it's own class, to be implemented, made it so the user couldn't double click the pause buttons and made it so the action wasn't called a second time when the mouse button was released, made PopIn and PopOut in PauseOverlay one line each, made Player.IsPaused a public getter with a private getter/setter, implemented restarting in Player	2017-01-30 04:08:14 -04:00
Dean Herbert	578b33dc64	Merge pull request #300 from peppy/more-beatmap-info ... Beatmap details	2017-01-30 16:23:30 +09:00
Dean Herbert	2ed5cf7c91	Hook up icons better.	2017-01-30 13:35:40 +09:00
DrabWeb	28967cf77a	Renamed Player.isPaused to IsPaused, did a small patch suggested for how the player can click through the pause menu onto the Playfield(only partially works, upstream changes need to be made for full functionality), made Retry default to Resume until retrying is implemented, minor cleanups	2017-01-29 05:04:48 -04:00
DrabWeb	c75b234b1a	Adjusted the fade time of the pause overlay, put a fill behind the colour of PauseButton to fix an issue where the background gray is visible when the pause overlay is fading out	2017-01-28 21:50:06 -04:00
DrabWeb	d0a22bfdd4	Added PauseOverlay.SetRetries for updating the retry indicator	2017-01-28 20:56:23 -04:00
DrabWeb	d4216eb539	Made resume not call until double the time of the fade animation	2017-01-28 20:45:10 -04:00
DrabWeb	6b57456681	Removed depth setting from PauseOverlay, removed shadow offset on PauseButton color(why was that even there?), fixed the triangles on PauseButton not masking to the sheared container, made PauseButton call it's action on MouseUp instead of MouseDown to match stable	2017-01-28 20:30:37 -04:00
DrabWeb	582599a8de	Made PauseButton more visually responsive, added force option to Player.Pause, added very basic implementation of the progress bar	2017-01-28 16:55:42 -04:00
Andrey Zavadskiy	f12a8ace3f	Moved Config logic to OsuConfigManager	2017-01-28 13:10:05 +03:00
EVAST9919	ac7feafe9a	Merge branch 'master' into login_fix	2017-01-28 11:24:08 +02:00
DrabWeb	feba3f35ba	Changed the roles of PauseOverlay and player in pausing, PauseOverlay is now only the UI portion and doesn't do things like actually pause the game, and only calls actions and hides itself, whereas Player actually pauses the game and brings up the pause overlay in the first place	2017-01-27 15:28:39 -04:00
DrabWeb	490feac030	Working on design	2017-01-27 14:18:57 -04:00
DrabWeb	e115120543	Renamed pauseDisableTime to pauseCooldown	2017-01-27 08:13:39 -04:00
DrabWeb	8c6d9bdf2e	Added commas to the end of UI creation to match how the rest of the project does, moved PauseButton audio loading to PauseOverlay, much more reliable(still using placeholder assets), made it so the player can't spam pause, cools down to one second	2017-01-27 08:03:32 -04:00
DrabWeb	3ed88ea043	Added PauseOverlay.TogglePaused, renamed OnPlay and similar to OnResume, made Pause and Play public, added proper testing for the visual test(pause button instead of auto-pause, logging actions), made PauseOverlay's fade duration a constant instead of statically typed	2017-01-27 07:11:22 -04:00
DrabWeb	81de5a2097	Made the pause overlay be at -1 depth so it renders on top of everything(used to allow circles to draw on top)	2017-01-27 06:36:43 -04:00
DrabWeb	f35974021a	Set actions for retry/quit, moved setting paused to PopIn and PopOut, added null propogation for the sound samples for PauseButton(sometimes in the visual tests the audio doesn't load for whatever reason), added a gradient to the background of the PauseOverlay visual test(same as the one in the menu button system test), wired up the retry and quit actions in Player, made the quit action quit the map, retry still does nothing	2017-01-27 06:19:52 -04:00
DrabWeb	dedd6a4bcf	Small cleanups	2017-01-27 05:39:15 -04:00
DrabWeb	fe265c01cb	Added current work on pause overlay	2017-01-27 05:24:49 -04:00
Dean Herbert	7ee6a50404	Fix checkbox design regressions.	2017-01-27 00:16:02 +09:00
Dean Herbert	25da8a53dc	Fix incorrect configuration retrievals.	2017-01-26 23:08:39 +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
Andrey Zavadskiy	63fcfdbbde	Fixed checkboxes state and better code	2017-01-11 10:28:24 +03: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
Andrey Zavadskiy	c0980437a6	Removed unnecessary api reference	2017-01-07 00:55:04 +03:00
Drew DeVault	4899d88d19	Update framework	2017-01-05 02:10:05 -05:00
Drew DeVault	b27139c2bd	Simplify layout of dropdown menu item	2017-01-05 00:57:19 -05:00
Drew DeVault	af4aeeab09	Update following framework changes	2017-01-04 01:14:25 -05:00
Drew DeVault	a1f8c0df64	Style dropdown to match osu!stable	2017-01-03 23:00:28 -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
Andrey Zavadskiy	eabfa11614	Minor fix	2016-12-24 10:04:43 +03:00
Andrey Zavadskiy	ba1d0b3a84	Added Events for checkboxes	2016-12-24 09:09:01 +03:00
Andrey Zavadskiy	9f202ecba8	fix	2016-12-23 23:49:42 +03:00
Andrey Zavadskiy	70c8250021	Revert "Dependent checkboxes" ... This reverts commit 70dc3bae4a.	2016-12-23 23:05:44 +03:00
Andrey Zavadskiy	70dc3bae4a	Dependent checkboxes	2016-12-23 20:24:28 +03:00
Andrey Zavadskiy	1c79ebff9f	Fix loggining on start even after logout and exit	2016-12-21 01:51:01 +03:00
Andrey Zavadskiy	bba4c46ae3	TODO comment and deleted repeating lines	2016-12-21 01:05:10 +03:00
Andrey Zavadskiy	d519e28dda	PasswordTextBox fix	2016-12-20 17:52:16 +03:00
Andrey Zavadskiy	21c6c23189	Login improvements	2016-12-20 17:28:27 +03:00
Andrey Zavadskiy	e23a1b8e92	Remove unnecessary items from OptionsOverlay	2016-12-19 19:17:04 +03:00
Drew DeVault	67d748f677	Adjust padding on sliders	2016-12-16 01:27:57 -05:00
Drew DeVault	796858f86f	Fix transparency issues	2016-12-16 00:37:37 -05:00
Drew DeVault	96a6e30a21	Drop complicated type constraints	2016-12-16 00:27:06 -05:00
Drew DeVault	80574423cb	Drop SliderBarEventSource	2016-12-16 00:27:06 -05:00
Drew DeVault	abc6db18b3	Add license header	2016-12-16 00:27:06 -05:00
Drew DeVault	a751cfcba3	Update SliderOption implementation ... Per @Tom94's suggestion, the bars track the nub in Update instead of animating seperately. Also only animates when the event source is the keyboard.	2016-12-16 00:27:06 -05:00
Drew DeVault	10cc6f7885	Move where clause to next line	2016-12-16 00:27:06 -05:00
Drew DeVault	9e75ecab4f	Fix up slider bugs	2016-12-16 00:27:06 -05:00
Drew DeVault	22c2a4757c	Play slider sample as the value changes in 1/10ths	2016-12-16 00:27:06 -05:00
Drew DeVault	c642f6c34f	Add sliderbar L+F	2016-12-16 00:27:06 -05:00
Dean Herbert	0538681f3b	Merge branch 'refs/heads/master' into general-fixes	2016-12-08 13:29:59 +09:00
Drew DeVault	bf7ec397dd	Wire dropdowns back to bindables	2016-12-07 09:42:53 -05:00
Drew DeVault	bf33bded24	Update star min/max type, just use sliders for now	2016-12-07 09:42:53 -05:00
Drew DeVault	b06f412ffb	Use styled dropdown	2016-12-07 09:42:53 -05:00
Drew DeVault	0e07ce26bc	Remove Height from dropdown	2016-12-07 09:42:53 -05:00
Drew DeVault	cf60c52f00	Switch to System.ComponentModel.Description	2016-12-07 09:42:53 -05:00
Drew DeVault	5456e0102c	s/OptionsDropdown/DropdownOption/g	2016-12-07 09:42:52 -05:00
Drew DeVault	4757a1c433	Wire up enum-backed dropdowns	2016-12-07 09:42:52 -05:00
Drew DeVault	0378de8346	Add DisplayName	2016-12-07 09:42:37 -05:00
Drew DeVault	9daf524120	Add OptionsDropdown<T> and wire up one example	2016-12-07 09:42:37 -05:00
Drew DeVault	ff7ec88e66	s/OptionsSlider/SliderOption/g	2016-12-07 09:42:37 -05:00
Drew DeVault	b97902d006	Add missing sliders	2016-12-07 09:42:37 -05:00
Drew DeVault	92cf841589	Add and wire up all sliderbar-based options	2016-12-07 09:42:37 -05:00
Drew DeVault	3aefa4d6a5	Wire up remaining sliders, except for ints	2016-12-07 09:42:37 -05:00
Drew DeVault	a350e95e40	Add OptionsSlider and wire up volume sliders	2016-12-07 09:41:28 -05:00
Dean Herbert	bc6c57c619	Make toolbar icons the same width as options icons.	2016-12-07 19:14:05 +09:00
Dean Herbert	f356640cb7	Add missing licence headers.	2016-12-06 19:07:15 +09:00
Dean Herbert	7bd9a87bda	Add menu button sound effects.	2016-12-05 21:09:41 +09:00
Dean Herbert	3056bbda5d	Add temporary workaround for crash.	2016-12-05 21:09:17 +09:00
Dean Herbert	590ca3108c	Add checkbox sound effects.	2016-12-05 19:45:54 +09:00
Thomas Müller	773d64cd5e	Update judgement after children have been updated.	2016-12-03 14:40:15 +01:00
Thomas Müller	b81bf7085f	Add missing licence headers and fixup using statements.	2016-12-03 13:56:35 +01:00
Thomas Müller	c43b47da2a	Add option toggles and configuration for snaking in and out sliders.	2016-12-03 13:56:19 +01:00
Dean Herbert	a80c28ca37	ToolbarOverlayToggleButton	2016-12-02 21:57:01 +09:00
Dean Herbert	9bf36418a0	Make toolbar buttons more independent logic-wise. ... Also adds visual toggle state for toggleable buttons.	2016-12-02 18:43:01 +09:00
Thomas Müller	20947623d5	Merge pull request #210 from peppy/online-improvements ... Add login support, better API state change handling.	2016-12-01 18:50:54 +01:00
Dean Herbert	511dab32ef	Remove masking from Triangles to simplify OsuLogo masking hierarchy.	2016-12-01 21:12:37 +09:00
Dean Herbert	858a79c402	Merge pull request #211 from huoyaoyuan/enhancement ... Minor enhancements	2016-12-01 20:01:39 +09:00
Dean Herbert	918a3bc74f	Add glow and bling to game mode selector.	2016-12-01 19:15:34 +09:00
Dean Herbert	3a5c41b970	Restore additive blending for toolbar button backgrounds.	2016-12-01 18:54:32 +09:00
Dean Herbert	11f958030f	Make Triangles more flexible and more random.	2016-12-01 18:53:13 +09:00
Dean Herbert	6554a4ea58	Fix shadow not displaying around avatar.	2016-12-01 17:45:32 +09:00
Dean Herbert	25d3818e7a	Fix game mode selector line regression.	2016-12-01 17:45:21 +09:00
Dean Herbert	6ccce88a0e	Add proper user data retrieval on connect.	2016-12-01 16:44:24 +09:00
Dean Herbert	d7ab74363d	Simplify toolbar width/padding calculations. Add avatar display (incorrect user id).	2016-12-01 16:05:54 +09:00
Dean Herbert	0b0fe2a857	Remove incorrect verbatim string specifications.	2016-12-01 16:04:58 +09:00
Dean Herbert	167b559a95	Move toolbar to own namespace.	2016-12-01 14:22:29 +09:00
Dean Herbert	13d26d0601	Tidy up options login section code; fix incorrect flow logic for online state.	2016-12-01 13:07:19 +09:00
Dean Herbert	9d05c132e8	Make Toolbar an IOnlineComponent to tidy up state change logic.	2016-12-01 13:03:40 +09:00
Dean Herbert	c6b7e90739	Merge branch 'refs/heads/master' into online-improvements	2016-12-01 12:51:45 +09:00
Huo Yaoyuan	3a4fb2ffed	IsEnabled property for drag bar of music controller.	2016-12-01 08:20:24 +08:00
Thomas Müller	579b8328dc	Revert "Fix options sidebar being transparent when moving in from the side, showing a view of the broken region left of the gamemode stack." ... This reverts commit 27a13eec97.	2016-11-30 20:50:41 +01:00
Thomas Müller	27a13eec97	Fix options sidebar being transparent when moving in from the side, showing a view of the broken region left of the gamemode stack.	2016-11-30 20:22:23 +01:00
Dean Herbert	ed879f33df	Add logout button and check for inputs before allowing login.	2016-11-30 19:43:03 +09:00
Dean Herbert	01dc7cb5c2	Thread safety, username saving correctly etc.	2016-11-30 19:22:36 +09:00
Dean Herbert	a980671c54	Add basic ChatOverlay state handling.	2016-11-30 18:30:19 +09:00
Dean Herbert	11f726ad45	Add basic login flow.	2016-11-30 18:30:15 +09:00
Dean Herbert	88748499fa	Register chat overlay with API.	2016-11-30 18:30:10 +09:00
Dean Herbert	18509e6a60	ChatConsole -> ChatOverlay. Namespace tidying.	2016-11-30 18:30:06 +09:00
Dean Herbert	481b9d3208	Make opening options shift the rest of the screen as per design.	2016-11-30 18:28:18 +09:00
Dean Herbert	6809e2ce0a	Use DI to get api for ChatConsole.	2016-11-30 17:07:36 +09:00
Dean Herbert	d65a275e32	Improve transition of toolbar when hovering.	2016-11-30 13:50:30 +09: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	b3b7fb90c5	Add shadows to toolbar tooltips.	2016-11-23 11:35:52 +09:00
Dean Herbert	3bc38268a0	Make MusicController more async.	2016-11-22 20:47:28 +09:00
Dean Herbert	42d2d39ade	Merge pull request #171 from huoyaoyuan/improvements ... Various improvements	2016-11-16 12:00:55 +09:00
Huo Yaoyuan	53deaf2a00	Merge branch 'master'	2016-11-16 10:51:39 +08:00
Dean Herbert	89bb87a6f3	Merge pull request #176 from Tom94/simpler-gradient ... Use gradient helper function to create toolbar tooltip gradient.	2016-11-16 11:18:31 +09:00
Thomas Müller	e049f8582a	Fix option checkbox losing its glow incorrectly in certain cases.	2016-11-15 19:11:36 +01:00
Thomas Müller	746c28246f	Use gradient helper function to create toolbar tooltip gradient.	2016-11-15 19:09:30 +01:00
Thomas Müller	696d21f762	Merge pull request #174 from peppy/general-fixes ... General fixes	2016-11-15 18:20:48 +01:00
Dean Herbert	0b8c307549	Toolbar should block Hover events.	2016-11-15 20:55:53 +09:00
Dean Herbert	a2d505af78	ToolbarButtons should still handle MouseDown events.	2016-11-15 20:55:52 +09:00
Dean Herbert	f415e5820f	Add an implementation of the new design of checkboxes.	2016-11-15 19:35:01 +09:00
Dean Herbert	5b1711f797	Update some colour palette discrepancies in options.	2016-11-15 19:34:58 +09:00
Dean Herbert	1f73bb4cf0	Set drag bar to correct orange.	2016-11-15 19:34:55 +09:00
Dean Herbert	a92404413c	Adjust padding and fonts of options.	2016-11-15 19:34:53 +09:00
Dean Herbert	566e09083f	Add gradient overlay when hovering toolbar to make tooltips more visible. ... Also adjusts opacity of toolbar.	2016-11-15 16:25:41 +09:00
Dean Herbert	4b6c139c3e	Toolbar buttons should handle on click, not mouse down.	2016-11-15 15:31:48 +09:00
Dean Herbert	51235343fd	Fix ChatConsole regression.	2016-11-15 14:46:57 +09:00
Dean Herbert	abdfe42388	Merge branch 'refs/heads/master' into better-anchors ... # Conflicts: # osu.Game.Mode.Osu/UI/OsuComboCounter.cs # osu.Game.Mode.Osu/UI/OsuScoreOverlay.cs	2016-11-15 14:33:13 +09:00
Huo Yaoyuan	f2f6fe8e00	Set option object to members.	2016-11-15 01:49:06 +08:00
Tom94	c860eb25f9	Migrate to new anchor system without x/y reversal.	2016-11-14 17:22:20 +01:00
Dean Herbert	9a8003f6fa	Merge remote-tracking branch 'refs/remotes/upstream/master' into project-restructure ... # Conflicts: # osu.Game/Beatmaps/Objects/Osu/OsuBaseHit.cs	2016-11-14 22:08:30 +09:00
Dean Herbert	06f4f93918	Move play modes to Modes namespace.	2016-11-14 18:03:20 +09:00
Dean Herbert	0f4538f69f	Rename GameModes namespace to Screens.	2016-11-14 17:23:33 +09:00
Dean Herbert	dde3a68c8f	Account for anchor when dragging MusicController (fixes VisualTest).	2016-11-14 16:40:13 +09:00
Dean Herbert	1d51e6af2a	Merge pull request #168 from huoyaoyuan/fixes ... Fixes for music controller	2016-11-14 16:11:31 +09:00
Dean Herbert	eb32d842cc	Use switch instead of if-else.	2016-11-14 16:10:07 +09:00
Dean Herbert	57c4314cae	Merge remote-tracking branch 'refs/remotes/upstream/master' into options-improvements	2016-11-14 16:00:06 +09:00
Dean Herbert	c37afd7a81	Merge pull request #166 from Tom94/various-improvements ... Various improvements	2016-11-14 15:59:17 +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
Thomas Müller	ac99e2d488	Avoid using load to construct the drawable hierarchy whereever possible.	2016-11-12 18:34:36 +01:00
Dean Herbert	75be78752b	Merge remote-tracking branch 'refs/remotes/upstream/master' into options-sidebar-tracking ... # Conflicts: # osu.Game/osu.Game.csproj	2016-11-12 22:30:15 +09:00
Thomas Müller	6355c8bd45	Hide scrolldragger in options.	2016-11-12 13:10:53 +01:00
Thomas Müller	1c47773e0d	Make sidebar behaviour feel a bit nicer.	2016-11-12 13:08:34 +01:00
Thomas Müller	e923da1998	Fix lastKnownScroll never being written to.	2016-11-12 12:30:12 +01:00
Thomas Müller	98b69bc6c6	Merge branch 'master' of github.com:ppy/osu into SirCmpwn/options-sidebar-tracking ... # Conflicts: # osu.Game/osu.Game.csproj	2016-11-12 12:24:02 +01: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
Dean Herbert	8d56a881d0	Merge pull request #157 from SirCmpwn/string-options ... Add TextBoxOption and wire it up	2016-11-12 16:11:09 +09:00
Dean Herbert	12bc259071	Merge pull request #158 from SirCmpwn/implement-options ... Implement ShowUnicode option behavior	2016-11-12 16:10:27 +09:00
Dean Herbert	a39d28efe2	Merge pull request #159 from SirCmpwn/platform-options ... Remove certain options when not running on Windows	2016-11-12 16:05:47 +09:00
Drew DeVault	00cc4278da	Split off SidebarButton	2016-11-12 01:53:20 -05:00
Drew DeVault	a8bba445db	Move scroll logic into Update	2016-11-12 01:44:26 -05:00
Drew DeVault	32196c57af	Track the visible section in options	2016-11-12 01:44:11 -05:00
Dean Herbert	ff67b77c5b	Merge pull request #154 from peppy/sidebar-toolbar-coexistence ... Make options overlay coexist with toolbar.	2016-11-11 13:34:08 +09:00
Dean Herbert	27542d9747	Merge pull request #151 from SirCmpwn/options-sidebar ... Expand the options sidebar on hover	2016-11-11 13:33:10 +09:00
Dean Herbert	a0e1513df6	Merge branch 'refs/heads/master' into sidebar-toolbar-coexistence ... # Conflicts: # osu.Game/OsuGame.cs	2016-11-11 13:30:57 +09:00
Drew DeVault	d36c8e9203	Remove certain options when not running on Windows	2016-11-10 21:54:01 -05:00
Drew DeVault	d49b418449	Implement ShowUnicode option behavior	2016-11-10 21:35:58 -05:00
Drew DeVault	e2365cfad2	s/internalText/InternalText/g	2016-11-10 18:25:20 -05:00
Drew DeVault	a81f099d40	Add TextBoxOption and wire it up	2016-11-10 18:17:15 -05:00
Drew DeVault	0d4560a054	Update to latest DI stuff	2016-11-10 17:40:42 -05:00
Drew DeVault	ee24cd310c	Convert everything to DI pattern	2016-11-10 16:41:18 -05:00
Dean Herbert	788c11de10	Merge pull request #103 from huoyaoyuan/music-controller ... Music controller	2016-11-10 12:54:56 +09:00
Dean Herbert	904d258dc3	Fix checkbox not updating correctly.	2016-11-09 20:13:13 +09:00
Dean Herbert	a5dcae859c	Give OptionsOverlay an offset to make up for toolbar possibly being present.	2016-11-09 15:24:27 +09:00
Dean Herbert	9d1d5a5cea	Modify toolbar tooltips to be closer to design.	2016-11-09 15:24:19 +09:00
Drew DeVault	676cdc44b2	Add expanding options sidebar	2016-11-08 23:36:06 -05:00
Drew DeVault	3ad633f363	Wire up all of the boolean options	2016-11-08 23:17:08 -05:00
Dean Herbert	04fa1f897e	Use margin instead of padding so mouseDown events on the sidebar buttons don't interrupt scrolling.	2016-11-09 12:32:38 +09:00
Dean Herbert	d41d7b8e9a	Don't derive ScrollContainer unnecessarily.	2016-11-09 12:10:22 +09:00
Dean Herbert	d70e8806b4	Merge remote-tracking branch 'refs/remotes/upstream/master' into options-fixes	2016-11-09 11:41:36 +09:00
Dean Herbert	28a94e2df1	Remove unused constant.	2016-11-08 20:35:21 +09:00
Dean Herbert	3ef26a6bf0	Fix paddings, transitions, const variable names.	2016-11-08 20:23:18 +09:00
Dean Herbert	89b11ed099	Handle sidebar buttons onClick not onMouseDown.	2016-11-08 19:18:31 +09:00
Dean Herbert	8c68f9ba93	OptionsSideNav -> OptionsSidebar.	2016-11-08 19:17:09 +09:00
Dean Herbert	3b0114671e	Max sidebar draggable.	2016-11-08 19:16:39 +09:00
Dean Herbert	30323876a8	Use preload for options (fix icons).	2016-11-08 18:49:20 +09:00
Dean Herbert	a851d7b44f	Updates.	2016-11-08 18:33:31 +09:00
Dean Herbert	c36b54b35a	Merge remote-tracking branch 'refs/remotes/upstream/master' into generic-container	2016-11-08 18:29:21 +09:00
Drew DeVault	743c1bde58	Wire up alternative chat font	2016-11-07 22:37:21 -05:00
Drew DeVault	1bca78f4b6	Wire up one of the settings to the config ... One step at a time, right	2016-11-07 22:36:24 -05:00
Drew DeVault	fbbd05e606	Remove unnecessary TODO	2016-11-07 22:28:02 -05:00
Drew DeVault	a6593505b3	Say NO to RelativeSizeAxes = Both	2016-11-07 22:19:02 -05:00
Drew DeVault	4d04eb6fb1	Rearrange some options a bit, update framework	2016-11-07 22:15:48 -05:00
Drew DeVault	cbbac0565f	Remove unused using statements	2016-11-07 21:28:06 -05:00
Drew DeVault	1ce6a7285a	Rearrange options namespaces	2016-11-07 21:24:41 -05:00
Drew DeVault	b2bbdfa284	Refactor how the sidebar buttons are created/used	2016-11-07 18:04:49 -05:00
Drew DeVault	e6c3fc1091	Implement scrolling to each section	2016-11-07 17:07:55 -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
Dean Herbert	d57d5daac9	Support generic FlowContainer.	2016-11-07 21:17:29 +09:00
Dean Herbert	a61fb5ef5d	Initial updates to make generic containers work.	2016-11-07 21:13:56 +09: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	8037f1233f	Merge branch 'master'	2016-11-07 18:58:35 +08:00
Dean Herbert	f14a35d480	Update FontAwesome definitions.	2016-11-07 17:59:00 +09: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
Thomas Müller	8894e5f73a	Fade the options overlay to prevent unnecessary updates to its content.	2016-11-06 08:54:36 +01: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	c470140d64	Merge branch 'master'	2016-11-06 00:11:30 +08:00
Dean Herbert	2ee5e2efb7	Bring framework up-to-date. ... # Conflicts: # osu-framework	2016-11-05 18:18:52 +09:00
Huo Yaoyuan	2d86cb1e81	Merge branch 'master'	2016-11-05 16:21:59 +08:00
Dean Herbert	10e5472624	Block mouse events from hitting things behind options.	2016-11-04 12:29:05 +09:00
Dean Herbert	2135b93791	Make options semi-transparent.	2016-11-04 12:28:00 +09:00
Dean Herbert	f3d461e318	Fix some events not firing correctly.	2016-11-04 12:27:43 +09:00
Drew DeVault	408173319b	Refactor options header and layout stuff	2016-11-03 23:01:11 -04:00
Drew DeVault	cb40b7079f	Rework how references are passed about	2016-11-03 22:43:00 -04:00
Drew DeVault	af8e4415c3	Split out [Sub]sections into seperate files	2016-11-03 19:06:22 -04:00
Drew DeVault	1d8c6db0a7	Add remaining options	2016-11-03 19:06:22 -04:00
Drew DeVault	c7fa0a5ab0	Add more options	2016-11-03 19:06:22 -04:00
Drew DeVault	7e77efcfdc	Add Graphics options	2016-11-03 19:06:22 -04:00
Drew DeVault	6c0cef894e	Add OsuButton with sane defaults	2016-11-03 19:06:22 -04:00
Drew DeVault	2aa85a4b18	Split up options into subclasses	2016-11-03 19:06:22 -04:00
Drew DeVault	2f990b884e	Tweak style to more closely match osu!next	2016-11-03 19:06:22 -04:00
Drew DeVault	dd0cb5da01	Add options from old osu	2016-11-03 19:06:22 -04:00
Drew DeVault	9f78f8607b	Implement General options section	2016-11-03 19:06:22 -04:00
Huo Yaoyuan	f2a8cc0c29	Merge branch 'master'	2016-11-03 20:38:34 +08:00
Dean Herbert	774b47c1fe	Don't cache drawable for no reason.	2016-11-02 00:53:13 +09:00
Dean Herbert	b86f308af6	Add async workflow.	2016-11-01 23:24:14 +09: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	35b1d0ae50	Seperated DragBar class.	2016-10-27 18:14:50 +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
Dean Herbert	28a41dcca6	Fix FlowContainers.	2016-10-22 18:05:46 +09:00
Dean Herbert	cdef75c98b	Fix AutoSize references.	2016-10-22 17:50:42 +09:00
Thomas Müller	68476eafb9	Use DrawSize instead of Size whereever Size was previously read due to framework changes. ... Note, that this was just stupid replacement. Many components will likely want to actually read Size and not DrawSize. We may want to do a pass over this at some point, but for now everything is working like this. (Old behavior.)	2016-10-18 18:53:31 +02:00
Lunar Dust	8e47d72f93	Reorder ToolbarButton instantiation for consistency ... Might as start good standards now rather than later	2016-10-16 18:42:40 -05:00
Thomas Müller	fec127eb8c	Merge branch 'master' of github.com:ppy/osu into unified_shader ... # Conflicts: # osu-framework # osu.Game/Overlays/Options.cs	2016-10-16 15:17:24 +02:00
Thomas Müller	7751a85e14	Update framework.	2016-10-16 14:10:06 +02:00
Huo Yaoyuan	f4c381f745	Use OverlayContainer in framework.	2016-10-16 17:14:17 +08:00
Dean Herbert	8c7ff58310	Fix regressions caused by overlay class.	2016-10-14 12:50:03 +09:00
Huo Yaoyuan	254cc87578	Use name ToggleVisibility.	2016-10-14 05:02:13 +08:00
Huo Yaoyuan	1c97edaac2	Base class for overlays.	2016-10-13 23:04:57 +08:00
Huo Yaoyuan	c93a440d3b	Make Options:IStateful.	2016-10-13 22:27:37 +08:00
Huo Yaoyuan	acd54d1ebc	Single Visibility enum type.	2016-10-13 22:22:27 +08:00
Dean Herbert	aa96d98822	Merge branch 'master' into limit-game-access ... Conflicts: osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs osu.Game/GameModes/Menu/ButtonSystem.cs osu.Game/Online/Chat/Display/ChatLine.cs osu.Game/OsuGame.cs osu.Game/Overlays/ToolbarButton.cs	2016-10-12 20:44:33 +09:00
Dean Herbert	b2c31d3047	Updates post-master-merge.	2016-10-12 16:01:23 +09:00
Dean Herbert	4052a665bf	Remove all non-load Game access.	2016-10-12 15:47:08 +09:00
Dean Herbert	24771a62cf	Remove upwards reference.	2016-10-12 15:23:22 +09:00
Dean Herbert	9276244d6a	getter on single line.	2016-10-12 15:22:03 +09:00
Dean Herbert	05031d18ef	Fix some display regressions in ChatConsole.	2016-10-12 13:35:21 +09:00
Dean Herbert	c0ea061bd4	Update framework; amend ToolbarButton to use padding and Children initialiser.	2016-10-12 12:24:07 +09:00
Dean Herbert	cb5e4287e2	Post-merge fixes.	2016-10-09 22:21:44 +09:00
Dean Herbert	926c46dbd4	Code formatting and slight changes to transitions.	2016-10-08 23:27:53 +09:00
Dean Herbert	9594b7193c	Standardise drawable state access and split large nested classes out of MainMenu.ButtonSystem	2016-10-08 23:27:46 +09:00
Dean Herbert	47faf8f40d	Add in-game chat display, along with a global hotkey handling method.	2016-10-08 19:23:21 +09:00
Dean Herbert	adba72d293	Toolbar stores its current state locally (just for conformity).	2016-10-08 19:23:21 +09:00
Dean Herbert	556420ee58	Add proper toolbar state handling.	2016-10-08 15:54:09 +09:00
Dean Herbert	698c1ef1ae	Fix width of toolbar buttons with text.	2016-10-05 20:07:10 +09:00
Dean Herbert	3891f467a3	Fix being able to click two toolbar buttons at once.	2016-10-04 20:00:55 +09:00
Dean Herbert	836083667f	Clean up a bit.	2016-10-04 19:57:32 +09:00
Dean Herbert	cc52580568	Implement mode selector highlight line.	2016-10-04 19:41:18 +09:00
Dean Herbert	11403a922a	Make Home, Settings and PlayMode buttons work.	2016-10-04 17:15:03 +09:00
Dean Herbert	ddcd5ec286	Add basic layout for toolbar.	2016-10-03 20:39:32 +09:00
Dean Herbert	ac16bffe49	Bring framework and resources up-to-date.	2016-10-01 19:05:26 +09:00
Dean Herbert	d93718d953	Add template toolbar.	2016-09-30 18:45:27 +09:00
Dean Herbert	154226b9a3	Basic white-boxing of all game modes.	2016-09-29 23:51:17 +09:00