25240 commits

Author	SHA1	Message	Date
Thijs Wenker	627fee80ec	added support for exporting parentJointName	2017-11-21 01:49:56 +01:00
Thijs Wenker	c3754d6369	smart pointer	2017-11-20 23:24:03 +01: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
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
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
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
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
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
John Conklin II	0306c22394	Merge pull request #11823 from luiscuenca/case9267 ... Fix not restoring animations after changing view modes	2017-11-15 16:38:35 -08:00
Sam Gateau	3f5b21ec22	Merge pull request #11559 from Zvork/bloom ... Bloom	2017-11-15 15:11:31 -08:00
Ryan Huffman	60a222e4b4	Merge pull request #11810 from Atlante45/fix/stuck-acs ... Fix stuck ACs	2017-11-15 14:59:51 -08:00
David Kelly	009e6b252a	Merge pull request #11814 from AndrewMeadows/fix-cylinders ... fix cylinder collision shape	2017-11-15 15:24:29 -07:00
luiscuenca	bf0d55aa98	9267 Fix not restoring animations after changing view modes	2017-11-15 15:04:24 -07:00
Anthony J. Thibault	b49891c0f8	Bug fix for MyAvatar.getEyeHeight()	2017-11-15 11:27:42 -08:00
Atlante45	d8b1cb10df	CR	2017-11-15 11:20:30 -08:00
Atlante45	e68ce97697	Remove the number of socket change tracking	2017-11-15 11:19:54 -08:00
Sam Gateau	2c51e516eb	Merge pull request #11744 from Zvork/shadow ... Shadow caster culling fix	2017-11-15 09:49:39 -08:00
John Conklin II	8592f3fd4d	Merge pull request #11764 from luiscuenca/case7587 ... 7587 Lasers resize with avatar	2017-11-15 09:31:45 -08:00
Andrew Meadows	d538a9aaa8	fix typo making cylinders collide as sphere	2017-11-15 09:04:04 -08:00
Olivier Prat	14275b1cf3	Added asserts in LightStage to catch shadow disappearance when domain is automatically reloaded	2017-11-15 15:42:04 +01:00
Olivier Prat	f47a3e7d2c	Moved draw frustum job to render DrawTask and made generic. A couple of fixes as requested by @samcake	2017-11-15 09:42:57 +01:00
Olivier Prat	bf46ccefaf	Merge branch 'master' of git://github.com/highfidelity/hifi into shadow	2017-11-15 08:59:36 +01:00
Andrew Meadows	2f5b7f32c6	only add valid renderables to _renderablesToUpdate	2017-11-14 17:08:12 -08:00
Andrew Meadows	500f381827	collect hard-coded time budgets in one spot	2017-11-14 15:57:17 -08:00
Andrew Meadows	ffe16a754e	another pass through the crucible	2017-11-14 15:57:17 -08:00
Andrew Meadows	f67114a0a8	PrioritySortUtil::Prioritizer doesn't need to be a template	2017-11-14 15:57:17 -08:00
Andrew Meadows	55cc945c78	organize PrioritySortUtil differently	2017-11-14 15:57:17 -08:00
Andrew Meadows	99b4283cbc	fix typo in 'out-of-view' check	2017-11-14 15:57:17 -08:00
Andrew Meadows	d7b84f8a86	fix typo in comment	2017-11-14 15:57:17 -08:00
Andrew Meadows	111480f630	fix bad conflict resolution	2017-11-14 15:57:17 -08:00
Andrew Meadows	e93c10b5ee	remove cruft	2017-11-14 15:57:17 -08:00
Andrew Meadows	8707c76a6a	templatize the ViewFrustum-relative sort algorithm	2017-11-14 15:57:17 -08:00
Andrew Meadows	f47185b2f6	remove tabs from indentation	2017-11-14 15:57:17 -08:00