3223 Commits

Author	SHA1	Message	Date
Jorolf	9f005488f7	make it work again after merge	2017-08-09 17:32:09 +02:00
Jorolf	7d7cfe5d92	Merge branch 'master' of git://github.com/ppy/osu into ranks-section	2017-08-08 23:13:25 +02:00
Jorolf	1c2329f111	generalize the hover code	2017-08-08 23:11:46 +02:00
Huo Yaoyuan	8843d97895	Remove depth setting in SectionsContainer and profile.	2017-08-05 18:01:10 +08:00
Dean Herbert	0d9ea97828	Allow Rulesets to create a non-FontAwesome icon ... This also - Renames TextAwesome to SpriteIcon. - Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).	2017-08-03 14:36:21 +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	f67822a59b	Add progress for deleting all maps	2017-07-31 18:52:59 +09:00
Dean Herbert	57d45b180c	Merge remote-tracking branch 'upstream/master' into import-from-stable	2017-07-31 17:31:10 +09:00
Dean Herbert	502ccae0ca	Merge branch 'master' into notification-improvements	2017-07-31 17:12:11 +09:00
Jorolf	02a22e3f77	remove empty argument list	2017-07-29 15:16:31 +02:00
Jorolf	cca49d6ed5	some renaming, a show more button and a placeholder if no scores exist	2017-07-29 15:06:46 +02:00
Jorolf	4720a47363	Merge branch 'master' of git://github.com/ppy/osu into ranks-section	2017-07-29 00:45:14 +02:00
Jorolf	88f206cfe4	rename file	2017-07-29 00:39:47 +02:00
Jorolf	0fc36065f4	replace Play with Score	2017-07-29 00:31:52 +02:00
Dean Herbert	4bb8f40b49	AutoSize notifications (and add animation)	2017-07-28 17:00:30 +09:00
Dean Herbert	74044baeff	Don't cancel a ProgressNotification when clicking by default	2017-07-28 17:00:27 +09:00
Dean Herbert	b3e3c4a226	Fix setting a ProgressNotification's progress too early crashing	2017-07-28 17:00:24 +09:00
Dean Herbert	5dfed1dba5	Add word-wrap functionality of ProgressNotification ... Fixes a potential threading issue when updating Text.	2017-07-28 17:00:20 +09:00
Dean Herbert	0d332d4754	Fix NotificationOverlay no longer automatically displaying	2017-07-28 16:59:42 +09:00
Dean Herbert	a55586f2ad	FIx potential sequence of execution issues in PlaylistOverlay	2017-07-28 15:04:58 +09:00
Dean Herbert	02a04afb29	Ensure notification posts are always scheduled to local thread ... Posts can be triggered by Logger.Log events which are not guaranteed to be on the update thread.	2017-07-28 15:03:53 +09:00
Dean Herbert	f705589bf2	Rename NotificationManager to NotificationOverlay	2017-07-28 15:03:42 +09:00
Dean Herbert	e448f79154	Fix deleted beatmaps not correctly being removed from the playlist	2017-07-28 12:58:35 +09:00
Dean Herbert	7d4218ea6c	Add option to import from osu-stable ... Also adds an option to delete all beatmaps for testing purposes.	2017-07-28 12:58:35 +09:00
EVAST9919	3263aa2ca7	Always return true while dragging	2017-07-27 17:02:23 +03:00
EVAST9919	eb4880cdd5	Applied suggestions	2017-07-27 16:33:10 +03:00
EVAST9919	ed08bcf844	Merge remote-tracking branch 'refs/remotes/ppy/master' into chat_dragging	2017-07-27 16:19:21 +03:00
Dean Herbert	6f4efbeda6	Merge remote-tracking branch 'upstream/master' into database-tidy	2017-07-27 17:41:29 +09:00
Dean Herbert	5f53426a9a	*Database -> *Store ... Welcome back BeatmapManager	2017-07-27 16:56:41 +09:00
Dan Balasescu	d375459fa9	Merge branch 'master' into chat-line-word-wrap	2017-07-27 16:54:15 +09:30
Dean Herbert	cbe7b08642	Make BeatmapStore's BeatmapDatabase private	2017-07-27 15:34:13 +09:00
Dean Herbert	96b08b8777	Simplify and document DatabaseStore API	2017-07-27 15:06:10 +09:00
Jorolf	7b8997cfc2	CI stuff	2017-07-26 19:42:34 +02:00
Jorolf	8e685a98d4	add RanksSection	2017-07-26 19:21:45 +02:00
Dean Herbert	9e20a02c0a	Split out BeatmapDatabase into BeatmapStore ... Hide database functionality at a lower level in preparation from eventually making it private.	2017-07-26 16:31:34 +09:00
Dean Herbert	fce580d717	Reshuffle namespaces	2017-07-26 13:22:46 +09:00
Dean Herbert	3c7546e2c1	Merge remote-tracking branch 'upstream/master' into no-more-colourinfo	2017-07-25 10:14:48 +09:00
Dean Herbert	ed7bb329de	Add word wrap support to chat	2017-07-24 18:11:25 +09:00
Dean Herbert	038e47ceda	Merge branch 'master' into drawableflag-ctor	2017-07-24 16:46:20 +09:00
Nabile Rahmani	c80f5c708a	Less verbose DrawableFlag constructor.	2017-07-24 09:25:49 +02:00
Dean Herbert	750d96be8f	Merge branch 'master' into playlist-beatmaplist-sync	2017-07-24 14:12:04 +09:00
Ben Pig Chu	950c55d6d0	No need to dispose/unbind the delegates	2017-07-24 13:10:51 +08:00
Dean Herbert	64f2e2dc32	Use Colour instead of ColourInfo	2017-07-23 13:06:16 +02:00
EVAST9919	dd96e101d4	Merge remote-tracking branch 'refs/remotes/ppy/master' into chat_dragging	2017-07-23 13:26:23 +03:00
Ben Pig Chu	76edcb4a67	Update playlist when adding or removing beatmap set	2017-07-23 14:21:10 +08:00
Thomas Müller	e68675f970	Rename EasingTypes to Easing	2017-07-22 20:53:53 +02:00
Thomas Müller	e36b65bfe0	Merge branch 'master' into better-transforms	2017-07-22 10:50:58 +02:00
Dean Herbert	7549d3a2c4	Allow ChatLines to exist without UserProfileOverlay ... Fixes testcases failing when logged in.	2017-07-22 17:18:20 +09:00
Thomas Müller	0f2bcb2904	Update framework	2017-07-21 18:23:01 +02:00
Thomas Müller	a7dc8a892b	Update framework	2017-07-21 17:24:09 +02:00
EVAST9919	66f816692f	Better boolean naming	2017-07-21 13:40:09 +03:00
EVAST9919	270ab5c987	Allow ChatOverlay resize only if it dragged by the tabs area only	2017-07-21 13:37:22 +03:00
Thomas Müller	2cd8f6b30c	Merge branch 'master' of github.com:ppy/osu into better-transforms ... # Conflicts: # osu-framework	2017-07-21 11:15:26 +02:00
Dean Herbert	cb3402098a	Merge remote-tracking branch 'upstream/master' into user-profile-fixes	2017-07-20 19:32:00 +09:00
Dean Herbert	3bdd4d7d02	Centralise TrackManager.AddItem logic to avoid duplicate adds	2017-07-20 17:46:33 +09:00
Dean Herbert	67b95926c4	Remove usage of SetExclusive ... Also immediately disposes WorkingBeatmaps on ValueChanged.	2017-07-20 16:45:44 +09:00
Jorolf	bac8693c81	Merge branch 'user-profile-fixes' of github.com:Jorolf/osu into user-profile-fixes	2017-07-20 01:08:42 +02:00
Jorolf	e0fb2563b5	remove using	2017-07-20 01:08:26 +02:00
jorolf	c2a2f77210	Merge branch 'master' into user-profile-fixes	2017-07-20 01:06:36 +02:00
Jorolf	b016103894	add link to user page	2017-07-20 01:03:00 +02:00
Thomas Müller	c4619f614a	Merge branch 'master' of github.com:ppy/osu into better-transforms ... # Conflicts: # osu-framework	2017-07-19 19:15:51 +02:00
MrTheMake	6ff2b73c30	Merge branch 'master' of https://github.com/ppy/osu into musiccontroller-canbeatmapchange	2017-07-19 16:50:29 +02:00
Dean Herbert	2c5019ff7c	Forward action in saner way	2017-07-19 18:22:46 +09:00
Dean Herbert	b6b7ae47db	Merge branch 'master' into user-profile-fixes	2017-07-19 18:15:38 +09:00
Dean Herbert	2eccb3822a	Make link text not suck	2017-07-19 17:54:04 +09:00
Dean Herbert	59416584c1	Don't show theme song in playlist	2017-07-19 15:16:35 +09: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
Thomas Müller	a225b542d5	Sender is always non-null	2017-07-18 12:35:36 +03:00
Thomas Müller	fce5a191f1	Migrate padding into the scroll content to not cut off effects	2017-07-18 12:26:27 +03:00
Thomas Müller	e58ea97604	Improve design as requested	2017-07-18 12:26:05 +03:00
Thomas Müller	c8eeea64c3	Merge branch 'master' of https://github.com/ppy/osu into custom-chat-colours	2017-07-18 10:54:15 +03:00
Thomas Müller	e72c009dd7	Highlight custom-named users	2017-07-18 10:53:41 +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
Dean Herbert	4229f933fe	Rename link class, add hover colour	2017-07-18 10:51:11 +09:00
Jorolf	9c70d03a33	replace SpriteText with OsuSpriteText	2017-07-17 21:12:50 +02:00
Jorolf	80dc888769	address CI concerns	2017-07-17 21:11:54 +02:00
Jorolf	edd4e622cf	add hyper links to twitter, website and skype	2017-07-17 20:31:10 +02:00
Jorolf	b9eb7a8445	make chat message users open UserProfileOverlay	2017-07-17 20:26:55 +02:00
Jorolf	689866f5dd	minor improvements	2017-07-17 20:25:57 +02:00
Thomas Müller	87bcd526f3	Get rid of raw AddDelay calls within osu.Game	2017-07-17 16:51:21 +03:00
Dean Herbert	93290ef966	Rename populate method	2017-07-17 13:56:50 +09:00
Dean Herbert	a63124c935	User property instead of weirdly named method	2017-07-17 13:39:29 +09:00
Dean Herbert	f322c264a0	One constant per line	2017-07-17 13:24:05 +09:00
Dean Herbert	5d77a5f988	Allow closing profile by clicking basically anywhere	2017-07-17 10:15:55 +09:00
Thomas Müller	19fb03e737	Try different formatting style	2017-07-16 18:28:20 +03:00
Thomas Müller	032e9df67b	ApplyDelay -> AddDelay	2017-07-16 17:47:29 +03:00
Thomas Müller	99221260c4	Replace several usages of BeginDelayedSequence with LINQ-style	2017-07-16 17:42:01 +03:00
Thomas Müller	71105bb9ee	Delay -> ApplyDelay; DelayReset -> ResetDelay	2017-07-16 14:06:46 +03:00
Thomas Müller	6063219b72	Update framework	2017-07-16 13:59:26 +03: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
Huo Yaoyuan	26b36c08a3	Prefer ScrollTo in SectionsContainer.	2017-07-14 22:56:27 +08:00
Huo Yaoyuan	6cf36da389	Merge branch 'master' into profile	2017-07-14 22:52:19 +08: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
Dan Balasescu	fa0c0e3b48	Merge branch 'master' into fix-track-rotation	2017-07-14 19:38:48 +10:00
Dan Balasescu	c13dc943f8	Merge branch 'master' into fix-track-rotation	2017-07-14 19:25:54 +10:00
Dan Balasescu	a6d917285a	Merge branch 'master' into settings-improvements	2017-07-14 19:22:45 +10:00
Dan Balasescu	3914b3ba13	Merge branch 'master' into right-mouse-scrollbar	2017-07-14 19:15:00 +10:00
Dean Herbert	9dba363b08	Use button boundaries to decide when to expand sidebar	2017-07-14 17:57:01 +09:00
Dean Herbert	b957bca4c5	Merge branch 'master' into settings-improvements	2017-07-14 17:27:09 +09:00
Dean Herbert	3aeed86392	Merge branch 'master' into drawable-room-update	2017-07-14 15:29:27 +09:00
Dean Herbert	bce4b838d8	Formatting	2017-07-14 14:40:50 +09:00
Dean Herbert	133bcdec7a	Move async loading to a higher level to simplify logic	2017-07-14 14:39:15 +09:00
Dean Herbert	980fb18ed6	Remove unnecessary alpha/alwayspresent changes	2017-07-14 14:30:35 +09:00
Dean Herbert	20052b060c	Nest delays and implement IStateful, allowing for flushing on early dismiss ... Note that this will break rotation loops until https://github.com/ppy/osu-framework/issues/900 is addressed.	2017-07-14 13:25:31 +09:00
Dean Herbert	ab5341eadc	Merge remote-tracking branch 'upstream/master' into DrabWeb/medal-splash	2017-07-14 09:46:36 +09:00
Dean Herbert	ce204b8e7b	Merge remote-tracking branch 'ppy/master' into right-mouse-scrollbar	2017-07-14 06:23:07 +09:00
Dean Herbert	2ff92ac25a	Contract sidebar on click ... Also makes queueing of expand more correct.	2017-07-13 17:09:12 +09:00
Dean Herbert	939e167d6a	Correct offset settings vertically based on toolbar visibility	2017-07-13 17:09:12 +09:00
Dean Herbert	f4fd263671	Fix settings not offsetting scroll operations by fixed header content	2017-07-13 17:09:12 +09:00
Dean Herbert	8460e29bcb	Sidebar now pushes full settings out further	2017-07-13 17:09:12 +09:00
Dean Herbert	fc28617099	Merge remote-tracking branch 'upstream/master' into ruleset-settings	2017-07-13 15:35:53 +09:00
Dean Herbert	de46f3ab07	Remove all unnecessary parenthesis where object initialisers are used ... Enforces at CI.	2017-07-13 15:11:33 +09:00
Dean Herbert	b13e8599f1	Hide the login overlay when the user panel container by it is clicked	2017-07-13 14:46:17 +09:00
Dean Herbert	3c7cd97d42	Vertically center "coming soon" text	2017-07-13 14:24:08 +09:00
Dean Herbert	4cf409ab35	Adjust padding slightly	2017-07-13 14:23:52 +09:00
Dean Herbert	c7a13740f9	Move sections to own namespace	2017-07-13 13:53:45 +09:00
Dean Herbert	c02a85bc4a	Formatting	2017-07-13 13:52:40 +09:00
Dean Herbert	3a4150c6c3	Merge remote-tracking branch 'upstream/master' into profile ... # Conflicts: # osu.Game/Graphics/Containers/SectionsContainer.cs	2017-07-13 13:44:21 +09:00
DrabWeb	fea40ccc1a	Share BeatmapSet cover sprite code.	2017-07-13 01:17:47 -03:00
Dean Herbert	f142bd0dc0	Improve formatting of panel creation code	2017-07-13 12:52:51 +09:00
DrabWeb	321ae42351	Formatting.	2017-07-13 00:27:41 -03:00
Dean Herbert	8045e0566f	Use a bindable for the current query. ... Aso debounce and don't require hitting enter.	2017-07-13 12:22:51 +09:00
Dean Herbert	4e1a998f9d	Don't return so early on empty search (never clears results)	2017-07-13 12:20:32 +09:00
Dean Herbert	e30f0a2e69	Avoid potentially calling updateSearch more than once in a single update	2017-07-13 12:20:07 +09:00
DrabWeb	931adcf677	Typo.	2017-07-13 00:13:56 -03:00
DrabWeb	ca12fd3042	Better medal sprite loading, fade in particles, visual test update.	2017-07-13 00:13:18 -03:00
Dean Herbert	190ea3bfab	Remove unnused variable	2017-07-13 11:06:28 +09:00
Dean Herbert	3f2f42d13c	Always load high resolution for now ... Also rename GetBackground to CreateBackground, since it's returning a new instance.	2017-07-13 10:30:09 +09:00
Dean Herbert	56c817e4b6	Merge branch 'master' into osu-direct-search	2017-07-13 10:16:27 +09:00
Dean Herbert	9d47dd9ff9	Add support for right mouse absolute scrolling (when enabled) ... Will likely need to be bindable when hooked up to settings and actually used.	2017-07-12 18:57:44 +09:00
Dean Herbert	54f6befd67	Merge branch 'master' into fix-track-rotation	2017-07-12 13:18:16 +09:00
Thomas Müller	9d523ea012	Update framework	2017-07-12 11:06:13 +09:00
DrabWeb	204d2ee43d	Convert MedalOverlay animation durations to constants.	2017-07-11 22:43:16 -03:00
DrabWeb	29cdbc65bc	CI fixes.	2017-07-11 22:38:13 -03:00
DrabWeb	aef2a3bdda	Cleanup.	2017-07-11 22:26:58 -03:00
DrabWeb	16bb96e6aa	Async medal sprite loading.	2017-07-11 22:12:49 -03:00
Jorolf	f7c9e449d4	add ruleset settings	2017-07-11 20:25:24 +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
DrabWeb	2ee0f3f5f6	Update with framework changes.	2017-07-11 02:11:08 -03:00
DrabWeb	202e3ca530	Merge https://github.com/ppy/osu into medal-splash	2017-07-11 02:00:36 -03:00
DrabWeb	a9ff0b5317	Make SlimMenu more opaque.	2017-07-11 01:59:52 -03:00
DrabWeb	b448603d6c	CI fixes.	2017-07-11 01:42:51 -03:00
DrabWeb	fc7b4ceff1	Fix osu!direct visual test initially not having a mode selected.	2017-07-11 01:30:59 -03:00
DrabWeb	fbe414d780	Cleanup.	2017-07-11 01:03:38 -03:00
DrabWeb	84701846ec	Merge https://github.com/ppy/osu into osu-direct-search	2017-07-11 00:26:49 -03:00
Huo Yaoyuan	752f625a62	Set relative axes inside AsyncLoadWrapper.	2017-07-11 09:19:36 +08:00
Huo Yaoyuan	fd4a054921	Merge branch 'master' into profile	2017-07-11 09:16:32 +08:00
Dean Herbert	d6d79432c9	Update framework	2017-07-11 09:59:08 +09:00
Dean Herbert	0e2dc9388a	More changes in-line with framework changes.	2017-07-10 12:55:47 +09:00
Huo Yaoyuan	6f2b49dea8	Merge branch 'master' into profile.	2017-07-10 10:36:23 +08:00
Dean Herbert	f856e89b58	Fix CI issues	2017-07-10 03:37:51 +09:00
Dean Herbert	7952e7caa9	Fix typos	2017-07-10 03:22:08 +09:00
Dean Herbert	2c8b8c3f9c	Update loop logic in line with framework changes	2017-07-09 18:23:34 +09:00
Thomas Müller	1b55692368	Merge branch 'master' into better-fill-mode	2017-07-08 12:49:46 +03:00
Thomas Müller	45d07e39c1	Update framework & change logic slightly	2017-07-08 12:41:15 +03: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
Thomas Müller	b6f90dada5	Merge branch 'master' into settingsoverlay-scrollto	2017-07-08 12:21:11 +03:00
Thomas Müller	6de9776e05	Update framework with tooltip changes	2017-07-07 08:59:17 +03:00
Jai Sharma	6eaeba5a92	Merge branch 'master' into remove-dragbar	2017-07-06 20:14:08 +01:00
Dean Herbert	724e5aa99e	Merge master into better-input	2017-07-05 13:59:40 -07:00
Dean Herbert	ecfaac4eac	Merge remote-tracking branch 'jai-sharma/master' into better-caching	2017-07-05 13:37:43 -07:00
Huo Yaoyuan	cadc191602	Merge branch 'master' into profile	2017-07-02 22:03:30 +08:00
Jorolf	5df33ad2d7	use Length instead of Count()	2017-07-02 13:33:42 +02:00
Jorolf	c9784f57d3	fix mod button samples	2017-07-02 13:16:22 +02:00
Thomas Müller	2d7eefa6fe	Update Cached usage according to framework	2017-07-02 13:00:02 +03:00
Thomas Müller	bbae6e2590	Remove unnecessary using	2017-06-30 10:02:07 +03:00
Thomas Müller	bb15bc0467	Use ReceiveMouseInputAt whenever possible	2017-06-30 09:54:03 +03:00
Thomas Müller	5c02f1812f	Remove now unneeded Contains overrides	2017-06-30 09:53:52 +03:00
Dean Herbert	f3f3952ba5	More unused usings	2017-06-29 12:20:05 -07:00
Dean Herbert	6865f9b231	Remove unused parameters	2017-06-29 12:05:37 -07:00
Dean Herbert	1e50840a8e	Fix unused usings	2017-06-29 12:04:04 -07:00
Dean Herbert	ee96d39b93	Shuffle sound samples around and make more conformant	2017-06-28 10:19:04 -07: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
Dean Herbert	480cdba023	Add OsuClickableContainer with generic sounds	2017-06-27 21:05:49 +09:00
Dean Herbert	b5cf022676	Add missing newline	2017-06-26 16:26:50 +09:00
Dean Herbert	3bb6005dc9	Merge remote-tracking branch 'upstream/master' into profile	2017-06-26 16:26:35 +09:00
MrTheMake	0e1b49dff9	Applied suggested changes	2017-06-25 20:56:22 +02:00
Huo Yaoyuan	0582eddcba	Slightly update text position.	2017-06-26 00:52:03 +08:00
Huo Yaoyuan	d6a7206041	Show rank chart with dummy data.	2017-06-26 00:43:49 +08:00
Dean Herbert	7baa2b7421	Fix CI issues	2017-06-25 14:46:59 +09:00
Huo Yaoyuan	be12f318e9	Allow showing offline data only in profile.	2017-06-25 10:40:45 +08:00
Huo Yaoyuan	d24f78ea24	Merge branch 'master' into profile	2017-06-25 10:29:14 +08:00
Huo Yaoyuan	18295a9b97	Handle scrolling in SectionsContainer.	2017-06-25 10:06:54 +08:00
MrTheMake	d914a1b00e	Added animation parameter	2017-06-24 13:47:34 +02:00
MrTheMake	ba783f984c	Change usage of ScrollIntoView to ScrollTo in the setttings overlay	2017-06-24 13:36:57 +02:00
Thomas Müller	1bca9ca0e9	Update framework with better children list	2017-06-24 12:56:35 +02:00
MrTheMake	cc71c10488	Merge branch 'master' into musiccontroller-canbeatmapchange	2017-06-24 12:26:40 +02:00
Jai Sharma	e16b646014	Add readonly to fill	2017-06-24 09:14:55 +01:00
Jai Sharma	e073100498	Merge branch 'master' into remove-dragbar	2017-06-24 08:55:02 +01:00
Thomas Müller	e3489928b7	Remove now obsolete InternalContains	2017-06-24 09:21:08 +02:00
DrabWeb	b2c516238e	Cleanup.	2017-06-24 01:48:55 -03:00
DrabWeb	0133f9c086	Medal sprite, make MedalOverlay auto-show when loaded.	2017-06-24 01:19:44 -03:00
DrabWeb	c71f34c507	Make the background strip expand from the disc edges.	2017-06-23 23:51:28 -03:00
DrabWeb	3c97f04826	Particles.	2017-06-23 23:18:44 -03:00
DrabWeb	e09625e49d	Merge https://github.com/ppy/osu into medal-splash	2017-06-23 22:42:36 -03:00
DrabWeb	15cd4f77b2	Proper dismissing.	2017-06-23 22:35:06 -03:00
Jai Sharma	de50a1694f	Merge branch 'master' into remove-dragbar	2017-06-23 19:26:47 +01:00
Jai Sharma	a327f49d68	Updating progressBar.EndTime is more thread safe	2017-06-23 18:24:46 +01:00
Thomas Müller	f5829860a2	Get rid of AlwaysReceiveInput	2017-06-23 18:02:24 +02:00
Huo Yaoyuan	674e2a4395	Align placeholder.	2017-06-23 23:37:19 +08:00
Dean Herbert	b90c9bcacf	Merge branch 'master' into profile	2017-06-23 22:51:31 +09:00
Dean Herbert	81de1bd5a7	Merge branch 'master' into multiplayer-room-inspector	2017-06-23 21:55:18 +09:00
Dean Herbert	5dc0b87ef5	Apply some fixes for my own comments	2017-06-23 14:02:19 +09:00
Dean Herbert	eafd05e98f	Fade shadow effect in to avoid appearing too early in transition	2017-06-23 11:54:32 +09: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
Huo Yaoyuan	8b8954b825	Add edge effect and adjust positioning.	2017-06-22 21:42:06 +08:00
Dean Herbert	4297c1a376	Use WaveOverlayContainer	2017-06-22 21:39:54 +09:00
Huo Yaoyuan	bb2e63e714	Avoid unverifiable capture.	2017-06-22 20:34:28 +08:00
Huo Yaoyuan	1d4add9079	Assign an explicit depth when reordering.	2017-06-22 20:26:06 +08: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
Huo Yaoyuan	bcfb1392d7	Hide scroll bar.	2017-06-21 17:17:54 +08:00
Dean Herbert	89986e8e77	Fix namespaces	2017-06-21 17:03:47 +09:00
Dean Herbert	45d3c2cd52	Merge branch 'master' into profile	2017-06-21 16:40:17 +09:00
smoogipooo	fc0e44b214	Update framework.	2017-06-21 11:28:27 +09: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	03c13620c8	Filter the playlist overlay's beatmap list	2017-06-20 02:12:05 +02: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	b9cf0e47ee	CI fix	2017-06-19 18:12:26 +02:00
MrTheMake	667e6a2d6b	Applied suggested changes	2017-06-19 18:06:39 +02:00
MrTheMake	aec46a57c8	Restart the current track when pressing PREVIOUS or NEXT rather than doing nothing	2017-06-19 17:33:58 +02:00
MrTheMake	15a1dd14a6	CanChangeBeatmap -> CanBeatmapChange	2017-06-19 16:45:21 +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
Huo Yaoyuan	fe3cbb7072	Update join date definition.	2017-06-16 20:32:11 +08:00
Huo Yaoyuan	69270814d5	CI fixes.	2017-06-16 16:54:05 +08:00
Huo Yaoyuan	6372cd0a13	Move namespace under Overlays.	2017-06-16 16:36:23 +08:00
Huo Yaoyuan	af4ddf8fbd	Merge branch 'master' into profile.	2017-06-16 16:32:54 +08:00
Huo Yaoyuan	43569d69a7	Update transforms.	2017-06-16 16:13:23 +08:00
Dean Herbert	ae79ba48be	Merge branch 'master' into numpad-enter	2017-06-16 15:32:52 +09:00
MrTheMake	06089a74e3	Handle the numpad's Enter in cases where only the normal Enter was handled	2017-06-15 23:06:28 +02:00
Huo Yaoyuan	9a77332063	Order sections.	2017-06-15 23:47:56 +08:00
Huo Yaoyuan	3ec5d774df	Child control fixes.	2017-06-15 22:42:15 +08:00
Huo Yaoyuan	f03530cdd2	Fetch latest user data.	2017-06-15 22:33:08 +08:00
Huo Yaoyuan	53bd22cf9c	Update usage design.	2017-06-15 20:06:17 +08:00
Huo Yaoyuan	13d9f3b9bb	Move namespace and setup for DI.	2017-06-15 17:53:12 +08:00
Huo Yaoyuan	ce67a28609	Merge branch 'master' into profile.	2017-06-15 02:31:51 +08:00
smoogipooo	99a93d98dc	Merge remote-tracking branch 'origin/master' into fix-hacky-tabs	2017-06-13 19:46:01 +09:00
Huo Yaoyuan	9ceb4930e9	Merge branch 'master' into profile	2017-06-13 15:23:12 +08:00
Huo Yaoyuan	fcd137ced2	Add OsuTextFlowContainer.	2017-06-13 00:51:06 +08:00
Dean Herbert	3efe8629d6	Fix hacky tabs	2017-06-12 18:39:22 +09:00
Dean Herbert	e94425f311	Improve the loading animation and use it in multiple places ... - Supersedes https://github.com/ppy/osu/pull/926. - [ ] Depends on https://github.com/ppy/osu-framework/pull/817.	2017-06-12 17:04:42 +09:00
Huo Yaoyuan	e311ac612c	Merge branch 'master' into profile	2017-06-12 14:40:42 +08:00
smoogipooo	ffbb46f668	Update in line with framework.	2017-06-12 12:48:47 +09:00
Huo Yaoyuan	d5dc37ec62	Merge branch 'master' into profile	2017-06-11 23:41:08 +08:00
Huo Yaoyuan	798d8711b8	Refactor SectionsContainer to generic.	2017-06-09 16:24:19 +08:00
Huo Yaoyuan	283b6b2b5e	Merge branch 'master' into profile	2017-06-09 13:45:32 +08:00
Dean Herbert	1b0e96f411	Fix some discrepancies when changing settings	2017-06-08 20:57:21 +09:00
Dean Herbert	83cdec3ee6	Merge remote-tracking branch 'upstream/master' into raw-input-osd	2017-06-08 20:41:04 +09:00
Dean Herbert	a454ca606f	Merge remote-tracking branch 'upstream/master' into johnneijzen-master	2017-06-08 20:33:39 +09:00
Dean Herbert	e3403c619c	Merge branch 'better-invalidations' into update-framework	2017-06-08 19:46:19 +09:00
DrabWeb	30fe7315ee	Small cleanup	2017-06-08 06:47:21 -03:00
DrabWeb	bb103d7878	Fix being able to commit with an empty query and clearing the results	2017-06-08 06:31:37 -03:00
DrabWeb	70e12e5d9b	Make the header tabs work	2017-06-08 06:21:45 -03:00
Dean Herbert	028364b2d9	Add on-screen display support for RawInput and CursorSensitivity ... Also allows resetting both at once using Ctrl+Alt+R. - Depends on https://github.com/ppy/osu-framework/pull/807	2017-06-08 17:58:57 +09:00
DrabWeb	1162df96be	Use DelayedLoadWrapper in DirectPanel backgrounds	2017-06-08 05:08:12 -03:00
Dean Herbert	64682a741c	Update framework	2017-06-08 17:05:25 +09:00
Tom94	5f7270ee4b	Use new invalidation rules	2017-06-08 09:53:45 +02:00
John Neijzen	2f7d9655fd	More Clean up	2017-06-08 15:27:35 +08:00
John Neijzen	d9a9616125	EOF remove blank spaces	2017-06-08 14:56:03 +08:00
John Neijzen	4abad17b92	Fix Black Space after } and Symbol Spacing	2017-06-08 14:48:42 +08:00
John Neijzen	431d225a60	Keyword Spacing and Brackets Fixing	2017-06-08 14:35:10 +08:00
Dean Herbert	bf45155ed5	Merge branch 'master' into master	2017-06-08 12:55:25 +09:00
DrabWeb	d541006134	Use 2x size covers in list view	2017-06-07 12:15:11 -03:00
DrabWeb	ddc4d45ae8	Unused usings	2017-06-07 11:39:04 -03:00
DrabWeb	add08e65ff	Result counts displaying	2017-06-07 11:30:52 -03:00
DrabWeb	a4be5c8a78	Fix being able to start typing something, change other filters, and have the search use the currently typing query	2017-06-07 11:13:12 -03:00
Huo Yaoyuan	e94d98fa84	Expose header background for SectionsContainer.	2017-06-07 22:11:38 +08:00
John Neijzen	aa3a231763	Review Changes	2017-06-07 22:00:14 +08:00
DrabWeb	312fd16631	Ruleset filtering	2017-06-07 11:00:05 -03:00
DrabWeb	f7f4f5e155	Request sorting, fix VS Code's "refactoring"	2017-06-07 10:40:18 -03:00
DrabWeb	3ed740676f	DirectSortCritera -> DirectSortCriteria	2017-06-07 10:19:17 -03:00
DrabWeb	0b204bd157	Add padding to the bottom of SearchableListOverlay's ScrollFlow	2017-06-07 10:11:10 -03:00
DrabWeb	8006fab3c7	Merge https://github.com/ppy/osu into osu-direct-search	2017-06-07 09:56:13 -03:00
DrabWeb	94b3320e58	Center direct panel covers	2017-06-07 09:45:12 -03:00
John Neijzen	23a7045eef	More Clean UP	2017-06-07 20:07:18 +08:00
Dean Herbert	59bed2b16e	Add missing spaces	2017-06-07 20:44:54 +09:00
Dean Herbert	8d434e88ee	Fix VisualTest not using placeholder data	2017-06-07 20:20:22 +09:00
Dean Herbert	97db4856fc	Add toolbar toggle button ... Also ensure chat is hidden when social is displayed and vice-versa.	2017-06-07 20:15:58 +09:00
Dean Herbert	fc2d9816df	Make SearchableListHeader icon customisable	2017-06-07 20:06:02 +09:00
Dean Herbert	6a12173175	Add very temporary data source for social browser	2017-06-07 20:05:43 +09:00
Dean Herbert	1de296747f	Merge remote-tracking branch 'upstream/master' into social-browser	2017-06-07 17:38:06 +09:00
Dean Herbert	5f537780cf	Bring framework up-to-date	2017-06-07 15:32:50 +09:00
Thomas Müller	fac16bdebd	Do not release focus of the chat text box when sending a message	2017-06-05 18:07:28 +02:00
Dean Herbert	6b7e18a1e3	Fix not being able to change channels when channel select dialog is up	2017-06-05 23:12:39 +09:00
Dean Herbert	d9106c4e30	Temporarily disable inspection	2017-06-05 21:58:13 +09:00
Dean Herbert	57aad1311d	Merge branch 'master' into channel-selection	2017-06-05 21:46:28 +09:00
Dean Herbert	09e075e3fb	Allow adjusting mouse sensitivity at 0.01 increments	2017-06-05 20:22:39 +09:00
Dean Herbert	55d8b8b5f5	Merge branch 'master' into raw-input-sensitivity	2017-06-05 20:16:40 +09:00
Dean Herbert	bf971f6613	Merge branch 'master' into social-browser	2017-06-05 19:16:28 +09:00
Dean Herbert	16fcfc473d	Fix toggle not toggling on pressing escape ... Also add comment about hacky implementation of toggle tab.	2017-06-05 18:04:40 +09:00
Dean Herbert	778865b6eb	Merge remote-tracking branch 'upstream/master' into channel-selection	2017-06-05 17:36:14 +09:00
Dean Herbert	0cb1df35e9	Merge remote-tracking branch 'upstream/master' into ingame_options	2017-06-05 14:53:37 +09:00
Dean Herbert	ae7388e68f	Don't update sensitivity when dragging slider	2017-06-05 13:25:18 +09:00
Dean Herbert	ff0888449f	Disable ability to adjust sensitivity when raw input is disabled	2017-06-05 12:13:15 +09:00
Dean Herbert	c1e6438bec	Merge remote-tracking branch 'upstream/master' into raw-input-sensitivity	2017-06-05 11:42:26 +09:00
Dan Balasescu	6bda62f260	Merge branch 'master' into async-channel-load	2017-06-05 10:02:01 +09:00
Jorolf	a43890ffb4	update osu to use the framework's TooltipContainer	2017-06-03 14:50:35 +02:00
Dean Herbert	edead2ad3a	Add settings for toggling raw input and adjusting sensitivity	2017-06-02 20:24:18 +09:00
DrabWeb	c13e807d82	Redundant parenthesis	2017-06-02 01:48:43 -03:00
DrabWeb	d81ff9cbc2	Add visual states for ChannelSelectorTabItem	2017-06-02 01:41:55 -03:00
DrabWeb	1fa70167c2	Fix channel list occasioanlly taking clicks when not open	2017-06-02 01:35:36 -03:00
DrabWeb	90dabe01f4	Fix the channel list appearing behind the tab bar	2017-06-02 01:00:09 -03:00
DrabWeb	fc6f8b9c0c	Merge https://github.com/ppy/osu into medal-splash	2017-06-01 21:19:11 -03:00
DrabWeb	62ada0afcb	Make the add tab item unselectable and toggle the channel list	2017-06-01 20:46:18 -03:00
DrabWeb	697fab9248	Reselect the chosen tab when closing the channel list	2017-06-01 20:22:09 -03:00
DrabWeb	24b3ec7787	Fix tab background not fading	2017-06-01 08:16:53 -03:00
DrabWeb	ecb0c2f68f	Cleanup ChannelListItem Joined binding	2017-06-01 07:55:01 -03:00
Dean Herbert	5b80c8ac49	Load initial channel content asynchronously ... Quite often, the first time loading a chat channel will be loading font characters (textures) that were previously never displayed. This stops the game from stuttering in such a scenario.	2017-06-01 18:29:34 +09:00
DrabWeb	fad5b4ca9d	Speed up animations	2017-06-01 06:10:26 -03:00
DrabWeb	a707d63647	Fix visual errors if spamming close/open on channel list	2017-06-01 05:41:21 -03:00
DrabWeb	d728c87cca	Fix janky opening transition when resizing the chat and reopening the channel list	2017-06-01 05:26:01 -03:00
DrabWeb	c2d1a44de5	Fix channel selection not getting focus	2017-06-01 05:17:45 -03:00
DrabWeb	212b2c1142	Initial layout and animation	2017-06-01 04:45:46 -03:00
DrabWeb	32f98ca62b	Don't autohide the channel list if the chat is too tall	2017-05-31 22:42:53 -03:00
DrabWeb	52d524a65e	Update with framework changes	2017-05-31 22:39:03 -03:00
DrabWeb	e7bf1e02cb	Merge https://github.com/ppy/osu into channel-selection	2017-05-31 22:32:05 -03:00
DrabWeb	6176f1d275	Make the transition when chat is too tall and opening the channel selector smoother	2017-05-31 22:29:52 -03:00
DrabWeb	d970430174	Fix the channel selector not appearing if the chat is scaled up too tall then back down	2017-05-31 22:08:25 -03:00
DrabWeb	0439b15728	Generic type argument formatting	2017-05-31 21:29:50 -03:00
Patrick Andersson	1dd85b5986	Add alternative for random beatmap selection ... "Never repeat" will not repeat until all songs have been seen by repeatedly pressing F2/Random button	2017-05-31 20:11:26 +02:00
DrabWeb	ec8a88c96a	Update with framework changes	2017-05-31 05:28:50 -03:00
DrabWeb	9942733b63	Trim whitespace	2017-05-31 05:22:54 -03:00
Seth	394745bca5	Merge branch 'master' into social-browser	2017-05-31 05:18:52 -03:00
Dean Herbert	bab3f1b89a	Merge branch 'master' into user-dropdown-arrow	2017-05-31 15:39:52 +09:00
EVAST9919	8cde50a88a	Merge branch 'master' of https://github.com/ppy/osu into ingame_options	2017-05-31 08:23:06 +03:00
DrabWeb	cd57343191	Text -> Label	2017-05-31 02:03:13 -03:00
DrabWeb	4fd7405fb8	Fix user dropdown menu item chevron alignment	2017-05-31 01:57:32 -03:00
Dean Herbert	8544b45443	Update in line with framework	2017-05-30 22:23:51 +09:00
Dean Herbert	6a6f0913cd	Merge branch 'master' into social-browser	2017-05-30 20:51:50 +09:00
EVAST9919	e737ded382	Applied suggested changes	2017-05-30 12:23:53 +03:00
EVAST9919	963d6e9e8f	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-30 12:04:41 +03:00
DrabWeb	3aa1f35127	Basic layout	2017-05-30 05:12:11 -03:00
DrabWeb	a1453eb9e1	Fix filter text box input	2017-05-29 22:52:38 -03:00
DrabWeb	b6cb9d3229	Fix display style dropdown scaling the filter control	2017-05-29 22:39:59 -03:00
DrabWeb	2edbf64d69	Redundant parentheses	2017-05-29 22:22:14 -03:00
DrabWeb	96efa5a240	Hook up to channel selector tab item	2017-05-29 22:10:07 -03:00
DrabWeb	b9292b6240	Merge https://github.com/ppy/osu into channel-selection	2017-05-29 22:06:05 -03:00
DrabWeb	2ba86cffa6	Channel list item hover effect	2017-05-29 22:04:53 -03:00
DrabWeb	d8e86da78c	Better scroll dragger position	2017-05-29 22:00:15 -03:00
Dean Herbert	e91a3f06f1	Merge remote-tracking branch 'upstream/master' into channel-selector-tab-item	2017-05-30 09:54:35 +09:00
Dean Herbert	fde579262f	User a simpler method to hide the background icon	2017-05-30 09:54:29 +09:00
DrabWeb	d29bf58817	Show scroll dragger	2017-05-29 21:50:15 -03:00
DrabWeb	745e2e5e18	Make the channel selection overlay hide/resize with chat	2017-05-29 21:23:03 -03:00
DrabWeb	50e50ce67e	Update with framework changes	2017-05-29 20:33:28 -03:00
DrabWeb	21a8071293	Merge https://github.com/ppy/osu into channel-selection	2017-05-29 20:31:35 -03:00
EVAST9919	261f1f4e1f	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-29 18:13:44 +03:00
Dean Herbert	5e4558cc54	Merge branch 'master' into social-browser	2017-05-29 18:35:22 +09:00
Dan Balasescu	6918368afc	Merge branch 'master' into ingame_options	2017-05-29 18:12:02 +09:00
Dan Balasescu	e4b876ff5b	Update ModButton.cs	2017-05-29 18:10:02 +09:00
Dean Herbert	7960b5cf26	More refactoring ... Also allows rotation when reaching the end of the available mods.	2017-05-29 18:03:40 +09:00
Dean Herbert	5e473c6c96	Merge remote-tracking branch 'upstream/master' into better-multimod-animation	2017-05-29 17:21:49 +09:00
Dean Herbert	31cc6917bc	Tidy up code, improve transition, add directionality	2017-05-29 17:20:55 +09:00
Dean Herbert	7b52c4621d	Merge branch 'master' into musiccontroller-init-fix	2017-05-29 10:28:56 +09:00
DrabWeb	8994c57f3c	Update with framework changes	2017-05-28 15:14:22 -03:00
Seth	0e087994a1	Merge branch 'master' into social-browser	2017-05-28 15:11:00 -03:00
jorolf	9a4abcc199	Merge branch 'master' into better-multimod-animation	2017-05-28 14:39:04 +02:00
Thomas Müller	bb14708165	Merge branch 'master' into fix-chat-overlay-drift	2017-05-28 14:38:39 +02:00
Dean Herbert	bc47dedf27	Add non-null assertion	2017-05-28 21:34:15 +09:00
Dean Herbert	3644198c6e	Fix CI issues	2017-05-28 21:20:11 +09:00
Dean Herbert	ed8b34d5ed	Fix drift when dragging chat beyond bounds	2017-05-28 21:11:46 +09:00
Dean Herbert	d749fc516d	Update focus handling in line with framework changes	2017-05-28 20:08:46 +09:00
Dean Herbert	bdeaf2dbb4	Update method names in line with framework changes	2017-05-28 18:34:12 +09:00
DrabWeb	95cfce2950	Rank status filtering	2017-05-28 02:43:37 -03:00
DrabWeb	8745948a01	Basic searching in osu!direct, move BeatmapSetOnlineInfo covers into their own class	2017-05-28 02:26:25 -03:00
DrabWeb	ab32e962ca	Make BeatmapOnlineInfo and BeatmapSetOnlineInfo separate classes, -OnlineWorkingBeatmap	2017-05-28 00:37:55 -03:00
DrabWeb	816caf86ea	Better exception for SearchableListFilterControl's generic type argument not being an enum	2017-05-27 18:49:55 -03:00
DrabWeb	239472c451	Lowercase hex colours	2017-05-27 18:35:46 -03:00
DrabWeb	b88c07f1a0	Make channel readonly	2017-05-27 17:49:57 -03:00
DrabWeb	754fe956f9	Make ChannelSection headers uppercase in the setter	2017-05-27 17:40:20 -03:00
DrabWeb	b632e7f1ad	Accept Channel in ctor and remove Channel property	2017-05-27 17:35:42 -03:00
Jorolf	e86ccf61b3	use recursion	2017-05-27 10:11:59 +02:00
EVAST9919	bedcf04043	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-27 02:25:03 +03:00
Jorolf	db1dde72de	change constant names	2017-05-26 16:29:15 +02:00
Jorolf	64612ef34b	add multimod animation	2017-05-26 16:10:28 +02:00
jorolf	f6f1ea42ee	Merge branch 'master' into channel-selector-tab-item	2017-05-26 13:18:50 +02:00
Jorolf	1e4bca90f0	remove duplicate code	2017-05-26 12:10:16 +02:00
DrabWeb	c0999c7fc1	Unused using directives	2017-05-26 06:12:22 -03:00
DrabWeb	12f6276e05	Move DisplayStyleControl to all FilterControls	2017-05-26 06:05:05 -03:00
DrabWeb	38d0138978	CI fixes	2017-05-26 04:11:45 -03:00
DrabWeb	ae96ef08f7	Tab character	2017-05-26 04:02:04 -03:00
DrabWeb	4c551270e9	Add OnRequestLeave	2017-05-26 03:56:10 -03:00
DrabWeb	d632435a34	Make ChannelListItems scale better	2017-05-26 03:51:09 -03:00
DrabWeb	21e900df73	Transition code cleanup	2017-05-26 03:46:50 -03:00
DrabWeb	d29ebb139f	Cleanup	2017-05-26 03:38:52 -03:00
DrabWeb	64016f9466	Merge https://github.com/ppy/osu into channel-selection	2017-05-26 03:24:41 -03:00
DrabWeb	5785715ad5	CI fixes	2017-05-26 03:10:36 -03:00
DrabWeb	28ee00109d	Wave colours	2017-05-26 02:55:25 -03:00
DrabWeb	8359f6ced0	Incorrect colour	2017-05-26 02:49:04 -03:00
DrabWeb	68377494f7	Browser - SearchableList	2017-05-26 02:44:09 -03:00
DrabWeb	5831da6978	Autohide social when entering a screen that doesn't allow overlays, fix potential nullrefs in DirectOverlay, CreateControls -> CreateSupplementaryControls	2017-05-26 02:32:01 -03:00
DrabWeb	fc67582c3f	Cleanup	2017-05-26 02:16:56 -03:00
DrabWeb	e19a4f5e6f	Add displaying users	2017-05-26 02:00:38 -03:00
DrabWeb	5c0d0cb7e7	Alpha on wrong object	2017-05-26 01:34:30 -03:00
DrabWeb	2d3995b85c	Fix filter controls having margin when no controls given, add DisplayStyleControl to social, misc cleanups	2017-05-26 01:32:20 -03:00
DrabWeb	8fca0fddb3	Abstract DirectOverlay layout into base class for Social and osu!direct - BrowseOverlay, initial layout of social browser	2017-05-26 00:54:03 -03:00
Dean Herbert	8ae7e84563	Merge branch 'master' into musiccontroller-init-fix	2017-05-26 10:48:32 +09:00
Jorolf	a9658ec66f	update colour, width, icon and text	2017-05-25 20:25:59 +02:00
MrTheMake	9de7e7bc40	Fixes	2017-05-25 17:49:47 +02:00
Dean Herbert	9eec2edd30	Fix initial login state not being reflected in user panel	2017-05-25 22:43:33 +09: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
Dean Herbert	1a255fdf48	Fix display order regression	2017-05-25 19:47:18 +09:00
Dean Herbert	be81346573	Attempt to fix inner scope warning	2017-05-25 14:47:25 +09:00
DrabWeb	e22eb1f205	CI fixes	2017-05-24 22:39:07 -03:00
DrabWeb	ec3c92fc3c	Trim whitespace	2017-05-24 22:26:48 -03:00
DrabWeb	9cad344401	Revert back header for login form, fix incorrect spacing on header	2017-05-24 22:02:32 -03:00
DrabWeb	8e09b738b0	Remove magic numbers	2017-05-24 21:51:00 -03:00
DrabWeb	9b863f60ab	Adjust dropdown layout	2017-05-24 21:32:46 -03:00
DrabWeb	efd4c57431	Dropdown actions, +User.Status, +UserStatusDoNotDisturb, properly align UserDropdownMenuItem	2017-05-24 21:09:18 -03:00
DrabWeb	b57a3f2056	Initial layout of user panel and user dropdown	2017-05-24 19:44:48 -03:00
Dean Herbert	3134f92051	Merge branch 'master' into user-panel	2017-05-24 16:32:09 +09:00
DrabWeb	a25c504965	CI fixes	2017-05-24 03:08:48 -03:00
DrabWeb	72c9959215	resultCounts -> ResultAmounts	2017-05-24 02:40:34 -03:00
DrabWeb	ba2627d4e2	Merge branch 'osu-direct' of https://github.com/DrabWeb/osu into osu-direct	2017-05-24 02:40:00 -03:00
DrabWeb	e59c1879a2	Remove tabs	2017-05-24 02:38:55 -03:00
DrabWeb	4490596f5f	Keep one object per file	2017-05-24 02:37:27 -03:00
DrabWeb	b08668b6d9	Remove @ from to-be-localized strings	2017-05-24 02:19:45 -03:00
Dean Herbert	5e01940770	Compare with private field	2017-05-24 13:43:10 +09:00
DrabWeb	2be1b00a76	Hide status bar when Status is null	2017-05-24 00:45:56 -03:00
DrabWeb	247d8e9b21	Replace "Connected as _" in login form with a UserPanel	2017-05-24 00:23:48 -03:00
Dean Herbert	4ee11764b8	Merge branch 'master' into osu-direct	2017-05-24 12:16:34 +09:00
DrabWeb	be1ae2bd8e	Remove ??, value can never be null	2017-05-23 15:08:02 -03:00
DrabWeb	7a4b476121	Tab character	2017-05-23 14:46:23 -03:00
DrabWeb	aa9a636c3c	Indentation	2017-05-23 14:42:57 -03:00
DrabWeb	7b9eacc213	CI fixes	2017-05-23 14:41:30 -03:00
DrabWeb	fbbcc80a3e	Merge branch 'osu-direct' of https://github.com/DrabWeb/osu into osu-direct	2017-05-23 14:34:58 -03:00
DrabWeb	4f17a4fe91	Make result counts scroll with the panels	2017-05-23 14:34:34 -03:00
Jorolf	af9b02746a	make fields readonly	2017-05-23 18:19:01 +02:00
Jorolf	7ad10009e6	Merge branch 'master' of git://github.com/ppy/osu into channel-selector-tab-item	2017-05-23 17:32:48 +02:00
EVAST9919	2ca0794b37	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-23 14:45:38 +03:00
EVAST9919	564abc1a5b	using autosize instead of constant height	2017-05-23 14:32:45 +03:00
EVAST9919	165d6ef1bb	Make transition a bit smoother	2017-05-23 12:30:39 +03:00
EVAST9919	c7a241246e	Better letterbox settings transition	2017-05-23 12:09:32 +03:00
Dean Herbert	0634a3a5c5	Merge branch 'master' into osu-direct	2017-05-23 17:33:20 +09:00
DrabWeb	62897d302e	Remove SettingsButton(old and outdated design), fix channel list scrolling under the header	2017-05-22 22:37:25 -03:00
Dean Herbert	5c5a18833a	Merge branch 'master' into channel-selector-tab-item	2017-05-22 20:22:57 +09:00
Huo Yaoyuan	63259a3457	Fix depth of header background. ... Thanks to the order of adding to parent container, the depth value is actually not needed.	2017-05-22 16:00:03 +08:00
DrabWeb	bdab545ca4	Use BeatmapBackgroundSprite	2017-05-22 03:15:22 -03:00
DrabWeb	77affc1eb7	Split onto multiple lines	2017-05-22 03:13:55 -03:00
EVAST9919	50e3feb761	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-22 09:12:40 +03:00
DrabWeb	3c35badf06	Unused using	2017-05-22 02:03:53 -03:00
DrabWeb	6bf0ca59fe	Make FilterControl not scroll with the panels	2017-05-22 02:03:26 -03:00
Huo Yaoyuan	d0ff9e6576	Merge branch 'master' into sections	2017-05-22 12:52:27 +08:00
Dean Herbert	93182e5da3	Merge branch 'master' into generic-interface	2017-05-22 09:52:40 +09:00
DrabWeb	4e2126dca8	Fix nullref when changing display mode without any BeatmapSets added	2017-05-21 18:54:35 -03:00
DrabWeb	eb77c94150	Fix search field losing focus	2017-05-21 15:30:10 -03:00
EVAST9919	8c1437c51a	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-21 13:44:52 +03:00
DrabWeb	51bc3dfe72	Padding below channel list, remove text shadows, fix search box focusing	2017-05-20 21:38:36 -03:00
DrabWeb	a60d1efc21	Basic channel joining (ignore layout in ChatOverlay, temporary)	2017-05-20 21:26:39 -03:00
DrabWeb	4a166c1949	Make ChannelSelectionOverlay a FocusedOverlayContainer	2017-05-20 20:48:36 -03:00
DrabWeb	2e1d01a268	Added searching	2017-05-20 20:22:55 -03:00
DrabWeb	47dfc0d7bc	Added transition	2017-05-20 20:05:28 -03:00
DrabWeb	7eba619f80	Move Joined to Channel	2017-05-20 19:37:11 -03:00
DrabWeb	3cc51006cc	Add settings button, background triangles, proper displaying of Channels	2017-05-20 19:30:40 -03:00
DrabWeb	6a8d745db1	Use Channels in ChannelListItems, ChannelSection, fix ChannelListItem being misaligned	2017-05-20 18:29:57 -03:00
DrabWeb	31890a1e01	Initial layout, channels items	2017-05-20 18:06:25 -03:00
Huo Yaoyuan	4a55666e03	Merge branch 'master' into sections	2017-05-21 04:43:39 +08:00
Huo Yaoyuan	f06f8b4dcd	Make sidebar buttons working.	2017-05-21 04:33:05 +08:00
Huo Yaoyuan	aa409ac1a9	Move SearchTextBox out of SettingsHeader.	2017-05-21 04:12:16 +08:00
Huo Yaoyuan	35712514a4	Update settings UI using SectionsContainer basically.	2017-05-21 03:50:04 +08:00
DrabWeb	87ace2d7ec	@"" -> string.Empty	2017-05-20 13:52:51 -03:00
DrabWeb	49eb096b03	Fix visual test mode toggle buttons activation state	2017-05-20 13:19:50 -03:00
Dean Herbert	0b987be600	Merge branch 'master' into osu-direct	2017-05-20 16:17:59 +09:00
Dean Herbert	fb72693c96	Merge branch 'master' into playlist-item-paragraph	2017-05-20 15:47:54 +09:00
DrabWeb	995a573b9c	@"" -> string.Empty	2017-05-20 03:22:37 -03:00
DrabWeb	7485a78128	Update framework	2017-05-20 03:14:22 -03:00
DrabWeb	139b03a1ce	Only recreate text once per unicode option change	2017-05-20 02:05:13 -03:00
DrabWeb	43bd0f686b	Fix artist being the opposite value	2017-05-20 01:25:42 -03:00
DrabWeb	48417beb81	Unused using directive	2017-05-20 01:22:33 -03:00
DrabWeb	615082d757	Remove whitespace	2017-05-20 01:17:04 -03:00
DrabWeb	dcc3dbf5e2	Make PlaylistItem use Paragraphs	2017-05-20 01:11:20 -03:00
DrabWeb	bfedd42ca4	Add mod tooltips	2017-05-19 23:56:48 -03:00
DrabWeb	e030573436	Add ReverseDepthFillFlowContainer to remove code duplication	2017-05-19 23:44:36 -03:00
DrabWeb	68cb23786a	Fade in background when loaded	2017-05-19 20:53:51 -03:00
DrabWeb	6e7a09fedb	Line endings, use ToString for statistic value	2017-05-19 20:37:13 -03:00
DrabWeb	ffb3450dc2	Remove <U+FEFF> character	2017-05-19 20:34:51 -03:00
DrabWeb	503ee97a15	Fix license header	2017-05-19 20:28:37 -03:00
DrabWeb	cdd2b54dc7	Move SlimEnumDropdown into it's own file	2017-05-19 20:25:08 -03:00
DrabWeb	e7a64126a3	Formatting and remove magic number	2017-05-19 20:13:59 -03:00
DrabWeb	83c81c0626	Cleanup (again)	2017-05-19 20:03:07 -03:00
DrabWeb	c981a4a511	Formatting	2017-05-19 19:50:45 -03:00
DrabWeb	0a96aaf575	Whitespace	2017-05-19 19:27:51 -03:00
DrabWeb	0a90965a5b	CI formatting	2017-05-19 19:22:42 -03:00
DrabWeb	c2ea2bb5b0	Proper search tab changing logic	2017-05-19 19:13:07 -03:00
DrabWeb	57115f453e	Remove todo comment	2017-05-19 19:03:45 -03:00
DrabWeb	6cc7602db1	Added download button animations	2017-05-19 19:02:53 -03:00
DrabWeb	649fc8362b	Fix ranked status dropdown expanding below the panels	2017-05-19 18:54:47 -03:00
DrabWeb	2f10b72cb2	Proper dropdown expansion, DisplayModeToggleButton -> DisplayStyleToggleButton	2017-05-19 18:32:04 -03:00
DrabWeb	05b8fc5126	Added switching between grid/list and little transitions for the panels	2017-05-19 17:52:34 -03:00
DrabWeb	1d61fc84c7	Remove duplicate code in SettingsEnumDropdown	2017-05-19 17:04:59 -03:00
DrabWeb	1bd13a8361	Indentation	2017-05-19 16:22:54 -03:00
DrabWeb	74ed4cf0e3	More cleanup	2017-05-19 16:19:23 -03:00
DrabWeb	6eac19e76b	Move constructor above methods in DirectPanel	2017-05-19 16:12:47 -03:00
DrabWeb	c3d753a585	DifficultyIcons -> GetDifficultyIcons()	2017-05-19 16:11:45 -03:00
DrabWeb	a86d07cac7	Remove enclosing background container	2017-05-19 16:07:05 -03:00
DrabWeb	e1c4c36122	+BeatmapOnlineInfo, +OnlineWorkingBeatmap, minor cleanups, panel beatmap backgrounds	2017-05-19 15:43:18 -03:00
EVAST9919	9f803de9d5	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-19 19:49:48 +03:00
Dean Herbert	a34d9d8b09	Oops	2017-05-20 01:14:51 +09:00
DrabWeb	3b8cadd4df	Clean up DirectPanel and it's subclasses	2017-05-19 12:52:23 -03:00
Dean Herbert	9c9c0a64fd	Merge branch 'master' into debug-config-rename	2017-05-20 00:45:16 +09:00
Dan Balasescu	7e8ffe8f34	Merge branch 'master' into osd-fixes	2017-05-20 00:12:10 +09:00
Dean Herbert	528d79be51	FrameworkDebugConfig -> DebugSetting	2017-05-19 22:53:26 +09:00
Dean Herbert	0332348b24	Correctly display default audio device on OSD	2017-05-19 22:51:09 +09:00
Dean Herbert	5bcef91b89	Add padding to setting value on on screen display ... Long audio device names were destroying all padding.	2017-05-19 22:49:47 +09:00
Dean Herbert	04f7acb68a	Add setting checkbox to toggle debug logs	2017-05-19 22:47:15 +09:00
Jorolf	94484974f9	use AddTabItem instead + Bindable for ChannelSelectorTabItem	2017-05-19 11:59:23 +02:00
DrabWeb	a5fa7e1a7d	Result counts displaying	2017-05-18 17:43:39 -03:00
DrabWeb	1d1375c4d4	Remove commented line	2017-05-18 17:13:53 -03:00
DrabWeb	ca6826f3ba	Fix incorrect height between sort tabs and ruleset toggle buttons	2017-05-18 17:12:57 -03:00
DrabWeb	c8102db780	Fix visual test crash	2017-05-18 16:54:50 -03:00
DrabWeb	065f4faa70	Fix ruleset toggle buttons not updating when changing from the toolbar	2017-05-18 16:34:34 -03:00
DrabWeb	0b480fe327	ModeToggleButton -> RulesetToggleButton	2017-05-18 16:17:16 -03:00
DrabWeb	c2880676db	Added displaying sets	2017-05-18 16:15:49 -03:00
DrabWeb	c3fb1ab7c6	Mapper -> Author, use BeatmapSetInfo for metadata	2017-05-18 15:01:01 -03:00
DrabWeb	ab1401054d	Added result counts (visually)	2017-05-18 14:08:14 -03:00
DrabWeb	9f36a39c59	More cleanup	2017-05-18 13:57:19 -03:00
Jorolf	0e3fb55d5e	usage of constant and formatting	2017-05-18 17:02:11 +02:00
DrabWeb	b26c8dd1c7	Added temporary difficulties on the panels	2017-05-17 18:42:40 -03:00
DrabWeb	b3ef8b8fd4	Design updates	2017-05-17 18:10:29 -03:00
DrabWeb	cabfe72c92	Changed DirectPanel to a base class for DirectGridPanel and DirectListPanel	2017-05-17 18:02:33 -03:00
Huo Yaoyuan	ffbab6bfeb	Tidy up DrawableChannel.	2017-05-18 04:08:47 +08:00
DrabWeb	5fb445e3fe	Basic direct panel, minor cleanups	2017-05-17 16:37:34 -03:00
Jorolf	67806c4247	add tab item	2017-05-17 21:16:53 +02:00
Huo Yaoyuan	23e2d3ef07	Use GroupBy in ChatOverlay.	2017-05-18 02:40:36 +08:00
Huo Yaoyuan	b5d7211cd6	Expire placeholder text.	2017-05-18 02:40:29 +08:00
EVAST9919	a21343da23	CI fixes	2017-05-17 17:14:09 +03:00
EVAST9919	eec813ad65	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-17 17:14:00 +03:00
Dean Herbert	d606b5b3a7	Fix CI warning	2017-05-17 22:13:56 +09:00
EVAST9919	e785f1ddf1	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-17 16:12:38 +03:00
EVAST9919	fd2150aa49	Moved collectionsDropdown to it's own class	2017-05-17 15:32:16 +03:00
DrabWeb	9ba356f2c6	Added osu!direct header and filter control	2017-05-17 05:58:34 -03:00
EVAST9919	5fb8830e3a	Moved music controller buttons to it's own class	2017-05-17 10:36:24 +03:00
Dean Herbert	231f7939a6	Fix channels being unnecessarily recycled on disconnect ... Resolves #768	2017-05-17 12:42:02 +09:00
Huo Yaoyuan	f1d5a92950	Use generic IEqutable to avoid typeless Equals.	2017-05-16 21:49:38 +08:00
Huo Yaoyuan	b9a40a841b	Use IsAssignableFrom.	2017-05-16 21:04:54 +08:00
Dan Balasescu	be3953aeb2	Merge branch 'master' into general-fixes	2017-05-16 20:52:38 +09:00
Dean Herbert	fdf0137fc2	Remove incorrect padding	2017-05-16 19:58:34 +09:00
Dean Herbert	23807aa3b9	Better handling of logged in state	2017-05-16 19:55:45 +09:00
Dean Herbert	0c7ceea4fd	Merge branch 'master' into on-screen-display	2017-05-16 18:54:54 +09:00
Dean Herbert	71b14bb8af	Merge branch 'master' into fix-duplicate-channels	2017-05-16 18:50:21 +09:00
Dean Herbert	712bd21e25	Fix duplicate channels being created on connection loss ... Resolves #763	2017-05-16 18:28:42 +09:00
Dean Herbert	3673e4af1f	Fade bold state of chat tabs better	2017-05-16 18:00:29 +09:00
Dean Herbert	0feaa407f2	Merge branch 'margin-padding-namespace' into on-screen-display	2017-05-16 16:40:06 +09:00
Dean Herbert	89e2a39d14	Merge remote-tracking branch 'upstream/master' into margin-padding-namespace	2017-05-16 16:36:34 +09:00
Dan Balasescu	91de72e161	Merge branch 'master' into on-screen-display	2017-05-16 16:27:19 +09:00
Dean Herbert	f0ea445e46	Fix initial requests of channel mesages not being performed ... fetchReq was being set even for initial lookups, which caused only one to run, and subsequent requests to be excessive to try and catch up.	2017-05-16 15:59:01 +09:00
Dan Balasescu	2ad9aa2ae5	Merge branch 'master' into chat-error-messages	2017-05-16 15:12:59 +09:00
Dean Herbert	5e5ad9a899	Add basic on-screen display	2017-05-16 15:03:03 +09:00
Dean Herbert	efab186384	Update namespaces in line with framework	2017-05-16 12:50:30 +09:00
Dean Herbert	3b1d5ce7df	CI fix	2017-05-15 13:31:51 +09:00
Dean Herbert	dcd4b4450d	Add error message in chat when attempting to use commands	2017-05-15 13:26:35 +09:00
Dean Herbert	1f3039926f	Reword settings text slightly	2017-05-15 12:57:55 +09:00
Dean Herbert	3b87a938db	Merge branch 'master' into cursor_size.	2017-05-15 12:23:49 +09:00
Dean Herbert	622b155fda	OsuConfig -> OsuSetting	2017-05-15 10:56:27 +09:00
Dean Herbert	eaaba11586	Change all instances of options to settings where applicable	2017-05-15 10:55:29 +09:00
EVAST9919	ca6df533bd	Automatic gameplay cursor size	2017-05-13 03:46:37 +03:00
Dean Herbert	fd9218b6d5	Use FirstOrDefault	2017-05-12 20:48:25 +09:00
Dean Herbert	24db423c4f	Merge remote-tracking branch 'upstream/master' into playlist-commit	2017-05-12 20:39:50 +09:00
Dan Balasescu	815379646c	Merge branch 'master' into new-option-search	2017-05-12 20:22:11 +09:00
Dean Herbert	6c117f15af	Remove unnecessary usings	2017-05-12 20:06:38 +09:00
Dean Herbert	d2e066ca35	Move SearchTextBox to better namespace ... Is being used in multiple places now.	2017-05-12 19:57:06 +09:00
Dean Herbert	bc5bcfa66a	Make tab background opaque when chat is fullscreen	2017-05-12 19:15:04 +09:00
Dean Herbert	dbf60d24bf	Second design update pass.	2017-05-12 15:39:00 +09:00
Dean Herbert	6ea65009c4	Initial design update pass	2017-05-12 15:38:55 +09:00
Dean Herbert	c4a93cbc85	Move drawable chat related classes to better namespace	2017-05-12 15:38:51 +09:00
Dean Herbert	9cf4998701	Make chat resizable via drag, save user set size	2017-05-12 15:36:37 +09:00
Dean Herbert	f248efb01f	CI Fixes	2017-05-12 13:25:50 +09:00
Dean Herbert	ffa59c6cb3	Support read-only channels, post to correct channel. ... Also cache drawable channels better.	2017-05-11 23:51:26 +09:00
Dean Herbert	a77049213d	Add basic hard-coded inefficient multi-channel support.	2017-05-11 23:10:48 +09:00
Dean Herbert	ca32caf9e4	Merge branch 'master' into new-option-search	2017-05-11 21:04:37 +09:00
Dean Herbert	b258109a9e	Fix chat input box not always keeping focus as expected	2017-05-11 19:38:36 +09:00
Dean Herbert	ec67b617ae	Add OptionsHeader class ... Makes search textbox anchor correctly. Also improves visual styling.	2017-05-11 16:06:18 +09:00
Dean Herbert	df48204403	Fix OptionsOverlay stealing focus itself.	2017-05-11 13:56:21 +09:00
Dean Herbert	7d8af5f1da	Use SearchTextBox ... Correctly handle focus.	2017-05-11 13:23:31 +09:00
Dean Herbert	6c5490e31c	Merge remote-tracking branch 'upstream/master' into new-option-search	2017-05-11 12:59:19 +09:00
Dean Herbert	70ef503403	Merge branch 'master' into metadata	2017-05-11 12:23:00 +09:00
Dean Herbert	262b42efe3	Merge branch 'master' into new-option-search	2017-05-11 12:20:58 +09:00
Dean Herbert	ab1768ef80	Merge branch 'master' into tidy-up	2017-05-09 10:27:29 +09:00
Jorolf	9aaac4ab0c	Merge branch 'new-option-search' of github.com:Jorolf/osu into new-option-search	2017-05-08 18:30:33 +02:00
Jorolf	86f0173c6b	fix license header	2017-05-08 18:30:00 +02:00
jorolf	3abf1b2a0b	Merge branch 'master' into new-option-search	2017-05-08 17:25:47 +02:00
Huo Yaoyuan	ced2332d20	Handle overlay in ToolbarOverlayToggleButton.	2017-05-08 19:37:41 +08:00
Huo Yaoyuan	dff05bec79	Use readonly fields.	2017-05-08 18:56:04 +08:00
Dean Herbert	2f4fad9d41	Refactor colour selection.	2017-05-08 11:33:22 +09:00
Dean Herbert	df4a737c9b	Merge remote-tracking branch 'ppy/master' into hud-mod-display	2017-05-08 10:56:34 +09:00
Dean Herbert	5131371c93	Merge branch 'master' into new-option-search	2017-05-08 10:49:49 +09:00
DrabWeb	de8428c95b	Make requested changes	2017-05-07 22:23:33 -03:00
Dan Balasescu	fbf05f12fc	Use controlWithCurrent as per comment.	2017-05-08 10:11:45 +09:00
Jorolf	3c4faae554	add search box and the ability to search	2017-05-07 20:35:57 +02:00
Huo Yaoyuan	146d57953d	Use metadata field of WorkingBeatmap.	2017-05-06 14:57:11 +08:00
DrabWeb	81d67cbe06	Play first visible set in playlist when commiting in the search field.	2017-05-05 01:59:24 -03:00
Dean Herbert	6298b3effd	Refactor ModSection and ModIcon to avoid null mods.	2017-05-05 12:16:41 +09:00
Dean Herbert	98b3b82c07	Apply CI fixes.	2017-05-04 23:32:27 +09:00
Dean Herbert	153951d3dd	Add OptionItem class ... Allow for centalised logic for all option UI controls.	2017-05-04 23:07:48 +09:00
EVAST9919	26985dbc62	Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor	2017-05-03 16:22:40 +03:00
Dean Herbert	19f6d58723	Merge remote-tracking branch 'upstream/master' into options-implementation	2017-05-03 21:54:27 +09:00
Dean Herbert	330dd458bd	Trim whitespace.	2017-05-03 20:49:52 +09:00
Dean Herbert	489f586887	Add FPS display toggling. ... Kinda temporary but better than nothing.	2017-05-03 20:34:53 +09:00
EVAST9919	5f2f1d2763	CI fixes	2017-05-03 14:01:43 +03:00
EVAST9919	e7a8619f01	ModIcon refactor	2017-05-03 09:48:10 +03:00
Dean Herbert	691742b828	Remove most options which have not yet been implemented.	2017-05-02 19:40:30 +09:00
Dean Herbert	f9de733128	Formatting.	2017-05-02 18:53:33 +09:00
Dean Herbert	d4045ee2c0	We only have one release stream, so let's unlock it.	2017-05-02 18:40:30 +09:00
Dean Herbert	57c2dd1f49	Fix options dropdown labels never being displayed.	2017-05-02 18:35:23 +09:00
Dean Herbert	1b0f353af3	Add support for framework-level mouse confining.	2017-05-02 17:45:42 +09:00
Dean Herbert	bef15fe637	Improve organisation of some options and config code.	2017-05-02 17:45:22 +09:00
Dean Herbert	116e92a542	Remove silly platform specific logic.	2017-05-02 17:00:30 +09:00
Dean Herbert	46ae8bc86b	Use value because we need to.	2017-05-02 16:49:27 +09: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	beb98c14b6	Fix layout not being invalidated when re-filtering playlist display.	2017-05-02 16:26:11 +09:00
Dean Herbert	6074cb5979	Make playlist filtering work. ... Also standardises searchable terms in beatmap metadata.	2017-05-02 10:45:55 +09:00
Dean Herbert	737ad78056	Set a sane default transform direction.	2017-05-01 20:10:19 +09:00
Dean Herbert	2437c416b1	Use less usings.	2017-05-01 19:56:01 +09:00
Dean Herbert	3943e4ae95	Fix comma.	2017-05-01 19:32:31 +09:00
Dean Herbert	c59589eba7	Only retrieve colour once.	2017-05-01 19:32:00 +09:00
Dean Herbert	0f4ef16910	Remove custom word splitting logic, add localisation support.	2017-05-01 17:14:59 +09:00
Dean Herbert	2cfb83436d	Add placeholder logic for filtering.	2017-05-01 15:27:41 +09:00
Dean Herbert	a1f341a64f	Fix textbox focus issues (and inability to use escape).	2017-05-01 15:23:01 +09:00
Dean Herbert	c1d0aea217	Refactoring part 5.	2017-05-01 15:09:14 +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
Huo Yaoyuan	cf3e83ca62	Save ShowUnicode in framework config.	2017-04-26 19:48:46 +08:00
Dean Herbert	30e2e7bfe4	Merge branch 'master' into slider-stuff	2017-04-25 19:42:46 +09:00
Jorolf	a6ea6738e5	add some spaces after commas	2017-04-24 17:10:00 +02:00
Jorolf	7ef90e6597	Merge branch 'master' of git://github.com/ppy/osu into slider-stuff	2017-04-24 17:05:32 +02: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
Jorolf	60bb45358c	remove more casts and usings	2017-04-22 18:36:37 +02:00
Jorolf	b151c71c0e	remove casts	2017-04-22 18:36:36 +02:00
Jorolf	e53c4be356	I guess this works...	2017-04-22 18:36:36 +02:00
Jorolf	02249dcd67	add a function to OsuSliderBar to manually set the tooltip text	2017-04-22 18:34:57 +02:00
Jorolf	1d2f19b5a2	change background dim from integer to double	2017-04-22 18:34:03 +02:00
smoogipooo	2d91400239	Fix nullref due to framework change.	2017-04-22 16:56:17 +09:00
Dean Herbert	d94035e9da	Merge branch 'master' into general-fixes	2017-04-21 20:42:46 +09:00
Dean Herbert	5fdc9819cf	Add basic UO support (now called Audio Offset).	2017-04-21 16:20:05 +09:00
Dean Herbert	25a7d99a8e	Remove unused reference.	2017-04-21 16:11:24 +09:00
Dean Herbert	5aa90df819	Allow OsuScreens to decide whether ruleset switching should be allowed. ... Tidies up ToolbarModeSelector a lot by using DI.	2017-04-21 16:03:59 +09:00
Dean Herbert	ef7bc0f92e	Update UI controls to understand DisabledChanged.	2017-04-21 14:02:04 +09:00
Dean Herbert	093abd6872	Add chat toggle button.	2017-04-19 19:54:03 +09:00
Dean Herbert	c7246fd2ac	Reorganise ChatOverlay to not suck.	2017-04-19 19:15:21 +09:00
Dean Herbert	dda3fb85ee	Add user colour support.	2017-04-19 19:07:38 +09:00
Dean Herbert	3129708ccb	Add chat sending support.	2017-04-19 18:46:52 +09:00
Dean Herbert	87f6dc9e5a	Change default channel to #lazer.	2017-04-19 18:46:50 +09:00
Dean Herbert	325af333b9	Update API responses for chat.	2017-04-19 18:46:48 +09:00
Dean Herbert	64a8992153	Merge branch 'master' into general-fixes	2017-04-18 16:19:52 +09:00
Dean Herbert	fbd26a1d5e	Mode -> Ruleset.	2017-04-18 16:05:58 +09:00
Dean Herbert	727086c0b2	Updates in-line with framework.	2017-04-18 15:34:53 +09:00
Dean Herbert	af13f97435	Fix regressions and test cases.	2017-04-17 19:44:03 +09:00
Dean Herbert	a4e2f34ee7	Make a RulesetDatabase.	2017-04-17 17:43:48 +09:00
smoogipooo	4a149c4ab8	Better default values + don't set Mode from outside.	2017-04-15 06:14:31 +09:00
smoogipooo	0333e1a050	Remove unused usings.	2017-04-15 05:57:18 +09:00
smoogipooo	0a1376c2db	Remove PlayMode game-wide.	2017-04-15 05:22:41 +09:00
smoogipooo	59bfc7abad	Move statics to RulesetCollection to avoid conflicts later on.	2017-04-15 04:53:37 +09:00
Dean Herbert	98544a8077	Fix unsynchronised tweening.	2017-04-14 19:20:07 +09:00
Dean Herbert	8c41707ac7	Fix incorrect default state. Handle input better.	2017-04-14 14:40:52 +09:00
Dean Herbert	09195a03a2	Merge remote-tracking branch 'upstream/master' into song-progress-graph ... # Conflicts: # osu.Game/Overlays/DragBar.cs	2017-04-14 11:25:00 +09:00
Poliwrath	dffdb100ab	Small fix to the chat overlay to prevent crashing on the test	2017-04-11 21:35:49 -04:00
Dean Herbert	9732110bd9	Update TransformTo methods in line with framework changes.	2017-04-11 17:25:56 +09:00
Dean Herbert	5af4259ab4	Add back explicit binds.	2017-04-10 17:10:15 +09:00
Dean Herbert	f12b5a8954	Unify disable logic.	2017-04-10 16:22:36 +09:00
Dean Herbert	b7cfdff8d1	Update SliderBar to use IHasCurrentValue.	2017-04-10 15:30:17 +09:00
Dean Herbert	bb4a909de5	Update UI control access in line with framework changes.	2017-04-10 14:54:23 +09:00
DrabWeb	fc7eef091f	current_colour -> currentColour, fix masked away playlist items not fading colours	2017-04-09 09:08:11 -03:00
DrabWeb	70756a069e	Unused usings	2017-04-09 07:52:26 -03:00
DrabWeb	241895c85b	Proper playlist item text wrapping	2017-04-09 07:36:41 -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	7f2feab9e7	Proper search field focusing and exit on escape	2017-04-09 06:26:17 -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
Thomas Müller	166a78a15a	Fix up comment in audio device options	2017-04-08 11:01:41 +02:00
Thomas Müller	ac073e22c9	Fix crash caused by multiple identical audio device names ... The option dropdown for audio device selection lists all audio device names. Dropdowns, however, may not have multiple identical keys. This commit adds removal of duplicate audio device names from the dropdown. BASS does not give us a simple mechanism to select specific audio devices in such a case anyways. This functionality would require OS-specific and involved code.	2017-04-07 17:00:34 +02:00
Dean Herbert	7e99fc47e2	wip	2017-04-07 16:54:54 +09:00
smoogipooo	a9d938e7ed	Fix brace style.	2017-04-07 15:57:00 +09:00
Dean Herbert	06776443eb	Merge branch 'music-controller-improvements' into song-progress-graph ... # Conflicts: # osu.Game/Overlays/DragBar.cs	2017-04-07 15:49:14 +09:00
Dean Herbert	2c2a4169c6	Better structure for button layout.	2017-04-07 15:28:18 +09:00
Dean Herbert	7d2af9310b	Expose DragBar's seeking property.	2017-04-07 15:23:03 +09:00
Dean Herbert	3dbf4879c7	Merge branch 'music-controller-improvements' into song-progress-graph ... # Conflicts: # osu.Game/Overlays/DragBar.cs	2017-04-07 15:18:58 +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	bc4e0bfa8b	Make DragBar animate seeks.	2017-04-07 13:14:41 +09:00
Dean Herbert	12d2102a88	Merge remote-tracking branch 'upstream/master' into song-progress-graph ... # Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj # osu.Game/Modes/UI/HudOverlay.cs # osu.Game/Screens/Play/PauseOverlay.cs # osu.Game/Screens/Play/Player.cs # osu.Game/osu.Game.csproj	2017-04-07 09:22:18 +09:00
Huo Yaoyuan	411988f038	Remove all trailing whitespaces in this repo.	2017-04-06 16:21:18 +08:00
Huo Yaoyuan	9b1e010dcc	Fix filename mismatch.	2017-04-06 16:05:41 +08:00
Dean Herbert	efe82ef88c	Merge branch 'master' into hud_visibility	2017-04-06 13:40:10 +09:00
Dean Herbert	863dc44c4d	Some minor improvements.	2017-04-06 09:57:34 +09:00
Andrey Zavadskiy	009909dd4b	Merge remote-tracking branch 'refs/remotes/ppy/master' into hud_visibility	2017-04-04 17:39:53 +03: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	83322dc5cb	Merge branch 'master' into hud_visibility	2017-04-03 11:51:11 +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
Andrey Zavadskiy	d7c39a00b4	Hud Visibility	2017-03-31 16:43:31 +03:00
Dean Herbert	fa7fd6efe3	Fix mode selector not invoking a re-filter.	2017-03-29 19:48:13 +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
Dean Herbert	768b3c4b4b	Add better focus handling in the login form.	2017-03-28 00:08:27 +09:00
Dean Herbert	13272e6995	Make Avatar accept a user. ... Add UpdateableAvatar to handle the toolbar use-case.	2017-03-28 00:08:26 +09:00
DrabWeb	215b016f32	Initial implementation	2017-03-24 05:59:26 -03:00
Dean Herbert	4d61424abd	Merge branch 'master' into song-progress-graph	2017-03-23 17:44:22 +09:00
Dean Herbert	54e1b24fe9	Enforce readonly private members where possible.	2017-03-23 13:50:08 +09:00
Huo Yaoyuan	0dbc232ebf	Rename all DropDown -> Dropdown.	2017-03-22 22:32:32 +08:00
Huo Yaoyuan	6a4ca08578	Merge branch 'master' into controls	2017-03-22 22:28:19 +08:00
DrabWeb	29c54d4d8b	Merge https://github.com/ppy/osu into song-progress-graph	2017-03-22 08:50:17 -03:00
Dean Herbert	fbe08436d2	Fix usages of CircularContainer in line with framework changes.	2017-03-22 19:35:03 +09:00
Huo Yaoyuan	e217c67bcf	Merge branch 'master' into controls	2017-03-22 08:54:03 +08:00
Huo Yaoyuan	b46ded7794	Use Bindable for DropDown.	2017-03-22 07:49:21 +08:00
Dean Herbert	8983bbcaad	Merge branch 'master' into leaderboards	2017-03-22 08:24:49 +09:00
Huo Yaoyuan	f0edf5d3d3	Update to DropDown and Menu.	2017-03-22 07:18:53 +08:00
Dean Herbert	b00f86d809	Merge branch 'master' into seperateCursorSize	2017-03-22 08:11:45 +09:00
Jorolf	82d6129063	renamed CursorSize to MenuCursorSize	2017-03-21 17:16:23 +01:00
Andrey Zavadskiy	943bd737c4	Hide letterbox position sliders	2017-03-21 18:24:19 +03:00
smoogipooo	d27f37beb5	Hard-code text size in cases it wasn't set.	2017-03-20 13:48:06 +09:00
Dean Herbert	5d0adc6454	Merge remote-tracking branch 'upstream/master' into DrabWeb/leaderboards	2017-03-19 18:51:53 +09:00
Jorolf	80de15d935	fixed typo	2017-03-18 15:22:03 +01: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
Seth	4aea06be22	Merge branch 'master' into leaderboards	2017-03-17 18:23:01 -03:00
Jorolf	8568e1536c	Separated menu and gameplay cursor size	2017-03-17 18:40:03 +01:00
Dean Herbert	ab8a5afdb9	AlwaysReceiveInput and InternalContains.	2017-03-16 17:38:36 +09:00
Dean Herbert	1ae4c2dfbb	Remove a lot of customisation from Avatar (and add it in individual usages).	2017-03-15 15:22:28 +09:00
DrabWeb	650fc7563d	ScoreRank, Avatar to own files, +DrawableRank	2017-03-14 10:58:28 -03:00
Seth	21a9996225	Merge branch 'master' into leaderboards	2017-03-14 10:07:33 -03:00
Dan Balasescu	879a78156d	Merge branch 'master' into mod_application	2017-03-14 12:38:55 +09:00
Huo Yaoyuan	3913a0a9ee	Fix removal of the last one beatmap.	2017-03-14 05:35:58 +08:00
DrabWeb	74eddc768a	Random diff	2017-03-13 13:02:56 -03:00
DrabWeb	8e90e05f23	Changed animation to match the one in Comp3 6c(will probably clean later), changed avatar sprite to a toolbar avatar(doesn't load in visual test since there's no OsuGame), removed random test case data, now static	2017-03-13 12:31:46 -03:00
DrabWeb	dbc8d513f9	Merge https://github.com/ppy/osu into leaderboards	2017-03-13 09:36:16 -03:00
smoogipooo	c0e29652a6	Initial attempt at making mods apply better.	2017-03-12 22:13:43 +09:00
Dean Herbert	e6f4fe9e61	Merge pull request #458 from Lahvuun/master ... Options sidebar flickering fix.	2017-03-10 13:20:07 +09:00
Jorolf	9dd835e256	didn't see this was unnecessary after my changes	2017-03-09 21:43:11 +01:00
Jorolf	d9a4a677fd	Added Descriptions to Rulesets + PlayModes list	2017-03-09 21:37:03 +01:00
Lahvuun	427a0dd0f5	Options sidebar flickering fix.	2017-03-09 22:29:39 +02:00
Huo Yaoyuan	9007409072	Follow appveyor's code style check.	2017-03-09 16:44:45 +08:00
Dean Herbert	115ebd4773	Merge branch 'master' into modselect	2017-03-09 17:31:25 +09:00
Huo Yaoyuan	1b182b1361	Fix typo.	2017-03-09 15:55:40 +08:00
Dean Herbert	dad6060149	Fix warnings not covered by resharper locally.	2017-03-09 16:07:34 +09:00
Dean Herbert	d7497330b2	Reduce warning/suggestion count to zero.	2017-03-09 15:52:40 +09:00
Dean Herbert	a048e666d7	Fix autoproperty which doesn't work on mono.	2017-03-09 14:26:09 +09:00
Dean Herbert	da751804b6	Reduce error count.	2017-03-09 14:24:16 +09:00
Dean Herbert	3eece390cb	Abstract constructors -> protected.	2017-03-09 14:01:08 +09:00
Dean Herbert	0c4c1689b6	Merge branch 'master' into modselect	2017-03-09 12:51:40 +09:00
Dean Herbert	5a42035f88	Update license headers.	2017-03-08 15:50:52 +09:00
Huo Yaoyuan	b19405c987	Allow null in mod list to generate a placeholder ModButton.	2017-03-07 19:52:51 +08:00
Huo Yaoyuan	8979b28496	Remove usages of the 'new' keyword.	2017-03-07 16:17:51 +08:00
Huo Yaoyuan	b56d6c767b	Merge branch 'master' into modselect	2017-03-07 16:10:53 +08:00
Dean Herbert	bff1179624	Merge branch 'master' into replay ... # Conflicts: # osu.Game/Modes/Mod.cs	2017-03-07 14:32:14 +09:00
Dean Herbert	ecdbcb20cf	Fix error-level inspections.	2017-03-07 13:52:47 +09:00
Dean Herbert	4430255ec4	Merge remote-tracking branch 'upstream/master' into replay ... # Conflicts: # osu.Desktop.VisualTests/Tests/TestCasePlayer.cs # osu.Desktop/OsuGameDesktop.cs # osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs # osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs # osu.Game/Database/BeatmapDatabase.cs # osu.Game/Graphics/Cursor/OsuCursorContainer.cs # osu.Game/IPC/BeatmapImporter.cs # osu.Game/Modes/Mod.cs # osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs # osu.Game/Modes/UI/Playfield.cs # osu.Game/Screens/Play/Player.cs # osu.Game/Screens/Play/PlayerInputManager.cs	2017-03-07 13:50:08 +09:00
Dean Herbert	3e4cd0dc7c	Merge remote-tracking branch 'upstream/master' into less-mods-enum ... # Conflicts: # osu.Game.Modes.Mania/ManiaMod.cs # osu.Game.Modes.Osu/OsuMod.cs # osu.Game/Modes/Mod.cs	2017-03-07 13:42:50 +09:00
Dean Herbert	0cad5d7d41	Fix most warnings.	2017-03-07 13:05:57 +09:00
Dan Balasescu	bc74f453aa	Merge branch 'master' into replay	2017-03-07 11:41:16 +09:00
Dean Herbert	9106c45858	Fix remaining errors.	2017-03-07 10:42:59 +09:00
Thomas Müller	9b92e99ce9	Merge branch 'master' into increase-ci-strictness	2017-03-06 21:44:39 +01:00
Thomas Müller	6e9c4a4251	Merge branch 'master' into options-footer	2017-03-06 20:01:51 +01:00
Huo Yaoyuan	27edc9971e	Update deselect logic. ... Change to DeselectTypes to avoid enumerating children for multi times.	2017-03-07 01:15:21 +08:00
Huo Yaoyuan	eda7e1b26f	Fix and update mode changing handling.	2017-03-07 01:01:42 +08:00
Huo Yaoyuan	5cd859ecf1	Fix missed color during loading.	2017-03-07 00:46:36 +08:00
Huo Yaoyuan	836484ba51	Add abstract ModType for ModSection.	2017-03-07 00:32:22 +08:00
Huo Yaoyuan	318ab68af1	Use Bindable<IEnumerable<Mod>> to fit other changes.	2017-03-07 00:17:06 +08:00
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