65836 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Rowe	b461a422c6	Merge branch 'master' into 21709	2018-03-09 14:18:42 +13:00
Brad Davis	47b08d7228	Update Hifi icon	2018-03-08 15:38:13 -08:00
John Conklin II	cad53a0203	Merge pull request #12585 from druiz17/small-tablet-changes ... tablet scale and position changes	2018-03-08 15:36:06 -08:00
John Conklin II	fe0d354d26	Merge pull request #12599 from zfox23/RC65_preventSendingEmptyKeys ... RC65: Don't hit certain Commerce backend endpoints when wallet isn't yet auth'd	2018-03-08 15:30:19 -08:00
Alexander Ivash	b427d6c326	FB12956 - Audio Meter Toggle Button Broken	2018-03-09 02:20:34 +03:00
NissimHadar	6026044526	Merge pull request #12558 from NissimHadar/shadowControlsOffZvork ... Shadow control for zones, models and shapes	2018-03-08 15:04:19 -08:00
Cristian Luis Duarte	4c3ee195de	Android - hide joystick when opening the Avatar window and disable it in cases is hidden (it was working with ui windows in front).	2018-03-08 19:58:15 -03:00
Zach Fox	c22d79041d	Cleanup after cherry-pick	2018-03-08 14:35:56 -08:00
howard-stearns	883528488c	clear wallet when picking a new one	2018-03-08 14:35:43 -08:00
Zach Fox	ec6f66ee52	Try this	2018-03-08 14:31:56 -08:00
Zach Fox	747a6b07ce	Fix font loading for MacOS via different font loading method	2018-03-08 14:31:48 -08:00
howard-stearns	9d805283d1	clear wallet when picking a new one	2018-03-08 14:24:44 -08:00
Alexander Ivash	1fb68ec5ca	FB12956 - Audio Meter Toggle Button Broken	2018-03-09 00:55:49 +03:00
Zach Fox	409f5293bf	Try this	2018-03-08 13:51:34 -08:00
Zach Fox	086431d0e7	Merge branch 'master' of github.com:highfidelity/hifi into fixFontsAgain	2018-03-08 13:50:19 -08:00
John Conklin II	260715d616	Merge pull request #12580 from elisa-lj11/RC65-blocks-image-bug ... Fixed blocks importer textures being interpreted as image entities	2018-03-08 13:33:41 -08:00
Zach Fox	b273d78729	Don't hit certain Commerce backend endpoints when wallet isn't yet auth'd	2018-03-08 13:18:02 -08:00
Zach Fox	22f18dbf56	Don't hit certain Commerce backend endpoints when wallet isn't yet auth'd	2018-03-08 13:12:13 -08:00
Dante Ruiz	9f246ea314	Merge branch 'master' of github.com:highfidelity/hifi into use-correct-audio-api	2018-03-08 13:04:02 -08:00
John Conklin II	c5514f5120	Merge pull request #12570 from dback2/RC65 ... Redo entity scale handles to fix scaling into avatars causing undesirable physics/dimensions	2018-03-08 12:58:08 -08:00
Stephen Birarda	2158acecf4	tell cmake we are fine ignoring generated for CMP0071	2018-03-08 12:39:40 -08:00
NissimHadar	fda32e4aa4	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-08 12:16:36 -08:00
NissimHadar	a703b5a3b5	Added check to correct crashing when selecting ambient occlusion from menu.	2018-03-08 12:15:26 -08:00
NissimHadar	d1b87b3116	Added missing avatar shadows.	2018-03-08 12:14:42 -08:00
Zach Fox	a479439b23	Merge pull request #12572 from zfox23/sendMoney_connectionInstructions ... Show Connection instructions in Send Money when 0 connections	2018-03-08 11:20:23 -08:00
Zach Fox	d0cc64f63d	Fix font loading for MacOS via different font loading method	2018-03-08 11:19:49 -08:00
Brad Hefta-Gaub	d2e264ab32	Merge pull request #12583 from samcake/punk ... Fix Local lights not showing anymore	2018-03-08 10:31:58 -08:00
Sam Gondelman	1e9cfe29f2	Merge pull request #12388 from highfidelity/android ... Android Tip	2018-03-08 10:18:35 -08:00
John Conklin II	1341774450	Merge pull request #12482 from SimonWalton-HiFi/declare-metatype ... Add a Q_DECLARE_METATYPE in TextureCache.	2018-03-08 09:37:06 -08:00
John Conklin II	3e9e55c3db	Merge pull request #12591 from zfox23/RC65_fixUncertifiedPurchases ... Don't default unknown Marketplace item types to 'Entity'	2018-03-08 09:36:28 -08:00
David Back	554c37d14b	removed undefined event checks in scaling	2018-03-07 19:34:08 -08:00
David Rowe	b1bda281ee	Merge branch 'master' into 21776	2018-03-08 15:36:10 +13:00
David Back	9681f0eb77	restore old scale math, disable avatar collisions while scaling	2018-03-07 18:20:26 -08:00
NissimHadar	7052ea3769	Merge branch 'master' of github.com:highfidelity/hifi into addRecursionToAutotester	2018-03-07 17:46:14 -08:00
NissimHadar	a4854839a4	Enable user selection of destination folder when creating a test.	2018-03-07 17:45:10 -08:00
Clément Brisset	b7ac07f590	Merge pull request #12589 from highfidelity/RC65 ... merge back RC65 to master after RC hotfixes	2018-03-07 17:22:41 -08:00
Ryan Huffman	004e15d2d9	Update ATP to be optional in ResourceManager for OBJBaker	2018-03-07 16:31:41 -08:00
Ryan Huffman	975f0bfbd2	Fix OBJBaker not correctly waiting until all assets have been baked to finish	2018-03-07 16:30:23 -08:00
David Rowe	d4487e92b8	Further JSDoc tweaks	2018-03-08 12:23:13 +13:00
Zach Fox	16e39f3637	Don't default unknown Marketplace item types to 'Entity'	2018-03-07 15:07:17 -08:00
Zach Fox	a0eb7e0712	Don't default unknown Marketplace item types to 'Entity'	2018-03-07 15:01:12 -08:00
John Conklin II	fcb2f358f8	Merge pull request #12579 from SimonWalton-HiFi/RC65 ... Fix for avatar record only replaying once	2018-03-07 14:55:03 -08:00
Cristian Luis Duarte	321896142c	Android - Make it possible to look around and move with touchscreen controls. Zoom-in not in 'My View' mode.	2018-03-07 19:52:15 -03:00
Sam Gondelman	f51a35455a	Merge pull request #12515 from SamGondelman/scriptableMaterials ... Material reflection	2018-03-07 14:29:31 -08:00
David Rowe	e2bf84224a	Add further examples.	2018-03-08 10:59:12 +13:00
SamGondelman	96e48a0162	warnings	2018-03-07 13:50:51 -08:00
Elisa Lupin-Jimenez	2987c90f96	fixed syntax for ubuntu	2018-03-07 13:48:35 -08:00
SamGondelman	0aacdcd558	docs	2018-03-07 13:34:48 -08:00
NissimHadar	b47b512ab9	Completed recursive creation of recursive scripts.	2018-03-07 13:25:40 -08:00
Elisa Lupin-Jimenez	9ae2da7e4b	fixed logic for texture files/non-models	2018-03-07 13:18:36 -08:00