186 commits

Author	SHA1	Message	Date
Seth Alves	aa1d3eb82a	respond to code review	2015-05-20 17:31:57 -07:00
Seth Alves	4a59dc24c5	split entity-add and entity-edit messages	2015-05-20 14:52:03 -07:00
Seth Alves	124ff68cee	make EntityItemID a subclass of QUuid	2015-05-20 14:22:08 -07:00
Seth Alves	f522334c99	sort out script interface changes	2015-05-20 12:30:06 -07:00
Seth Alves	a769cfdaf2	client decides on new entity-ids, keep EntityItemID class	2015-05-20 10:42:19 -07:00
Seth Alves	f9d46b0cb5	interface decides on entityIDs rather than bouncing a temporary id through the entity server	2015-05-19 14:25:23 -07:00
Andrew Meadows	7e9e223b3e	merge upstream/master into andrew/nova	2015-05-12 21:48:55 -07:00
Andrew Meadows	4872a565c9	bid for simulation ownership	2015-05-12 21:46:52 -07:00
ZappoMan	73428ec12d	add support to not displace very large clipboards on import	2015-05-11 14:21:58 -07:00
Stephen Birarda	305835ea79	Merge branch 'master' of https://github.com/highfidelity/hifi into sequence-numbers	2015-05-07 15:38:35 -07:00
Seth Alves	c35edd8eb4	some debugging on Andrew's refactor	2015-05-05 16:40:10 -07:00
Seth Alves	1cd93b9ec8	pull andrew's branch, add back in visual indicator of an entity being active in bullet	2015-05-05 13:14:22 -07:00
Stephen Birarda	6b3cf1ba4a	remove dependency of PacketHeaders on NodeList	2015-05-05 12:19:42 -07:00
Andrew Meadows	6be3cc6efb	remove debug stuff	2015-05-05 10:18:03 -07:00
Andrew Meadows	d5f4c5a0ef	add/delete/cleanup of physical entities works	2015-05-05 10:10:08 -07:00
Andrew Meadows	3031d55c8e	merge upstream/master into andrew/nova	2015-05-01 11:03:51 -07:00
Andrew Meadows	31ca5b9eef	add EntityTree::_pendingDelete for delayed deletes ... for case where EntitySimuation needs time to remove pointers	2015-05-01 10:43:58 -07:00
Seth Alves	f75b599288	don't save default values in json file	2015-04-30 11:28:27 -07:00
Andrew Meadows	14b6ee608a	more PhysicalEntitySimulation implementation ... with changes to API's accordingly (does not compile yet)	2015-04-28 15:07:37 -07:00
Seth Alves	6f441e3490	if our Node isn't allowed to create entities in this domain, don't try.	2015-04-27 19:07:53 -07:00
Seth Alves	0fb1a83e3b	quiet compiler, remove some trailing control-Ms	2015-04-25 09:20:00 -07:00
Seth Alves	cde64893af	coding standard	2015-04-21 18:36:06 -07:00
Seth Alves	08d300afcd	use a flag to indicate that simulation ownership should be grabbed	2015-04-20 11:49:10 -07:00
Seth Alves	3da2d1680d	fix code that causes scripted changes to physics-related entity properties to claim simulation ownership	2015-04-17 10:41:11 -07:00
Seth Alves	deec577db6	if nodes are fighting over phyics variables, squash physics-related properties in the updates from the loser of the race	2015-04-17 10:21:52 -07:00
Seth Alves	d7059d8f2d	add code for uuids in wire protocol. some debugging prints	2015-04-16 14:46:38 -07:00
Seth Alves	b30b9a0a30	don't update _simulatorIDChangedTime unless the value is different than the current one. if a script changes an entity, attempt to claim ownership	2015-04-16 12:03:34 -07:00
Seth Alves	df37b853f7	setup test of lockout-period oafter simulator-owner-id change	2015-04-16 08:57:57 -07:00
Seth Alves	3cf31ff701	fix to allow modelEntityItems with shape of box into physicsengine. ignore entity updates echoed back to us. stop broadcasting after 3 non-moving updates	2015-04-14 13:32:02 -07:00
Seth Alves	d4461f1ecb	put avatars and embedded-webserver and entities logging into their own QLoggingCategory	2015-04-06 16:22:54 -07:00
ZappoMan	45ab438339	add logging for delete operations in the server	2015-04-02 16:44:04 -07:00
ZappoMan	84940d8e43	fix SVO import	2015-04-02 14:13:19 -07:00
Seth Alves	4e83301c65	add a bool value to Node which indicates if it is allowed to rez new entities	2015-03-31 18:27:46 -07:00
ZappoMan	df99c314aa	fix issue with preload not being called on import	2015-03-31 12:44:44 -07:00
ZappoMan	a765b4c8a5	fix to preload getting called when you change a script	2015-03-27 18:56:55 -07:00
Brad Hefta-Gaub	a5294ae3fa	Merge pull request #4436 from sethalves/persist-entities-as-json ... Optionally persist entities as json	2015-03-17 21:53:17 -07:00
Clément Brisset	9acc4a1a8f	Merge pull request #4457 from ZappoMan/quietLogs ... dont report deleteEntity warnings in client for delete messages coming back from server	2015-03-17 15:42:20 +01:00
Seth Alves	bed37ef49a	incorporate code review feedback	2015-03-16 13:57:22 -07:00
Seth Alves	c90ca4b425	Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json	2015-03-16 12:13:26 -07:00
Seth Alves	2d4a95c634	move to-map recurse operator class to its own file	2015-03-16 11:54:50 -07:00
ZappoMan	7ddd54b782	dont report deleteEntity warnings in client for delete messages coming back from server	2015-03-16 11:11:07 -07:00
Seth Alves	32c79f6172	bounce json's QVariants through QScripts before making them into properties, in order to take advantage of existing conversion code	2015-03-16 09:17:32 -07:00
Atlante45	ad16f49d01	Merge branch 'master' of https://github.com/highfidelity/hifi into edit_entities_box_selection	2015-03-16 14:28:24 +01:00
Seth Alves	6c4b808813	Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json	2015-03-15 07:10:56 -07:00
Atlante45	7911974946	Added findEntities for AAbox	2015-03-13 13:55:26 +01:00
Seth Alves	c9eacd2197	remove unneeded debug print	2015-03-12 11:37:53 -07:00
Seth Alves	e66ac7f982	formatting	2015-03-12 11:29:47 -07:00
Seth Alves	4aa7b0eb0f	provide defaults for anything entity properties read from a map	2015-03-12 11:19:47 -07:00
Ryan Huffman	5c9ec6bdcc	Add add/delete/rename/clear events to EntitiesScriptingInterface	2015-03-12 11:17:07 -07:00
Seth Alves	ac882f86e2	backup code is now aware of possible file extension differences	2015-03-12 09:13:53 -07:00