2339 commits

Author	SHA1	Message	Date
Ryan Huffman	4e358f76fe	Remove trailing whitespace from EntityItemProperties.cpp	2017-01-20 14:36:45 -08:00
Ryan Huffman	ee8898568d	Remove const from getScript & getServerScripts	2017-01-20 14:36:01 -08:00
Atlante45	20a82df9a0	Fix scripts not reloading in certain edge cases	2017-01-19 15:48:44 -08:00
Ryan Huffman	465f5c6789	Add getters to ScriptStatusRequest	2017-01-19 15:09:16 -08:00
Ryan Huffman	d45f5ade97	Update Entities.getServerScriptStatus to return more information	2017-01-19 13:27:44 -08:00
Clément Brisset	89d1242925	Merge pull request #10 from huffman/feat/entity-server-script-property ... Entity script status + reload	2017-01-19 11:19:40 -08:00
Stephen Birarda	33cde412b1	make getJSONParameters thread-safe	2017-01-18 17:49:54 -08:00
Stephen Birarda	5fbdc94c66	pass usesFrustum down to EntityTreeElement	2017-01-18 17:49:54 -08:00
Stephen Birarda	ed41412d95	fix for unpack of OctreeQuery	2017-01-18 17:49:54 -08:00
Atlante45	cbc69fbf9e	Fix script preload functions	2017-01-18 16:42:25 -08:00
Atlante45	e94cccf08d	Fix server script preload funcitons	2017-01-18 16:12:41 -08:00
Stephen Birarda	112b119f17	send entities that just stopped matching filter	2017-01-18 14:58:36 -08:00
Stephen Birarda	5d1b53c600	move map population with properties back	2017-01-18 14:58:36 -08:00
Stephen Birarda	b08bfe93f4	change lastViewFrustumSent to lastQuerySent	2017-01-18 14:58:36 -08:00
Stephen Birarda	a1ad496772	handle match on non-default serverScripts property during entity send	2017-01-18 14:58:36 -08:00
Stephen Birarda	3556379034	leverage JSON filter changes to OctreeQuery in EntityServer	2017-01-18 14:58:36 -08:00
Ryan Huffman	d85f27e992	Add Entities.getServerScriptStatus	2017-01-18 11:15:59 -08:00
Ryan Huffman	8137c59ef7	Add support for sending requests to entity script server	2017-01-18 11:15:29 -08:00
Atlante45	20b7bb0c54	EntityScriptServer tracks server scripts	2017-01-17 16:41:56 -08:00
Ryan Huffman	812aaee48c	Add Entities.reloadServerScripts	2017-01-17 14:47:57 -08:00
Ryan Huffman	b0c2a9d614	Add serverScripts entity property	2017-01-17 14:47:06 -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
David Rowe	9459b967be	Merge branch 'master' into 21089	2016-12-16 20:02:43 +13:00
David Rowe	be00730073	Add canWriteAssets method and signal to Entities API	2016-12-14 14:27:55 +13:00
Seth Alves	6fe35ac0da	use smart pointers to avoid leaking EntityTreeElementExtraEncodeData	2016-12-12 16:04:41 -08:00
David Rowe	c87149cfc2	Tidying	2016-12-10 12:59:01 +13:00
Faye Li Si Fi	9289dd36d4	Merge remote-tracking branch 'refs/remotes/highfidelity/master' into last-edited-property	2016-12-08 10:50:00 -08:00
Faye Li Si Fi	1fde68c86e	better code style	2016-12-07 16:10:03 -08:00
Faye Li Si Fi	b6798adb5c	yay	2016-12-07 15:40:37 -08:00
Faye Li Si Fi	0556661d13	getting rid of uneccessary flag, fix formatting, and getting it to work yay	2016-12-07 15:40:21 -08:00
Faye Li Si Fi	0fcb8803b6	attempt to expose last edited property to script	2016-12-07 12:27:31 -08:00
Brad Davis	5cbf7588ac	Fixes for building on MSVC 2015 / Qt 5.8	2016-12-02 14:58:09 -08:00
Seth Alves	d2b32c3084	Merge pull request #9057 from druiz17/childParent ... fixed children of parent object not being added back when performing an undo	2016-12-01 16:59:06 -08:00
Dante Ruiz	348c0c95e5	conforming to coding standard and better variable naming	2016-12-01 22:22:17 +00:00
Chris Collins	942850293e	Merge pull request #9105 from druiz17/teleportBug ... Fix for unable to teleport to areas that you should	2016-12-01 11:35:06 -08:00
Dante Ruiz	0c9cd5803a	added descendant checking	2016-12-01 10:54:26 -08:00
Dante Ruiz	c52f893273	isChildOfParent	2016-12-01 10:54:26 -08:00
Dante Ruiz	1b20cc8bd0	more clean up	2016-11-30 18:28:50 +00:00
Dante Ruiz	104cbbff7e	clean up	2016-11-30 18:26:06 +00:00
Dante Ruiz	34d24b947e	better implementation	2016-11-30 18:03:11 +00:00
Dante Ruiz	daf12047ca	removed unnessary comments	2016-11-22 18:55:20 +00:00
Dante Ruiz	2dfb745443	made some chnages	2016-11-22 18:53:03 +00:00
samcake	dfc0b7beac	adressed reveiw comments	2016-11-22 10:15:49 -08:00
Dante Ruiz	a176c624ab	fixed teleport bug	2016-11-21 23:04:07 +00:00
Dante Ruiz	1ba769b0ef	teleportBug	2016-11-21 10:38:20 -08:00
samcake	9031e65aa5	Merge and fix the bug!!!	2016-11-16 19:12:56 -08:00
Dante Ruiz	66ff81f450	Another function name change	2016-11-16 22:32:15 +00:00
Dante Ruiz	9c4ae9df5a	function name change	2016-11-16 22:09:22 +00:00
Dante Ruiz	ff7c11d48c	Fixed avatar parent delete issue	2016-11-16 13:03:34 -08:00