344 commits

Author	SHA1	Message	Date
Andrew Meadows	65825a4501	Merge pull request #4659 from ericrius1/collision ... Filtering triggering of collisions with contact type of "continue"	2015-04-22 09:33:40 -07:00
Seth Alves	cde64893af	coding standard	2015-04-21 18:36:06 -07:00
Seth Alves	4a5631fca6	cleanups, diff minimization	2015-04-20 16:51:28 -07:00
Seth Alves	23f1767634	cleanup	2015-04-20 16:13:28 -07:00
Seth Alves	d6c8bd94cf	clean up some debugging prints	2015-04-20 15:59:33 -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	88f289f3c1	small cleanup and some debugging prints	2015-04-20 11:19:48 -07:00
Seth Alves	fbff3627dc	attempt to claim simulation ownership of entities the avatar crashes with	2015-04-20 11:13:51 -07:00
Seth Alves	b3cb9fe9a4	fix comment some more	2015-04-17 15:33:41 -07:00
Seth Alves	dac57c44da	if measured acceleration is close to zero, send zero to entity server, else send gravity	2015-04-17 15:05:47 -07:00
Seth Alves	292ba20cf3	pull andrew's measure-acceleration branch	2015-04-17 11:35:12 -07:00
Eric Levin	2b4d894ab3	moved the type computation inside the while loop so it is correctly computed each iteration	2015-04-17 08:17:58 -07:00
Seth Alves	62a45ccebb	re-enable code that gives up simulation ownership	2015-04-16 17:00:36 -07:00
Eric Levin	096f69961a	Filtering triggering of collisions with contact type of "continue"	2015-04-16 16:42:28 -07:00
Seth Alves	faf5e7415d	don't explicitly release simulator status	2015-04-16 16:32:51 -07:00
Seth Alves	ec26b4595a	adjust comment	2015-04-16 16:27:30 -07:00
Seth Alves	f48f9caea4	cut back on debuging prints	2015-04-16 16:18:13 -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
Andrew Meadows	619d1ba191	rename to measureAcceleration	2015-04-16 14:09:33 -07:00
Andrew Meadows	1acb90e23a	merge upstream/master into andrew/isothermal	2015-04-16 13:48:47 -07:00
Andrew Meadows	b7ca69d4e1	fix typo	2015-04-16 13:46:26 -07:00
Andrew Meadows	5180e7e715	measure linear velocity of moving objects	2015-04-16 13:44:17 -07:00
Seth Alves	bce269ada2	Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol	2015-04-16 12:31:25 -07:00
Andrew Meadows	83d54eb46b	merge upstream/master into andrew/bispinor	2015-04-16 12:07:22 -07:00
Andrew Meadows	4bef5b7b73	Merge pull request #4638 from Triplelexx/myavatar-targetvelocity ... Myavatar targetvelocity	2015-04-15 14:22:02 -07:00
Seth Alves	c87dca5ba0	remove debug print	2015-04-15 11:58:12 -07:00
Seth Alves	51ac44a9b7	try to increase chances the interface gives up simulation ownership	2015-04-15 11:34:42 -07:00
Seth Alves	b21cc357e4	undo stop-sending hack	2015-04-14 16:08:53 -07:00
Seth Alves	2a87eb9ce1	pull from andrew's branch	2015-04-14 15:44:53 -07:00
Andrew Meadows	7da1c51877	whoops, missed a file	2015-04-14 14:55:42 -07:00
Andrew Meadows	da9091a99d	remove SHAPE_TYPE_CONVEX_HULL from libs and tests	2015-04-14 14:54:43 -07:00
Seth Alves	e25590f00e	don't give up ownership of simulation until the last packet is sent	2015-04-14 13:37: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	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	de2e5ae718	adjust logic for when to claim or release simulator status	2015-04-14 09:00:48 -07:00
Andrew Meadows	abb40ca080	cleanup: split stats dump out of stepSimulation	2015-04-14 09:00:36 -07:00
Seth Alves	05ef357854	debug prints	2015-04-13 16:47:06 -07:00
Seth Alves	256a7f5198	try different login for deciding when to update/clear simulatorID	2015-04-13 16:37:44 -07:00
Seth Alves	4677324a87	try different login for deciding when to update/clear simulatorID	2015-04-13 16:30:16 -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
Triplelexx	d2b643d389	Add targetVelocity into MyAvatar simulation ... MyAvatar sets a target velocity to achieve, this is parsed in the preSimulation controller step.	2015-04-13 23:57:08 +01:00
Seth Alves	396f6b1987	mess with debugging prints	2015-04-13 15:22:54 -07:00
Andrew Meadows	86f89a1d6f	fix bug where fly speed is limited to walk speed	2015-04-13 13:23:15 -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	eace91e833	if an entity is being moved and has no sim-id, set sim-id to local node-id. if it has a sim-id, and it's not the same as the local node's, don't broadcast the change	2015-04-13 12:25:44 -07:00
Seth Alves	e2af93db5f	some debugging	2015-04-13 11:38:30 -07:00
Seth Alves	4ada3fc9a4	don't keep large things out of physics engine	2015-04-09 15:12:51 -07:00