25335 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	b2c5154cb6	Merge pull request #11909 from ZappoMan/rc60FixModelImportSizing ... fix issues in model import sizing caused by recent refactor	2017-12-02 09:30:57 -08:00
Anthony Thibault	fe16cc3fab	Merge pull request #11902 from luiscuenca/onloadFix ... Fixes create list and web and QML audio sync	2017-12-01 16:05:07 -08:00
luiscuenca	fefedc11c8	mac fix	2017-12-01 15:17:23 -07:00
luiscuenca	d271f61987	Proper fix	2017-12-01 14:37:59 -07:00
ZappoMan	d1017d81bd	fix issues in model import sizing caused by recent refactor	2017-11-30 18:08:32 -08:00
luiscuenca	83e370d9de	add shared pointer	2017-11-30 17:40:49 -07:00
luiscuenca	5d1f2a04c1	restate deleted lines	2017-11-30 16:43:38 -07:00
luiscuenca	98e8361690	Fix and rebuild	2017-11-30 16:07:43 -07:00
luiscuenca	9cd2dc921a	back to for loop	2017-11-30 15:31:29 -07:00
luiscuenca	0729579266	fix for loop	2017-11-30 15:21:43 -07:00
luiscuenca	58e829dbda	Delete leftover line	2017-11-30 15:11:38 -07:00
luiscuenca	e02e810399	Audio Handler fix	2017-11-30 15:06:02 -07:00
luiscuenca	b817143e2e	Fixes on web and QML audio sync	2017-11-29 18:16:21 -07:00
Zach Fox	39afb4ab6a	Merge pull request #11882 from howard-stearns/the-lost-ECDSA ... The lost ecdsa	2017-11-29 15:53:52 -08:00
Stephen Birarda	8978254037	kick logged in by fingerprint/ip if enabled in DS settings	2017-11-27 18:23:14 -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