2547 commits

Author	SHA1	Message	Date
Seth Alves	7f4399b0a3	fix name in entity-edit-an-overlay warning	2017-05-04 19:16:15 -07:00
Seth Alves	92966377fb	Merge branch 'fix-dont-send-non-entity-edits-over-wire' of github.com:sethalves/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-04 19:05:57 -07:00
Seth Alves	a7c684e007	entity scripting call to get the nestable-type of an object, by id	2017-05-04 19:05:29 -07:00
Seth Alves	d25db099b9	be more effecient about ignoring edits to unknown entities	2017-05-04 18:49:46 -07:00
Seth Alves	74a82f92df	return null uuid for failure	2017-05-04 10:05:17 -07:00
Seth Alves	9171995ed3	add a comment	2017-05-03 21:41:00 -07:00
Seth Alves	69944cc76d	add a way to get a SpatiallyNestable's name without knowing what its type is	2017-05-03 21:32:49 -07:00
Seth Alves	03f416ff4d	Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-03 20:32:08 -07:00
Seth Alves	0fff7678bf	code review	2017-05-03 19:07:46 -07:00
Seth Alves	e96c3e84b4	if a script attempts to edit a non-entity, don't send the edit packet over the wire	2017-05-03 13:58:49 -07:00
Seth Alves	4c4e0dffcc	bullet cone-twist constraint	2017-04-29 12:30:12 -07:00
Seth Alves	6623028d71	ball-and-socket constraint	2017-04-29 08:35:55 -07:00
Seth Alves	e2e9371e96	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-4	2017-04-29 08:04:31 -07:00
1st-BrainStormer	953a3f7a6f	Update EntityDynamicInterface.cpp ... Grammar correction.	2017-04-28 20:14:01 -07:00
Seth Alves	b196dd082b	expose bullet slider constraint to javascript	2017-04-27 07:56:35 -07:00
Seth Alves	f7378abb08	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1	2017-04-20 02:40:10 -07:00
Chris Collins	889b054085	Merge pull request #10067 from humbletim/fix-Entities-setLocalJointTranslations ... Fix Entities.setLocalJointTranslations	2017-04-19 09:32:28 -07:00
Seth Alves	21ca767b7c	remove setPosition and setRotation for actions because they were never finished and never used.	2017-04-18 11:59:16 -07:00
Andrew Meadows	31bfc98b87	use const reference for ScenePointer when possible	2017-04-18 11:52:22 -07:00
Seth Alves	b1dc5be316	make far-grab it's own action (which is just like spring) in order to avoid bootstrapping own avatar	2017-04-14 11:48:06 -07:00
Seth Alves	2dab3069da	fix bug that was causing spring action to cause constant re-insertion of its rigidbody into bullet. store UUIDs rather than shared pointers in _objectDynamicsByBody so that refcounting works right and actions get their destructors called.	2017-04-14 11:06:40 -07:00
Seth Alves	afa8fc161b	allow hinge constraint between two entities	2017-04-13 15:37:28 -07:00
Seth Alves	9b12956909	formatting	2017-04-12 16:34:34 -07:00
Seth Alves	507f658a5f	update comment	2017-04-12 07:37:41 -07:00
Seth Alves	74c0a70cb0	rename base action classes to dynamics, start on constraints	2017-04-11 20:39:13 -07:00
Stephen Birarda	602d65a71a	Merge pull request #10001 from birarda/cleanup-ebp ... cleanup EncodeBitstreamParams to use nodeData when possible	2017-04-10 15:54:30 -07:00
Brad Hefta-Gaub	0d4649ded8	Merge pull request #10079 from jherico/entity_thread_safety ... Thread safety for property getter/setters on entities	2017-04-07 19:01:07 -07:00
Andrew Meadows	b9c7d6351f	Merge pull request #10135 from samcake/ambient ... Rename render::PendingChanges to render::Transaction	2017-04-07 09:54:10 -07:00
samcake	6122155880	Renaming the PendingCHanges class to Transaction	2017-04-05 13:10:31 -07:00
Brad Davis	15f7e895aa	More thread safety	2017-04-04 15:09:21 -07:00
Brad Davis	cd7c1643a3	More thread safety	2017-04-04 14:03:30 -07:00
Brad Davis	54200c03a7	Fixing deadlock	2017-04-04 13:53:49 -07:00
Brad Davis	fe84232ab4	More work on thread safety	2017-04-04 10:50:56 -07:00
Brad Davis	03c6275268	more thread safety	2017-04-04 10:50:54 -07:00
Brad Davis	172fab6789	Thread safety for property getter/setters on entities	2017-04-04 10:50:53 -07:00
Ryan Huffman	b9fffc10f8	Fix entity "unlock" edits not being propagated to clients ... The lastEditedBy property was not being updated when changing the locked property of entities from true to false.	2017-04-03 15:51:19 -07:00
David Kelly	348674a267	Merge pull request #10034 from davidkelly/dk/avatarEntityIssue ... bad serialization of Avatar Entity parentID	2017-03-30 10:12:19 -07:00
humbletim	d02fd06305	mark joint translations dirty	2017-03-30 07:45:18 -04:00
David Kelly	4b40633104	oops damn space	2017-03-28 11:22:18 -07:00
David Kelly	e119c38748	bad serialization of parentID	2017-03-28 09:26:40 -07:00
Seth Alves	651d87dc2a	move Qt-related stuff out of model and into model-networking	2017-03-28 07:53:25 -07:00
Seth Alves	8da91695df	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2	2017-03-27 20:15:54 -07:00
Seth Alves	5ed0ff729b	cleanups	2017-03-27 07:25:40 -07:00
Stephen Birarda	53e6a77fcc	cleanup EncodeBitstreamParams to use nodeData when possible	2017-03-24 13:41:36 -07:00
ZappoMan	246f377a07	Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick	2017-03-23 10:40:37 -07:00
Seth Alves	ce9bb439b3	change Model api in anticipation of more than just PolyVox being able to give meshes to javascript	2017-03-23 09:55:30 -07:00
Seth Alves	048da6e6cb	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2	2017-03-21 09:52:15 -07:00
Brad Hefta-Gaub	ac309df3d1	Merge pull request #9946 from sethalves/model-scripting-1 ... Model scripting	2017-03-21 09:26:32 -07:00
Atlante45	73dd2abdaf	Delete old sitting points code	2017-03-20 17:29:44 -07:00
Seth Alves	d5ea69d81d	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2	2017-03-20 14:06:00 -07:00