34 commits

Author	SHA1	Message	Date
ZappoMan	a89691fc66	switch GLCanvas back to being owned by Application	2015-02-25 12:11:35 -08:00
Stephen Birarda	11f3161029	resolve conflicts on merge with upstream/master	2015-02-04 10:38:05 -08:00
Atlante45	27459ba861	Settings update	2015-02-03 12:27:30 -08:00
Atlante45	647a935eaa	Remove app->getAvatar	2015-01-29 15:16:40 -08:00
Atlante45	cdb0c22207	interface/ui uses new settings	2015-01-19 22:49:27 -08:00
Atlante45	5930e06849	Moved Snapshot location out of Menu ... Moved into Snapshot	2015-01-18 06:02:03 -08:00
Atlante45	296c0025de	Switched to auto and changed macro	2014-12-18 15:42:38 -08:00
Atlante45	0bd9ed469e	Changed NodeList::getInstance() calls to use the DM	2014-12-17 15:28:25 -08:00
Atlante45	4d1529f77b	typedefs	2014-12-16 14:02:22 -08:00
Atlante45	e5e2eb4e8a	Moved GLCanvas in DM and DM to QSharedPointers	2014-12-15 16:20:52 -08:00
Stephen Birarda	eb0f7da517	cleanup to snapshot class to reduce passing of variables	2014-09-22 16:14:06 -07:00
Stephen Birarda	8dddbb9d4b	make snapshots uploaded for locations temp files that will be cleared	2014-09-17 14:43:48 -07:00
Stojce Slavkovski	b2c1afe1bd	Merge branch 'master' of https://github.com/worklist/hifi into 19507	2014-05-03 09:52:19 +02:00
Stephen Birarda	4936fb3857	expose access token from AccountManager	2014-05-02 10:34:29 -07:00
Stojce Slavkovski	27c2255adf	Merge branch 'master' of https://github.com/worklist/hifi into 19507	2014-04-17 20:52:30 +02:00
Stojce Slavkovski	1a3e6595c5	Allow users to set the destination of Snapshots	2014-04-15 19:36:02 +02:00
Stojce Slavkovski	4d0ed5796e	Merge branch 'master' of https://github.com/worklist/hifi into 19507 ... Conflicts: interface/interface_en.ts	2014-04-12 08:45:23 +02:00
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