691 commits

Author	SHA1	Message	Date
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	c69aaa806b	if a uuid is null, don't send a uuid of all zeros	2015-04-17 09:55:49 -07:00
Seth Alves	f77038c52d	when ignoring an incoming packet, still read it so the data-stream pointer doesn't get screwed up	2015-04-17 09:37:48 -07:00
Seth Alves	f48f9caea4	cut back on debuging prints	2015-04-16 16:18:13 -07:00
Seth Alves	1484d6e37f	fix READ_ENTITY_PROPERTY_UUID_TO_PROPERTIES to use binary version	2015-04-16 16:10:01 -07:00
Seth Alves	3b2a15f76a	more debugging	2015-04-16 15:52:48 -07:00
Seth Alves	ea8dcfa5b5	read UUIDs as UUIDs rather than as strings. more debugging prints	2015-04-16 15:33:43 -07:00
Seth Alves	d7881f1891	adjust logic for releasing ownership of simulation	2015-04-16 15:15:28 -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	6c4d232ad9	respond to code review	2015-04-15 16:08:15 -07:00
Seth Alves	e3a90b80a4	fix typo in comment	2015-04-15 16:04:18 -07:00
Seth Alves	62b59b7ccc	remove uneeded debug print	2015-04-15 11:02:12 -07:00
Seth Alves	afca5440f0	entity-server will automatically clear simulation-owner ID if it doesn't get an update for 2 seconds	2015-04-15 10:58:56 -07:00
Seth Alves	e5db2380bf	Merge branch 'bispinor' of github.com:AndrewMeadows/hifi into acceleration-and-owner-in-wire-protocol	2015-04-14 15:44:59 -07:00
Seth Alves	2a87eb9ce1	pull from andrew's branch	2015-04-14 15:44:53 -07:00
Andrew Meadows	aec42cf2dc	enforce ShapeType agreement for ModeEntityItem	2015-04-14 15:39:49 -07:00
Andrew Meadows	5b81b5b11b	removing SHAPE_TYPE_CONVEX_HULL from entities lib	2015-04-14 14:56:32 -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	b5bfbba759	only set simulationID on scripted entity creation if the entity has velocity or rotation	2015-04-14 10:17:54 -07:00
Seth Alves	d330319ed9	when a script creates and object, set the local Node as the simulation owner	2015-04-14 09:56:39 -07:00
Seth Alves	f7c0637952	oops	2015-04-13 16:51:05 -07:00
Seth Alves	cf6259c5d7	turn down debugging	2015-04-13 16:41:38 -07:00
Seth Alves	a30e807051	get rid of unneeded updateSimulatorID, set changed simulator id in properties so it gets included in outgoing packet	2015-04-13 16:20:30 -07:00
Seth Alves	396f6b1987	mess with debugging prints	2015-04-13 15:22:54 -07:00
Seth Alves	9c2fec36fd	adjust debugging, try a different DIRTY flag	2015-04-13 12:52:31 -07:00
Seth Alves	f42a43e180	cause changes to _simulatorID to be broadcast	2015-04-13 12:39:40 -07:00
Seth Alves	f44f823649	Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol	2015-04-13 10:45:07 -07:00
Andrew Meadows	e9159304d2	Merge pull request #4617 from sethalves/acceleration-and-owner-in-wire-protocol ... Acceleration and owner in wire protocol	2015-04-10 09:07:47 -07:00
Seth Alves	b472edbebb	remove debug print for something that no longer exists	2015-04-09 09:26:14 -07:00
Atlante45	298a81cea9	Trim entity properties set from JS that are strings	2015-04-09 14:42:26 +02:00
Seth Alves	62ff8bf735	set PROP_LAST_ITEM automatically	2015-04-08 17:07:20 -07:00
Seth Alves	51a0fdf3d4	formatting	2015-04-08 15:43:49 -07:00
Seth Alves	1dd01cde00	expand svo to hold acceleration and id of current simulator node	2015-04-08 15:39:34 -07:00
Seth Alves	9014397167	try again without macro	2015-04-07 09:59:04 -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
Clément Brisset	efbd74f539	Merge pull request #4597 from huffman/light-overlays ... Light overlays	2015-04-06 16:02:44 +02:00
Ryan Huffman	5fd960fb43	Add entity light cutoff/dimensions constraints	2015-04-03 15:32:53 -07:00
Andrew Meadows	abd78fede5	fix: change of dimensions would not update physics	2015-04-03 15:11:57 -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
Seth Alves	186cb1ec7a	merge from upstream	2015-03-30 11:28:47 -07:00
Philip Rosedale	685de8cc7f	Merge pull request #4522 from huffman/rename-attribution ... Rename attribution to marketplaceID	2015-03-30 10:57:28 -07:00
ZappoMan	a765b4c8a5	fix to preload getting called when you change a script	2015-03-27 18:56:55 -07:00
Ryan Huffman	81cb1e98ba	Rename attribution to marketplaceID	2015-03-27 13:35:58 -07:00
Seth Alves	212f564131	Merge branch 'master' of github.com:highfidelity/hifi into multi-hull-collisions	2015-03-26 13:08:44 -07:00