575 commits

Author	SHA1	Message	Date
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	69a7ec42fd	Added fade state in render::Item	2017-07-07 09:16:54 +02:00
Olivier Prat	e178e36963	Fixed compilation error	2017-07-06 17:29:14 +02:00
Olivier Prat	018c0489f4	Merged with 21378	2017-07-06 16:53:47 +02:00
Sam Gateau	53ffca796f	Drafting a better SHape plumber to render the items	2017-07-06 16:35:40 +02:00
Olivier Prat	5cee2cff9f	Merge branch 'master' of git://github.com/highfidelity/hifi into 21378	2017-07-04 17:48:07 +02:00
Seth Alves	70a7b302fc	Merge pull request #10860 from jherico/deadlock_guards ... Don't use blocking connections on the main thread	2017-07-03 09:05:56 -07:00
Olivier Prat	972db8f54c	Fixed compilation error on Mac and Linux	2017-07-03 17:17:37 +02:00
Olivier Prat	d9a83539b2	Merged with master	2017-07-03 15:32:30 +02:00
Brad Davis	6fc82bb351	Switch to preprocessor macro for blocking invokes to capture function information	2017-06-30 11:36:24 -07:00
Olivier Prat	87833abd31	Sky working again.	2017-06-30 16:46:25 +02:00
Brad Davis	b52dd7b822	Don't use blocking connections on the main thread	2017-06-29 20:45:17 -07: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
Sam Cake	09529f6592	One more refinemnt of the comment	2017-06-21 00:54:04 -07:00
Sam Cake	484aeed589	More comments on the getCOnfig call	2017-06-21 00:36:03 -07:00
Sam Cake	c35be446e6	adding profiling on the script engine call back to timer event	2017-06-21 00:06:45 -07:00
samcake	d853a76376	Fixing the scripts and investigating the scripting	2017-06-20 17:23:44 -07:00
Sam Cake	5b6f6ab84f	Trying to fix the getCOnfig from QML...	2017-06-20 00:25:51 -07:00
Zach Fox	cbdffce88e	Merge branch 'master' of https://github.com/highfidelity/hifi into spectatorCamera_mergeable_20170619	2017-06-19 13:53:29 -07:00
Brad Davis	a69cf31f4b	PR feedback and cmake fixes	2017-06-16 16:59:58 -07:00
Brad Davis	fece438602	Cleanup and refactoring	2017-06-15 18:58:56 -07: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	cba70e6be0	Fade working on voxel objects	2017-06-08 14:57:09 +02:00
samcake	bac66ee4c7	Introducing the renderview task	2017-06-06 18:00:41 -07:00
Olivier Prat	1433ae4b34	Merged from 21274	2017-06-05 11:12:57 +02:00
Sam Cake	1f090d8148	Debugging the size problem and fixing the compression size evaluation	2017-05-22 01:00:34 -07:00
samcake	c449229850	Cleaned up the counters for memory	2017-05-19 17:52:56 -07:00
samcake	80b6fd65ae	Cleaning up counters and naming schemes...	2017-05-17 18:31:28 -07:00
samcake	b466964817	REvisiting the stats counter for the gpu context in the hope of better understanding the gpu texture streaming behavior	2017-05-16 18:21:24 -07:00
Sam Gateau	ff3cf7801a	Merge branch 'master' into 21274	2017-05-09 11:48:57 -07:00
samcake	4514da2a09	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-05-01 16:49:35 -07:00
Olivier Prat	8071c04e98	Added fade effect prototype version	2017-04-27 10:31:06 +02:00
Atlante45	ad16a935e9	Texture::create returns shared pointer	2017-04-25 15:56:23 -07:00
samcake	c36f8da4c0	Fixing build on mac	2017-04-24 10:46:29 -07:00
Sam Cake	33d770c24e	removing the explicit SettingHandle path to REnder?engine	2017-04-24 00:52:09 -07:00
Sam Cake	fa62a1ba9d	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-04-22 08:53:44 -07:00
Sam Cake	3691be4a2f	PUshing function to cpp	2017-04-22 08:53:13 -07:00
samcake	8e73fa3eb4	Separating the task classes in their own folder, and easing the declaration	2017-04-21 18:16:07 -07:00
sam gateau	733e268391	FIx the SSBO usage on amd, needed a bit more explanation on the glsl side	2017-04-21 16:17:18 -07:00
sam gateau	0a615f35a7	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-04-21 14:31:15 -07:00
Sam Cake	321d281919	Separating job/task classes from the render specific	2017-04-21 01:46:44 -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	61ed5c3ce9	THank you mac	2017-04-15 01:35:28 -07:00
Sam Cake	038d01ce04	Avoiding temp variable reference to appease mac and fixing a warning	2017-04-15 00:45:50 -07:00
Sam Cake	96960a505d	COmpleted the Resource Buffer, compilation and binding works. Now need to help on the shader side	2017-04-14 23:22:45 -07:00