Code

History

Commits on master to interface/src/ui/ApplicationOverlay.cpp245+
  1. Merge branch 'master' of https://github.com/worklist/hifi into 20224Thijs Wenker committed 11 years ago46618db
  2. Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizingZappoMan committed 11 years ago4a6cc5c
  3. Moved some headers aroundAtlante45 committed 11 years ago20358a8
  4. intial removal of Audio to audio-clientStephen Birarda committed 11 years ago0eced09
  5. more workZappoMan committed 11 years agobddb785
  6. Move Oculus UI ratio to ApplicationOverlayAtlante45 committed 11 years ago229791a
  7. Merge branch 'master' of https://github.com/worklist/hifi into 20224Thijs Wenker committed 11 years ago5de4f8f
  8. Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizingZappoMan committed 11 years agodb94949
  9. rough pass at adding color to geometry cacheZappoMan committed 11 years agoe6388a6
  10. Merge branch 'master' of https://github.com/worklist/hifi into 20224Thijs Wenker committed 11 years ago74d56fb
  11. Fix merge accidental code deleteAtlante45 committed 11 years ago4429e14
  12. Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11Atlante45 committed 11 years ago2a82ff9
  13. added HMD interface to toggle magnifierThijs Wenker committed 11 years ago3da5677
  14. Fix gl projection matrix stack overflow when rendering to HUDRyan Huffman committed 11 years agoe00b629
  15. Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizingZappoMan committed 11 years ago873403a
  16. multi-mode renderVerticesZappoMan committed 11 years agoac1f7c9
  17. more work on eliminating immediate mode callsZappoMan committed 11 years agoa9b7367
  18. add alternate renderGrid for audio scopeZappoMan committed 11 years ago9545bd1
  19. Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizingZappoMan committed 11 years agobd1612f
  20. remove head mouseZappoMan committed 11 years ago7cf4bd1
  21. resolve conflicts on merge with upstream masterStephen Birarda committed 11 years ago51bba48
  22. add renderBevelCornersRect to GeometryCacheZappoMan committed 11 years agoc2d45df
  23. resolve conflicts on merge, add cstring incStephen Birarda committed 11 years agodfb02ae
  24. Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomyZappoMan committed 11 years ago9630279
  25. Merge pull request #3995 from huffman/camera-displayBrad Hefta-Gaub committed 11 years agod47b0a3
  26. first major pass at voxelEctomyZappoMan committed 11 years ago4ea9bbc
  27. Merge branch 'master' of github.com:highfidelity/hifi into camera-displayRyan Huffman committed 11 years ago0105906
  28. Rename 2D -> HUD, 3D -> World in OverlaysRyan Huffman committed 11 years ago2b835e6
  29. first cut at registered quads to reduce copies of constantly changing quadsZappoMan committed 11 years agobe13753
  30. resolve conflicts and merge with upstream masterStephen Birarda committed 11 years agoc7a5f3c
  31. almost completely eliminate immediate mode QUADSZappoMan committed 11 years ago0790bd7
  32. more work on removing immediate mode GL_QUADSZappoMan committed 11 years ago1f307e9
  33. more work on removing immediate mode GL_QUADSZappoMan committed 11 years ago3d42d53
  34. first pass at removing immediate mode GL_QUADSZappoMan committed 11 years ago14458ac
  35. Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11Atlante45 committed 11 years ago327daac