4088 commits

Author	SHA1	Message	Date
Sam Gateau	79cad36c58	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-12-08 19:14:21 -08:00
sam gateau	28d36c81e0	there and back , trying to converge with the new Assemble Lighting Stage task	2018-12-07 16:24:51 -08:00
SamGondelman	8431b3b0c1	correct order of mixes	2018-12-07 10:39:10 -08:00
Sam Gateau	50fcd7f40a	trying...	2018-12-06 22:45:44 -08:00
Sam Gateau	b24a2d33bf	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-12-06 19:51:05 -08:00
sam gateau	e941833676	gathering the lighting stage jobs in their own task away from the renderer specificities	2018-12-06 17:27:13 -08:00
Adam Smith	08d6e35d4d	Merge pull request #14372 from SamGondelman/decals ... Case 19798: 3D projected Material Entities and materialRepeat option	2018-12-06 11:13:46 -08:00
sam gateau	a267c3115a	drafting more factorisation of render tasks	2018-12-05 17:47:33 -08:00
Adam Smith	653974ca30	Merge pull request #14293 from SamGondelman/branching ... Case 19473: Reduce branching in our shaders	2018-12-05 16:42:42 -08:00
sam gateau	8efdec1e51	merging with master	2018-12-04 11:03:46 -08:00
sam gateau	0343983f31	Applying changes done in deferred to forward	2018-12-03 16:58:54 -08:00
Sam Gateau	259a97c43a	Exploring varying with names	2018-12-02 23:41:57 -08:00
sam gateau	2c4cd68a00	iterating on a simpler engine graph	2018-11-30 17:43:27 -08:00
Sam Gateau	ba4aec2aff	Fixing the issues with thte debug renderdeferredTask and investigating the avatars perf	2018-11-28 01:01:18 -08:00
Sam Gondelman	5ee803bf1d	Update parabola.slv	2018-11-27 10:54:56 -08:00
Sam Gondelman	3a4ec2cc27	Update glowLine.slv	2018-11-27 10:53:25 -08:00
sam gateau	f348cc35c4	separting debug in its own task	2018-11-26 15:20:45 -08:00
Sam Gateau	b7b8e8e6bf	Trying to group together the debug jobs in a separate task	2018-11-26 00:38:04 -08:00
Sam Gateau	6b1c7bf96e	restoring the engine render views and cleaning up the task / config section of the pr	2018-11-20 23:15:09 -08:00
Sam Gateau	dd828c81e0	Merge branch 'master' of https://github.com/highfidelity/hifi into one	2018-11-20 19:29:01 -08:00
Jeff Clinton	870619b19d	Merge pull request #14412 from amantley/avatarPipelineOffsets ... Avatar Pipeline Joint Rotation Offsets Handling	2018-11-19 08:54:29 -08:00
Sam Gateau	837b321004	merging with master	2018-11-17 10:35:05 -08:00
Sam Gondelman	968ffe7ec3	Merge branch 'master' into branching	2018-11-16 10:25:02 -08:00
Sam Gateau	0166d7748a	Merging with master around rc76 cut time	2018-11-15 22:52:37 -08:00
amantley	f9829c270d	merged new fbx.h	2018-11-15 10:19:04 -08:00
amantley	c8cd65c3bd	added getter for the orginal cluster bind matrix values in AnimSkeleton	2018-11-15 09:58:10 -08:00
Sam Gondelman	a5fe4709a9	Update Fade.slh	2018-11-14 17:50:21 -08:00
amantley	80ebde1036	started cleanup of pr	2018-11-14 17:27:45 -08:00
Sam Gondelman	a206d9e25a	Merge branch 'master' into branching	2018-11-14 17:08:08 -08:00
amantley	8256c652fc	added the hook to put the copy of the mutated bind poses into tthe skeleton	2018-11-14 17:02:25 -08:00
Olivier Prat	85a3938cbe	Switch to app for ambient occlusion debug script	2018-11-14 11:55:11 +01:00
Olivier Prat	45e0f65972	Merge branch 'ao' of http://github.com/Zvork/hifi into ao	2018-11-14 09:48:24 +01:00
Sam Gondelman	13f650d514	Merge pull request #14093 from SamGondelman/police ... Case 19409, Case 19468: Fading fixes and shader cleanup	2018-11-13 15:00:23 -08:00
sabrina-shanman	753557736e	Merge branch 'master' into hfm_library	2018-11-12 15:03:30 -08:00
John Conklin II	512b847684	Merge pull request #14339 from hyperlogic/bug-fix/anim-debug-draw-crash ... AnimDebugDraw: Prevent multi-threaded access to shared map collection.	2018-11-12 10:47:01 -08:00
John Conklin II	9d404a6cf3	Merge pull request #14379 from Cristo86/gles_use_tbo_no_ssbo ... case 19562: GLES - Use TBO instead of SSBO and make shaders use it when it is not gl45 (master)	2018-11-12 10:45:52 -08:00
Brad Hefta-Gaub	22dd958582	Merge pull request #14297 from jherico/feature/vcpkg ... Case 19807: Switch to vcpkg for many dependencies on all non-mobile platforms	2018-11-12 09:52:02 -08:00
SamGondelman	1d1510e18e	Merge remote-tracking branch 'upstream/master' into police	2018-11-09 13:32:41 -08:00
SamGondelman	b3abd97707	projected materials and repeat property	2018-11-09 10:47:07 -08:00
Brad Davis	8c4f0ec774	Vcpkg migration	2018-11-08 12:28:06 -08:00
Dante Ruiz	501746b156	3D Keyboard	2018-11-08 09:58:53 -08:00
Olivier Prat	be7806644a	Removed ternary operators with mix (try to limit branching)	2018-11-08 17:29:00 +01:00
Olivier Prat	d64127aa9c	Android shader compilation fix	2018-11-08 13:48:19 +01:00
Olivier Prat	829e5ff44f	Same android problem fix, but elsewhere	2018-11-08 13:37:22 +01:00
Olivier Prat	09b26db650	Shader fix for android... <sigh>	2018-11-08 13:19:42 +01:00
Olivier Prat	40b7b42f5b	Bis	2018-11-08 12:29:01 +01:00
Olivier Prat	cd89ce5388	Another stupid android shader compilation error fix	2018-11-08 12:07:17 +01:00
Olivier Prat	de2f1c52cc	Another android shader compilation fix	2018-11-08 11:44:47 +01:00
Olivier Prat	05ac2fccb6	Still android fixes	2018-11-08 11:24:46 +01:00
Olivier Prat	851cfff960	Again, android shader compilatio fix	2018-11-08 11:06:28 +01:00