24883 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
ZappoMan	496da6fcd5	wire up the skybox color property to the new skybox renderer	2015-05-06 20:36:06 -07:00
ZappoMan	af2c3d91cf	Merge branch 'master' of https://github.com/highfidelity/hifi into skyboxPropertiesInZones	2015-05-06 18:05:54 -07:00
Stephen Birarda	e3490838de	Merge pull request #4787 from jherico/flipped_icons ... Fix inverted icons	2015-05-06 20:25:43 -04:00
Bradley Austin Davis	3b8108e887	Fix inverted icons	2015-05-06 16:09:17 -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
Philip Rosedale	cd4cc30a34	Merge pull request #4783 from thoys/20522 ... CR for Job #20522 - Make Jenga	2015-05-06 15:14:58 -07:00
ZappoMan	b7dfbd103a	Merge branch 'master' of https://github.com/highfidelity/hifi into skyboxPropertiesInZones	2015-05-06 14:41:53 -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
Thijs Wenker	477447b95f	Planky game script	2015-05-06 23:36:44 +02:00
Seth Alves	719747ee2d	Merge pull request #4725 from howard-stearns/objReader ... Textures for .obj reader:	2015-05-06 14:30:29 -07:00
Brad Hefta-Gaub	cb4a76a5cd	Merge pull request #4758 from jherico/plugins_pt1 ... Display Plugins Prep - Part 1	2015-05-06 14:27:09 -07:00
Sam Gateau	8fd77f964c	Fix include filke case for ubuntu...	2015-05-06 14:23:42 -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	00c45dbb43	missing includes	2015-05-06 12:38:12 -07:00
Howard Stearns	35337ef2c2	Spell out order-of-evaluation for the compiler.	2015-05-06 12:28:45 -07:00
Sam Gateau	0fbccf1d33	get ready for PR, SKY_DOME by default	2015-05-06 12:22:19 -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
samcake	06e1330e42	Clean up the includes in gpu, make the skybox shader works	2015-05-06 12:12:54 -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
Brad Davis	a9de502e76	removing commented out old implementation.	2015-05-06 12:03:47 -07:00
Brad Hefta-Gaub	e1db23887a	Merge pull request #4781 from jherico/off_axis ... Removing off-axis projection from menu	2015-05-06 11:59:59 -07:00
Howard Stearns	d2dbb2c116	Missing the code!	2015-05-06 11:57:34 -07:00
Bradley Austin Davis	fc73676b4d	Merge branch 'master' into plugins_pt1	2015-05-06 11:43:25 -07:00
ZappoMan	f2ebb6e821	fix output of group names to be lowercase	2015-05-06 11:30:41 -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
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
samcake	50012ee9de	fixing build issues on MAc	2015-05-06 11:00:37 -07:00
ZappoMan	edb84a1a14	Merge branch 'master' of https://github.com/highfidelity/hifi into skyboxPropertiesInZones	2015-05-06 10:52:04 -07: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
Howard Stearns	e9c76da8d4	Merge branch 'master' of https://github.com/highfidelity/hifi into objReader	2015-05-06 10:30:10 -07:00
Sam Gateau	fe3b5d1867	preparing for PR, back to the default background mode SKy_DOME	2015-05-06 10:27:31 -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
Brad Hefta-Gaub	410baa6ac0	Merge pull request #4778 from ctrlaltdavid/20525 ... CR for 20525 - Fix lobby not displaying in HMD mode	2015-05-06 08:34:32 -07:00
David Rowe	9c1d73747f	Merge branch 'master' into 20526	2015-05-06 08:24:57 -07:00
Clément Brisset	0470e72459	Merge pull request #4777 from cozza13/20529 ... CR for Job #20529 - Change defaulscripts.js	2015-05-06 16:12:22 +02: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
Chris Collins	7396bb138d	Removed headmove ... removed head move, it is not being used by Oculus users at the moment	2015-05-05 16:52:38 -07:00
Seth Alves	e637a9b5ae	Merge pull request #4776 from PhilipRosedale/master ... dice don't go away unless 'X' key is clicked, harmonicOscillator.js	2015-05-05 16:52:35 -07:00
David Rowe	1c21874f00	Make face tracker mute action start / stop face tracker	2015-05-05 16:51:31 -07:00
samcake	5f19141050	Merge pull request #4773 from AndrewMeadows/bispinor ... fix crash in UserInputMapper::update() for invalid DeviceProxy	2015-05-05 15:18:16 -07:00
Philip Rosedale	5fb79df4c9	dice don't go away unless 'X' key is clicked, added harmonicOscillator test script	2015-05-05 15:18:16 -07:00