Code

History

Commits on master to interface/src/Menu.cpp1155+
  1. Merge branch 'master' of git://github.com/highfidelity/hifi into 19630Ryan Huffman committed 12 years agob48b8aa
  2. Move server borders to a submenuRyan Huffman committed 12 years agof646eda
  3. Merge pull request #2865 from talentraspel/19662Brad Hefta-Gaub committed 12 years ago6bd1bde
  4. MenuOption::Visage now default to false.Kai Ludwig committed 12 years agoe893785
  5. Merge branch '19630' of github.com:huffman/hifi into 19630Ryan Huffman committed 12 years ago21819ce
  6. Add Node border displayRyan Huffman committed 12 years ago7a3826b
  7. Merge branch 'master' of git://github.com/highfidelity/hifi into 19644Ryan Huffman committed 12 years agocfb1e5a
  8. Working on alternate IK mode.Andrzej Kapolka committed 12 years ago8388255
  9. Add ScriptsLocation settings valueRyan Huffman committed 12 years ago38a5b5b
  10. Menu.cpp Typo: goToOrientation calling goToDestination.Bennett Goble committed 12 years ago55d9614
  11. Merge pull request #2830 from huffman/19645Clément Brisset committed 12 years agodb9f2c5
  12. Add hifi:// clickable links to chatRyan Huffman committed 12 years agofdaa42b
  13. Merge branch 'master' of https://github.com/worklist/hifiPhilip Rosedale committed 12 years ago3a25626
  14. Merge pull request #2815 from ZappoMan/modelserverPhilip Rosedale committed 12 years ago538e785
  15. scope menus better, pause hotkey, no stay paused, remove menu for shared face culling opsPhilip Rosedale committed 12 years ago01e5b00
  16. place models in proper containing voxelZappoMan committed 12 years ago128e4a1
  17. CRAtlante45 committed 12 years agofd1f6be
  18. Fix for windowsAtlante45 committed 12 years ago6308c39
  19. mute environment packetAtlante45 committed 12 years ago40ed729
  20. correctly handle SHADOW_RENDER_MODE in a bunch of places that were drawing shadows when they shouldn'tZappoMan committed 12 years ago37ca6ef
  21. gravity disabled by defaultAndrew Meadows committed 12 years ago68b0e91
  22. Merge pull request #2793 from PhilipRosedale/masterAndrewMeadows committed 12 years ago7a19196
  23. Merge branch 'master' of https://github.com/worklist/hifi into 19597Stojce Slavkovski committed 12 years agoaedc7ed
  24. Merge branch 'master' of https://github.com/worklist/hifiPhilip Rosedale committed 12 years agoe0c898b
  25. Merge branch 'master' of https://github.com/highfidelity/hifiAndrzej Kapolka committed 12 years ago2a32700
  26. merge fixPhilip Rosedale committed 12 years agoda0b36e
  27. Added lookAt rendering bubblePhilip Rosedale committed 12 years ago691b1d6
  28. Merge branch 'master' of https://github.com/worklist/hifi into 19597Stojce Slavkovski committed 12 years agobcad49d
  29. Merge upstream/master into andrew/inertiaAndrew Meadows committed 12 years ago5ffd307
  30. More attachment bits.Andrzej Kapolka committed 12 years ago53a2760
  31. Merge branch 'master' of https://github.com/worklist/hifi into 19597Stojce Slavkovski committed 12 years ago01ebefd
  32. Working on allowing attachment models to be uploaded.Andrzej Kapolka committed 12 years agoe0400db
  33. Merge branch 'master' of https://github.com/worklist/hifi into 19597Stojce Slavkovski committed 12 years ago37664d3
  34. Remove dead ‘play slaps’ codePhilip Rosedale committed 12 years agoeb991b6
  35. resolve conflicts on merge with upstream/masterStephen Birarda committed 12 years agoaa2931d