1744 commits

Author	SHA1	Message	Date
Anthony J. Thibault	e9f529bf12	Entities: Removed Start Automatically property from Animation Group ... There is an issue when startAutomatically was set to true and animationPlaying was set to false. This would cause clients to play the animation when they connected to the entity server, even though the server was not.	2015-12-09 17:59:56 -08:00
Seth Alves	ec9f1e0754	possible fix for crash when grabbing bubblewand	2015-12-08 09:44:43 -08:00
Seth Alves	0bf276efa5	adjust method names to fit convention	2015-12-07 14:37:35 -08:00
Seth Alves	982e986f1a	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-12-07 14:31:18 -08:00
Seth Alves	f99812a903	adjust method names to fit convention	2015-12-07 14:31:08 -08:00
Leonardo Murillo	25494ec867	Merge pull request #6562 from Atlante45/baseball ... Baseball	2015-12-07 14:11:21 -08:00
Seth Alves	96e9580473	change some more parameters back to being pass-by-reference, where it's safe	2015-12-07 05:30:19 -08:00
Seth Alves	3cc423ca03	remap IDs when importing entities	2015-12-06 17:55:48 -08:00
Seth Alves	f0fb9966ad	expose parent-joint-index to edit.js	2015-12-06 12:34:41 -08:00
Seth Alves	a948ae5f19	children of avatar joints might be right, now	2015-12-06 10:48:00 -08:00
Seth Alves	138125faab	fix-up parentJointIndex in terse logging	2015-12-06 05:42:51 -08:00
Seth Alves	d518a4573e	if script sets parent or jointIndex, don't pop entity off to someplace	2015-12-05 15:15:33 -08:00
Seth Alves	1f0150f65f	add parentID and parentJointIndex to terse logging	2015-12-05 15:12:44 -08:00
Atlante45	1d498af76e	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-12-04 15:18:25 -08:00
Ryan Huffman	89c412c324	Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message	2015-12-04 11:38:28 -08:00
Brad Hefta-Gaub	d9a1563396	Merge pull request #6152 from sethalves/parents ... Parents	2015-12-04 10:26:57 -08:00
Brad Hefta-Gaub	5a75a17174	Revert "Cruft removal"	2015-12-03 17:40:41 -08:00
Clément Brisset	fa52b97f61	Merge pull request #6538 from ZappoMan/cruftRemoval ... Cruft removal	2015-12-03 17:03:04 -08:00
Brad Hefta-Gaub	1a5bc5d111	removing optional compression	2015-12-03 12:40:24 -08:00
Seth Alves	4e74c98ae7	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-12-03 11:00:13 -08:00
Seth Alves	6f79b381f9	working toward making children of avatar joints work	2015-12-03 11:00:06 -08:00
Ryan Huffman	667d2b728e	Fix uninitialized xColor value when converting script value	2015-12-03 09:52:56 -08:00
Brad Hefta-Gaub	1e51a90204	add edit times and entity ids to the viewer stats	2015-12-02 14:43:00 -08:00
Seth Alves	6eae98fb28	merge from upstream	2015-12-02 14:38:26 -08:00
Brad Hefta-Gaub	08ba535c38	add some basic send tracking	2015-12-02 13:43:05 -08:00
Brad Hefta-Gaub	112cdaf028	Merge pull request #6512 from AndrewMeadows/remove-debug-cruft ... remove debug option for disabling physics updates	2015-12-02 10:00:29 -08:00
Brad Hefta-Gaub	75a57c3cb8	Merge pull request #6500 from Atlante45/octree_crash ... Octree crash fix	2015-12-02 09:59:56 -08:00
Andrew Meadows	ab6367ff4e	remove debug option for disabling physics updates	2015-12-01 11:13:01 -08:00
Atlante45	083205916f	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-30 18:25:53 -08:00
Seth Alves	b7ebe5b92b	merge from upstream	2015-11-30 16:59:52 -08:00
Seth Alves	3402585d1a	fix a crash from previous commit	2015-11-30 16:54:29 -08:00
Seth Alves	9b54924524	edit.js can now manipulate children without flipping the table	2015-11-30 16:21:14 -08:00
Atlante45	4aaa9ca02f	Make OctreeElementBag safer to use	2015-11-30 15:23:49 -08:00
Seth Alves	89b78986d5	remove some more stray const	2015-11-30 14:01:17 -08:00
Stephen Birarda	4573e5c59e	resolve conflicts on merge with upstream/master	2015-11-30 13:32:38 -08:00
Seth Alves	4b87e09848	clean up some unneeded consts. get edit.js closer to working on parented entities	2015-11-30 13:23:55 -08:00
Ryan Huffman	99dd9646bc	Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message	2015-11-30 10:20:13 -08:00
Seth Alves	4add3e2e91	rework worldToLocal, start on allowing scripts entity position/rotation to always be in world space	2015-11-30 09:41:15 -08:00
Seth Alves	cf39cac7fc	attempt to make SpatiallyNestable data access thread-safe	2015-11-29 12:50:33 -08:00
Seth Alves	eb50c9de5f	aabox delivered to scripts in properties should be in world space	2015-11-29 10:16:56 -08:00
Seth Alves	6062691c2a	minimize diff vs master	2015-11-26 07:04:27 -08:00
Seth Alves	10cf85bad9	fix some rotation handling in EntityItem, minimize diff vs master	2015-11-26 07:02:53 -08:00
Seth Alves	ca75802b9c	unmangle merge	2015-11-26 06:43:28 -08:00
Atlante45	a364e85e1d	Remove DeleteHooks	2015-11-25 17:21:56 -08:00
Anthony J. Thibault	23def8d173	Merge branch 'master' into tony/remove-joint-states	2015-11-25 13:55:23 -08:00
Clément Brisset	5ff482071e	Merge pull request #6465 from ericrius1/polyLineFix ... moved logic to build vertex buffer to renderable polyline class, recalculati…	2015-11-25 11:02:02 -08:00
Anthony J. Thibault	f120e10ff4	Merge branch 'master' into tony/remove-joint-states	2015-11-24 15:00:05 -08:00
Philip Rosedale	dde01b2071	Merge pull request #6476 from AndrewMeadows/arrow ... fix for objects suffering from very small updates to physics properties	2015-11-24 11:22:25 -08:00
Andrew Meadows	e26081e981	always update physics properties when they change ... and move activation check logic to MotionState	2015-11-24 10:20:19 -08:00
Ryan Huffman	dac491ef41	Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message	2015-11-24 09:59:22 -08:00