395 commits

Author	SHA1	Message	Date
Andrew Meadows	31e5758422	namechange updateObjectEasy()-->updateBodyEasy()	2015-04-27 13:04:59 -07:00
Andrew Meadows	72deb2e49b	merge upstream/master into andrew/thermonuclear ... Conflicts: libraries/entities/src/EntityItem.h libraries/physics/src/EntityMotionState.cpp	2015-04-27 12:54:21 -07:00
Seth Alves	2e5049a190	fix bug caused by no-longer reusing a variable	2015-04-27 12:20:01 -07:00
Seth Alves	e14b4c6ad4	cleanups	2015-04-27 11:01:48 -07:00
Seth Alves	8278f52a79	cleanups	2015-04-27 10:59:51 -07:00
Seth Alves	26511575c2	Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic	2015-04-27 06:44:59 -07:00
Andrew Meadows	e3d29d74af	name changes and preparation for more cleanup	2015-04-26 15:24:30 -07:00
Seth Alves	81ff8a4448	count steps during which an EntityItem is moving but has no simulation owner. Once the count is high enough (how high is TBD), attempt to claim ownership	2015-04-25 07:17:21 -07:00
Seth Alves	48ec0c8339	formatting, re-enable code that causes an interface to attempt to claim a moving object with no current simulation-owner	2015-04-25 06:56:19 -07:00
Atlante45	ba507cef98	Fix a few warnings	2015-04-25 11:01:02 +02:00
Seth Alves	218393a2b3	rather than keeping track of previous pos/rot sent by server, use a new flag that indicates that the values should be updated in the physics engine, but that the object should not be woken	2015-04-24 17:37:19 -07:00
Seth Alves	6e6793cbcc	remove debugging prints	2015-04-24 15:18:02 -07:00
Andrew Meadows	3ecf959b3e	removed cached copies of damping and restitution	2015-04-24 14:50:37 -07:00
Seth Alves	2a8fbeca32	sync	2015-04-24 14:43:39 -07:00
Seth Alves	e7c6ee597a	sync	2015-04-24 14:36:05 -07:00
Seth Alves	ea250c037a	sync	2015-04-24 14:27:32 -07:00
Seth Alves	6b53fefebe	sync	2015-04-24 14:21:59 -07:00
Seth Alves	fea8d84618	sync	2015-04-24 14:09:10 -07:00
Seth Alves	ad85837b5a	sync	2015-04-24 13:44:34 -07:00
Andrew Meadows	f09a67af6c	don't need temp variable	2015-04-24 13:26:26 -07:00
Andrew Meadows	c4395e75bb	cleanup and comments	2015-04-24 13:26:26 -07:00
Seth Alves	902e84c711	sync	2015-04-24 13:10:38 -07:00
Seth Alves	a27f8f3f10	sync	2015-04-24 11:28:44 -07:00
Seth Alves	926694517f	sync	2015-04-24 11:07:45 -07:00
Seth Alves	1b84be6e10	attempting to have visual indicator of simulatorID	2015-04-24 10:55:43 -07:00
Seth Alves	6fdbce9ee3	oops	2015-04-24 09:29:57 -07:00
Seth Alves	6d151ee3ed	try a different way of identifying when to claim simulation ownership of a moving entity	2015-04-24 09:29:05 -07:00
Seth Alves	cf0499e671	various physics-related experiments	2015-04-23 21:07:04 -07:00
Seth Alves	2ca592de8b	fix logic with infectious simulation ownership	2015-04-23 10:02:29 -07:00
Seth Alves	10e5378396	fix mangled if	2015-04-23 09:13:18 -07:00
Seth Alves	9e96026c52	move _accelerationNearlyGravityCount and _shouldClaimSimulationOwnership from EntityItem to EntityMotionState	2015-04-22 21:36:36 -07:00
Seth Alves	4ca076ed94	put PhysicsEngine::bump back in. some things get missed if we just set the one thing active	2015-04-22 18:53:49 -07:00
Seth Alves	5a7f8a2f5a	git rid of unneeded bump code. re-indent billiards.js and rez in balls with some y velocity so they fall to the table	2015-04-22 17:06:21 -07:00
Seth Alves	864f8cb3b3	fix comment	2015-04-22 16:10:25 -07:00
Seth Alves	96b4517e6e	when removing something from bullet, attempt to wake up anything that was touching it	2015-04-22 16:05:31 -07:00
Seth Alves	07a848c9ce	added bump call in physics engine for when an entity is deleted and may have something resting on top of it	2015-04-22 15:50:39 -07:00
Seth Alves	7781808bea	remove debug prints, fix a comment	2015-04-22 15:25:09 -07:00
Seth Alves	6678922f5c	put back code for interface giving up simulator status when something stops	2015-04-22 15:09:56 -07:00
Seth Alves	3450597d70	remove some debugging prints	2015-04-22 15:03:23 -07:00
Seth Alves	c30d742f7d	experimenting	2015-04-22 14:22:09 -07:00
Seth Alves	36dbbd0c9d	experimenting	2015-04-22 14:14:12 -07:00
Seth Alves	cd3ee39fcc	experimenting	2015-04-22 13:42:04 -07:00
Seth Alves	69ee33a392	experimenting	2015-04-22 13:29:28 -07:00
Seth Alves	ee000f91ae	experimenting	2015-04-22 13:27:19 -07:00
Seth Alves	27ed0c4a98	experimenting	2015-04-22 13:21:06 -07:00
Seth Alves	7382b0b19f	experimenting	2015-04-22 13:17:20 -07:00
Seth Alves	a6750eafd8	experimenting	2015-04-22 13:03:59 -07:00
Seth Alves	dc30ca0210	experimenting	2015-04-22 12:51:29 -07:00
Seth Alves	41166c1a42	allow entity server to time-out entity-simulation ownership rather than having interfaces give it up	2015-04-22 11:18:18 -07:00
Seth Alves	32673efc80	compute collision events inside lock to avoid a rare crash	2015-04-22 10:51:45 -07:00