3366 commits

Author	SHA1	Message	Date
Sam Cake	e9ff06df24	FIx the issue where the view frustum used in the skybox wasn;t in sync with the true camera, except if shadows is on, THe one call missing is now always executed	2015-05-15 17:22:29 -07:00
Brad Davis	6797174b97	Fix picking in the HMD	2015-05-14 19:15:47 -07:00
Andrew Meadows	81d06e0dc3	Merge upstream/master into andrew/nova ... Conflicts: libraries/entities/src/EntityItem.cpp libraries/entities/src/EntityItemProperties.cpp	2015-05-14 10:09:55 -07:00
Brad Hefta-Gaub	d1f52231be	Merge pull request #4863 from samcake/orange ... Using the skymap for ambient lighting	2015-05-14 09:12:46 -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
Sam Cake	d13106f4c9	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-05-13 16:00:42 -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
Sam Cake	8324268ec8	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-05-13 11:32:39 -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
Andrew Meadows	fb34a5ba84	renaming and cleanup	2015-05-13 08:44:10 -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
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	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
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
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
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	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
Sam Gateau	f2c4e04a5a	clean up for pr	2015-05-11 14:06:10 -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
Brad Davis	1624ca4120	Merge branch 'master' into plugins_pt2	2015-05-11 12:32:49 -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
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
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
Stephen Birarda	ddb52348bc	don't force use of Settings to all QCoreApplication	2015-05-08 16:24:39 -07:00
Brad Hefta-Gaub	bfb2b278ee	Merge pull request #4791 from jherico/scale ... Fixing scale resolution issues	2015-05-08 15:54:24 -07:00
Bradley Austin Davis	03bd17ed49	Rebasing onto scale changes	2015-05-08 15:09:46 -07:00
Bradley Austin Davis	0751443a01	Merge branch 'master' into scale	2015-05-08 15:03:24 -07:00