124 commits

Author	SHA1	Message	Date
SamGondelman	4202685a4b	Merge remote-tracking branch 'upstream/master' into fst	2019-02-11 16:07:36 -08:00
John Conklin II	95aadeafb0	Merge pull request #14868 from SamGondelman/color ... Case 21070: Fix black albedo coloring	2019-02-08 14:42:19 -08:00
John Conklin II	851b968501	Merge pull request #14737 from SamGondelman/zone ... Case 19291: Fix zone bugs	2019-02-08 14:07:26 -08:00
SamGondelman	7fe0e5909e	fix black albedo coloring	2019-02-07 10:14:10 -08:00
SamGondelman	3ee448a89a	fix scattering and working on resource cache bug	2019-02-05 17:32:15 -08:00
SamGondelman	d17e04967a	fix zone bugs	2019-01-18 13:49:16 -08:00
SamGondelman	717da1b6fa	track texture loading	2019-01-17 15:59:32 -08:00
SamGondelman	ff3545beab	working with texture transform fallthrough	2019-01-07 13:28:00 -08:00
SamGondelman	a9d798070a	wip	2019-01-02 18:08:59 -08:00
SamGondelman	9155853889	working on material fallthrough	2018-12-20 16:03:58 -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
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 Gondelman	860d920368	more typos	2018-11-28 09:55:10 -08:00
Sam Gondelman	ecd936705b	typo	2018-11-28 09:54:20 -08:00
Sam Gateau	87730884ab	Merge pull request #14340 from Nex-Pro/patch-5 ... Change to English spelling of 'declination'	2018-11-27 10:53:28 -08:00
Sam Gondelman	a206d9e25a	Merge branch 'master' into branching	2018-11-14 17:08:08 -08: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
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
Nex-Pro	3eb70a7617	Change to English spelling of 'declination' ... Addressed other minor typos. NB: Searched all sources in the project for the call and it is only found in this file.	2018-11-03 16:08:53 +00:00
SamGondelman	dc9405775f	more branching removal	2018-10-29 16:42:46 -07:00
SamGondelman	e8c5324e39	start removing branching	2018-10-25 11:59:04 -07:00
SamGondelman	0efbdc1ab5	merge with master	2018-10-23 14:33:57 -07:00
SamGondelman	d254db02dc	small cleanup	2018-10-23 11:27:17 -07:00
Brad Davis	c8e664a0a1	New SPIRV Shader toolchain	2018-10-23 10:40:12 -07:00
SamGondelman	5652fa0b1e	merge with master	2018-10-22 10:18:52 -07:00
SamGondelman	cce0981d6c	Merge remote-tracking branch 'upstream/master' into police	2018-10-17 11:40:01 -07:00
Clement	8983fe2bcf	Fix new Mac warnings	2018-10-09 12:11:55 -07:00
sam gateau	215818e313	adjusting page size but still seeing a perf drop	2018-09-27 17:18:43 -07:00
SamGondelman	e069817978	more fixes	2018-09-27 14:18:43 -07:00
sam gateau	4078be3df5	Better naming and simpler template maybe	2018-09-26 17:58:06 -07:00
SamGondelman	0f24c18de5	slightly fix forward pipelines	2018-09-26 15:01:46 -07:00
sam gateau	b5a47b2e76	Finalizing the renaming from Skinned to Deformed	2018-09-26 14:11:22 -07:00
SamGondelman	09a6053044	cleaning up fragment shaders	2018-09-26 14:10:47 -07:00
Sam Gateau	4210ce46aa	bringing the tex corrd transform in the Material struct and shaving one ubo	2018-09-23 23:10:56 -07:00
sam gateau	7349562111	Removing commented code	2018-09-06 15:50:31 -07:00
sam gateau	e428248472	Adressing build warnings	2018-09-06 11:33:26 -07:00
sam gateau	21f65d8a78	position are used correctly for evaluting bounds in the Mesh	2018-09-05 17:50:06 -07:00
sam gateau	0e614ad578	Merge branch 'master' of github.com:highfidelity/hifi into black-bis	2018-09-05 11:35:08 -07:00
sam gateau	761e8a3f95	fixing warnings	2018-09-04 09:19:24 -07:00
Sam Gateau	e8d922a56c	Interleaving the attributes and relying on just 3 input buffers	2018-09-03 02:48:07 -07:00
SamGondelman	d01b438cb3	CR	2018-08-31 11:25:17 -07:00
SamGondelman	5f08ed5027	misc perf improvements	2018-08-30 16:55:15 -07:00
John Conklin II	467fe56103	Merge pull request #13845 from SamGondelman/perf ... Move blendshape packing to worker thread	2018-08-27 09:40:03 -07:00
John Conklin II	fcdbc6c6d2	Merge pull request #13778 from SamGondelman/bloom ... Enable bloom in zone properties	2018-08-24 14:46:31 -07:00
SamGondelman	70f4d0c634	Merge remote-tracking branch 'upstream/master' into perf	2018-08-24 14:04:37 -07:00
John Conklin II	b28aa3951f	Merge pull request #13802 from jherico/feature/scribe_programs ... Migrating to scribe program descriptors	2018-08-20 14:48:54 -07:00
Brad Davis	f03370c826	Migrating to scribe program descriptors	2018-08-09 17:58:34 -07:00
SamGondelman	a0c3c09b05	Merge remote-tracking branch 'upstream/master' into bloom	2018-08-08 14:44:02 -07:00
SamGondelman	2959a406d7	working on enabling bloom	2018-08-07 21:52:05 -07:00