311 commits

Author	SHA1	Message	Date
Brad Davis	e5e9ab42ea	Encapsulate AnimPose members for easier optimizations	2016-12-28 12:11:24 -08:00
Brad Hefta-Gaub	c65471e880	Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam ... Conflicts: libraries/script-engine/src/FileScriptingInterface.cpp	2016-12-19 22:27:24 -08:00
Brad Hefta-Gaub	dbbed462b4	cleanup naked qDebug() calls	2016-12-19 22:24:25 -08:00
Chris Collins	61c60fca2d	Merge pull request #8968 from ctrlaltdavid/21089 ... Clara.io marketplace improvements	2016-12-19 18:21:45 -08:00
Brad Davis	30a9961362	tracing polish	2016-12-16 14:02:27 -08:00
Andrew Meadows	ee6a9f4506	adding profile stats relating to avatar CPU costs	2016-12-16 13:41:31 -08:00
Ryan Huffman	7bb2755913	Add chrome tracing support	2016-12-16 01:14:01 -08:00
David Rowe	aefa116207	Add extra logging for Clara.io asset resizing	2016-12-13 17:55:22 +13:00
Seth Alves	689fdfb35f	implement RenderableModelEntityItem::setAbsoluteJointRotationInObjectFrame and RenderableModelEntityItem::setAbsoluteJointTranslationInObjectFrame	2016-11-04 11:44:42 -07:00
Seth Alves	e41fa94958	implement RenderableModelEntityItem::setAbsoluteJointRotationInObjectFrame and RenderableModelEntityItem::setAbsoluteJointTranslationInObjectFrame	2016-11-04 11:42:31 -07:00
Seth Alves	727fe4bc21	Merge branch 'master' of github.com:highfidelity/hifi into fix-setLocalJointRotation-name	2016-11-04 10:04:56 -07:00
Seth Alves	339d6a55cf	getLocalJointRotation getLocalJointTranslation, started on getLocalJointTranslation getLocalJointRotation	2016-11-03 10:06:07 -07:00
Andrew Meadows	cd5826e2ce	load model of new entity with unknown dimensions	2016-11-03 09:03:04 -07:00
Seth Alves	844cc03dcb	fix names of model-entity joint setters	2016-11-02 10:24:01 -07:00
Seth Alves	f47aeae2a7	stop passing bare pointers to EntityTreeRenderer all around	2016-10-27 10:10:22 -07:00
Brad Davis	ecfe56085d	GLM update and GLI integration	2016-09-09 10:18:15 -07:00
Brad Hefta-Gaub	e1845e2c3f	add support for renderInfo properties to model entities	2016-08-31 15:00:21 -07:00
Andrew Meadows	b95cb566cd	fix collision mesh for non-trivial registration	2016-08-24 22:26:56 -07:00
Andrew Meadows	e4317adcf1	remove cruft	2016-08-24 22:26:56 -07:00
Andrew Meadows	2f16aca114	remove cruft and fix typo in rebase	2016-08-24 22:26:56 -07:00
Andrew Meadows	83426fd5a8	handle transitions to/from STATIC_MESH ... when rendering collision geometry	2016-08-24 22:26:56 -07:00
Andrew Meadows	68dd66daec	create collision render geometry only when needed	2016-08-24 22:26:56 -07:00
Andrew Meadows	eb65be5478	remove cruft argument from allocateModel()	2016-08-24 22:26:56 -07:00
Andrew Meadows	b0a0293e6e	move compoundResource out of Model class	2016-08-24 22:26:56 -07:00
Andrew Meadows	191b7f0f39	variable namechange: Hull --> Mesh	2016-08-24 22:26:56 -07:00
Andrew Meadows	6b0ae654ba	cleanup logic around creating RenderItems	2016-08-24 22:26:56 -07:00
Andrew Meadows	726928c14c	creae collision Geometry from mesh	2016-08-24 22:25:45 -07:00
Andrew Meadows	499150bbed	finish hook alert for new entity collision shape	2016-08-24 22:25:45 -07:00
Andrew Meadows	c3f165d9da	BufferView::Iterator doesn't support operator<	2016-08-19 10:15:37 -07:00
Andrew Meadows	2ba35e6398	skip non-existant meshes	2016-08-18 11:48:56 -07:00
Andrew Meadows	cb9a5466d5	workaround bad FBXMesh data rather than assert	2016-08-18 11:09:48 -07:00
Brad Hefta-Gaub	a714f325fe	Merge pull request #8333 from SamGondelman/miscFixes ... Miscellaneous cmake and render engine improvements	2016-08-10 11:06:50 -07:00
SamGondelman	328d3128fa	merge from master	2016-08-08 13:30:39 -07:00
Ryan Huffman	d367583426	Clean up priority loading implementation	2016-08-08 08:53:06 -07:00
Ryan Huffman	c594dcdf9f	Add priority loading for model entities	2016-08-08 08:52:29 -07:00
SamGondelman	dd51e0e38f	merge from master	2016-08-05 17:04:45 -07:00
Brad Hefta-Gaub	83280aa3f2	implement support for updating the render items of models when they finish their fade	2016-08-05 10:11:07 -07:00
Seth Alves	ad4fc8c656	merge from upstream, don't hold up enabling of physics if a collision hull fails to load	2016-08-03 10:42:15 -07:00
Stephen Birarda	5d3e125a06	make failed geomtetry request not hold physics	2016-08-02 16:32:41 -07:00
SamGondelman	676f4bdfcf	misc fixes from particles branch	2016-07-29 15:36:32 -07:00
Ryan Downe Karpf	91714aaca6	Merge pull request #8258 from AlexanderOtavka/edit-model-ui ... Edit model dialog improvements	2016-07-22 17:11:52 -07:00
Andrew Meadows	20eebb90f8	fix build -- remove some accidental changes	2016-07-20 14:08:25 -07:00
Andrew Meadows	3fdfc0db14	fix bug breaking simple-compound shape type	2016-07-20 12:55:13 -07:00
Andrew Meadows	2afd65467a	fix bug where model is not yet ready for col shape	2016-07-19 18:01:22 -07:00
Andrew Meadows	25fdea6bac	fix for change of API after rebase	2016-07-13 15:13:35 -07:00
Andrew Meadows	72175ae09e	fix warnings about implicit casts	2016-07-09 22:55:55 -07:00
Andrew Meadows	207ddcea38	wrap hull about each mesh part	2016-07-09 22:25:28 -07:00
Brad Hefta-Gaub	5f71f77445	Merge pull request #8192 from AndrewMeadows/simple-hull-shapes ... experimental ModelEntityItem collision shape options (no visual debugging)	2016-07-08 08:55:11 -07:00
Andrew Meadows	e4828b03b1	fix crash when building shape before model loaded	2016-07-07 13:32:30 -07:00
Brad Davis	c7382ea886	Optimize updateModelBounds	2016-07-07 11:11:26 -07:00