174 commits

Author	SHA1	Message	Date
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
ZappoMan	8366dd02a0	remove RenderableZoneEntityItem class since zones don't render like other entities	2015-04-21 15:03:04 -07:00
ZappoMan	4ce451f984	wire up zone rendering again	2015-04-21 14:55:45 -07:00
ZappoMan	e436c95212	first cut at reworking zones	2015-04-21 14:36:13 -07:00
ZappoMan	8ce4cb628a	another attempt at zones starting from box	2015-04-20 18:18:01 -07:00
ZappoMan	a9c2a6e048	another attempt at zones starting from box	2015-04-20 18:17:21 -07:00
Andrew Meadows	21d669f2f1	use computed shape type	2015-04-16 12:13:41 -07:00
Andrew Meadows	8623a0606c	remove accidentally commited debug code	2015-04-14 15:39:24 -07:00
Andrew Meadows	5b81b5b11b	removing SHAPE_TYPE_CONVEX_HULL from entities lib	2015-04-14 14:56:32 -07:00
Seth Alves	8479f0d4c1	don't compute shape info until both render and collision geometries are fully loaded	2015-04-13 09:34:38 -07:00
Seth Alves	e8ff727c61	when populating shape-info, give the dimensions of the collision model rather than those of the visual model	2015-04-07 15:47:13 -07:00
Andrew Meadows	a47170b02c	Merge pull request #4601 from samcake/temp1 ... Introducing gpu::State and using it in the Model rendering path and more...	2015-04-07 12:48:42 -07:00
Seth Alves	9014397167	try again without macro	2015-04-07 09:59:04 -07:00
Seth Alves	074e476797	put entities-renderer logging into its own QLoggingCategory	2015-04-06 16:30:20 -07:00
Sam Gateau	ecdffadcb7	trying to debug the indirect sh lighting going wrong, the noraml on avatar is not correct	2015-04-06 10:17:31 -07:00
Sam Gateau	00817ab64f	MErging with origin/orange, brinign the fix for shadows	2015-04-05 18:36:39 -07:00
Sam Gateau	b8db0ff2d7	getting ready for pr for a few syntax issues	2015-04-03 17:05:08 -07:00
Sam Gateau	6f5c411a46	Fixing a few issues and syntax, trying to understand why the shadows are not rendering correctly	2015-04-03 10:32:20 -07:00
Seth Alves	abf83bcf9e	Merge branch 'master' of github.com:highfidelity/hifi into island	2015-04-01 18:26:26 -07:00
Seth Alves	997f7251c7	dont need _collisionGeometryScale	2015-04-01 18:23:43 -07:00
Seth Alves	81200bb2a0	save collision hull scaling in model	2015-04-01 17:49:01 -07:00
ZappoMan	d87fe9efff	fix typo	2015-04-01 14:47:04 -07:00
ZappoMan	c66db5d8e4	another approach	2015-04-01 14:43:27 -07:00
ZappoMan	d7188bac0b	another approach	2015-04-01 14:38:01 -07:00
ZappoMan	aac824fb99	fix crash on shutdown	2015-04-01 13:47:25 -07:00
Sam Gateau	0d721ec1e9	merging	2015-03-31 17:47:05 -07:00
Sam Gateau	9b63739a72	Trying to clen up the REnderMode usage in connection with the needed gpu::State for all the different variations	2015-03-31 17:35:34 -07:00