377 commits

Author	SHA1	Message	Date
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
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
Seth Alves	3f705f3172	keep track of the number of simulation steps each entity has been accelerated at nearly its gravity. if we get 4 in a row, start sending acceleration equal to gravity to the entity server, so it will include gravity in its estimates	2015-04-22 10:39:13 -07:00
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