738 commits

Author	SHA1	Message	Date
Seth Alves	d71cecbc61	Merge pull request #6675 from AndrewMeadows/crash-fix ... fix crash when visiting new domain with gun in hand	2015-12-20 06:24:44 -08:00
Andrew Meadows	ff83f8fc37	fix crash mode when leaving domain with handgun	2015-12-16 15:11:47 -08:00
Seth Alves	d3c57821c0	call a method on actions before each physics simulation step. use this to attempt to dejitter held objects	2015-12-16 14:00:04 -08:00
Atlante45	ce51350b65	Fix warnings on windows 64bit	2015-12-11 15:42:15 -08:00
Atlante45	a07d7494f0	More OS X warning cleanup	2015-12-11 14:20:36 -08:00
Andrew Meadows	9e99bff250	fix avatar upward drift after shape change	2015-12-09 18:09:55 -08:00
Andrew Meadows	8c109fd623	move raw bullet code from interface to physics lib	2015-12-08 17:21:43 -08:00
Atlante45	1d498af76e	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-12-04 15:18:25 -08:00
Seth Alves	6eae98fb28	merge from upstream	2015-12-02 14:38:26 -08:00
Andrew Meadows	ab6367ff4e	remove debug option for disabling physics updates	2015-12-01 11:13:01 -08:00
Stephen Birarda	2acfbd0f8f	revert accidental CCD change	2015-11-30 15:52:03 -08:00
Stephen Birarda	f07314f4ef	resolve conflicts on merge with huffman/baseball	2015-11-30 13:34:36 -08:00
Seth Alves	4add3e2e91	rework worldToLocal, start on allowing scripts entity position/rotation to always be in world space	2015-11-30 09:41:15 -08:00
Seth Alves	ca75802b9c	unmangle merge	2015-11-26 06:43:28 -08:00
Andrew Meadows	527408c7c1	Merge pull request #6292 from huffman/physics-continuous-collision-detection ... Physics continuous collision detection	2015-11-25 15:45:18 -08:00
Andrew Meadows	e26081e981	always update physics properties when they change ... and move activation check logic to MotionState	2015-11-24 10:20:19 -08:00
Andrew Meadows	5135c9dded	whitespace cleanup	2015-11-24 10:20:19 -08:00
Seth Alves	d4937071e1	rather than activating rigid body and forcing non-static on deserialize, just force non-static	2015-11-23 12:17:15 -08:00
Seth Alves	6f19093cb9	if an entity with an action has a motion-type of static, flag it so it gets updated in bullet	2015-11-23 10:03:35 -08:00
Seth Alves	f013f95e9b	merge from upstream	2015-11-21 08:43:00 -08:00
Ryan Huffman	510189dfbc	Update CCD motion threshold	2015-11-17 15:08:05 -08:00
Ryan Huffman	5154fbc8c5	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-16 12:23:26 -08:00
Seth Alves	b0d24be58f	add a way to get a list of all actions of a certain type from an entity. hold actions average their positional targets.	2015-11-13 16:02:39 -08:00
Seth Alves	919ea5f1a0	send action updates even if we aren't the simulation owner	2015-11-13 12:37:07 -08:00
Seth Alves	7979fb38cf	don't always send actiondata along with other physics related properties	2015-11-13 09:25:17 -08:00
Seth Alves	ed8a604e13	adjust how the decision to send action changes over the wire is made	2015-11-12 17:36:45 -08:00
Seth Alves	756b382a75	adjust how the decision to send action changes over the wire is made	2015-11-12 17:12:20 -08:00
Seth Alves	6f83f32ecc	adjust how the decision to send action changes over the wire is made	2015-11-12 16:27:54 -08:00
Seth Alves	d7be1699a7	adjust how the decision to send action changes over the wire is made	2015-11-12 15:27:10 -08:00
Seth Alves	a8cd891e48	adjust how the decision to send action changes over the wire is made	2015-11-12 14:19:23 -08:00
Seth Alves	2e635bd936	cleanups	2015-11-12 11:14:25 -08:00
Seth Alves	93da3ed5bd	if our simulation-bid priority matches the remote one, don't bid.	2015-11-12 11:03:34 -08:00
Seth Alves	774e2ab6d6	adjust how EntityMotionState updates its idea of what the server knows about an entity	2015-11-10 15:13:07 -08:00
Seth Alves	97fec5b814	adjust how EntityMotionState updates its idea of what the server knows about an entity	2015-11-10 15:09:53 -08:00
Seth Alves	df5d161721	adjust how EntityMotionState updates its idea of what the server knows about an entity	2015-11-10 15:02:17 -08:00
Seth Alves	e067195dfe	adjust how EntityMotionState updates its idea of what the server knows about an entity	2015-11-10 14:42:40 -08:00
Seth Alves	82bd506086	adjust how EntityMotionState updates its idea of what the server knows about an entity	2015-11-10 14:32:57 -08:00
Ryan Huffman	7c5f0bb620	Update RADIUS_MOTION_THRESHOLD_MULTIPLIER	2015-11-10 08:51:22 -08:00
Ryan Huffman	7694958b20	Merge branch 'master' of https://github.com/highfidelity/hifi into physics-continuous-collision-detection	2015-11-09 15:22:26 -08:00
Atlante45	6a53021818	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-09 13:23:31 -08:00
Seth Alves	4ed8a1e5d1	changes to send an update to entity-server when AvatarActionHold releases an entity	2015-11-06 09:25:53 -08:00
Atlante45	55894f2eee	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-03 17:46:24 -08:00
Seth Alves	ffb0317a50	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-11-03 16:53:00 -08:00
Ryan Huffman	c0a7da0b88	Add comment to ObjectMotionState::updateCCDConfiguration	2015-11-03 11:22:15 -08:00
Ryan Huffman	b410604475	Add comments to updateCCDConfiguration	2015-11-03 11:18:38 -08:00
Ryan Huffman	b75e053e9d	Add automatic CCD activation to the physics engine	2015-11-03 11:01:51 -08:00
Ryan Huffman	f4531759be	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-02 12:27:08 -08:00
Seth Alves	3ac0fef1ea	merge from upstream	2015-11-01 15:22:57 -08:00
Howard Stearns	79f05c63e5	Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds	2015-10-31 11:23:18 -07:00
Seth Alves	944f0965c0	some refactoring and a bug fix -- grab script can throw things again	2015-10-30 16:35:50 -07:00