Code

History

  1. Merged from orgin taaOlivier Prat committed 8 years ago9cfe53b
  2. Merged with masterOlivier Prat committed 8 years agof5a2557
  3. Merge branch 'master' of http://github.com/highfidelity/hifi into taaOlivier Prat committed 8 years ago1aa4191
  4. Merged with masterOlivier Prat committed 8 years ago5af4337
  5. Merged with samcake/blackOlivier Prat committed 8 years agof3aac2a
  6. Merged with masterOlivier Prat committed 8 years agoc92a997
  7. Merge remote-tracking branch 'upstream/master' into androidBrad Davis committed 8 years agobdfa127
  8. Merged with masterOlivier Prat committed 8 years ago902bfac
  9. fix black flashing on transparent objectsSamGondelman committed 8 years agoa44c965
  10. Merged with masterOlivier Prat committed 8 years agoe6caa83
  11. Merge remote-tracking branch 'upstream/master' into androidBrad Davis committed 8 years ago6a06bf4
  12. rename model:: -> graphics::humbletim committed 8 years agob91d536
  13. First working local lights on transparent objectsOlivier Prat committed 8 years ago54eab1c
  14. Fixing UIBrad Davis committed 8 years ago105dffe
  15. Merge branch 'master' of https://github.com/highfidelity/hifi into blacksamcake committed 8 years ago403e77b
  16. Mergingsamcake committed 8 years agodf3b442
  17. Fixed merge conflicts with masterOlivier Prat committed 8 years ago0fc496d
  18. Merge branch 'master' into hazeOnTransparentNissim Hadar committed 8 years ago409eade
  19. Removed jitter samples from shader and added name to batches in DEBUG mode to ease render debugOlivier Prat committed 8 years ago92e1fe8
  20. Merging with upstreamsamcake committed 8 years agoe0110ff
  21. Merged with samcake's 'black' branchOlivier Prat committed 8 years ago1ce1aca
  22. Fixed warnings on Mac and UbuntuOlivier Prat committed 8 years agodc55a16
  23. Merge branch 'master' of git://github.com/highfidelity/hifi into csmOlivier Prat committed 8 years ago0b6dcb2
  24. Still working on solving that underestimated shadow far plane on the first cascade. I have finally understood the problem (see TODO in LightStage)Olivier Prat committed 8 years agod98dfff
  25. Working shadow cascade debugging view in Luci appOlivier Prat committed 8 years ago917ce71
  26. Merged disappearing shadow bug fix from pcf branchOlivier Prat committed 8 years agof8c241c
  27. Merge pull request #11559 from Zvork/bloomSam Gateau committed 8 years ago3f5b21e
  28. Moved draw frustum job to render DrawTask and made generic. A couple of fixes as requested by @samcakeOlivier Prat committed 8 years agof47a3e7
  29. Merge branch 'master' of git://github.com/highfidelity/hifi into shadowOlivier Prat committed 8 years agobf46cce
  30. Merged with masterOlivier Prat committed 8 years ago5102c8e
  31. Merge pull request #11802 from dback2/mirrorfanciness2David Back committed 8 years ago4b8021b
  32. Working CSM with smooth blend between cascades. Switched to 4 1024 cascadesOlivier Prat committed 8 years ago74b0b52
  33. Merged with PCF fix with dithered filteringOlivier Prat committed 8 years ago7515c34
  34. Merged with masterOlivier Prat committed 8 years agodd6b7b0
  35. Merged with masterOlivier Prat committed 8 years agofa58cf2