31301 commits

Author	SHA1	Message	Date
SamGondelman	935d827421	try to cull wearables with avatars	2019-02-17 02:10:25 -08:00
sabrina-shanman	bb123cfe3b	Fix GLTF materials	2019-02-15 14:51:29 -08:00
Andrew Meadows	7872da6b97	Merge pull request #14915 from samcake/brown ... Case 21190: Introducing msaa to forward renderer	2019-02-15 13:48:33 -08:00
Sam Gateau	6edf7e7907	Merge pull request #14931 from jherico/fix/vive_crash ... Case 21230: Fix crash in vive and interleaved stereo plugins	2019-02-15 11:41:03 -08:00
John Conklin II	5f0db88a20	Merge pull request #14914 from raveenajain/gltf_tangents ... Case 21165: tangent attribute	2019-02-15 11:24:21 -08:00
Sam Gondelman	9aa99f24f0	Merge pull request #14905 from SamGondelman/materialMapping ... Case 20242: FST materialMapping supports our material JSON format	2019-02-15 11:21:51 -08:00
Brad Davis	5483971855	Fix crash in vive and interleaved stereo plugins	2019-02-15 10:46:08 -08:00
Anthony Thibault	702f1c8e74	Merge pull request #14925 from hyperlogic/bug-fix/revert-anim-pose-optimization ... Revert anim pose optimization	2019-02-15 09:42:27 -08:00
Sam Gateau	13b5390243	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2019-02-14 21:01:44 -08:00
Shannon Romano	f267043953	Merge pull request #14838 from SamGondelman/billboardMode ... Case 20962: Billboard mode improvements	2019-02-14 17:44:48 -08:00
Shannon Romano	3b5b077a3e	Merge pull request #14887 from AndrewMeadows/shape-garbage-collector ... Case 21066: restore shape caching in ShapeManager	2019-02-14 17:33:33 -08:00
Sam Gateau	34db48d3a3	Merging and resolving conflict	2019-02-14 17:03:44 -08:00
Anthony Thibault	a3407b96b0	Merge branch 'master' into bug-fix/revert-anim-pose-optimization	2019-02-14 16:56:17 -08:00
Sam Gateau	6168001ad4	Merge pull request #14909 from AndrewMeadows/update-collision-group-after-grab-80 ... Case 21159: fixes for more grab bugs	2019-02-14 16:52:03 -08:00
Anthony Thibault	39b4eaac34	Revert "AnimPose operator* optimizations" ... This reverts commit 569bef50fd.	2019-02-14 16:13:00 -08:00
Anthony Thibault	f0e163b4df	Revert "AnimPose::inverse() optimization" ... This reverts commit 5c7e81584c.	2019-02-14 16:10:26 -08:00
Sam Gateau	fc1d3df613	Merge branch 'brown' of github.com:samcake/hifi into brown	2019-02-14 15:44:26 -08:00
Sam Gateau	522a9ed7c1	Keeping only the minimum for quest	2019-02-14 15:43:36 -08:00
Sam Gateau	98a5ec84a9	Adjusting the HUD operator render job to shave an extra framebuffer	2019-02-14 15:35:02 -08:00
raveenajain	01def37efd	spacing	2019-02-14 14:22:43 -08:00
Bradley Austin Davis	d45d87031d	Merge pull request #14782 from SamGondelman/NOverlaysFinal ... Case 20723, Case 20334: Internally, replace all overlays with local entities	2019-02-14 13:49:47 -08:00
raveenajain	e825be566d	Merge branch 'master' of https://github.com/highfidelity/hifi into gltf_tangents	2019-02-14 11:45:53 -08:00
SamGondelman	dd0d7f0118	merge with master	2019-02-14 09:57:13 -08:00
Sam Gateau	8fdf0fb80c	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2019-02-13 22:33:48 -08:00
Andrew Meadows	efe2767f3f	Merge pull request #14913 from SamGondelman/pal ... Case 21147, Case 20944: Fix setTextures (pal, etc.)	2019-02-13 17:50:08 -08:00
Sam Gateau	bd3a732cdc	Introducing msaa to forward renderer	2019-02-13 17:38:59 -08:00
Andrew Meadows	72b5fa1968	Merge pull request #14857 from Atlante45/fix/ess-parenting ... Case 15420: Fix ESS sometimes not getting the parents/children of entities with scripts.	2019-02-13 17:26:57 -08:00
SamGondelman	13ece79476	merge with master	2019-02-13 16:30:22 -08:00
SamGondelman	3f8bfc5475	CR and fix deadlock	2019-02-13 16:19:39 -08:00
raveenajain	a967d7a1bc	tangent attribute	2019-02-13 15:59:55 -08:00
SamGondelman	9e002c59d4	fix pal	2019-02-13 15:24:55 -08:00
Shannon Romano	8a07e2b31a	Merge pull request #14895 from ctrlaltdavid/M21132 ... Case 21132: Add "Avatar Script" classification to relevant JSDoc APIs	2019-02-13 10:35:00 -08:00
Andrew Meadows	ba91bab224	remove cruft	2019-02-13 10:05:32 -08:00
Shannon Romano	1330b108d6	Merge pull request #14890 from sabrina-shanman/gltf_mat-support ... (case 20980) Add support for Roughness/Metallic in GLTF models	2019-02-13 08:16:00 -08:00
sabrina-shanman	08ef9b6f84	Remove unused duplicate ColorChannel enum	2019-02-12 16:44:37 -08:00
sabrina-shanman	b2e3b87ef4	Add two missing CMake includes	2019-02-12 16:24:13 -08:00
Anthony Thibault	5db764f5df	Merge pull request #14908 from hyperlogic/bugfix/bug-eyes ... Revert "Pack all non-instanced traits"	2019-02-12 16:23:19 -08:00
sabrina-shanman	b2af6d1374	Have only one ColorChannel enum as header in image library	2019-02-12 16:14:41 -08:00
Andrew Meadows	d4c52e4b1c	fix implicit cast warning for Visual Studio	2019-02-12 15:37:09 -08:00
Andrew Meadows	8bdac589b8	use RingBuffer for gradual garbage collection	2019-02-12 15:37:09 -08:00
Andrew Meadows	c9b142531b	add more tracing details in PrePhysics	2019-02-12 15:37:09 -08:00
Andrew Meadows	a3567dea3a	clean HashKey API, reduce dependency tree	2019-02-12 15:37:09 -08:00
Andrew Meadows	17ab0cb92e	more robust ShapeManager garbage collector	2019-02-12 15:37:09 -08:00
Andrew Meadows	ed8481ead9	fix grab bugs	2019-02-12 14:04:56 -08:00
Shannon Romano	ee83c69d3e	Merge pull request #14899 from samcake/brownBis ... Case 21146: Adding support for MSAA textures and framebuffer to gpu lib and backends.	2019-02-12 13:54:09 -08:00
Anthony Thibault	eee41bc41e	Revert "Pack all non-instanced traits" ... This reverts commit 5b7d7b8833.	2019-02-12 13:46:21 -08:00
sabrina-shanman	1b2cb94b0c	Fix not changing input to processImage in TextureBaker.cpp	2019-02-12 13:21:21 -08:00
John Conklin II	1761df7ccd	Merge pull request #14875 from jherico/feature/quest_custom_plugins ... Case 20882: Support custom display / input plugin lists and small tweaks	2019-02-12 12:52:07 -08:00
SamGondelman	fdbcf4b2ea	cleanup and expose mapped materials to getScriptableModel	2019-02-12 12:03:35 -08:00
sabrina-shanman	2b355e9d52	Re-name ColorChannelMapping to ColorChannel and put versions in two specific libraries rather than shared	2019-02-12 11:56:44 -08:00