Code

History

  1. Merge remote-tracking branch 'upstream/master' into bindless_masterBrad Davis committed 8 years agoddd60de
  2. Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvorkNissimHadar committed 8 years ago000b08f
  3. Re-implemented shadow controls.NissimHadar committed 8 years ago0f2cf8e
  4. Merge remote-tracking branch 'upstream/master' into android_devBrad Davis committed 8 years ago136ced9
  5. Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork"SamGondelman committed 8 years ago0fca56e
  6. Merge remote-tracking branch 'upstream/master' into android_devBrad Davis committed 8 years agob9387f2
  7. Merge branch 'master' into bug-fix/entity-mat-avatar-dual-quaternionsAnthony J. Thibault committed 8 years agof5fcaae
  8. Code review feedbackAnthony J. Thibault committed 8 years ago0404b72
  9. Merge remote-tracking branch 'upstream/master' into android_devBrad Davis committed 8 years ago0550138
  10. Switch between dualQuats and matrix skinning based on model entity scale factor.Anthony J. Thibault committed 8 years ago0469eaf
  11. Merge remote-tracking branch 'upstream/stable' into android_stableBrad Davis committed 8 years agoaeb29db
  12. Merge branch 'master' into bug-fix/entity-mat-avatar-dual-quaternionsAnthony J. Thibault committed 8 years ago86351f1
  13. Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvorkNissim Hadar committed 8 years agob2a06cd
  14. WIP - clean-up.Nissim Hadar committed 8 years ago6a9bbaf
  15. No extraneous shadows.Nissim Hadar committed 8 years ago7ba8a99
  16. Models and Avatar cast shadows (box doesn't, yet).Nissim Hadar committed 8 years ago4c1f22f
  17. WIP - for review.Nissim Hadar committed 8 years ago194c7f4
  18. mergeSamGondelman committed 8 years agob189433
  19. CRSamGondelman committed 8 years ago2d754ed
  20. Merge branch 'master' into decalsSam Gondelman committed 8 years ago15cdfef
  21. Fixing namessamcake committed 8 years ago6357f36
  22. Work in progress to get the render items beeing tagged correctly for groupCulledsamcake committed 8 years ago1d3ae1b
  23. Avatars use Dual Quaternion Skinning and Model Entities do not.Anthony J. Thibault committed 8 years agod2c1991
  24. Models can now switch between dual quats and matrix palette skinning.Anthony J. Thibault committed 8 years ago7f5f48b
  25. WIP check in of making the use of dq or mat dynamic per modelAnthony J. Thibault committed 8 years agocf54523
  26. wip live material swapping on model entities, model overlays, avatars, and albedo swap on shape entitiesSamGondelman committed 8 years ago84cd0e1
  27. Addressing review commentssamcake committed 8 years ago4419dfe
  28. improving the forward rendering pass, removing the specular variation and making it defautlsamcake committed 8 years agob66da18
  29. First pass at bindless texturesBradley Austin Davis committed 9 years agoab5355d
  30. Adding the ubo slot assignment for the resource texture tablesamcake committed 9 years ago03aeb7a
  31. Merge remote-tracking branch 'upstream/master' into decalsSamGondelman committed 8 years ago4d4294d
  32. wip finish adding material entitySamGondelman committed 8 years agod7f4b03
  33. cleaning en routesamcake committed 8 years ago8dfa3aa
  34. Introducing the tag in lieu of the vsisiblity maskSam Gateau committed 8 years ago51dac04
  35. Making it work maybesamcake committed 8 years ago2f4e618