11689 commits

Author	SHA1	Message	Date
Brad Davis	1ff8c67576	More work on menus and some code cleanup	2015-04-24 12:54:11 -07:00
Brad Davis	c0d562ed55	Merge branch 'offscreen' into m_and_m	2015-04-23 23:45:11 -07:00
Brad Davis	a4619c8e59	Merge branch 'master' into offscreen	2015-04-23 23:41:36 -07:00
Brad Davis	1d316a1872	Still working on menus	2015-04-23 23:41:09 -07:00
Brad Davis	d68d13489d	Working on appearance of menus	2015-04-23 21:55:31 -07:00
Brad Davis	f17387fab4	Working on menus	2015-04-23 21:23:21 -07:00
Brad Davis	bb1c73adc7	Working on menus	2015-04-23 14:24:01 -07:00
Brad Davis	8cb298a55b	Working on menus	2015-04-23 14:23:15 -07:00
Brad Davis	d2ff89aaec	Cleaning up qml	2015-04-23 14:23:13 -07:00
Brad Davis	3ba0df5201	Fixing headers	2015-04-23 14:23:13 -07:00
Brad Davis	8269b9925b	Adding first pass at message box	2015-04-23 14:23:12 -07:00
Brad Davis	a9d65f168b	Working on marketplace dialog	2015-04-23 14:23:11 -07:00
Brad Davis	ae804357d8	Attempting to fix backspace issue in new UI	2015-04-23 14:10:54 -07:00
Brad Hefta-Gaub	ad7293d4ad	Merge pull request #4679 from jherico/offscreen ... Fix a couple of bugs with the new offscreen UI	2015-04-23 12:45:51 -07:00
Brad Davis	ac7b373231	Throttle rendering needs to ensure it's active context	2015-04-23 10:27:28 -07:00
Ryan Huffman	b31f95a002	Fix cube rendering not working with transparency	2015-04-23 09:34:23 -07:00
Brad Hefta-Gaub	82d3302d1b	Merge pull request #4644 from jherico/offscreen ... Working on new-UI implementations of address bar and login	2015-04-23 07:17:45 -07:00
Brad Davis	eab4ad9ea9	More coding standard stuff	2015-04-22 20:16:41 -07:00
Brad Davis	732e9723cd	Messed up rename	2015-04-22 19:24:43 -07:00
Brad Davis	c4d2bd2cda	More coding standard fixes	2015-04-22 19:18:09 -07:00
Brad Davis	8d8c4babba	Coding standard fixes	2015-04-22 19:06:22 -07:00
David Rowe	35e2b87a70	Rename DDE menu items	2015-04-22 13:15:57 -07:00
David Rowe	649d4736cd	Merge branch 'master' into dde-miscellaneous	2015-04-22 13:00:40 -07:00
Brad Davis	e68f149aac	Fixing bad merge	2015-04-21 13:18:53 -07:00
Brad Davis	7a33474245	Merge remote-tracking branch 'upstream/master' into offscreen ... Conflicts: interface/src/Menu.cpp	2015-04-21 13:02:38 -07:00
Seth Alves	284215d46a	Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol	2015-04-21 09:53:15 -07:00
Seth Alves	64c23b8e8b	Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol	2015-04-20 16:56:24 -07:00
David Rowe	1af17fa9e7	Use voice to control DDE mouth ... Add voice blend coefficient values to DDE values.	2015-04-20 16:14:36 -07:00
Clément Brisset	b64d7fc17c	Merge pull request #4662 from birarda/remove-visage ... remove visage support	2015-04-20 20:06:21 +02:00
David Rowe	766087c032	Run DDE "readonly" ... Try to fix some people having to run Interface in admin mode on Windows	2015-04-20 10:29:53 -07:00
David Rowe	8268dc95ac	Include DDE reset in sensors reset	2015-04-20 10:28:17 -07:00
Seth Alves	f452e47577	Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol	2015-04-20 08:49:33 -07:00
Brad Hefta-Gaub	29971a5c59	Merge pull request #4664 from samcake/orange ... Teaching Project, Cleaning the interface for the default Sun light properties and more	2015-04-19 09:57:04 -07:00
Brad Davis	8d23bf874f	Enable resizable dialogs	2015-04-17 17:43:54 -07:00
Brad Davis	16efa2a46f	Improving toggle visibility and loading behavior	2015-04-17 16:59:04 -07:00
Stephen Birarda	511240da5a	remove Visage from FaceTracker comment	2015-04-17 14:29:51 -07:00
Stephen Birarda	6b615c1ba1	remove Visage from menu header	2015-04-17 14:28:20 -07:00
Stephen Birarda	63a81bdcb4	remove VISAGE handling in interface CMakeLists	2015-04-17 14:27:58 -07:00
David Rowe	931c46345e	Move visibility methods into DiscoverabilityManager	2015-04-17 14:15:50 -07:00
Stephen Birarda	30e580e207	remove visage from Menu	2015-04-17 13:42:30 -07:00
Stephen Birarda	604bc2abe1	remove visage related files	2015-04-17 13:40:31 -07:00
Stephen Birarda	3055359d4c	remove visage references from Application	2015-04-17 13:40:18 -07:00
Sam Gateau	11879f6142	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-04-17 13:04:00 -07:00
Philip Rosedale	3814fbc0c2	Merge pull request #4658 from ctrlaltdavid/dde-filtering ... DO NOT MERGE - DDE filtering	2015-04-17 15:41:03 -04:00
Seth Alves	292ba20cf3	pull andrew's measure-acceleration branch	2015-04-17 11:35:12 -07:00
Sam Gateau	f1e0d5855e	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-04-17 11:33:39 -07:00
David Rowe	ee48024831	Remove uninitialized method reference	2015-04-17 11:31:48 -07:00
David Rowe	6b085ca668	Move method out of Menu class	2015-04-17 10:53:04 -07:00
David Rowe	c823fcd083	Code tidying	2015-04-17 10:35:48 -07:00
Brad Davis	ad585f7559	Fixing NaN reference in test dialog	2015-04-17 10:05:54 -07:00