67 commits

Author	SHA1	Message	Date
Stephen Birarda	1c861fbecb	resolve conflicts on merge with upstream master	2014-04-09 15:36:15 -07:00
Stephen Birarda	684c6b5372	run regex header replacement on all cpp files	2014-04-09 09:35:42 -07:00
Stephen Birarda	62041d91a8	rename NodeList DomainInfo to DomainHandler	2014-04-01 13:09:35 -07:00
stojce	e2eb34b6c9	Layout setup ... image ratio fixed image centre position	2014-03-23 07:03:20 +01:00
stojce	8101a5c1fb	Merge branch 'master' of https://github.com/worklist/hifi into 19507	2014-03-02 14:36:06 +01:00
stojce	5f73b76be7	Share dialog	2014-03-02 14:36:01 +01:00
Stephen Birarda	78c246f1ba	repair to saveSnapshot call from interface	2014-02-19 13:08:57 -08:00
Stephen Birarda	ff7a49d8c2	resolve conflicts on merge with upstream master	2014-02-19 13:07:26 -08:00
Andrew Meadows	4010f3ab3f	Remove Avatar::_head, use AvatarData::_headData	2014-02-18 17:41:46 -08:00
stojce	7621d70c24	use base class - replaced MyAvatar with Avatar	2014-02-18 08:11:59 +01:00
stojce	6c2f3b687e	removed unnecessary references	2014-02-18 01:50:55 +01:00
stojce	2ba7426757	windows build fix	2014-02-17 19:25:53 +01:00
stojce	0244ead5df	fixed glm::quat initialization	2014-02-12 21:06:30 +01:00
stojce	68584c654b	Allow drag-and-drop of snapshots into Interface	2014-02-12 02:12:52 +01:00
stojce	c82a8a152e	Set JPG quality to 100	2014-01-27 20:59:46 +01:00
stojce	40ea552981	filename format changes ... - new wav file - changed filename format	2014-01-27 20:35:06 +01:00
stojce	74801da07f	#19491 - Implement in-app snapshots	2014-01-27 18:07:03 +01:00