11967 commits

Author	SHA1	Message	Date
Sam Cake	d13106f4c9	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-05-13 16:00:42 -07:00
Seth Alves	80749195e6	don't ddeTracker->init if HAVE_DDE isn't set	2015-05-13 11:44:42 -07:00
Sam Cake	8324268ec8	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-05-13 11:32:39 -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
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
Sam Cake	04d3f690dc	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-05-12 23:12:37 -07:00
Sam Cake	536fff4502	Trying to create the SH from the skybox cubemap	2015-05-12 23:11:52 -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
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
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
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	e58976fe5a	Fix magnifier location	2015-05-11 13:56:49 -07:00
Seth Alves	ead200b77a	remove unneeded code	2015-05-11 12:03:10 -07:00
Seth Alves	9bd101ee2a	oops	2015-05-11 12:01:59 -07:00
Seth Alves	de9e74a725	put max-octree-pps in Application rather than in the Octree	2015-05-11 12:01:13 -07:00
Seth Alves	83748096ef	max pps for an octree-query is a per-query thing, not an application-wide thing. move the settings-related max-octree-pps stuff into the entity tree	2015-05-11 11:37:53 -07:00
Stephen Birarda	8c6715e4fc	resolve conflicts on merge with upstream/master	2015-05-11 11:10:22 -07:00
Sam Gateau	72c3270ec6	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2015-05-11 10:48:29 -07:00
Clément Brisset	421ebeb3d7	Merge pull request #4795 from birarda/sequence-numbers ... add sequence number support to NL, don't double send data from AvatarMixer	2015-05-11 19:23:33 +02:00
Philip Rosedale	c3828e4152	Merge pull request #4782 from ctrlaltdavid/20531 ... DO NOT MERGE - QA for #20531 - Don't flash whole screen when audio clips	2015-05-11 10:18:07 -07:00
Sam Gateau	d51904b7b3	fixing file	2015-05-09 11:43:21 -07:00
Sam Gateau	5a11143a5d	Using the skybox cubemap for ambient lighting	2015-05-09 11:40:46 -07:00
David Rowe	5092e385b1	Disable "calibrate" menu item if webcam isn't enabled	2015-05-08 18:39:22 -07:00
David Rowe	15b8dc4144	Don't start calibration if the camera is muted	2015-05-08 18:18:15 -07:00
David Rowe	e26147fc94	Do a reset at the end of calibration	2015-05-08 18:17:59 -07:00
David Rowe	b3b735032d	Automatically calibrate if Use Camera is enabled ... Do at start up or when Use Camera is first enabled per program run.	2015-05-08 18:16:59 -07:00
David Rowe	9f6bc080c9	Default face tracking to Use Camera for first-time users ... First time start up with face tracking enabled.	2015-05-08 17:45:21 -07:00
Brad Hefta-Gaub	a517e773f4	Merge pull request #4786 from ctrlaltdavid/20530 ... CR for #20530 - Add DDE calibration	2015-05-08 16:25:02 -07:00