24802 commits

Author	SHA1	Message	Date
Zach Fox	7b3a6f9967	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-20 13:28:03 -07:00
Ryan Huffman	de195dd844	Merge pull request #11585 from huffman/fix/draco-material-ids ... Fix baking bug with single-part FBX + multiple materials	2017-10-20 11:32:31 -07:00
Zach Fox	9e68e805a0	Get marketplace public key from backend	2017-10-20 10:38:59 -07:00
Zach Fox	c99e803ab7	Error handling	2017-10-19 17:19:37 -07:00
Zach Fox	74180bc4cd	Implement static cert verification correctly	2017-10-19 16:39:13 -07:00
Zach Fox	0dc6211a7d	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-19 14:43:33 -07:00
Stephen Birarda	23563cca47	Merge pull request #11592 from birarda/bug/ignore-dds-in-fbx ... ignore unbakeable textures in FBXBaker	2017-10-19 15:51:41 -05:00
Daniela	832e30ad1c	Edited Packet headers.	2017-10-19 19:53:47 +01:00
Zach Fox	9537e19ad4	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-19 10:58:55 -07:00
Seth Alves	89ce9e6367	Merge pull request #11614 from sethalves/fix-others-adjusting-hats ... handle camera-relative controller joints for other avatars	2017-10-19 08:10:04 -07:00
Melissa Brown	1a3821e984	Merge pull request #11591 from ctrlaltdavid/21568 ... Add some Quat and Uuid JavaScript helper properties	2017-10-18 22:07:06 -07:00
Sam Gateau	4d7accabdf	Merge pull request #11439 from NissimHadar/hazeZone ... Adding haze component to the zone entity.	2017-10-18 16:14:28 -07:00
Zach Fox	a669aff453	Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171018	2017-10-18 10:45:30 -07:00
John Conklin II	08cfa32858	Merge pull request #11610 from ElderOrb/case8217_RC57 ... 8217 Search in tablet doesn't update (RC-57)	2017-10-18 10:41:33 -07:00
Zach Fox	3f0b08aea8	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-18 10:37:47 -07:00
Nissim	fe286aff83	Andrew's corrections (per coding standard).	2017-10-18 08:42:07 -07:00
David Rowe	f31e014e8b	Quat.ZERO --> Quat.IDENTITY	2017-10-18 20:34:55 +13:00
beholder	e8589d53dd	updated code based on code review	2017-10-18 03:45:50 +03:00
Andrew Meadows	25818fc5e9	Merge pull request #11613 from jherico/feature/qml_whitelist ... Support for custom functionality for specific QML URLs	2017-10-17 17:34:22 -07:00
Seth Alves	aaf3c24a44	handle camera-relative controller joints for other avatars	2017-10-17 12:36:15 -07:00
Nissim	d53aadc617	Merge branch 'master' into hazeZone	2017-10-17 12:13:40 -07:00
Bradley Austin Davis	f53a74b515	Support for custom functionality for specific QML URLs	2017-10-17 11:53:30 -07:00
Nissim	5a1c4d5a30	Fixed gcc warning.	2017-10-17 11:08:15 -07:00
John Conklin II	31b8013ed9	Merge pull request #11538 from kencooke/audio-mac-bugfix2 ... Additional cleanup of audio noise gate	2017-10-17 11:02:55 -07:00
Nissim	3e228acdb6	Fixed gcc warning.	2017-10-17 10:41:49 -07:00
Nissim	afa93f46e5	Merge branch 'master' into hazeZone	2017-10-17 09:28:07 -07:00
Nissim	a641d6de66	Variable rename.	2017-10-17 09:18:29 -07:00
David Rowe	ed1c974f75	Use MyAvatar.SELF_ID instead of Uuid.SELF	2017-10-17 15:58:51 +13:00
David Rowe	1e3a2b3e4e	Merge branch 'master' into 21568	2017-10-17 15:15:49 +13:00
Nissim	072ac13120	Fixed gcc warnings.	2017-10-16 17:12:59 -07:00
Brad Hefta-Gaub	b0fc050fe2	Merge pull request #11586 from Zvork/hdrcube ... HDR cube map equirectangular bug fix	2017-10-16 16:49:20 -07:00
Brad Hefta-Gaub	c1ce84b060	Merge pull request #11602 from kencooke/audio-startup-fix ... Fix loud screeching sound when certain users join a domain	2017-10-16 16:47:42 -07:00
John Conklin II	42a018c2c5	Merge pull request #11606 from ElderOrb/case8213 ... 8213 Keyboard Input Field: Reveals Passwords (RC-57)	2017-10-16 16:14:43 -07:00
beholder	fa7892e5c6	8217 Search in tablet doesn't update	2017-10-17 02:02:21 +03:00
Zach Fox	e1b0e5a2dd	Move some include files around	2017-10-16 16:00:32 -07:00
Zach Fox	a4b8bf0be6	Bugfixes and CR	2017-10-16 15:33:10 -07:00
Brad Hefta-Gaub	c4e672d6b8	Merge pull request #11582 from ElderOrb/case8213 ... 8213 Keyboard Input Field: Reveals Passwords	2017-10-16 14:57:18 -07:00
Nissim	1b42572f99	Merge branch 'hazeZone' of https://github.com/NissimHadar/hifi into hazeZone ... # Conflicts: # scripts/system/html/js/entityProperties.js	2017-10-16 14:29:56 -07:00
Zach Fox	3c572b0f7a	Fix deadlock	2017-10-16 13:41:39 -07:00
Zach Fox	960f1fbfe4	Still broken, but safer	2017-10-16 13:28:14 -07:00
Nissim	fd2b0da76d	First version.	2017-10-16 12:20:31 -07:00
Ken Cooke	bd82f47c66	Remove debug logging	2017-10-16 12:11:50 -07:00
Ken Cooke	7c14d5bbdf	Remove debug logging	2017-10-16 11:43:52 -07:00
Ken Cooke	a702c5a0e4	Fix audio glitches caused by initial burst of SelectedAudioFormat packets. ... Temporary codec mismatch is expected during audio codec startup, due to packets already in-flight.	2017-10-16 11:41:40 -07:00
Zach Fox	552defb418	Change protocol version	2017-10-16 11:23:34 -07:00
Nissim	45ffd3bd58	Merge branch 'master' into hazeZone	2017-10-16 11:01:33 -07:00
Nissim	0a5302ce25	Merge branch 'master' of https://github.com/highfidelity/hifi	2017-10-16 11:01:13 -07:00
Nissim	e51b8047f1	Corrected gcc warning.	2017-10-16 11:00:10 -07:00
Zach Fox	febc725520	Merge branch 'RC-57' of https://github.com/highfidelity/hifi into pop_dynamicTests57	2017-10-16 09:53:15 -07:00
beholder	f83040c572	updating code accordingly to the comments	2017-10-14 12:29:06 +03:00