3209 commits

Author	SHA1	Message	Date
Brad Davis	8f993e5a68	Merge branch 'android' into android_new	2018-01-22 12:48:38 -08:00
Brad Davis	d2fe9e2710	PR feedback	2018-01-19 20:24:34 -08:00
Brad Davis	3e7872637d	Merge branch 'android' into android_new	2018-01-19 14:40:01 -08:00
Brad Davis	d53b8b38ac	Merge remote-tracking branch 'upstream/master' into android	2018-01-19 14:35:20 -08:00
Brad Davis	3dba928b72	Merge remote-tracking branch 'upstream/android' into android_new	2018-01-19 10:36:46 -08:00
Olivier Prat	12c48a38f7	Normalized diffuse & specular of directional, point and spot lights such as a light intensity of 1 gives a perpendicular diffuse lighting of the same color as the albedo for dielectric materials.	2018-01-19 13:58:35 +01:00
Brad Davis	bdfa1273ba	Merge remote-tracking branch 'upstream/master' into android	2018-01-18 17:33:10 -08:00
Brad Davis	0a0e5ab84b	Don't try to set invalid slots in the fade effect	2018-01-18 16:49:19 -08:00
Brad Davis	6fa0ef88ff	Fix compile issues in forward global light	2018-01-18 16:48:48 -08:00
Brad Davis	a9b2cc3408	Fixing lighting shader and removing being of light	2018-01-18 15:25:22 -08:00
Brad Davis	9e2503893c	Merge remote-tracking branch 'gcalero/android_render_forward_fixes' into android_new	2018-01-18 10:03:50 -08:00
Sam Gateau	dd436229c1	Merge pull request #12193 from SamGondelman/transparent ... Fix black flashing on transparent objects	2018-01-18 09:11:46 -08:00
Brad Davis	cbb2d9d854	Merge remote-tracking branch 'upstream/master' into android	2018-01-17 17:51:39 -08:00
SamGondelman	a44c965f56	fix black flashing on transparent objects	2018-01-17 15:59:07 -08:00
Seth Alves	33c586de60	Merge pull request #12188 from hyperlogic/feature/small-anim-refactor ... Remove dangerous "Use Anim Pre and Post Rotations" menu item	2018-01-17 13:41:51 -08:00
Bradley Austin Davis	25b778be1d	Tracking down remaining SOX crashes	2018-01-17 12:18:39 -08:00
Bradley Austin Davis	9f6c2c3cdd	Merge remote-tracking branch 'upstream/master' into android	2018-01-17 11:44:00 -08:00
Gabriel Calero	1ad61b7683	Adding forward pipelines for translucent objects	2018-01-17 16:26:17 -03:00
Sam Gateau	0e72197a37	Merge pull request #12179 from Zvork/specular ... Fixed error in Specular shader which gave low key specular highlights	2018-01-17 10:51:25 -08:00
Seth Alves	69a33428c0	Merge pull request #12078 from druiz17/soft-entities ... Soft Entities	2018-01-17 08:02:37 -08:00
Brad Davis	795a3b8407	Fix merge errors	2018-01-16 19:27:35 -08:00
Brad Davis	6a06bf405a	Merge remote-tracking branch 'upstream/master' into android	2018-01-16 18:24:44 -08:00
Anthony J. Thibault	bc587bf6d8	Removal of legacy Rig methods	2018-01-16 18:19:35 -08:00
Anthony J. Thibault	576273efe3	Remove Rig::restoreJointPosition and references to it.	2018-01-16 18:01:58 -08:00
humbletim	b91d536dd0	rename model:: -> graphics::	2018-01-16 12:46:16 -05:00
humbletim	08ccda9cfc	rename libraries/model(src/model) -> libraries/graphics(src/graphics)	2018-01-16 12:44:44 -05:00
Olivier Prat	6686b328c7	Fixed error in Specular shader which gave low key specular highlights	2018-01-16 10:47:46 +01:00
Brad Davis	17e9c3d00c	Don't try to set invalid uniforms	2018-01-15 13:43:19 -08:00
Sam Gateau	2f5d2bef49	Merge pull request #12028 from Zvork/roughness_metal ... Lighting model update for better specular	2018-01-15 10:51:18 -08:00
Dante Ruiz	645f608814	fixing merge conflict	2018-01-15 10:45:51 -08:00
Dante Ruiz	c76fdd1f5f	adding scale	2018-01-15 10:43:26 -08:00
Brad Davis	db30e9c45f	Fixing PR builds	2018-01-15 09:47:31 -08:00
Brad Davis	58530c595a	Pre-merge cleanup	2018-01-14 19:48:12 -08:00
Brad Davis	acb95d1355	GLAD polish	2018-01-14 00:10:05 -08:00
Brad Davis	24b83aa0f1	Merge remote-tracking branch 'sam/android-gles' into windows_gles	2018-01-13 11:36:31 -08:00
Brad Davis	3d69ceea71	Re-enable HUD compositing	2018-01-13 11:34:56 -08:00
Sam Gateau	d6e771f01d	Adding the batch as aprameter to the custom pipeline register to be able to make program through a call to runLamda in order to perform the make call in the present thread where the gl context is valid	2018-01-13 10:02:53 -08:00
Sam Gateau	57f1ba2412	Merging with master to be able connect to dev domains and it works. fixing shaders for gles compile errors and disabling material textures by default	2018-01-13 02:00:34 -08:00
Sam Gateau	df0660f823	Merge branch 'master' of https://github.com/highfidelity/hifi into android-gles	2018-01-13 01:00:41 -08:00
Sam Gateau	331a8f3094	fixing the stencil not clearing correctly and shaders not compiled correctly in main thread	2018-01-13 01:00:10 -08:00
Sam Gateau	628731ed19	Merge branch 'windows_gles' of https://github.com/jherico/hifi into android-gles	2018-01-12 19:37:07 -08:00
Brad Davis	ab7aa52a10	GLES emulaton on windows	2018-01-12 19:17:35 -08:00
Dante Ruiz	283b9a8003	fix softEntity edge cases	2018-01-12 15:31:54 -08:00
Dante Ruiz	5b82c7bc41	fix merge conflict	2018-01-12 11:00:19 -08:00
Anthony J. Thibault	088f227df2	Pass model offset from avatar skeletonModel to attached entity	2018-01-12 10:26:02 -08:00
Brad Davis	7579451c24	Merge remote-tracking branch 'upstream/master' into android	2018-01-11 23:31:45 -08:00
Sam Gateau	e3faec838c	Adding colors to the world	2018-01-11 23:22:51 -08:00
Sam Gateau	6f6aedbf4f	Merge branch 'master' of https://github.com/highfidelity/hifi into android-fixes	2018-01-11 19:56:52 -08:00
Sam Gateau	8142b207af	Making the forward model normal lighted	2018-01-11 19:56:08 -08:00
samcake	f22429d098	Working on the shaders	2018-01-11 18:03:11 -08:00