24 commits

Author	SHA1	Message	Date
Niraj Venkat	694272ffaa	"fixed" formatting issues and code cleanup	2015-06-03 14:48:25 -07:00
Niraj Venkat	57004c61c7	Fixed snapshot bug. Snapshots now save and load ok	2015-06-03 14:29:39 -07:00
Brad Davis	302aa9db47	Removing access to the gl widget and display managers	2015-05-02 00:49:52 -07: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
Stephen Birarda	5be045d612	remove LocationManager and NamedLocation, replace with DataWebDialog	2014-09-22 16:55:44 -07: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	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	ae4b8348a2	fix header include guards via regex	2014-04-09 12:03:17 -07:00
Stephen Birarda	6a51df9e38	initial regex replacement of headers	2014-04-08 17:30:36 -07:00
stojce	e2eb34b6c9	Layout setup ... image ratio fixed image centre position	2014-03-23 07:03:20 +01:00
Stephen Birarda	0b4021ea43	switch to ini settings file by default for Interface, closes #2029	2014-02-19 13:17:53 -08:00
Stephen Birarda	ff7a49d8c2	resolve conflicts on merge with upstream master	2014-02-19 13:07:26 -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	0df0c23c32	Windows build fix (3)	2014-02-17 21:14:28 +01:00
stojce	677e6f5ce9	windows build fix (2)	2014-02-17 20:19:35 +01:00
stojce	68584c654b	Allow drag-and-drop of snapshots into Interface	2014-02-12 02:12:52 +01:00
Andrew Meadows	1cc992a7f8	import --> include	2014-01-28 14:18:21 -08:00
stojce	74801da07f	#19491 - Implement in-app snapshots	2014-01-27 18:07:03 +01:00