1779 commits

Author	SHA1	Message	Date
Seth Alves	2b800d711f	queryAACube to and from scriptvalues	2015-12-15 15:18:43 -08:00
Seth Alves	0013d58365	include queryAACube when scripts make changes	2015-12-15 14:25:02 -08:00
Seth Alves	165c41d843	add a way to remember which entities couldn't be properly placed in octree due to missing parents	2015-12-14 14:19:19 -08:00
Seth Alves	008065ba38	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2015-12-14 09:15:56 -08:00
Seth Alves	c74f8bca49	location getters also return a success boolean so that callers can know if the value they are receiving is bad due to lack of information about an object's parent	2015-12-14 09:13:36 -08:00
Seth Alves	270d5fc8e1	remove commented-out code	2015-12-13 06:44:34 -08:00
Seth Alves	7f11d2a4fe	whitespace	2015-12-12 14:45:02 -08:00
Seth Alves	1492fd6090	merge from upstream	2015-12-12 12:37:57 -08:00
Seth Alves	24fb43e8cd	first steps toward a puffed-out query-box for child entities	2015-12-12 12:33:14 -08:00
Atlante45	79fdb2e882	Fix warnings on windows 64bit	2015-12-11 16:31:27 -08:00
Atlante45	0f49653da3	More OS X warning cleanup	2015-12-11 16:31:27 -08:00
Seth Alves	920e2941b9	don't crash when a child no longer has a containing element	2015-12-11 15:31:56 -08:00
Seth Alves	6c033d9603	call locationChanged when receiving changing avatar joints over the network. RenderableModelEntityItem uses locationChanged to relay updates to _model	2015-12-11 11:35:42 -08:00
Howard Stearns	585911fe98	Merge pull request #6612 from sethalves/no-physics-until-ready ... No physics until ready	2015-12-10 16:09:49 -08:00
Atlante45	03ee07c8b7	Merge branch 'master' of https://github.com/highfidelity/hifi into particle	2015-12-10 13:37:20 -08:00
Seth Alves	8ca6c7acc3	Merge pull request #6611 from Atlante45/attachments ... Fix Attachments jitter	2015-12-10 11:46:19 -08:00
Seth Alves	dbde0b641e	Merge branch 'attachments' of github.com:Atlante45/hifi into no-physics-until-ready	2015-12-10 11:38:08 -08:00
Atlante45	6f29d9e7b8	Use strongly typed enum instead of nested alias	2015-12-10 11:10:09 -08:00
Seth Alves	a59af2c1b2	Merge branch 'master' of github.com:highfidelity/hifi into no-physics-until-ready	2015-12-10 09:03:57 -08:00
Seth Alves	d09f70239c	make entity-tree a global. change how network-requests to load model geometry are triggered	2015-12-10 09:03:53 -08:00
Brad Hefta-Gaub	bd1ab418a4	Merge pull request #6606 from hyperlogic/tony/remove-animation-start-automatically-property ... [PROTOCOL CHANGE] Entities: Removed Start Automatically property from Animation Group	2015-12-10 07:35:55 -08:00
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
Atlante45	1d513cfbba	Merge branch 'master' of https://github.com/highfidelity/hifi into particle	2015-12-09 15:09:19 -08:00
Philip Rosedale	c93252b134	Merge pull request #6596 from AndrewMeadows/fix-bad-ownership ... fix bad simulation ownership when using edit.js	2015-12-08 17:49:38 -08:00
Andrew Meadows	987b8d3334	fix bad simulation ownership when using edit.js	2015-12-08 14:34:25 -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
Atlante45	c8ab95bb53	Spacing	2015-12-03 15:01:18 -08:00
Atlante45	180ffcc456	Typo (English is weird)	2015-12-03 15:01:18 -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