11885 commits

Author	SHA1	Message	Date
Seth Alves	fabff7fdf4	Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1	2015-05-06 18:26:00 -07:00
Seth Alves	e73503a53d	Merge branch 'nova' of github.com:AndrewMeadows/hifi into dice-on-table-1	2015-05-06 16:05:13 -07:00
Andrew Meadows	584b643791	lock entitySimulation during physics simulation	2015-05-06 16:01:00 -07:00
Philip Rosedale	72da678bc2	Merge pull request #4785 from jherico/scale ... Fix ensmallened overlay UI	2015-05-06 15:30:01 -07:00
Bradley Austin Davis	561d275dda	Fix ensmallened overlay UI	2015-05-06 15:18:17 -07:00
Seth Alves	a057d7dfa3	Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1	2015-05-06 14:41:54 -07:00
Brad Hefta-Gaub	5551997cdc	Merge pull request #4780 from samcake/blue ... Add support for Skybox and rendering path of background according to Zones	2015-05-06 14:41:06 -07:00
Seth Alves	fe06ce2931	pull from upstream	2015-05-06 14:31:22 -07:00
Bradley Austin Davis	3c10d29d53	Removing another reference to oculus manager	2015-05-06 14:09:43 -07:00
Bradley Austin Davis	351246fac1	Fixing new image texture use from last upstream merge	2015-05-06 12:50:20 -07:00
Sam Gateau	1b5185abeb	fix the conditional on the texture pointer which was wrong and bring back atmosphere sky dome	2015-05-06 12:19:19 -07:00
Seth Alves	a72ac3ead2	Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1	2015-05-06 12:19:04 -07:00
Bradley Austin Davis	ea6f840fdb	Merge remote-tracking branch 'upstream/master' into plugins_pt1	2015-05-06 12:18:04 -07:00
Brad Hefta-Gaub	4de6d645e5	Merge pull request #4701 from jherico/infoview ... Infoviews & Browser in QML	2015-05-06 12:12:21 -07:00
Bradley Austin Davis	fc73676b4d	Merge branch 'master' into plugins_pt1	2015-05-06 11:43:25 -07:00
Bradley Austin Davis	4c22e637d7	Merge remote-tracking branch 'upstream/master' into off_axis	2015-05-06 11:28:03 -07:00
Bradley Austin Davis	c832fd969a	Removing off-axis projection from menu	2015-05-06 11:26:46 -07:00
Seth Alves	238a41f2b9	pull from upstream	2015-05-06 11:22:18 -07:00
Clément Brisset	9f8e52652b	Merge pull request #4771 from ctrlaltdavid/20526 ... CR for #20526 - Fix Mixamo avatar clipping in HMD view	2015-05-06 20:17:07 +02:00
Brad Hefta-Gaub	b27154186b	Merge pull request #4779 from jherico/hmd_tools ... Fix for HMDTools targeting wrong screen on OSX	2015-05-06 10:46:55 -07:00
Bradley Austin Davis	de49057f17	Fix for HMDTools targeting wrong screen on OSX	2015-05-06 10:32:45 -07:00
David Rowe	eb438e9ccb	Can use same clipping calc for non-Oculus	2015-05-06 09:58:14 -07:00
Philip Rosedale	e2541c4243	Merge pull request #4740 from ctrlaltdavid/20518 ... CR for #20518 - Mute camera button next to mute audio button	2015-05-06 09:54:42 -07:00
Sam Gateau	c86a8b3944	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2015-05-06 09:54:08 -07:00
Sam Gateau	dc81a3ecc2	Cube texture are working with the GL backend, useing it in SKybox successfullly	2015-05-06 09:53:36 -07:00
Seth Alves	7a5fe8a34e	quiet compiler	2015-05-06 09:05:13 -07:00
Seth Alves	ff104bb915	Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1	2015-05-06 08:55:06 -07:00
David Rowe	9c1d73747f	Merge branch 'master' into 20526	2015-05-06 08:24:57 -07:00
David Rowe	333da93642	Updated face tracker mute icons	2015-05-05 23:20:23 -07:00
David Rowe	b519884609	Fix lobby not displaying in HMD mode ... This usage of Glower is similar to that in renderAvatarBillboard(). Both may indicate that something needs changing in the graphics pipeline.	2015-05-05 20:54:12 -07:00
David Rowe	1c21874f00	Make face tracker mute action start / stop face tracker	2015-05-05 16:51:31 -07:00
Seth Alves	4a7fe50084	Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1	2015-05-05 16:43:43 -07:00
Andrew Meadows	419cfee775	more correct fix for invalid DeviceProxy crash bug	2015-05-05 15:06:51 -07:00
Andrew Meadows	0d4d5d024e	revert last change (fix for invalid DeviceProxy)	2015-05-05 14:59:22 -07:00
David Rowe	35dbb9491c	Merge branch 'master' into 20518	2015-05-05 13:13:49 -07:00
Seth Alves	8aafce6382	Merge branch 'nova' of github.com:AndrewMeadows/hifi into dice-on-table-1	2015-05-05 12:53:28 -07:00
Sam Gateau	13482575d2	merge	2015-05-05 12:03:45 -07:00
Sam Gateau	6d02d4d25e	adding skybox step by step	2015-05-05 11:40:00 -07:00
Andrew Meadows	00bea4d274	fix crash for NULL deviceProxy	2015-05-05 11:05:28 -07:00
samcake	61f6139f4f	Merge pull request #4764 from ZappoMan/atmosphereInZones ... First cut at adding "Atmosphere" support to zone	2015-05-05 11:00:58 -07:00
Bradley Austin Davis	d2a8681139	Merge branch 'master' into infoview	2015-05-05 10:31:19 -07:00
Andrew Meadows	aa5a59c3dc	merge upstream/master into andrew/nova ... Conflicts: libraries/entities/src/EntityItem.cpp libraries/physics/src/PhysicsEngine.cpp	2015-05-05 10:24:17 -07:00
Philip Rosedale	e9476029fb	Merge pull request #4724 from jherico/menu_polish ... Menu polish	2015-05-04 23:44:06 -07:00
David Rowe	7afd990e2e	Fix Mixamo avatar clipping in HMD view	2015-05-04 22:27:41 -07:00
Philip Rosedale	d52d3513a4	Merge pull request #4768 from jherico/track-camera ... Remove camera wobble caused by having a face tracker enabled	2015-05-04 18:01:47 -07:00
ZappoMan	77232e35f8	Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereInZones	2015-05-04 17:16:33 -07:00
Bradley Austin Davis	dc1b5a262f	Remove camera wobble cause by the face tracker and by idle animations	2015-05-04 17:03:33 -07:00
ZappoMan	32ef0c2010	removed some dead code	2015-05-04 15:49:21 -07:00
ZappoMan	741323e6c1	wire up atmosphere.hasStars property	2015-05-04 14:19:13 -07:00
Sam Gateau	b36775e781	After a very long debate it's clear that we shouldn;t have change the a and d keys behavior, so we bring them back but with a twist, now RIghtButton + A or D strafe right and left making the controller equivalent to everquest, world of warcraft	2015-05-04 13:57:40 -07:00