24206 commits

Author	SHA1	Message	Date
vladest	33e70be18a	Merge branch 'master' into move_to_qqc2	2018-03-12 18:55:29 +01:00
vladest	405951e411	Fix merge conflict	2018-03-10 14:45:20 +01:00
vladest	fe5d7463fe	Merge branch 'master' into move_to_qqc2	2018-03-10 14:42:51 +01:00
samcake	10016756b7	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-03-09 16:32:37 -08:00
samcake	c78df4d967	Setting the correct Job config for ssao check box and fixing typo	2018-03-09 15:41:56 -08:00
samcake	fec30b8363	Fixing the menu for Shadow and AO to do the correct path to engine config	2018-03-09 15:04:14 -08:00
John Conklin II	42a686ad93	Merge pull request #12578 from druiz17/use-correct-audio-api ... use correct scripting api for audio in Audio.qml	2018-03-09 13:41:20 -08:00
samcake	10447bf10e	Fix the fact that all avatars should cast shadows, not just MyAvatar. since this is always a SkeletonMOdel class let s just turn it on by default there	2018-03-09 13:04:04 -08:00
Sam Gateau	d0de5b2d96	Merge pull request #12496 from AndrewMeadows/faster-raypick ... faster per-entity raypick culling and time-boxed picks	2018-03-09 13:01:52 -08:00
Dante Ruiz	e21c4988fb	stereo checkbox text change	2018-03-09 10:11:25 -08:00
Dante Ruiz	3a39fca268	made requested changes	2018-03-09 10:09:51 -08:00
John Conklin II	6969f014fc	Merge pull request #12601 from howard-stearns/clear-wallet-when-picking-a-new-one ... clear wallet when picking a new one	2018-03-09 10:09:41 -08:00
Zach Fox	2b137f94a6	Merge pull request #12596 from zfox23/fixFontsAgain ... Fix font loading for MacOS via completely different font loading method	2018-03-09 09:49:56 -08:00
Dante Ruiz	c49d0557fc	fixing check box issues	2018-03-09 09:29:37 -08:00
Brad Hefta-Gaub	5437ffb2c8	Merge pull request #12536 from ctrlaltdavid/21700 ... Remove deprecated Window.openFileChanged() signal from API	2018-03-09 08:47:57 -08:00
Dante Ruiz	8703e9e002	Merge branch 'master' of github.com:highfidelity/hifi into use-correct-audio-api	2018-03-09 08:42:50 -08:00
Andrew Meadows	9fbe7ec194	time-box Picks and solve in round-robin sequence	2018-03-09 08:35:18 -08:00
Atlante45	69fb830480	Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master	2018-03-08 17:23:17 -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
howard-stearns	9d805283d1	clear wallet when picking a new one	2018-03-08 14:24:44 -08: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	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
NissimHadar	fda32e4aa4	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-08 12:16:36 -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
Sam Gondelman	1e9cfe29f2	Merge pull request #12388 from highfidelity/android ... Android Tip	2018-03-08 10:18:35 -08:00
Zach Fox	a0eb7e0712	Don't default unknown Marketplace item types to 'Entity'	2018-03-07 15:01:12 -08:00
Sam Gondelman	f51a35455a	Merge pull request #12515 from SamGondelman/scriptableMaterials ... Material reflection	2018-03-07 14:29:31 -08:00
Elisa Lupin-Jimenez	2987c90f96	fixed syntax for ubuntu	2018-03-07 13:48:35 -08:00
Elisa Lupin-Jimenez	9ae2da7e4b	fixed logic for texture files/non-models	2018-03-07 13:18:36 -08:00
Elisa Lupin-Jimenez	28589094c2	hopefully fixed mac/ubuntu builds	2018-03-07 10:18:40 -08:00
Dante Ruiz	2d448d7208	tablet scale and position changes	2018-03-07 10:02:35 -08:00
Dante Ruiz	13767beece	Caps change	2018-03-07 08:19:36 -08:00
Brad Hefta-Gaub	9595049e01	Merge pull request #12582 from thoys/fix/JSDOCtypo ... fix JSDOC typo rule -> role	2018-03-07 07:50:07 -08:00
Elisa Lupin-Jimenez	c6e5f4c9c8	zip file drags don't auto add model textures	2018-03-06 19:24:09 -08:00
Thijs Wenker	866bec0b34	rule -> role	2018-03-07 02:36:07 +01:00
Cristian Luis Duarte	bde2ba9272	Merge remote-tracking branch 'gcgithub/android_bubble_fix' into android_experimental_joystick_fixed	2018-03-06 22:02:23 -03:00
Elisa Lupin-Jimenez	251e4a3127	Fixed blocks importer textures being interpreted as image entities	2018-03-06 16:44:23 -08:00
NissimHadar	d72f46ec3e	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-06 16:24:53 -08:00
Zach Fox	04a230c20f	Merge pull request #12491 from ElderOrb/FB12523 ... fix for not re-enabling preview on leaving security-sensitive pages in marketplace	2018-03-06 16:19:39 -08:00
Dante Ruiz	97d283cc5f	use correct api call for audio and correct function call to set stereo input mode	2018-03-06 16:17:27 -08:00
Atlante45	edeed95ccc	Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master	2018-03-06 15:33:12 -08:00
NissimHadar	dbf1be5de3	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-06 15:22:40 -08:00
Gabriel Calero	a2327ea0cf	Merge branch 'android' into android_bubble_fix	2018-03-06 19:03:53 -03:00
Gabriel Calero	069d3e40bc	Merge branch 'android' into android_bubble_fix	2018-03-06 18:58:49 -03:00