29977 commits

Author	SHA1	Message	Date
sabrina-shanman	a98a9b1c0c	Move HFM prefixed classes to hfm namespace and add HFM prefixed names as typedefs	2018-11-05 12:47:34 -08:00
sabrina-shanman	2801f324b7	Switch references to HFM to the HFM lib and remove HFM classes in FBX	2018-11-05 12:47:34 -08:00
sabrina-shanman	e00024e8b0	Create HFM library	2018-11-05 12:47:34 -08:00
sabrina-shanman	30eb360f62	Convert remaining HFMModels called model to hfmModel, and rename some missed local variables	2018-11-05 12:07:17 -08:00
sabrina-shanman	cbca77b12f	Rename HFMGeometry to HFMModel and adjust related variables	2018-11-01 17:17:48 -07:00
sabrina-shanman	0b7ddca5f6	Change naming for straggler names in model loading debug dumps	2018-10-31 14:03:20 -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
Sam Gateau	439452f9ee	Merge pull request #14123 from jherico/fix/mac_gl2 ... Additional Mac OpenGL work	2018-10-26 15:38:23 -07:00
John Conklin II	fa2fb3a87a	Merge pull request #14246 from sethalves/sync-grab-props ... keep userData and new grab properties in sync	2018-10-26 11:52:47 -07:00
Brad Davis	a3a952265a	Fix android crash	2018-10-26 11:23:30 -07:00
Brad Davis	7ca8b54039	Fix crash on startup on windows / android	2018-10-26 11:23:30 -07:00
Brad Davis	9a30073f27	Only enable debug GL context on demand	2018-10-26 11:23:29 -07:00
Bradley Austin Davis	28b45ce1d9	Resolve compositing glitches	2018-10-26 11:23:29 -07:00
Bradley Austin Davis	95d160a170	Working on mac GL issues	2018-10-26 11:23:29 -07:00
Sam Gondelman	7339a43536	Merge pull request #14278 from SamGondelman/macbs ... Mac: Possibly fix a completely different blendshapes bug	2018-10-26 09:26:30 -07:00
SamGondelman	7dff015585	maybe?	2018-10-25 14:40:58 -07:00
Jeff Clinton	946d68af6a	Merge pull request #14262 from SamGondelman/particleLoad ... Fix and expose Particle Entity emitRadiusStart	2018-10-25 12:41:02 -07:00
John Conklin II	2eb801bdc6	Merge pull request #14035 from SimonWalton-HiFi/avatar-mixer-improvements ... Further avatar-mixer improvements	2018-10-25 12:25:32 -07:00
SamGondelman	faff5f11e8	Merge remote-tracking branch 'upstream/master' into particleLoad	2018-10-25 10:56:11 -07:00
Jeff Clinton	eb383b1d09	Merge pull request #14040 from hyperlogic/feature/acceleration-limit-filter ... Quality Improvements to Avatars driven by Vive Trackers	2018-10-25 08:51:59 -07:00
Seth Alves	c5aafd4644	fix spatialKey conversion	2018-10-25 07:47:16 -07:00
Seth Alves	387a8ce933	fix QJsonArray handling	2018-10-25 07:47:15 -07:00
Seth Alves	252e504ab9	attempt to keep userData and new grab properties in sync	2018-10-25 07:47:15 -07:00
Sam Gateau	6afd9a1dca	Merge pull request #14269 from SamGondelman/bs ... Possible fix for yet another blendshape crash	2018-10-24 17:51:23 -07:00
Jeff Clinton	67fe43ebb1	Merge pull request #14243 from hyperlogic/bug-fix/small-jumping-avatars ... Small avatars now have a minimum jump height of 0.25 meters	2018-10-24 17:08:28 -07:00
Simon Walton	b6f259fc42	Fix incorrect merge-resolution	2018-10-24 13:17:45 -07:00
SamGondelman	a3c42363cc	please for the love of god	2018-10-24 12:43:01 -07:00
Simon Walton	e22e0ecb04	Merge branch 'master' into avatar-mixer-improvements	2018-10-24 10:39:23 -09:00
Luis Cuenca	fac9188dfb	Merge pull request #14187 from luiscuenca/transitAddAnimation ... Add animations to Avatar Transit	2018-10-24 10:51:21 -07:00
Simon Walton	0a78eeaf1a	Merge branch 'master' into avatar-mixer-improvements	2018-10-23 15:56:56 -07:00
John Conklin II	e21e7d30d7	Merge pull request #14126 from amantley/squattyPottyFix ... Sit State for the seated user in HMD: Squatty Potty Fix	2018-10-23 15:20:49 -07:00
Kerry Ivan Kurian	3cf000a71b	Merge pull request #14232 from kkurian/log-resource-requests-2 ... Display resource-access events in marketplace item tester	2018-10-23 15:18:30 -07:00
John Conklin II	7019439356	Merge pull request #14260 from SamGondelman/resourceCrash ... Fix ResourceCache crash on shutdown	2018-10-23 15:03:55 -07:00
Stephen Birarda	b789fa96f8	Merge pull request #14192 from Atlante45/fix/traits-race ... Prevent race on internal client traits members	2018-10-23 14:53:11 -07:00
Stephen Birarda	061f86e550	Merge pull request #14051 from birarda/feat/improve-sock-addr-belongs ... consider all node sockets in sockAddrBelongsToNode	2018-10-23 14:21:42 -07:00
Kerry Ivan Kurian	e7d1c2873a	Merge branch 'master' into log-resource-requests-2	2018-10-23 13:46:59 -07:00
Stephen Birarda	5cbddfe0c4	consider all sockets in findNodeWithAddr	2018-10-23 13:35:07 -07:00
SamGondelman	8807b90474	fix emitRadiusStart	2018-10-23 13:33:14 -07:00
Bradley Austin Davis	5416de9a02	Merge pull request #13951 from jherico/feature/spirv ... Bug 15087: Updating our shader tool chain to enable SPIRV optimization	2018-10-23 13:27:49 -07:00
SamGondelman	78f0afd39f	fix crash on shutdown	2018-10-23 12:13:41 -07:00
luiscuenca	fa67e1b269	Remove logs and magic numbers	2018-10-23 11:51:15 -07:00
Brad Hefta-Gaub	405b1d5725	Revert "Better imports for controls and styles"	2018-10-23 10:58:28 -07:00
Brad Davis	5a43462218	Remove unneeded shader directive	2018-10-23 10:40:12 -07:00
Brad Davis	85b92a372d	Don't use optimized GLSL on android for now	2018-10-23 10:40:12 -07:00
Brad Davis	4cf4a5582d	Fix Android build on Windows hosts	2018-10-23 10:40:12 -07:00
Brad Davis	3f2f5b18ec	Reimplement procedural uniforms without extension requirements	2018-10-23 10:40:12 -07:00
Brad Davis	c8e664a0a1	New SPIRV Shader toolchain	2018-10-23 10:40:12 -07:00
Brad Davis	339b25a362	Fix access to uniforms at index 0	2018-10-23 08:36:18 -07:00
amantley	cce2f295a1	fixed conflict in myskeletonmodel.cpp	2018-10-22 17:49:30 -07:00
Sam Gateau	40b77c338c	Merge pull request #14176 from jherico/fix/fb19156 ... Add additional safety checks to gl::Uniform::load	2018-10-22 14:12:36 -07:00