457 commits

Author	SHA1	Message	Date
Seth Alves	0ad4cdc41b	works now	2018-01-18 13:15:47 -08:00
Seth Alves	fb974b0b9c	attempt to straighten out use of view-visibility masks	2018-01-18 10:09:23 -08:00
Seth Alves	76ef3d7c7d	pull from upstream	2018-01-18 07:01:50 -08:00
Seth Alves	69a33428c0	Merge pull request #12078 from druiz17/soft-entities ... Soft Entities	2018-01-17 08:02:37 -08:00
humbletim	b91d536dd0	rename model:: -> graphics::	2018-01-16 12:46:16 -05:00
Dante Ruiz	283b9a8003	fix softEntity edge cases	2018-01-12 15:31:54 -08:00
Dante Ruiz	5b82c7bc41	fix merge conflict	2018-01-12 11:00:19 -08:00
Anthony J. Thibault	088f227df2	Pass model offset from avatar skeletonModel to attached entity	2018-01-12 10:26:02 -08:00
Seth Alves	227dbd6f68	put this back to a working state	2018-01-12 08:52:07 -08:00
Seth Alves	9d4ab13a10	cauterize all head-based entities rather than just models	2018-01-11 19:45:15 -08:00
Seth Alves	e7a3d98ae5	don't draw head-descendent entities when in 1st-person camera mode	2018-01-11 19:34:54 -08:00
Dante Ruiz	96a97b5938	added model transform override	2018-01-11 16:41:45 -08:00
Dante Ruiz	980807c657	make changes	2018-01-10 16:50:41 -08:00
SamGondelman	df574c6bc9	keep requesting render update until textures load	2018-01-10 13:19:53 -08:00
Dante Ruiz	d0bff29471	fixing merge conflict	2018-01-10 10:11:53 -08:00
Dante Ruiz	c4253f3b3b	Merge branch 'master' of github.com:highfidelity/hifi into soft-entities	2018-01-09 15:31:38 -08:00
SamGondelman	7c56a9ffb2	model meta is only withTypeShape if visual geometry request fails	2018-01-09 12:43:43 -08:00
Sam Gondelman	5cf25a20c9	use correct model ptr	2018-01-04 21:21:58 -08:00
SamGondelman	6a19b0e0b6	update render items on texture load	2018-01-04 13:10:46 -08:00
Dante Ruiz	527d00871a	making relaying translation work	2018-01-04 11:57:51 -08:00
Dante Ruiz	e1a7f9bfb8	working on imporving soft-entities	2018-01-03 08:47:11 -08:00
Dante Ruiz	6fa3446c57	joints are being relayed to children	2018-01-02 13:54:13 -08:00
Dante Ruiz	be9bf31843	Merge branch 'master' of github.com:highfidelity/hifi into soft-entities	2018-01-02 08:04:26 -08:00
druiz17	0ebbb76b49	fixed property over written issue and start relaying joints	2017-12-29 16:12:40 -08:00
Seth Alves	96197e66bb	Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3	2017-12-22 15:13:02 -08:00
Sam Gateau	a2c16ddf6a	Merge pull request #12026 from SamGondelman/burp3 ... Remove _model from ModelMeshPartPayload	2017-12-22 13:50:06 -08:00
Seth Alves	897b96d092	Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3	2017-12-22 07:36:26 -08:00
SamGondelman	bd06dc6443	cleaning up modelmeshpartpayload	2017-12-20 11:00:14 -08:00
Andrew Meadows	bad2c1df76	proper modulus of animation frame	2017-12-19 10:40:17 -08:00
Andrew Meadows	559cb33563	remove incorrect comment	2017-12-19 10:40:17 -08:00
Andrew Meadows	661a63bd0c	fix crash for bad QVector index	2017-12-19 10:40:17 -08:00
amantley	29538851b6	Made the changes from the latest code review, except getting rid of the ... while loop.	2017-12-12 09:06:43 -08:00
amantley	65bb896450	Merge remote-tracking branch 'origin/master' into character_entity_fixes	2017-12-11 10:55:54 -08:00
Seth Alves	2cd64ccd2c	merge from upstream	2017-12-11 10:14:30 -08:00
Ryan Huffman	f3fc5769e8	Move asset baking on asset server to separate process	2017-12-06 11:49:19 -08:00
Seth Alves	b590cd5b89	avatar-entities which are children of an avatar will scale with the avatar	2017-12-02 09:31:43 -08:00
ZappoMan	750d505f9b	fix issues in model import sizing caused by recent refactor	2017-11-30 17:51:59 -08:00
amantley	233d693d76	removed debug print statements and fixed negative FPS handling	2017-11-29 10:51:04 -08:00
amantley	778d98f56b	made some changes to fix coding standard problems in the code, also added the update for the EntityItem base class to the update function	2017-11-28 18:42:03 -08:00
amantley	101e67498a	cleaned up the code to remove _currentFrame updating in RenderModelEntityItem also removed the unnessary currently playing frame property	2017-11-28 14:11:56 -08:00
amantley	d607ca0914	initialize the _lastAnimated time when the modelEntityRenderer is instantiated, this fixes the sync between interface and the server	2017-11-28 11:04:48 -08:00
amantley	522dc3dfb1	Merge remote-tracking branch 'origin/master' into character_entity_fixes ... updating Character entity fixes branch with the changes in the origin master	2017-11-22 17:55:39 -08:00
amantley	2e75016021	changes to modelEntity.cpp	2017-11-22 17:53:21 -08:00
amantley	fdf5139a74	everything now works with an atomic start time property. but now I will get rid of this and use current frame instead	2017-11-22 17:52:13 -08:00
amantley	1e5d099b06	changed the currentlyplayingframe property so that it is updated in RenderableModelEntity.cpp now. Remains to remove everything but initializing currentlyPlayingFrame in ModelEntityRender.cpp	2017-11-21 17:36:01 -08:00
ZappoMan	04ee1adabd	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-19 14:40:31 -08:00
amantley	013d16cee9	this is the change to add a property for the currentframeplaying	2017-11-17 18:37:54 -08:00
amantley	20fd893b47	Starting to implement the update function to ModelEntityItem_cpp Also put access to the currently playing frame in RenderableModelEntityItem_cpp	2017-11-16 18:38:28 -08:00
amantley	881b22ab15	added update function to modelEntityItem.cpp	2017-11-16 12:41:56 -08:00
amantley	cc43d8115c	In response to bug in the original PR, in RenderModelEntityItem.cpp I made a change in the handling of the boundary cases for the first and last frame properties. Also deleted some extraneous comments.	2017-11-15 17:42:33 -08:00