155 commits

Author	SHA1	Message	Date
Philip Rosedale	c2e559342a	Merge pull request #4341 from AndrewMeadows/bispinor ... load non-moving dynamic objects as "inactive" in physics engine	2015-02-26 09:21:49 -08:00
Andrew Meadows	5776df1012	load dynamic obj as inactive when not moving	2015-02-25 12:07:19 -08:00
Stephen Birarda	6b08b2993a	fix for bullet system include to silence warnings	2015-02-19 13:03:16 -08:00
Stephen Birarda	70a89680f5	fix bullet include to match previous format	2015-02-19 12:04:41 -08:00
Stephen Birarda	6f055ca0d7	add an external project to handle bullet	2015-02-19 12:01:40 -08:00
Stephen Birarda	b2e587dbbd	remove use of include_dependency_includes and use cmake	2015-02-18 14:12:05 -08:00
Stephen Birarda	e99012efbb	updates to build guides to remove soxr	2015-02-17 10:33:12 -08:00
Stephen Birarda	8c998a65ee	use the glm find_package and check externals	2015-02-13 12:50:32 -08:00
Stephen Birarda	d7ce10dedb	use external project glm for physics library	2015-02-13 10:33:35 -08:00
Andrew Meadows	f4a4c9786c	don't create shape for SHAPE_TYPE_NONE	2015-02-11 08:43:55 -08:00
Andrew Meadows	3239c259f9	remove commented out cruft	2015-02-11 08:43:19 -08:00
Andrew Meadows	e6a6946027	merge upstream/master into andrew/thermonuclear	2015-02-09 12:44:52 -08:00
Andrew Meadows	0ef5d42a5b	unit tests support new ShapeInfo API	2015-02-08 15:13:21 -08:00
Andrew Meadows	12a7021bb5	ShapeInfo computs own DoubleHashKey, gets new API	2015-02-08 15:12:44 -08:00
Andrew Meadows	b4da2ddd52	fix physics crash on disconnect from domainserver	2015-02-05 09:13:32 -08:00
Andrew Meadows	28a3c3f469	separate new shape types from legacy	2015-02-03 08:34:06 -08:00
Andrew Meadows	58bb137c4d	bulletRotationStep --> computeBulletRotationStep	2015-01-27 17:37:12 -08:00
Andrew Meadows	23bd3f90d9	Bullet-style rotation integration for kinematics ... and for dead reckoning after wire-transfer	2015-01-27 17:27:15 -08:00
Andrew Meadows	d1cf6559c5	merge upstream/master into andrew/isentropic ... Conflicts: libraries/physics/src/ObjectMotionState.cpp	2015-01-27 16:24:11 -08:00
Andrew Meadows	d5c0c200de	optimization for when physics engine doesn't step	2015-01-27 15:54:32 -08:00
Andrew Meadows	aebdd3b335	fix bad extrapolation of rapidly spinning objects	2015-01-27 15:53:37 -08:00
ZappoMan	23892ab1e7	fixed comments	2015-01-27 11:38:14 -08:00
ZappoMan	94e04e2d7d	removed extra whitespace	2015-01-27 11:34:46 -08:00
ZappoMan	b1586d4f90	move debug into ifdef	2015-01-27 11:29:17 -08:00
ZappoMan	45dbff67f8	more hacking	2015-01-27 11:15:33 -08:00
ZappoMan	83d1cc911a	hacking	2015-01-26 19:38:24 -08:00
ZappoMan	81185cfe56	removed some debugging	2015-01-26 12:46:22 -08:00
ZappoMan	08fbcbaf40	tweaks for debugging	2015-01-26 12:38:02 -08:00
ZappoMan	a1ec44b8e0	add developer menu item to disable sending physics updates	2015-01-26 12:05:57 -08:00
ZappoMan	73b9c06ec0	added some debugging	2015-01-26 11:13:30 -08:00
ZappoMan	f85774c687	adding some debugging	2015-01-26 09:45:33 -08:00
ZappoMan	9cc61e90f7	Merge branch 'master' of https://github.com/highfidelity/hifi into fixGlitches ... Conflicts: libraries/entities/src/EntityItem.cpp	2015-01-23 15:01:35 -08:00
Andrew Meadows	1ad5f9c7db	merge upstream/master into andrew/isentropic ... Conflicts: libraries/physics/src/ObjectMotionState.cpp	2015-01-23 14:04:26 -08:00
ZappoMan	c01d2d657c	added comment	2015-01-23 13:55:12 -08:00
Andrew Meadows	b34189115d	Merge branch andrew/isentropic	2015-01-23 13:21:45 -08:00
Andrew Meadows	f2bcdfa2b4	update _lastSimulated for kinematic motion	2015-01-23 13:10:41 -08:00
Andrew Meadows	eefd32b42b	remove KinematicController classes	2015-01-23 11:04:02 -08:00
Andrew Meadows	d173afaa70	add support for non-physical kinematic movement	2015-01-23 11:01:46 -08:00
Andrew Meadows	355759d3d4	Merge pull request #4152 from ZappoMan/fixGlitches ... Fix glitches in bullets and multiple viewers	2015-01-22 13:49:00 -08:00
ZappoMan	d34764bd55	fix whitespace diff	2015-01-22 13:33:59 -08:00
ZappoMan	6a9a6968f2	debugging stutter	2015-01-22 13:32:57 -08:00
ZappoMan	c6ad1462e6	debugging stutter	2015-01-22 13:31:59 -08:00
ZappoMan	838a549abe	debugging stutter	2015-01-22 13:31:09 -08:00
ZappoMan	14c7dc8eb9	debugging stutter	2015-01-22 13:13:18 -08:00
Andrew Meadows	3997b916c1	remove ground collision hack for physics testing	2015-01-22 09:17:51 -08:00
Andrew Meadows	77c4362991	fix typo	2015-01-21 18:14:24 -08:00
Andrew Meadows	b2e79a0157	don't process results when no simulation	2015-01-21 18:06:19 -08:00
Andrew Meadows	2751fab2c3	don't send collision events for inactive pairs ... also throttle collision events to 30/sec	2015-01-21 18:02:13 -08:00
Andrew Meadows	1c38b08e8f	remane emitEntityCollision... to entityCollision...	2015-01-21 14:07:23 -08:00
Andrew Meadows	6840daa0b5	removing tabs from formatting	2015-01-21 11:55:28 -08:00