24418 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Atlante45	99fd590a90	Update compound shape geometry when async get	2015-04-23 16:05:06 +02:00
Atlante45	d18229d52d	Merge branch 'master' of https://github.com/highfidelity/hifi into zones	2015-04-23 15:58:57 +02:00
Atlante45	6be0910966	Fix contain for collision hulls	2015-04-23 15:58:18 +02:00
Atlante45	3a0b5f9d22	Register RenderableZoneEntityItem in EntityTreeRenderer	2015-04-23 15:34:03 +02:00
Atlante45	c91ca146d5	Add different shapes to zone example	2015-04-23 15:22:58 +02:00
Atlante45	15482d6a57	Don't compute shape for zones	2015-04-23 15:21:51 +02:00
Atlante45	fb4d1d3557	Fix compoundShapeURL reseting shapeType	2015-04-23 14:24:20 +02:00
Atlante45	f117941c8d	Macro fixing	2015-04-23 13:25:14 +02:00
Atlante45	01f4f34911	Centralize contains standard cases	2015-04-23 13:04:59 +02:00
Atlante45	837a0d3ba8	rename collision model in edit.js	2015-04-23 12:13:52 +02:00
Atlante45	3ebe72f025	Fix read macro	2015-04-23 12:12:42 +02:00
Seth Alves	9e96026c52	move _accelerationNearlyGravityCount and _shouldClaimSimulationOwnership from EntityItem to EntityMotionState	2015-04-22 21:36:36 -07:00
Brad Davis	eaaada908a	Merge pull request #4674 from ZappoMan/ZoneVolume ... implement volume priority for zones	2015-04-22 20:21:30 -07:00
Brad Davis	de179256d3	Kill all the whitespace	2015-04-22 20:19:19 -07:00
Brad Davis	eab4ad9ea9	More coding standard stuff	2015-04-22 20:16:41 -07:00
Brad Davis	44efcdf82a	More coding standard	2015-04-22 20:08:49 -07:00
Brad Hefta-Gaub	67a12d8272	Merge pull request #4665 from ctrlaltdavid/dde-miscellaneous ... DDE miscellaneous	2015-04-22 19:57:49 -07:00
Brad Davis	732e9723cd	Messed up rename	2015-04-22 19:24:43 -07:00
Brad Davis	930ec7a6d8	One more	2015-04-22 19:22:10 -07:00
Brad Davis	c4d2bd2cda	More coding standard fixes	2015-04-22 19:18:09 -07:00
Brad Davis	8d8c4babba	Coding standard fixes	2015-04-22 19:06:22 -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	d51f5a0ae8	remove commented out code	2015-04-22 17:22:37 -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	92ceff1a03	clean up EntityItem constructors	2015-04-22 14:53: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
David Rowe	35e2b87a70	Rename DDE menu items	2015-04-22 13:15:57 -07:00
Seth Alves	a6750eafd8	experimenting	2015-04-22 13:03:59 -07:00
David Rowe	649d4736cd	Merge branch 'master' into dde-miscellaneous	2015-04-22 13:00:40 -07:00
Seth Alves	dc30ca0210	experimenting	2015-04-22 12:51:29 -07:00
ZappoMan	fb4e334c70	implement volume priority for zones	2015-04-22 12:38:34 -07:00
Atlante45	287d625c52	Added RenderableZoneEntities class	2015-04-22 21:17:12 +02:00
Atlante45	99b3ef0d75	Move contain function to FBXGeometry	2015-04-22 21:17:12 +02:00
Atlante45	9cec256142	Rename collisionModelURL members/methods	2015-04-22 21:16:09 +02:00
Atlante45	8dc98d86b5	Bump entities packet version	2015-04-22 21:16:03 +02:00
Atlante45	7f3be9c89b	Add shapeType/compoundShapeURL to ZoneEntities	2015-04-22 21:14:10 +02:00
Atlante45	b446644549	Rename CollisionModelURL handle	2015-04-22 21:03:56 +02:00
Atlante45	f3fcb749df	Fix algorithm + add comments	2015-04-22 21:03:55 +02:00