24829 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Bradley Austin Davis	351246fac1	Fixing new image texture use from last upstream merge	2015-05-06 12:50:20 -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
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
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
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
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
Andrew Meadows	419cfee775	more correct fix for invalid DeviceProxy crash bug	2015-05-05 15:06:51 -07:00
Andrew Meadows	bbb8e2e076	merge upstream/master into andrew/bispinor	2015-05-05 15:00:19 -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
samcake	7ee4a1baca	Merge pull request #4774 from ZappoMan/atmosphereInZones ... change skyboxMode to backgroundMode	2015-05-05 12:54:35 -07:00
ZappoMan	5fc5df7c55	change skyboxMode to backgroundMode	2015-05-05 12:38:44 -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	fbee3c1782	Clearing a GL error from Qt internals that triggers an assert	2015-05-05 10:49:12 -07:00
Bradley Austin Davis	d2a8681139	Merge branch 'master' into infoview	2015-05-05 10:31:19 -07:00
Leonardo Murillo	fa9dfbe073	Merge pull request #4769 from birarda/master ... handle the case where a symlink replaces a copy	2015-05-05 10:31:29 -06: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	4dfc329af2	Merge pull request #4770 from ericrius1/mouseGrab ... added rotation ability to grab script	2015-05-04 21:22:05 -07:00
ZappoMan	4422c63c79	another sample for changing atmosphere properties	2015-05-04 20:31:37 -07:00
ZappoMan	4b9c6728e7	fix issue with skyboxMode getting randomly set	2015-05-04 18:58:35 -07:00
Eric Levin	39efde7e8c	added rotation ability to grab script	2015-05-04 18:14:46 -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
Stephen Birarda	b28e7cc765	handle case where a symlink replaces copy	2015-05-04 17:46:03 -07:00
Andrew Meadows	457ae5b0dd	Merge pull request #4763 from ericrius1/quatHelpers ... added axis and angle helper methods to Quat class- script user can now g...	2015-05-04 17:22:52 -07:00
ZappoMan	8b3b32c70d	add example	2015-05-04 17:21:50 -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
Seth Alves	bdfdc8c016	Merge pull request #4767 from birarda/master ... fix objects below array in JSONBreakableMarshal	2015-05-04 16:57:15 -07:00
Eric Levin	6a987fdaf5	now conforming to coding standards	2015-05-04 16:40:04 -07:00
ZappoMan	3f8c52cdd4	attempt to fix unix build buster	2015-05-04 16:36:38 -07:00
Stephen Birarda	00b8c937c7	remove spacing change in AudioMixerClientData	2015-05-04 16:34:50 -07:00