Code

History

  1. Merge branch 'master' of https://github.com/highfidelity/hifi into black-bisSam Gateau committed 8 years agoc593f00
  2. minimize diffSeth Alves committed 8 years ago90d9af3
  3. static_cast can be used here rather than dynamicSeth Alves committed 8 years agoe304975
  4. get asan to not complain about invalid downcast of CauterizedMeshPartPayload UpdateFunctorSeth Alves committed 8 years ago749b02c
  5. fixing review commentssam gateau committed 8 years agocc00194
  6. bringing the blendshape in skin shader only work in mastersam gateau committed 8 years agoec6117e
  7. I hate blendshapesSamGondelman committed 8 years ago1a36693
  8. please workSamGondelman committed 8 years agocde2dc2
  9. fix blendshapes one last timeSamGondelman committed 8 years ago028092f
  10. fix blendshapes crashSamGondelman committed 8 years ago248c262
  11. Merge remote-tracking branch 'upstream/master' into perfSamGondelman committed 8 years ago70f4d0c
  12. Merge remote-tracking branch 'upstream/master' into perfSamGondelman committed 8 years ago9ab1fc0
  13. working on blendshapesSamGondelman committed 8 years ago05ff99a
  14. Rename createVisibleRenderItemSet() to createRenderItemSet() in Model classsabrina-shanman committed 8 years ago79fd3cb
  15. Remove functionality for rendering collision meshes directly in the Model classsabrina-shanman committed 8 years ago440c779
  16. Merge pull request #13275 from luiscuenca/fixNoAvatarMaterialsJohn Conklin II committed 8 years ago277758c
  17. Check for null pointerluiscuenca committed 8 years ago60758de
  18. Clean up and trying to get ready for mergesamcake committed 8 years ago2e9076c
  19. Removing the getLayer from the meshPArtPayload and check that it s workingSam Gateau committed 8 years ago2f94c43
  20. adding the correct flag maybe?samcake committed 8 years ago2fc23d7
  21. Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvorkNissimHadar committed 8 years agofda32e4
  22. Re-implemented shadow controls.NissimHadar committed 8 years ago0f2cf8e
  23. Merge remote-tracking branch 'upstream/master' into scriptableMaterialsSamGondelman committed 8 years agocc53b33
  24. Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork"SamGondelman committed 8 years ago0fca56e
  25. Merge branch 'master' into bug-fix/entity-mat-avatar-dual-quaternionsAnthony J. Thibault committed 8 years agof5fcaae
  26. Code review feedbackAnthony J. Thibault committed 8 years ago0404b72
  27. material reflectionSamGondelman committed 8 years agob56f755
  28. WIP - for review.Nissim Hadar committed 8 years ago194c7f4
  29. Models can now switch between dual quats and matrix palette skinning.Anthony J. Thibault committed 8 years ago7f5f48b
  30. WIP check in of making the use of dq or mat dynamic per modelAnthony J. Thibault committed 8 years agocf54523
  31. Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1Seth Alves committed 8 years ago861497e
  32. Fix for rigidly bound mesh not being properly cauterized.Anthony J. Thibault committed 8 years agoa1b67af
  33. merge from upstreamSeth Alves committed 8 years ago64a46bf
  34. cleaning en routesamcake committed 8 years ago8dfa3aa
  35. Introducing the tag in lieu of the vsisiblity maskSam Gateau committed 8 years ago51dac04