92 commits

Author	SHA1	Message	Date
Howard Stearns	6ebeb7a22e	Another constexpr.	2015-05-13 15:47:47 -07:00
Howard Stearns	76e39fc95b	constexpr => const for Windows compiler.	2015-05-13 13:56:10 -07:00
Howard Stearns	1a87ca04da	Entity sound.	2015-05-13 13:18:02 -07:00
Seth Alves	4881b0c53c	copy box to make a new type of line entity item	2015-05-11 19:25:14 -07:00
Howard Stearns	51a29bdba6	Put back the script-fix that belongs in this branch.	2015-05-11 11:53:48 -07:00
ZappoMan	17c3c1a18d	add support for automatic hour/day calculations and backward compatibility on stage properties	2015-05-10 15:22:02 -07:00
ZappoMan	0b6a815a20	moved zone stage properties into a group	2015-05-08 20:17:01 -07:00
ZappoMan	1936f4c114	fix zone:nothing bug	2015-05-08 14:03:58 -07:00
Sam Gateau	deb303838d	Cleaning code	2015-05-07 17:15:45 -07:00
Sam Gateau	ce5295a55f	THese is not final but we have a basic working framework so let's try to share	2015-05-07 17:06:15 -07:00
Atlante45	faabf29e84	Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones	2015-05-07 19:58:26 +02:00
ZappoMan	496da6fcd5	wire up the skybox color property to the new skybox renderer	2015-05-06 20:36:06 -07:00
Atlante45	6d2fe945af	Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones	2015-05-06 09:53:57 +02:00
ZappoMan	5fc5df7c55	change skyboxMode to backgroundMode	2015-05-05 12:38:44 -07:00
Atlante45	429c1e1231	Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones	2015-05-05 21:33:55 +02:00
Atlante45	46cd1f458b	Actually call render on zone entities from tree	2015-05-05 17:20:27 +02:00
ZappoMan	4b9c6728e7	fix issue with skyboxMode getting randomly set	2015-05-04 18:58:35 -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
Atlante45	12fcb35717	Made RenderArgs a default ctor	2015-05-04 17:22:46 +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	0fb1a83e3b	quiet compiler, remove some trailing control-Ms	2015-04-25 09:20:00 -07:00
Atlante45	a4f03f8b1c	Zones use avatar position not view frustum	2015-04-24 22:16:21 +02: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	d18229d52d	Merge branch 'master' of https://github.com/highfidelity/hifi into zones	2015-04-23 15:58:57 +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	9cec256142	Rename collisionModelURL members/methods	2015-04-22 21:16:09 +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	a9c2a6e048	another attempt at zones starting from box	2015-04-20 18:17:21 -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	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
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
ZappoMan	df99c314aa	fix issue with preload not being called on import	2015-03-31 12:44:44 -07:00
ZappoMan	a88b3c02d2	quiet warning flood when scripts are bad	2015-03-30 18:24:34 -07:00
ZappoMan	31072b2b2e	only start one download per url even if still pending	2015-03-30 16:48:41 -07:00