61951 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
samcake	6fab8df8d2	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-09-08 09:13:29 -07:00
David Kelly	db0ecb61fd	Merge pull request #11325 from davidkelly/dk/UserHfcAccountRework ... Use new hfc account endpoint	2017-09-08 09:03:53 -07:00
Daniela	758f049f30	Correct offset for teleport pad.	2017-09-08 14:02:26 +01:00
David Kelly	45c8dd9dd4	cr feedback	2017-09-08 05:28:41 -07:00
Daniela	10e29d1cf0	Decrease offset for teleport pad. Add Bubble orientation and scale correction.	2017-09-08 12:45:29 +01:00
Daniela	fde5e14c04	Merge branch 'feature/ant-man' of https://github.com/hyperlogic/hifi into feature/ant-man	2017-09-08 11:54:43 +01:00
Daniela	9eb429b25a	Fix offset for teleport pad.	2017-09-08 11:23:19 +01:00
Olivier Prat	d6d36cbd43	Outline working on voxels	2017-09-08 11:14:06 +02:00
vladest	832e4aa5eb	Introducong tablet audio events	2017-09-08 09:51:10 +02:00
David Rowe	03ddf04140	Merge branch 'master' into vr-edit-a	2017-09-08 16:51:12 +12:00
David Kelly	bb07a586ca	warning, plus salting passphrase now	2017-09-07 19:24:31 -07:00
Cain Kilgore	b953c49461	Commit for Better Logger - WL 21537	2017-09-08 03:20:55 +01:00
Stephen Birarda	3cf77f377c	remove FBX SDK from CMake files	2017-09-07 18:46:44 -07:00
Stephen Birarda	b153d1e177	use FBXReader/FBXWriter for texture baking in FBXBaker	2017-09-07 18:38:29 -07:00
David Kelly	efdc340c5c	Use new hfc account endpoint	2017-09-07 18:15:04 -07:00
samcake	73ec095235	fooling around with communicating the update transform to render thread through a trasnaction, not the solution yet	2017-09-07 17:58:16 -07:00
Melissa Brown	cb2911f3e0	Merge pull request #11305 from cain-kilgore/delete-test-plan ... Deleted unnecessary Test Plan 2.docx	2017-09-07 16:59:53 -07:00
Anthony J. Thibault	7ca498dc7f	Entities created from Google Blocks zip files now are positioned/scaled relative to the avatar.	2017-09-07 16:28:08 -07:00
David Rowe	70581ebbc1	Fix handle scaling's scaling and positioning of entities	2017-09-08 10:43:43 +12:00
Anthony J. Thibault	f4f9c29bff	Fix for avatar scale preferences	2017-09-07 15:30:16 -07:00
Anthony J. Thibault	d0f9a20a01	Fix for tablet grabbing at small scales	2017-09-07 15:10:15 -07:00
Bradley Austin Davis	eb8b892571	Various Mac fixes	2017-09-07 14:45:35 -07:00
druiz17	ef050a09f9	made requested changes and also allow entities/overlays to be grabbed by the grip button	2017-09-07 14:42:46 -07:00
Bradley Austin Davis	37b184d982	Fix crashes in entity rendering on OSX	2017-09-07 14:32:50 -07:00
Ryan Huffman	7214f57376	Update FBXBaker::exportScene with FBXWriter	2017-09-07 14:12:15 -07:00
Ryan Huffman	b60d68c714	Replace FBX SDK loading of file in FBXBaker with FBXReader	2017-09-07 14:00:09 -07:00
Ryan Huffman	49e09f4838	Remove FBXBaker and TextureBaker from oven	2017-09-07 13:12:07 -07:00
Ryan Huffman	7a55c867be	Fix _fbxNode rename to _rootNode in FBXReader	2017-09-07 12:56:46 -07:00
Ryan Huffman	aa1aad0a09	Add FBXWriter for serializing FBXNode	2017-09-07 12:56:36 -07:00
Brad Hefta-Gaub	ca00349abc	Merge pull request #11248 from birarda/feat/install-remember-custom ... remember if express or custom was selected for install	2017-09-07 12:43:01 -07:00
Brad Hefta-Gaub	6a1fe81832	Merge pull request #11210 from AndrewMeadows/mtwabp-OctreeSendThread-002 ... split packet construction from packet sending in OctreeSendThread	2017-09-07 12:36:29 -07:00
Brad Hefta-Gaub	b316f366fc	Merge pull request #11198 from druiz17/oculus-tablet-position ... fixed tablet spawn position for oculus menu button	2017-09-07 12:30:33 -07:00
Stephen Birarda	bd36ba19b3	fix dereference of end iterator	2017-09-07 12:07:58 -07:00
Stephen Birarda	e4de869db6	fix iterator find from merge	2017-09-07 12:07:58 -07:00
Stephen Birarda	1508edb459	use store/load to be clearer about atomics	2017-09-07 12:07:58 -07:00
Stephen Birarda	7859b3b11f	remove image compression choices from Interface settings	2017-09-07 12:07:57 -07:00
Stephen Birarda	e25b4700d9	re-set defaults in texture baking when AssetServer done	2017-09-07 12:07:57 -07:00
Stephen Birarda	26b74db864	enable compression in image library from Asset Server	2017-09-07 12:07:57 -07:00
Stephen Birarda	5e1decb02b	Merge branch 'master' of github.com:highfidelity/hifi into feat/auto-bake	2017-09-07 12:06:53 -07:00
Thijs Wenker	e2229b3c38	Merge pull request #11302 from cain-kilgore/21523 ... WL 21523 - Update text in the "How to Quit The Sandbox" Prompt	2017-09-07 21:04:34 +02:00
Chris Collins	12d720805c	Merge pull request #11319 from jherico/async_qml_load_crash ... Fix potential crash on asynchronous QML loads	2017-09-07 12:03:10 -07:00
Brad Hefta-Gaub	c5098abfb9	Merge pull request #10937 from kencooke/zzmp-audio/peak-values ... Add peak values for all input devices in selection dialog	2017-09-07 11:58:50 -07:00
Brad Hefta-Gaub	3b16ebcc90	Merge pull request #11287 from jherico/vcpkg_ssl ... Migrate to vcpkg version of OpenSSL	2017-09-07 11:53:09 -07:00
Daniela	d11a749365	Refactor 1 line. Pad alignment is correct.	2017-09-07 19:28:36 +01:00
Brad Hefta-Gaub	7cce45017b	Merge pull request #11244 from birarda/bug/ice-dns-fail ... add a timeout for ICE server DNS lookup	2017-09-07 11:09:05 -07:00
Cain Kilgore	84f37b9663	Changed string name	2017-09-07 18:53:05 +01:00
Daniela	94e26a554d	Add 180 degrees rotation so that pad faces the avatar	2017-09-07 18:48:20 +01:00
Brad Hefta-Gaub	fce8715457	Merge pull request #11306 from ElderOrb/case7385 ... 7385 - Collect Stats on "Exit VR" button	2017-09-07 10:18:58 -07:00
Olivier Prat	7fb7ebca57	Fixed warning on Mac	2017-09-07 19:03:22 +02:00
Brad Davis	cc3beb3d91	Fix potential crash on asynchronous QML loads	2017-09-07 09:53:21 -07:00