318 commits

Author	SHA1	Message	Date
Olivier Prat	aba8be595e	Separated fade categories from transition event types	2017-07-11 11:37:24 +02:00
Olivier Prat	9758a6ded0	Edition picking again (but without bounding box highlighting)	2017-07-10 17:57:02 +02:00
Olivier Prat	4256a1f2a7	Preparing for merge with stage. DOESN'T COMPILE!	2017-07-07 15:16:20 +02:00
Olivier Prat	5ab093dc38	Preparing to introducte TransitionStage	2017-07-07 11:01:47 +02:00
Olivier Prat	57b2bdf709	Working bubble isect owner POV	2017-07-04 09:14:08 +02:00
Olivier Prat	d9a83539b2	Merged with master	2017-07-03 15:32:30 +02:00
Olivier Prat	87833abd31	Sky working again.	2017-06-30 16:46:25 +02:00
Olivier Prat	6a31dc2659	Selection of edited object working	2017-06-29 12:13:55 +02:00
Olivier Prat	8a12d0c106	Fade effect working again for basic enter domain but with various Fade jobs	2017-06-29 08:54:23 +02:00
Sam Gateau	93963b3257	Apply the projection and deferred transform fixes found while working on spectator camera	2017-06-28 15:44:17 +02:00
Olivier Prat	1bb0d51849	Merged with master	2017-06-26 11:55:46 +02:00
Brad Davis	fece438602	Cleanup and refactoring	2017-06-15 18:58:56 -07:00
Olivier Prat	ace301945c	Added scale and duration debug parameters in debugFade.qml	2017-06-13 15:31:04 +02:00
Olivier Prat	24d45e0f5b	Updated from upstream master because of change of protocol	2017-06-13 10:43:25 +02:00
Olivier Prat	7d58c9a741	Fixed fade for shadow job	2017-06-08 17:09:08 +02:00
Olivier Prat	de143d0ea2	Switched to uniforms for sending fade shader data. Moved more fade functions to FadeEffect class	2017-06-06 17:07:20 +02:00
Olivier Prat	a9ab9d2476	Renamed FadeManager to FadeEffect	2017-06-06 16:27:56 +02:00
Olivier Prat	8af2f75996	Added FadeManager to centralize some common fade effect data and functions	2017-06-06 16:11:12 +02:00
Olivier Prat	e7eca7728f	Debug fade management moved out of the inner render loop	2017-06-06 14:57:52 +02:00
Olivier Prat	08fcd6c357	Added new shaders	2017-06-05 16:32:36 +02:00
Olivier Prat	1433ae4b34	Merged from 21274	2017-06-05 11:12:57 +02:00
samcake	c5e9551bab	more cleanup	2017-06-01 18:05:18 -07:00
samcake	82d348a2ef	Stencil rejection is working, and more cleaning	2017-05-31 16:46:20 -07:00
Sam Cake	32c5dac66a	Big cleanup of unecessary shaders and legacy from deferred lighting, and messing around with the stencil	2017-05-31 00:55:28 -07:00
samcake	8559ed6260	Starting to add the stencil mask for hmd	2017-05-30 16:37:10 -07:00
samcake	c256893575	some clean up:	2017-05-23 18:00:22 -07:00
samcake	2cd2c95940	Adding more debugging tool	2017-05-16 16:12:31 -07:00
Sam Cake	4c3ddfbff9	Adding debuging of the ambient lighting	2017-05-16 01:01:19 -07:00
samcake	bc41be7ec1	Introucing the BackgroundStage to manage the background / skybox in one place	2017-05-09 17:10:05 -07:00
Sam Cake	d3724116d9	Using the items to pick the key light!	2017-05-08 00:20:20 -07:00
samcake	64317f5fd0	Adding a light item per zone	2017-05-04 16:47:03 -07:00
Olivier Prat	111f0762ea	Added debug scripts and fade position is now stable	2017-04-30 14:42:27 +02:00
Olivier Prat	8071c04e98	Added fade effect prototype version	2017-04-27 10:31:06 +02:00
Atlante45	33f58f99d1	CR	2017-04-25 16:09:31 -07:00
Atlante45	a450f52427	Start to setup image library	2017-04-25 15:56:22 -07:00
samcake	63fe579022	simply removing the SceneContext from the engine/task run call since we never used it and can unify into the RenderContext instead'	2017-04-18 17:05:40 -07:00
Sam Cake	a458828590	MOving forward with the TaskConcept and TaskModel, all working	2017-04-10 02:30:13 -07:00
Sam Cake	b65448bcbe	Trying to improve the Job/Task classes and testing it with the ZoneRenderer	2017-04-09 11:08:35 -07:00
samcake	e6844f4294	Cleaning up the basic jobs of render	2017-04-07 18:35:27 -07:00
samcake	cb94e1009d	Adding a job...	2017-04-06 18:10:28 -07:00
samcake	6fc965072c	Adding the Selection, and not the Tag concept fro real, and beeing able to reset it from the Transaction and simply communicating the ranked zones to the engine through a selection, ready to be used by the ZOneREnderer	2017-04-06 15:19:55 -07:00
Brad Davis	e482eac437	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-03-20 16:22:13 -07:00
samcake	0399249a03	Expeand the wireframe to the primitive entities and the polyvox	2017-03-15 16:58:31 -07:00
samcake	ea2f1359bc	Expose rendering in wireframe mode	2017-03-15 12:23:44 -07:00
Brad Davis	8782fe1d93	Merge branch 'master' into smarter_textures ... Conflicts: libraries/model-networking/src/model-networking/TextureCache.cpp	2017-03-06 15:29:41 -08:00
Bradley Austin Davis	efad7da508	Merge remote-tracking branch 'upstream/master' into HEAD	2017-03-03 08:59:24 -08:00
Seth Alves	5f570c1ba8	fix up bounds handling in Line3DOverlay	2017-03-02 16:16:48 -08:00
sam	709c2e4240	Fixing the emissive on overlayfor models	2017-02-27 02:52:00 -08:00
sam	a53d5e8fbd	adjusted the PLumber shape keys to coever non material shapes in main pass	2017-02-25 13:00:37 -08:00
samcake	55611d2373	Backing up to master	2017-02-21 14:56:07 -08:00