81650 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
dante ruiz	0797e154a1	first round of review changes	2019-10-28 13:41:15 -07:00
sabrina-shanman	993aa06301	Let hfm prep calculate OBJ model extents	2019-10-28 13:05:27 -07:00
sabrina-shanman	9fd76cac84	Fix FBX UpAxis transform not being applied to skinned models	2019-10-28 11:50:53 -07:00
Zach Fox	0afcb67c41	Merge pull request #16415 from zfox23/caseInsensitiveEmoteShortcuts ... DEV-2574: Make emote shortcuts case-insensitive	2019-10-28 11:50:09 -07:00
Amer	e61d9f3091	Merge pull request #16409 from amerhifi/dev-2450 ... case dev 2286: Wireless headphones crash due to missing device	2019-10-28 11:39:04 -07:00
Zach Fox	bda1e3f696	Merge pull request #16398 from RebeccaStankus/grayEmoteWindow ... Gray emote window	2019-10-28 11:37:17 -07:00
Zach Fox	c578eb2d9b	DEV-2574: Make emote shortcuts case-insensitive	2019-10-28 11:24:42 -07:00
sabrina-shanman	3de61b4a18	Properly calculate shape extents for FBX aside from geometricTransform/upAxis, speed up model extents calculation	2019-10-28 10:59:44 -07:00
Shannon Romano	316bdc83ae	Merge pull request #16414 from MiladNazeri/serverConsoleFix ... Server console fix	2019-10-28 10:46:27 -07:00
amer cerkic	f1f67f1996	android build fix	2019-10-28 10:42:25 -07:00
Zach Fox	c4e83e553f	Merge pull request #16408 from zfox23/autoLowerHandIfTalking ... DEV-2575: Automatically lower raised hand if talking	2019-10-28 10:00:08 -07:00
danteruiz	761ca1c2f5	Merge branch 'qt-launcher' of github.com:danteruiz/hifi into qt-launcher	2019-10-28 09:41:05 -07:00
danteruiz	afbb16ea78	undo some changes	2019-10-28 09:40:48 -07:00
milad	2059168bd3	switched to arrow functions	2019-10-28 09:05:38 -07:00
milad	c672213a88	quieted warning	2019-10-28 09:03:52 -07:00
Oren Hurvitz	35082a730e	Changed the desktop sprint speed to 2.0. ... This change will not actually be felt by users, because the speed was already effectively 2.0 (because the sprint speeds for Desktop and HMD were reversed).	2019-10-27 09:35:16 +02:00
Oren Hurvitz	62e5b50e24	Fixed the sprint speeds of Desktop vs HMD (they were flipped)	2019-10-27 09:33:59 +02:00
Simon Walton	6bceba7300	Use real avatar URL for verification rather than possible stolen-woody	2019-10-25 16:29:05 -07:00
amerhifi	8dc13ec242	fixed mac param spacing	2019-10-25 16:01:24 -07:00
dante ruiz	3c834fa598	Merge branch 'master' of github.com:highfidelity/hifi into qt-launcher	2019-10-25 15:52:32 -07:00
dante ruiz	c39e5a0ea8	qt entitlements for mac	2019-10-25 15:52:12 -07:00
amerhifi	397586bd19	setting defauld device code for mac to use QT with optional backup to platform code on failure	2019-10-25 15:19:24 -07:00
Shannon Romano	20282571ee	Merge pull request #16407 from hyperlogic/bug-fix/unused-avatar-transit-vars ... Fix for unused avatar transit warnings on mac and linux NEED THIS!	2019-10-25 15:15:14 -07:00
Zach Fox	4f7028ff0f	DEV-2575: Automatically lower raised hand if talking	2019-10-25 14:05:29 -07:00
Anthony J. Thibault	8cf58f2034	Fix for unused avatar transit warnings on mac and linux ... This was introduced by PR #16403 https://github.com/highfidelity/hifi/pull/16403	2019-10-25 13:56:12 -07:00
amerhifi	6860ac9693	fix missing default device	2019-10-25 13:09:13 -07:00
amerhifi	3e1f341225	typo fix	2019-10-25 12:50:13 -07:00
amerhifi	52637320f0	mac build fix	2019-10-25 12:49:03 -07:00
amerhifi	358f042f32	Merge branch 'master' into dev-2450	2019-10-25 12:12:10 -07:00
amerhifi	49465b1b96	null default device	2019-10-25 12:10:26 -07:00
Sabrina Shanman	c5884fd585	Merge pull request #16405 from highfidelity/master ... Merge master into instancing	2019-10-25 10:28:57 -07:00
danteruiz	bc207638a5	Merge branch 'master' of github.com:highfidelity/hifi into qt-launcher	2019-10-25 10:15:39 -07:00
danteruiz	6a51584356	Merge branch 'qt-launcher' of github.com:danteruiz/hifi into qt-launcher	2019-10-25 10:13:37 -07:00
danteruiz	58a3cf6e67	finishing qt-lite build info	2019-10-25 10:13:23 -07:00
Shannon Romano	c650ca6544	Merge pull request #16403 from hyperlogic/bug-fix/remove-avatar-transit-log-spam ... Remove AvatarTransit log spam	2019-10-25 10:12:17 -07:00
sabrina-shanman	77dcad21db	Fix OBJSerializer crash with empty groupMaterialName	2019-10-25 09:56:27 -07:00
sabrina-shanman	fa51ec3daf	(WIP) (has debug) Fix baked FBX materials	2019-10-25 09:56:27 -07:00
Sabrina Shanman	e74de214e2	Merge pull request #16404 from highfidelity/master ... Merge master into instancing	2019-10-25 09:55:44 -07:00
Amer	42234b119f	Merge pull request #16381 from amerhifi/amer-dev471-re ... case Dev 471: HMD default audio behavior	2019-10-24 16:23:14 -07:00
Sabrina Shanman	b49c1b615d	Merge pull request #16402 from sabrina-shanman/instancing_gltf ... (DEV-561) GLTF fixes	2019-10-24 15:53:56 -07:00
Anthony J. Thibault	a67904212d	Remove AvatarTransit log spam	2019-10-24 15:52:44 -07:00
sabrina-shanman	4e0db5d641	Fix build warnings	2019-10-24 15:49:03 -07:00
sabrina-shanman	83229db458	Fix GLTFSerializer not reading tangents	2019-10-24 15:49:03 -07:00
sabrina-shanman	1fe1321b6c	Disable GLTF skinning	2019-10-24 15:48:59 -07:00
Shannon Romano	15f27e53cb	Merge pull request #16372 from ctrlaltdavid/DEV-2055 ... DEV-2055: Sanitize LODManager.setWorldQualityDetail() parameter value	2019-10-24 15:20:34 -07:00
amerhifi	5dd5447095	moved call to hmd device name prior to locking device mutex	2019-10-24 15:03:55 -07:00
Rebecca Stankus	9a8fda2705	Feedback changes	2019-10-24 12:07:34 -07:00
Rebecca Stankus	f8102be74d	Added a timeout to update the content holder parent after interactive window has finished loading	2019-10-24 12:07:25 -07:00
Rebecca Stankus	8e8c157567	Debugging stuff	2019-10-24 12:07:20 -07:00
Rebecca Stankus	83a6155592	Added tons of logging to debug interactive window	2019-10-24 12:06:49 -07:00