2661 commits

Author	SHA1	Message	Date
Seth Alves	a3f4aeb182	code review	2017-07-24 19:41:30 -07:00
Seth Alves	a1107deef1	cleanups	2017-07-23 08:21:50 -07:00
Seth Alves	47ea32f4d3	vertex color support in ModelScriptingInterface	2017-07-23 08:06:26 -07:00
Seth Alves	72e5fecb4e	do Model::getMeshes on the correct thread. added ModelScriptingInterface::getVertexCount and ModelScriptingInterface::getVertex	2017-07-20 16:34:34 -07:00
Seth Alves	be48268be8	getMeshes handles registration point	2017-07-19 15:02:40 -07:00
Seth Alves	750b7192af	trying to get the resulting model to line up with the originals	2017-07-19 13:58:03 -07:00
Seth Alves	a8698c2fbc	EntityScriptingInterface::getMeshes support for Model entities	2017-07-19 08:59:09 -07:00
Seth Alves	12f52e8f20	don't do SoftAttachmentModel::updateClusterMatrices if geometry isn't ready	2017-07-13 13:18:21 -07:00
Sam Gateau	746812ff78	Merging with origin orange	2017-07-10 17:25:13 +02:00
Sam Gateau	0c3755483b	adding assert or checks whenever getting a scene stage	2017-07-10 12:37:26 +02:00
Sam Gateau	4edea433ce	Rename the _pipeline into _shapePipeline in the render::Args	2017-07-10 12:16:53 +02:00
Sam Gateau	d15c4ea2d3	Merging with the stage branch	2017-07-07 15:12:40 +02:00
Sam Gateau	a8086764da	REmoving warnings for unused var	2017-07-07 12:19:22 +02:00
Sam Gateau	4c1bf6af47	REmoving comments	2017-07-07 11:38:25 +02:00
Sam Gateau	156c20d01e	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-07-07 10:58:05 +02:00
Sam Gateau	53ffca796f	Drafting a better SHape plumber to render the items	2017-07-06 16:35:40 +02:00
Sam Gateau	48b4b5f49c	Fixing the bug appearing on Nvidia 284.76	2017-07-05 18:39:09 +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
Brad Davis	6fc82bb351	Switch to preprocessor macro for blocking invokes to capture function information	2017-06-30 11:36:24 -07:00
Brad Davis	b52dd7b822	Don't use blocking connections on the main thread	2017-06-29 20:45:17 -07: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
Sam Gateau	76dae279cf	Removing the default case from the renderer	2017-06-27 14:24:34 +02:00
Sam Gateau	7687bdc060	less comments & constant	2017-06-26 17:02:45 +02:00
Sam Gateau	5e05c41980	less comments & constant	2017-06-26 16:56:04 +02:00
Sam Gateau	6ab2dccd38	less comments & constant	2017-06-26 16:52:04 +02:00
Sam Gateau	7cbeabfc29	less comments & constant	2017-06-26 16:49:20 +02:00
Sam Gateau	a2fc44703d	One less constant	2017-06-26 16:45:54 +02:00
Sam Gateau	904f22985c	CLeaning up comments	2017-06-26 16:43:04 +02:00
Sam Gateau	77644e7e9d	Removing commented objects from deferredlighting effect	2017-06-26 14:34:09 +02:00
Sam Gateau	75e457ce7c	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-06-26 10:05:04 +02:00
samcake	20d8c11e28	ALmost there, getting eback everything to work with the light and background stages in the scene, not in deferredLighting Effect anymore	2017-06-22 17:54:16 -07:00
Sam Cake	07e18eb3a8	Keep cleaning up the DeferredLightingEffect , removing stage s from there...	2017-06-22 01:12:32 -07:00
samcake	9ae2861ee6	Moving the stage objects under the scene umbrella and creating a cear task to update the scene elements	2017-06-21 18:29:38 -07:00
Anthony J. Thibault	2dcca2125b	Merge branch 'master' into feature/pole-vector	2017-06-21 15:50:03 -07:00
samcake	ba9dbbb4d4	Fix the local lights issue, and correct the script relying on the Render.getConfig(), this one is on me...	2017-06-19 17:34:50 -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
Anthony J. Thibault	323dc62ef2	Merge branch 'master' into feature/pole-vector	2017-06-16 17:37:11 -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
Zach Fox	47e5fb56d3	Show MyAvatar's head in the SpectatorCamera view!	2017-06-15 11:31:20 -07:00
Anthony J. Thibault	03a6f7082e	Merge branch 'master' into feature/pole-vector	2017-06-13 15:37:59 -07:00
Anthony J. Thibault	f20c03fa6e	Pole vectors can be controlled via anim vars.	2017-06-13 15:36:05 -07:00
Zach Fox	79b6dc3f78	Remove one more instance of FramebufferCache	2017-06-13 15:26:07 -07:00
Zach Fox	52ea7e7994	Rendering improvements based on spectator-camera changes	2017-06-13 15:19:29 -07:00
Brad Davis	db8bdbc0a6	Merge pull request #10659 from samcake/orange ... simple Render Engine refactors coming from the Spectator Cam project	2017-06-12 20:31:07 -07:00
Zach Fox	e96c55956f	First pass at the fix	2017-06-12 09:53:14 -07:00
Seth Alves	eb049c8c6e	Merge pull request #10624 from misslivirose/feat/add-primitive-shapes ... Add additional primitive shapes	2017-06-09 19:02:54 -07:00
samcake	bb38938534	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-06-09 14:34:25 -07:00
Liv	7785473ccb	moving else	2017-06-09 12:59:08 -07:00
Liv	8c488d95d1	Stylish updates	2017-06-09 11:46:38 -07:00