200 commits

Author	SHA1	Message	Date
Seth Alves	867fe18472	put some code back now that entity-server is doing simple simulation again. don't draw blue physics-enabled dot unless debug menu-item is checked	2015-05-07 10:11:36 -07:00
Seth Alves	fe14202f51	add getName passthrough to ObjecdtMotionState, don't compute model shapes until the model has been simulated	2015-05-07 09:53:39 -07:00
Seth Alves	5ac8558168	flash yellow box when transmitting an edit packet	2015-05-06 17:03:27 -07:00
Seth Alves	4a7fe50084	Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1	2015-05-05 16:43:43 -07:00
Seth Alves	c35edd8eb4	some debugging on Andrew's refactor	2015-05-05 16:40:10 -07:00
Seth Alves	82828f0b93	print when bullet and local octree don't agree on position of an entity	2015-05-05 13:52:10 -07:00
Seth Alves	1cd93b9ec8	pull andrew's branch, add back in visual indicator of an entity being active in bullet	2015-05-05 13:14:22 -07:00
ZappoMan	5fc5df7c55	change skyboxMode to backgroundMode	2015-05-05 12:38:44 -07:00
ZappoMan	4b9c6728e7	fix issue with skyboxMode getting randomly set	2015-05-04 18:58:35 -07:00
ZappoMan	77232e35f8	Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereInZones	2015-05-04 17:16:33 -07:00
ZappoMan	2c02bfdda5	fix build buster	2015-05-04 16:01:50 -07:00
ZappoMan	3827e961a7	hook sunBrightness to keyLightIntensity	2015-05-04 15:31:50 -07:00
ZappoMan	403ed6d77b	wire up sunlocation from keylight direction	2015-05-04 15:20:16 -07:00
ZappoMan	cfe717fe08	only override environment when skyboxMode is atmosphere	2015-05-04 13:53:29 -07:00
ZappoMan	4561c59203	wire up zone to environment atmosphere rendering	2015-05-04 13:49:43 -07:00
Philip Rosedale	0f22b9beb8	Merge pull request #4741 from sethalves/box-stacking-1 ... move common debugging rendering into a new class	2015-05-02 00:34:44 -07:00
Ryan Huffman	51c2a8273e	Add drawZoneBoundaries	2015-05-01 12:52:40 -07:00
Seth Alves	bd1f77b8f3	cleanups	2015-05-01 11:35:14 -07:00
Seth Alves	ea1ec0186e	stop doing useless multiple inheritance	2015-05-01 11:31:58 -07:00
Seth Alves	b47184de78	oops	2015-05-01 11:21:27 -07:00
Seth Alves	452d78805e	oops	2015-05-01 11:20:50 -07:00
Seth Alves	b443ce5d3e	oops	2015-05-01 11:20:34 -07:00
Seth Alves	a31e2dc309	oops	2015-05-01 11:18:56 -07:00
Seth Alves	3765ace7ef	move common debugging rendering into a new class	2015-05-01 11:17:46 -07:00
Seth Alves	3c24d42d93	improve display of box and model entities when in simulator-id debug mode	2015-04-30 14:17:20 -07:00
Seth Alves	5d5624053f	drow boxes as aabox when we are the simulator	2015-04-30 13:15:55 -07:00
Brad Hefta-Gaub	50eecb15b3	Merge pull request #4712 from Atlante45/compound_zones_fix ... Compound zones fix	2015-04-28 09:48:05 -07:00
Atlante45	fe0bd456e1	Zones now use Models instead of FBXGeometries	2015-04-28 17:07:40 +02:00
Seth Alves	2cdbe8bf7b	merge from upstream	2015-04-27 09:57:36 -07:00
Seth Alves	e007617112	hook up menu-items to control debug rendering of collision hulls and owned simulations	2015-04-27 09:56:24 -07:00
Seth Alves	26511575c2	Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic	2015-04-27 06:44:59 -07:00
Seth Alves	0fb1a83e3b	quiet compiler, remove some trailing control-Ms	2015-04-25 09:20:00 -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
Seth Alves	ac46f84291	cleanups	2015-04-24 18:36:41 -07:00
Seth Alves	6e6793cbcc	remove debugging prints	2015-04-24 15:18:02 -07:00
Atlante45	a4f03f8b1c	Zones use avatar position not view frustum	2015-04-24 22:16:21 +02:00
Seth Alves	1b84be6e10	attempting to have visual indicator of simulatorID	2015-04-24 10:55:43 -07:00
Atlante45	b776ea8110	Make ::contains() back into a const	2015-04-23 19:15:06 +02:00
Atlante45	83490051d9	Move shape related contains() to ShapeInfo	2015-04-23 18:55:20 +02:00
Atlante45	f494f86ee5	Handle registration point in transforms	2015-04-23 17:48:29 +02:00
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
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	f3fcb749df	Fix algorithm + add comments	2015-04-22 21:03:55 +02:00
Atlante45	955723acf1	RenderableEntityItem uses collision hull in contains	2015-04-22 21:03:55 +02:00