Zach Fox f10b9ae30c Squashed commit of the following: ... commit 515ff016a4 Author: Zach Fox <fox@highfidelity.io> Date: Mon Nov 5 13:03:34 2018 -0800 Fix seven bugs commit a4d36b3845 Merge: 8906b909eb d0181283dd Author: Zach Fox <fox@highfidelity.io> Date: Mon Nov 5 10:25:58 2018 -0800 Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce commit d0181283dd Merge: be17ed0910 643026abd6 Author: Brad Hefta-Gaub <brad@highfidelity.io> Date: Fri Nov 2 16:44:31 2018 -0700 Merge pull request #14308 from sabrina-shanman/fbx2hfm (case 19302) Re-name FBXGeometry to HFMGeometry and do the same for related classes commit 643026abd6 Author: sabrina-shanman <sabrina@highfidelity.io> Date: Wed Oct 31 14:15:30 2018 -0700 Change local variable in TestFbx for clarity commit 0b7ddca5f6 Author: sabrina-shanman <sabrina@highfidelity.io> Date: Wed Oct 31 14:03:20 2018 -0700 Change naming for straggler names in model loading debug dumps commit becee7f010 Author: sabrina-shanman <sabrina@highfidelity.io> Date: Tue Oct 30 17:28:42 2018 -0700 Re-name FBXGeometry to HFMGeometry and do the same for related classes		2018-11-05 13:12:43 -08:00
..
controllers
entities	code review, remove some unneeded automoc includes	2018-09-28 16:04:40 -07:00
gl
gpu	Squashed commit of the following:	2018-11-05 13:12:43 -08:00
gpu-textures	New SPIRV Shader toolchain	2018-10-23 10:40:12 -07:00
qml	Only enable debug GL context on demand	2018-10-26 11:23:29 -07:00
render-perf	code review, remove some unneeded automoc includes	2018-09-28 16:04:40 -07:00
render-texture-load	Shader refactoring for explicit bindings	2018-08-03 14:58:11 -07:00
render-utils	New SPIRV Shader toolchain	2018-10-23 10:40:12 -07:00
ui	Revert "Better imports for controls and styles"	2018-10-23 10:58:28 -07:00
CMakeLists.txt	Restoring manual tests to solution, removing dead tests	2018-05-09 13:20:47 -07:00