11986 commits

Author	SHA1	Message	Date
Brad Davis	e20d2ffb15	Merge typo	2015-05-13 21:39:04 -07:00
Brad Davis	c94b8b6e30	Merge branch 'master' into dk1 ... Conflicts: interface/src/devices/OculusManager.cpp interface/src/devices/TV3DManager.cpp	2015-05-13 21:25:56 -07:00
Brad Hefta-Gaub	77019eafa7	Merge pull request #4831 from jherico/plugins_pt2 ... Display plugins part 2	2015-05-13 20:40:33 -07:00
Brad Hefta-Gaub	3b7acae8a2	Merge pull request #4850 from jherico/web-entity ... Web entity	2015-05-13 17:02:55 -07:00
Brad Davis	3b7e8a69b5	Attempting to fix threading issues with web entities	2015-05-13 14:00:41 -07:00
Bradley Austin Davis	a0097bcff8	Fixing offscreen rendering on retina display, even without a proxy window	2015-05-13 12:26:46 -07:00
Seth Alves	80749195e6	don't ddeTracker->init if HAVE_DDE isn't set	2015-05-13 11:44:42 -07:00
Philip Rosedale	96b761357b	Merge pull request #4853 from huffman/remove-scripts-tip ... Remove scripts 'Tip' label and fix tool window heights	2015-05-13 11:21:49 -07:00
Philip Rosedale	a5c49b7a13	Merge pull request #4813 from ctrlaltdavid/20532 ... CR for 20532 - Default face tracking to Use Camera for first time users	2015-05-13 11:06:46 -07:00
Brad Davis	9b6c20d93c	Merge remote-tracking branch 'upstream/master' into web-entity	2015-05-13 09:49:53 -07:00
Bradley Austin Davis	fc825f6632	Fixing the loading of local HTML so it works on both OSX and win32	2015-05-13 09:46:24 -07:00
Ryan Huffman	7ff9422717	Fix runningScripts and tool window height	2015-05-13 09:45:18 -07:00
Ryan Huffman	8e5438a4ad	Remove scripts 'Tip' label	2015-05-13 09:32:17 -07:00
Philip Rosedale	b658c26799	Merge pull request #4840 from jherico/menu ... Only display new menu in VR mode	2015-05-13 08:15:04 -07:00
Brad Davis	a8d343bbf1	Working on web entities	2015-05-13 00:27:57 -07:00
Brad Davis	e9b83e1c02	Working on web entities	2015-05-12 21:15:54 -07:00
David Rowe	8a3c8e0d9a	Merge branch 'master' into 20532 ... Conflicts: interface/src/devices/DdeFaceTracker.cpp	2015-05-12 17:41:12 -07:00
Philip Rosedale	349886c146	Merge pull request #4847 from birarda/domain-paths ... add initial support for local paths in domain	2015-05-12 17:09:13 -07:00
Philip Rosedale	65277e0573	Merge pull request #4836 from ctrlaltdavid/20535 ... CR for #20535 - Improve DDE eyelid control	2015-05-12 17:00:02 -07:00
Brad Davis	8c4f802dbf	Merge remote-tracking branch 'upstream/master' into web-entity ... Conflicts: libraries/entities/src/EntityItemProperties.h libraries/entities/src/EntityTypes.h	2015-05-12 15:56:02 -07:00
Stephen Birarda	8c9a14cd9d	Merge branch 'master' of https://github.com/highfidelity/hifi into domain-paths	2015-05-12 15:04:59 -07:00
Brad Davis	f42e0c696a	Merge branch 'master' into menu	2015-05-12 14:58:42 -07:00
Brad Davis	41d587bd2e	Revert "Revert "Fixing HMD asymmetrical projections (esp DK1) and santizing the transform stuff"" ... This reverts commit 6e8c067bcb. Conflicts: interface/src/Camera.h	2015-05-12 14:47:44 -07:00
Brad Davis	32c1b5e4c5	Merge remote-tracking branch 'upstream/master' into dk1 ... Conflicts: interface/src/Camera.h	2015-05-12 14:46:34 -07:00
Brad Davis	02a6b557dd	Restoring position as a slot	2015-05-12 14:45:38 -07:00
Brad Davis	64d0aa39dd	Merge branch 'master' into dk1	2015-05-12 14:43:33 -07:00
samcake	6e8c067bcb	Revert "Fixing HMD asymmetrical projections (esp DK1) and santizing the transform stuff"	2015-05-12 14:34:43 -07:00
Stephen Birarda	332601b91c	final fixes for path query from DS	2015-05-12 14:34:14 -07:00
samcake	7c255738af	Merge pull request #4837 from jherico/dk1 ... Fixing HMD asymmetrical projections (esp DK1) and santizing the transform stuff	2015-05-12 12:30:32 -07:00
Brad Davis	f844dcd25f	Only display new menu in VR mode	2015-05-12 09:05:24 -07:00
Atlante45	00864afe53	Quiet compiler	2015-05-12 17:06:40 +02:00
Clément Brisset	91939ff4ed	Merge pull request #4832 from jherico/magnifier ... Fix magnifier location	2015-05-12 14:32:23 +02:00
Clément Brisset	9bf4cf1262	Merge pull request #4830 from ZappoMan/moreZoneProperties ... New Zone Features	2015-05-12 14:28:01 +02:00
Brad Davis	666caf0d59	Working on fixing DK1 and santizing the transform stuff	2015-05-12 00:44:30 -07:00
Brad Hefta-Gaub	f56b5fcdcd	Merge pull request #4833 from samcake/blue ... Clean the cube map loading behavior	2015-05-11 18:40:42 -07:00
Seth Alves	866a6fba9b	Merge pull request #4823 from birarda/master ... repairs to AC stop and clean shutdown	2015-05-11 18:11:52 -07:00
David Rowe	909aaab434	Better preference description	2015-05-11 17:19:50 -07:00
David Rowe	d92aca72a0	Fix typo	2015-05-11 17:11:53 -07:00
David Rowe	5832259643	Add preferences slider for webcam eyelid closing threshold	2015-05-11 17:11:52 -07:00
David Rowe	667ad9b0cb	Add menu option to enable/disable binary webcam eyelid control	2015-05-11 17:11:51 -07:00
ZappoMan	a2a1bf4e8c	make stars fade in as sun drops below horizon	2015-05-11 16:32:27 -07:00
Stephen Birarda	68af209417	call Setting::init from Interface setupEssentials	2015-05-11 16:20:03 -07:00
Brad Davis	69937d21f2	Addressing the actual gcc bug	2015-05-11 14:40:10 -07:00
Brad Davis	44238d02ae	Tweak the tv 3d manager to get around apparent GCC bug	2015-05-11 14:30:59 -07:00
ZappoMan	73428ec12d	add support to not displace very large clipboards on import	2015-05-11 14:21:58 -07:00
Sam Gateau	f2c4e04a5a	clean up for pr	2015-05-11 14:06:10 -07:00
Brad Davis	b29fbfe693	Merge branch 'magnifier' into plugins_pt2	2015-05-11 13:59:07 -07:00
Brad Davis	e58976fe5a	Fix magnifier location	2015-05-11 13:56:49 -07:00
Brad Davis	abab54aed8	Working on display plugins	2015-05-11 13:08:53 -07:00
Brad Davis	6a5c7b8b42	Merge remote-tracking branch 'upstream/master' into plugins_pt2 ... Conflicts: libraries/script-engine/src/MenuItemProperties.cpp	2015-05-11 12:40:17 -07:00