5610 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
DrabWeb	d29ebb139f	Cleanup	2017-05-26 03:38:52 -03:00
DrabWeb	fb0b54e66a	Remove merge error	2017-05-26 03:28:09 -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	63313045d9	Add SocialOverlay to OsuGame	2017-05-26 00:58:18 -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	79e731ec2a	Updated framework	2017-05-25 20:20:30 +02:00
MrTheMake	9de7e7bc40	Fixes	2017-05-25 17:49:47 +02:00
Thomas Müller	e67a00f1f6	Merge pull request #857 from smoogipooo/triangles-particles ... Triangles particles	2017-05-25 16:30:03 +02:00
Thomas Müller	061df80f23	Merge branch 'master' into triangles-particles	2017-05-25 16:02:47 +02:00
Thomas Müller	fbeaf9610e	Merge pull request #858 from peppy/fix-initial-online-state ... Fix initial login state not being reflected in user panel	2017-05-25 16:02:18 +02:00
Dean Herbert	4ecb3220dd	Merge remote-tracking branch 'ppy/master' into triangles-particles	2017-05-25 22:47:03 +09:00
Dean Herbert	ec8f49df0f	Update framework	2017-05-25 22:46:50 +09:00
Dean Herbert	9eec2edd30	Fix initial login state not being reflected in user panel	2017-05-25 22:43:33 +09:00
Thomas Müller	47be8b42aa	Merge pull request #855 from peppy/fix-nullref ... Fix potential nullref	2017-05-25 15:24:35 +02:00
smoogipooo	c8cf387f5f	A bit more cleanup.	2017-05-25 22:09:02 +09:00
smoogipooo	91dba765c2	Add back the concept of triangle ordering by size.	2017-05-25 22:03:36 +09:00
smoogipooo	86f6db2d31	Cleanup.	2017-05-25 21:33:49 +09:00
smoogipooo	97e57178a7	Make triangles use raw vertices instead of sprites.	2017-05-25 21:33:04 +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	d7fa6933be	Fix potential nullref	2017-05-25 16:33:58 +09:00
Dan Balasescu	4d7d4b7389	Merge pull request #854 from peppy/fix-warning ... Attempt to fix inner scope warning	2017-05-25 15:06:32 +09:00
Dean Herbert	be81346573	Attempt to fix inner scope warning	2017-05-25 14:47:25 +09:00
Dean Herbert	7a369547fd	Merge pull request #852 from DrabWeb/user-dropdown ... Update user dropdown	2017-05-25 14:38:13 +09:00
Dean Herbert	df8c13c12d	Merge branch 'master' into user-dropdown	2017-05-25 14:32:49 +09:00
Dean Herbert	95c03b7086	Merge pull request #824 from DrabWeb/drawable-multiplayer-room ... Drawable multiplayer room	2017-05-25 14:22:58 +09:00
Dean Herbert	012f60d59b	Merge branch 'master' into drawable-multiplayer-room	2017-05-25 13:58:05 +09:00
Dean Herbert	d1d7b8e1b1	Merge pull request #847 from peppy/early-activate-flashes ... Add missing early activation to menu flashes	2017-05-25 13:58:00 +09:00
Dan Balasescu	4c5b2cda16	Merge branch 'master' into early-activate-flashes	2017-05-25 13:51:08 +09:00
Dan Balasescu	2021e3cead	Merge pull request #851 from peppy/make-spinners-easier ... Make spinners easier for now	2017-05-25 13:47:26 +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
DrabWeb	b803e40a7d	Unbind from room values when disposing	2017-05-24 17:02:28 -03:00