25322 commits

Author	SHA1	Message	Date
Bradley Austin Davis	d6072f2bf2	Add bullet and draco to precompiled libraries	2017-11-28 11:32:34 -08:00
Brad Davis	d769acd345	Updating Android toolchain	2017-11-28 11:32:32 -08:00
Brad Hefta-Gaub	6d6ac0a5a9	Merge pull request #11873 from sethalves/fix-wearable-domain-change-crash ... avoid a crash during domain change while wearing something	2017-11-27 13:01:48 -08:00
Sam Gateau	9a31a3dc95	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-11-22 23:29:55 -08:00
Seth Alves	9ccc416e80	avoid a crash during domain change	2017-11-22 16:34:56 -08:00
samcake	84ff40c717	Merging with master	2017-11-21 14:12:47 -08:00
Brad Hefta-Gaub	817afcd083	Merge pull request #11741 from ZappoMan/entityItemCleanup ... Entity item cleanup	2017-11-21 12:24:46 -08:00
Brad Hefta-Gaub	5914f27027	Merge pull request #11706 from luiscuenca/webAudioDev_fresh ... QML & Web generated audio now follow the client audio device selection	2017-11-21 11:29:48 -08:00
ZappoMan	3a967ca895	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-21 10:53:29 -08:00
Brad Hefta-Gaub	5dadec0b93	Merge pull request #11845 from thoys/feat/parentJointName ... Import JSON parentJointName value	2017-11-21 07:58:13 -08:00
ZappoMan	b44ced4c21	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-20 17:19:18 -08:00
Thijs Wenker	627fee80ec	added support for exporting parentJointName	2017-11-21 01:49:56 +01:00
Howard Stearns	4018b99118	Merge pull request #11848 from zfox23/commerce_flipTheSwitch ... Turn Commerce on by default!	2017-11-20 16:18:53 -08:00
Elisa Lupin-Jimenez	3211aa7d13	Merge pull request #11849 from elisa-lj11/blocks ... Zip file structures replicated in asset server	2017-11-20 16:13:51 -08:00
Bradley Austin Davis	7a5dc9e00b	remove test code disabling the script cache	2017-11-20 15:57:44 -08:00
Thijs Wenker	c3754d6369	smart pointer	2017-11-20 23:24:03 +01:00
Elisa Lupin-Jimenez	b6e75d1222	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-11-20 10:07:11 -08:00
Elisa Lupin-Jimenez	3aa7cb440d	file structures in zip files replicated, more useful unzip debug print, updated blocks tablet app url	2017-11-20 10:01:33 -08:00
Dante Ruiz	76935c1457	fixing merge conflict	2017-11-20 09:51:10 -08:00
Thijs Wenker	e94199acad	Merge branch 'master' of github.com:highfidelity/hifi into feat/parentJointName	2017-11-20 18:29:54 +01:00
Thijs Wenker	84ec9890ca	reverted special property case, parentJointName is now only parsed from the JSON import	2017-11-20 18:29:33 +01:00
Seth Alves	df07b66872	Merge branch 'master' of github.com:highfidelity/hifi into av-ent-misc-fixes	2017-11-20 07:47:19 -08:00
ZappoMan	3b77f14f69	fix build error	2017-11-19 15:12:23 -08:00
ZappoMan	04ee1adabd	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-19 14:40:31 -08:00
Brad Hefta-Gaub	6429b61463	Merge pull request #11850 from druiz17/tablet-initial-page ... Fix tablet not loading webpage when tablet root not initialized	2017-11-19 11:12:50 -08:00
Brad Hefta-Gaub	33d35bbe14	Merge pull request #11770 from AndrewMeadows/sort-and-throttle ... sort and throttle UpdateRenderables work... when necessary	2017-11-19 11:09:08 -08:00
Brad Hefta-Gaub	ebac2556e4	Merge pull request #11841 from ZappoMan/makeAddEntityAtomic ... Make add entity atomic	2017-11-18 14:27:12 -08:00
Brad Hefta-Gaub	74bafcbb10	Merge pull request #11795 from huffman/fix/ds-punchlist ... Punchlist fixes for DS	2017-11-17 17:04:27 -08:00
Brad Hefta-Gaub	0678a7c9df	Merge pull request #11718 from kencooke/audio-louder-mastergain ... Adjustable master avatar volume	2017-11-17 16:58:27 -08:00
ZappoMan	66454e7288	fix unix warnings	2017-11-17 16:33:43 -08:00
SamGondelman	033f658fff	Merge remote-tracking branch 'upstream/master' into pointers	2017-11-17 16:10:20 -08:00
Dante Ruiz	427f676859	minimize diff	2017-11-17 16:06:34 -08:00
Dante Ruiz	ab9432c1cd	load webpage if tablet root is not initialized	2017-11-17 16:02:53 -08:00
Zach Fox	f47f259816	Turn Commerce on by default	2017-11-17 15:12:49 -08:00
Brad Hefta-Gaub	a85a6f6795	Merge pull request #11308 from luiscuenca/patch-1 ... glTF import DEMO	2017-11-17 14:52:51 -08:00
ZappoMan	71a46a3374	cleanup	2017-11-17 13:03:04 -08:00
Stephen Birarda	239b116874	Merge pull request #11835 from birarda/bug/octree-connection-id ... Reset EntityTreeSendThread known state if client disconnects from Entity Server	2017-11-17 12:56:25 -08:00
Brad Hefta-Gaub	f5bb29f767	Merge pull request #11842 from birarda/networking-api-info ... clarify the send packet list APIs	2017-11-17 12:30:09 -08:00
Thijs Wenker	3c37bf8acd	parentJointName property experiment	2017-11-17 20:33:06 +01:00
Andrew Meadows	98001b64d9	Merge pull request #11788 from ctrlaltdavid/21579-a ... Particles emitter fixes	2017-11-17 11:31:12 -08:00
Stephen Birarda	16d93ee168	clarify signatures in LNL to send packet lists	2017-11-17 11:17:11 -08:00
SamGondelman	61c7ccde6e	cleanup	2017-11-17 10:45:39 -08:00
Stephen Birarda	dd27e3db31	add diff traversal reset when resetting state	2017-11-17 09:44:35 -08:00
ZappoMan	cd0fa989e1	debugging	2017-11-17 08:55:55 -08:00
ZappoMan	e438ac54d5	make adds go over NLPacketList as reliable	2017-11-16 13:16:23 -08:00
samcake	bafa82f6c5	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-11-16 12:12:04 -08:00
Stephen Birarda	eedb77dae9	add clearing of known state if client resets ES connection	2017-11-16 11:40:35 -08:00
Clément Brisset	2b39cb4500	Merge pull request #11832 from highfidelity/RC59 ... Merge RC59 into master	2017-11-16 11:19:54 -08:00
ZappoMan	4c4f23e312	Merge branch 'master' of https://github.com/highfidelity/hifi into makeAddEntityAtomic	2017-11-16 10:09:46 -08:00
SamGondelman	ac7242102c	Merge remote-tracking branch 'upstream/pointers' into ui	2017-11-16 09:47:29 -08:00