3285 commits

Author	SHA1	Message	Date
Sam Gateau	653d2e72b1	Skybox kind of working	2015-05-07 11:23:11 -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
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
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
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
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
David Rowe	35dbb9491c	Merge branch 'master' into 20518	2015-05-05 13:13:49 -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
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
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
ZappoMan	4561c59203	wire up zone to environment atmosphere rendering	2015-05-04 13:49:43 -07:00
Bradley Austin Davis	098a9bd70e	Fixing sixense and restoring lookat	2015-05-04 13:10:16 -07:00
Sam Gateau	936eefd4f0	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-05-04 10:41:32 -07:00
Sam Gateau	c7153bcc14	fixing commetns from review	2015-05-04 10:40:11 -07:00
Bradley Austin Davis	fb3e309a64	Merge branch 'master' into plugins_pt1	2015-05-04 10:00:13 -07:00
Sam Gateau	b7bacccce7	Fine tunning on windows	2015-05-04 00:54:54 -07:00
samcake	8e65ce34d1	FINe tune the scales for the Mac Book	2015-05-03 23:47:43 -07:00
samcake	d2e61dba05	Make the nw mapper work for th einputs	2015-05-03 17:34:39 -07:00
Sam Gateau	c9b296693c	bringing the UserInputMapper to the application	2015-05-03 15:45:19 -07:00
Seth Alves	0341caad95	quiet compiler	2015-05-03 11:10:52 -07:00
Brad Davis	e72756ab99	Merge remote-tracking branch 'upstream/master' into plugins_pt1 ... Conflicts: libraries/render-utils/src/TextureCache.cpp	2015-05-02 00:51:50 -07:00
Brad Davis	302aa9db47	Removing access to the gl widget and display managers	2015-05-02 00:49:52 -07:00
Philip Rosedale	d7cc76e48b	Merge pull request #4735 from jherico/menu_fix ... Prevent the menu from coming up when alt is applied as a modifier to touch or mouse events	2015-05-02 00:35:49 -07:00
David Rowe	528f73897c	Make double click face tracking toggle button reset tracking	2015-04-30 23:14:23 -07:00
David Rowe	bc05159504	Add face tracking toggle button beside microphone toggle button	2015-04-30 23:14:22 -07:00
David Rowe	d053379831	Add "Mute Face Tracking" menu item	2015-04-30 23:14:21 -07:00
Brad Davis	57b7be3abe	Prevent the menu from coming up when alt is applied as a modifier to touch or mouse events	2015-04-30 17:43:16 -07:00
Brad Hefta-Gaub	40d2e97d44	Merge pull request #4673 from ctrlaltdavid/20496 ... CR for 20496 - Modify lobby.js to work as avatar selector	2015-04-29 21:51:08 -07:00
Bradley Austin Davis	c4349e797f	Merge remote-tracking branch 'upstream/master' into infoview	2015-04-29 00:15:32 -07:00
Brad Davis	0fb8884f9c	Merge branch 'browser' into infoview ... Conflicts: tests/ui/src/main.cpp	2015-04-28 17:54:04 -07:00
Stephen Birarda	404cd67bb7	Merge pull request #4716 from sethalves/assignment-client-exits ... assignment-client shouldn't try to save contents of its nonexistent address bar	2015-04-28 19:40:44 -04:00
Seth Alves	28ad80936a	assignment-client shouldn't try to save contents of its nonexistent address bar. interface still needs to save the address.	2015-04-28 13:21:14 -07:00
Brad Davis	f467abcf91	Merge branch 'vr_menus' into browser	2015-04-28 01:18:03 -07:00
Brad Davis	9836ffed97	Merge branch 'vr_menus' into infoview ... Conflicts: tests/ui/src/main.cpp	2015-04-28 01:17:51 -07:00
Brad Davis	b4e9dbedbc	Merge remote-tracking branch 'upstream/master' into vr_menus	2015-04-28 00:28:57 -07:00
Brad Davis	f86b9f62b9	Adding key to trigger a browser window	2015-04-27 23:16:35 -07:00
Brad Davis	b0eccc40c2	Fix crash cause when Menu::instance() is before offscreen ui startup	2015-04-27 22:58:09 -07:00