1406 Commits

Author	SHA1	Message	Date
Dean Herbert	a257c6846e	Merge branch 'master' into zero-notifications-closes	2017-08-22 22:45:52 +09:00
Dean Herbert	480d839d67	Allow the notification overlay to close when all notifications are dismissed	2017-08-22 19:51:42 +09:00
Dean Herbert	ab0e3ccc55	Make SimpleNotifications support word wrap	2017-08-22 19:33:18 +09:00
Dean Herbert	97acff535d	Tidy up conditionals	2017-08-22 18:21:00 +09:00
Dean Herbert	ff8ad30127	Add support for binding mousewheel actions	2017-08-22 14:44:34 +09:00
Dean Herbert	7693fc1382	Merge branch 'master' into mask-settings-overlay	2017-08-22 00:22:39 +09:00
Dean Herbert	1d0b89d592	Restore usage of AddRange	2017-08-21 18:51:14 +09:00
Dean Herbert	9ba2258f80	Add spaces for smoogipoo	2017-08-21 17:44:39 +09:00
Dean Herbert	877c69d5fe	Add local chat echo support	2017-08-21 17:43:26 +09:00
Jorolf	9b20da94e7	change Query to AllRulesets	2017-08-19 22:07:03 +02:00
Jorolf	bae1340b50	mask the settings overlay	2017-08-19 17:00:01 +02:00
Dean Herbert	d6249e7a63	Add support for binding mouse buttons to actions	2017-08-18 20:01:41 +09:00
Dan Balasescu	f5c3af2f20	Merge branch 'master' into fix-nullref	2017-08-18 12:38:20 +09:00
Dean Herbert	02aa38d1c2	Merge branch 'master' into toolbar-button-swap	2017-08-18 11:18:19 +09:00
Dean Herbert	e4b832e8a6	Fix a possible nullref when login fails	2017-08-18 10:49:41 +09:00
MrTheMake	6118209200	Fix unlit initial state of the OnScreenDisplay	2017-08-17 18:46:16 +02:00
Dean Herbert	f459794665	Update MainSettings.cs	2017-08-17 18:11:15 +09:00
Dean Herbert	58b1e9c954	Remove unused DI retrieval	2017-08-17 17:47:55 +09:00
Dean Herbert	a19fc28cff	Visually improve settings transitions and back button	2017-08-17 17:31:14 +09:00
Dan Balasescu	69a3251f61	Merge branch 'master' into toolbar-button-swap	2017-08-17 10:39:02 +09:00
Thomas Müller	4ef1be3080	More localised key binding hover colour logic	2017-08-17 08:43:45 +09:00
MrTheMake	94d664a626	Swap the order of the social and chat toolbar buttons	2017-08-16 17:00:30 +02:00
Dean Herbert	0c19202b9a	Add basic back button	2017-08-16 23:20:18 +09:00
Dean Herbert	e64f455ff7	Escape to cancel, again	2017-08-16 23:01:10 +09:00
Dean Herbert	71f83dbdfa	Add null check for safety	2017-08-16 22:56:32 +09:00
Dean Herbert	5ebec53970	Integrate key binding config with main settings	2017-08-16 22:56:32 +09:00
Dean Herbert	7e21ddb5eb	Remove usage of HideOnEscape	2017-08-16 22:56:32 +09:00
Thomas Müller	16372d9b45	Merge branch 'master' into key-config-settings	2017-08-16 17:48:00 +09:00
Dean Herbert	7e1fc47b76	Fix forgotten rename	2017-08-16 17:43:01 +09:00
Dean Herbert	3df51540e1	Code review fixes	2017-08-16 17:39:57 +09:00
Dean Herbert	dc82a88bb8	Improve namespaces of key bindings	2017-08-16 17:24:01 +09:00
Dean Herbert	25a3835c3c	Cancel pending sidebar expansion when a button is clicked	2017-08-16 17:06:20 +09:00
Dean Herbert	89987229de	Merge remote-tracking branch 'origin/is-alive' into key-config-settings	2017-08-16 15:49:43 +09:00
Dean Herbert	a5007fc64f	Fix some remaining usage of local InputManager instances	2017-08-16 13:07:18 +09:00
Dean Herbert	c221472d6e	Code tidy-ups	2017-08-16 01:19:21 +09:00
Dean Herbert	72eb082f91	Use .Equals	2017-08-16 01:14:37 +09:00
Dean Herbert	9c75df884f	Add initial implementation of KeyConfiguration overlay	2017-08-16 00:17:33 +09:00
Dean Herbert	143ff695ef	Remove unused using statements	2017-08-15 17:44:04 +09:00
Dean Herbert	6ded194c53	Remove all usage of DI to retrieve InputManager ... Uses GetContainingInputManager instead, as per framework changes.	2017-08-15 14:30:50 +09:00
Dean Herbert	dccefe1c0e	Make the settings sidebar optional ... Also removes an unnecessary secondary list of SidebarButtons by using generic containers.	2017-08-14 14:40:48 +09:00
Dean Herbert	66fa84a451	Make settings more modular	2017-08-14 13:09:59 +09:00
Dean Herbert	fe2911f165	Fix some formatting issues	2017-08-13 10:36:57 +09:00
Dean Herbert	48d4ed55e9	Move a lot of code to framework	2017-08-11 16:11:46 +09: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
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
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