4019 commits

Author	SHA1	Message	Date
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
Olivier Prat	c79c403a52	More android shader compilation fixes	2018-11-08 10:47:24 +01:00
Olivier Prat	7e93d91bfa	Fixed android shader compilation	2018-11-08 09:29:02 +01:00
Olivier Prat	9d5dcec0a0	Merge from master	2018-11-08 09:14:42 +01:00
Sam Gateau	d15c8a8854	Merge pull request #14313 from SamGondelman/macFix ... Case 19686: Possibly fix mac debug deferred issue	2018-11-07 10:33:41 -08:00
sabrina-shanman	cbca77b12f	Rename HFMGeometry to HFMModel and adjust related variables	2018-11-01 17:17:48 -07:00
SamGondelman	c4c4d2c98d	possibly fix mac issues	2018-10-31 13:28:07 -07:00
sabrina-shanman	becee7f010	Re-name FBXGeometry to HFMGeometry and do the same for related classes	2018-10-30 17:28:42 -07:00
SamGondelman	7dff015585	maybe?	2018-10-25 14:40:58 -07:00
Olivier Prat	aa64e51281	Fixed shaders for GLSL 4.1	2018-10-24 11:04:32 +02:00
Olivier Prat	69ace03919	Merged with master	2018-10-24 08:27:39 +02:00
Brad Davis	c8e664a0a1	New SPIRV Shader toolchain	2018-10-23 10:40:12 -07:00
Olivier Prat	5f3a299fd9	Merge with master	2018-10-22 14:02:24 +02:00
Seth Alves	2ce8ed25f8	Merge pull request #14125 from Atlante45/fix/mac-warnings ... Fix new Mac warnings	2018-10-20 13:40:53 -07:00
Sam Gateau	388b31acf7	Merge pull request #14169 from SamGondelman/highlight ... Fix highlight not working after HMD switch	2018-10-19 11:58:25 -07:00
John Conklin II	9c841db9fb	Merge pull request #14184 from SamGondelman/blendshape ... Move blendshape buffers to render thread	2018-10-19 11:55:44 -07:00
SamGondelman	47c6825aea	CR	2018-10-18 11:08:53 -07:00
SamGondelman	de4dff5202	fix highlight weirdness	2018-10-17 16:18:55 -07:00
John Conklin II	72c9f697ab	Merge pull request #14119 from SamGondelman/varying ... Move stage frames to Varyings	2018-10-17 11:16:28 -07:00
John Conklin II	9f0b4fb437	Merge pull request #14122 from SamGondelman/skybox ... Rebake default skybox for all platforms	2018-10-17 09:50:00 -07:00
Sam Gondelman	121fc7205c	Delete Default-Sky-9-cubemap.texmeta	2018-10-14 22:36:22 -07:00
Sam Gondelman	39c828fad8	please	2018-10-10 19:07:49 -07:00
Sam Gondelman	2421f9388c	FIX BUILD ERRORS?	2018-10-10 17:09:35 -07:00
Sam Gondelman	6ed38ea333	fix build errors	2018-10-10 16:16:56 -07:00
Sam Gondelman	296bd65c9b	fix build errors	2018-10-10 16:05:14 -07:00
SamGondelman	327c2f4e3d	move blendshape buffers to render thread	2018-10-10 15:32:53 -07:00
Clement	8983fe2bcf	Fix new Mac warnings	2018-10-09 12:11:55 -07:00
Olivier Prat	cfcf6f05a2	Merge with master	2018-10-09 14:18:02 +02:00
SamGondelman	c10bb7d525	pointers	2018-10-08 18:05:09 -07:00
Sam	87efeb1a70	make sure that we compile, dah	2018-10-03 16:15:07 -07:00
sam gateau	81e0d5ced0	Merge branch 'black-bis' of github.com:samcake/hifi into black-bis	2018-10-03 16:03:33 -07:00
sam gateau	702d26d2bd	Addressing the bug on Mac AMD	2018-10-03 16:03:09 -07:00
Sam Gateau	c194e795ac	Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis	2018-10-03 12:12:15 -07:00
Olivier Prat	1322302b6b	Default parameter tweaking	2018-10-03 14:17:24 +02:00
Olivier Prat	fe15063459	Another compilation fix	2018-10-03 09:34:31 +02:00
Olivier Prat	7124474b0e	Fix ubuntu compilation	2018-10-03 09:33:40 +02:00
Olivier Prat	b131de9e51	Added some comments	2018-10-03 08:43:51 +02:00
Olivier Prat	8ad58754da	Fixed compilation on Mac, Ubuntu and Android	2018-10-03 08:41:03 +02:00
sam gateau	5d0f2e3035	And more changes for better syntax and less useless stuff	2018-10-02 13:09:04 -07:00
sam gateau	ff24a99032	Unify the the packing of the blendshape offset for simplicity and settle on the name DrawcallUniform	2018-10-02 11:18:20 -07:00
Olivier Prat	72d0693252	Clean up for stereo	2018-10-02 18:46:01 +02:00
Olivier Prat	4c84ae02fa	Merge branch 'master' of http://github.com/highfidelity/hifi into ao	2018-10-02 18:13:57 +02:00
Olivier Prat	dfe9deb154	Two group of config settings for SSAO and HBAO	2018-10-02 17:47:33 +02:00
Olivier Prat	6fcd63ed64	Improved acnee issues	2018-10-02 15:08:39 +02:00
Olivier Prat	1ed0bd68b9	Small bilateral blur optim	2018-10-02 12:25:00 +02:00
Olivier Prat	6420d96149	Tried to limit banding effect	2018-10-02 11:16:23 +02:00