564 commits

Author	SHA1	Message	Date
Howard Stearns	eb67254e54	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-09-08 16:54:14 -07:00
Howard Stearns	26f63a44fc	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-09-08 15:30:22 -07:00
Stephen Birarda	25aeda2e18	Merge branch 'master' of https://github.com/highfidelity/hifi into protocol	2015-09-08 08:40:51 -07:00
Howard Stearns	086afc47b1	Avatar animations on by default. (Using the now old animation machinery.) ... Default robot avatar consistent with the animations. Don't require all the bones to be present.	2015-09-04 14:24:37 -07:00
Leonardo Murillo	232fd72e53	Revert "Address bar now closes when you click outside of it"	2015-09-01 16:32:29 -06:00
Seiji Emery	e0f6db2152	Coding style	2015-08-28 16:36:44 -07:00
Seiji Emery	c704fb7b12	Fixed to follow signal naming conventions, and added null check	2015-08-28 11:01:30 -07:00
Seiji Emery	9353eaf35a	Added signal to detect + close address bar when user clicks outside of it	2015-08-28 10:33:30 -07:00
Stephen Birarda	80cf7b6c76	resolve conflicts on merge with upstream/master	2015-08-27 14:50:04 -07:00
Howard Stearns	b3a919a5ca	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-08-27 13:46:12 -07:00
Brad Hefta-Gaub	176860c612	Merge pull request #5649 from larsnaesbye/master ... Move i18n to own dir, update FA	2015-08-27 10:46:29 -07:00
Howard Stearns	0e18395fd0	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-08-26 12:04:28 -07:00
Brad Davis	0aaa07a2de	Remove items from the QML version of the menu when they are removed from the main menu	2015-08-25 19:05:29 -07:00
Ryan Huffman	dc5d5cbb63	Add asset server ping to stats	2015-08-25 15:06:40 -07:00
Lars Christensen	324f592719	updated FontAwesome to v4.4	2015-08-25 01:55:52 +02:00
Howard Stearns	dc75b238a8	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates ... And update with current code.	2015-08-18 15:35:37 -07:00
Seth Alves	551f0aaba3	show how many times per second Application::idle is called	2015-08-18 01:41:17 -07:00
ericrius1	3910cb0d69	Merge branch 'master' into polyLineInProgress	2015-08-07 10:12:02 -07:00
Sam Gateau	95682e6270	Introducing the Normal fitting algorithm for better normal in the deferred buffer	2015-08-05 17:17:00 -07:00
ericrius1	b2753507dc	cleanup of comments and dead code	2015-08-03 09:35:47 -07:00
David Rowe	f943dc8492	Use single file robot model as fallback for full avatar models ... Fixes having only a skeleton with no head if an invalid full model file is configured.	2015-07-29 19:34:05 -07:00
Brad Davis	914b47069b	Working on line height	2015-07-17 14:33:32 -07:00
Bradley Austin Davis	24643ca282	Working on line spacing	2015-07-17 14:19:39 -07:00
Bradley Austin Davis	c5e0298f8d	Working on mac sizing	2015-07-17 12:22:38 -07:00
Brad Davis	89faf85ad9	Working on text rendering overlays	2015-07-16 15:56:01 -07:00
David Rowe	daf34053a8	Tweak button positions	2015-07-09 10:15:28 -07:00
David Rowe	db7f1d6d27	Change font to Trebuchet	2015-07-09 09:35:22 -07:00
David Rowe	abc54f2e3f	Polished fonts, colors, etc.	2015-07-07 17:08:02 -07:00
David Rowe	cd258262d2	Use proper Interface logo	2015-07-07 16:21:24 -07:00
David Rowe	1774ad9c53	Rework buttons	2015-07-07 15:59:34 -07:00
David Rowe	98cd706528	Add border around update details	2015-07-07 15:48:39 -07:00
David Rowe	0994cd97dc	Rework header and add logo ... Use HiFi logo as placeholder for now until Interface SVG is available.	2015-07-07 15:14:15 -07:00
David Rowe	085d87e035	Make background squared, white, and dragable	2015-07-07 14:16:45 -07:00
David Rowe	46e58cd106	Rework dialog container and layout	2015-07-07 13:56:47 -07:00
David Rowe	5046f4c1ac	Update upgrade dialog ... - Strip out "<br />"s - Show information for all new versions since current, not just latest - Display scrollbar if content too long to show all at once - "version" / "versions" behind depending on if one or more - Align buttons with heading and text - Darken text so that is more readable	2015-07-06 13:19:42 -07:00
Stephen Birarda	3dc3d8b4c1	make the tooltip background darker	2015-06-29 11:05:59 -07:00
Stephen Birarda	133247ec6d	Merge branch 'master' of https://github.com/highfidelity/hifi into hyperlink-photo	2015-06-29 10:57:16 -07:00
Stephen Birarda	f93ad34282	add spacing above and below tooltipPic	2015-06-29 10:57:09 -07:00
Brad Davis	5cfa22396c	Merge pull request #5219 from venkatn93/master ... Changing tooltip reticle	2015-06-29 10:51:16 -07:00
Niraj Venkat	9101b4ad70	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-06-26 16:28:01 -07:00
Niraj Venkat	fe8d539cf5	changing link icon	2015-06-26 16:27:04 -07:00
Stephen Birarda	ff33922716	handle conflicts on merge with upstream master	2015-06-26 15:33:35 -07:00
Stephen Birarda	5b660e8c91	Merge pull request #5214 from venkatn93/master ... Changing formatting of tooltip	2015-06-26 18:27:59 -04:00
Niraj Venkat	87fce44271	Changing formatting of tooltip	2015-06-26 14:41:38 -07:00
Stephen Birarda	9b84eabd18	Merge branch 'master' of https://github.com/highfidelity/hifi into hyperlink-photo	2015-06-26 14:40:01 -07:00
Stephen Birarda	7e19a540fd	add the new placeholder image	2015-06-26 14:13:23 -07:00
Stephen Birarda	18e2b62ecc	initial image replacement for hyperlink preview	2015-06-26 14:12:26 -07:00
David Rowe	1898c6bd55	Merge branch 'master' into 20547 ... Conflicts: libraries/networking/src/PacketHeaders.cpp libraries/networking/src/PacketHeaders.h	2015-06-26 13:05:51 -07:00
Stephen Birarda	c6df573933	fix some OS X warnings, add description to tooltip	2015-06-26 10:50:31 -07:00
Niraj Venkat	23f4f7d824	Place name is underlined	2015-06-25 15:56:40 -07:00