Code

History

Commits on master to interface/src/Menu.cpp1400+
  1. stylingstojce committed 12 years ago6383457
  2. removed old menu items for voxel protocol optionsZappoMan committed 12 years ago7a2419a
  3. Merge pull request #2108 from ZappoMan/remove_cpp_voxel_editingPhilip Rosedale committed 12 years ago4646961
  4. remove old c++ implementation of voxel toolsZappoMan committed 12 years ago869b35a
  5. some cruft cleanupZappoMan committed 12 years agod359480
  6. possible fix to windows assertZappoMan committed 12 years ago42ddc82
  7. Merge pull request #2101 from birarda/authenticationZappoMan committed 12 years ago4b3911c
  8. fix wording for access token change signalStephen Birarda committed 12 years agod5fc1ca
  9. fix login/logout flow when jumping domainsStephen Birarda committed 12 years ago2496c62
  10. moved MenuScriptingInterface to own filesZappoMan committed 12 years agoe03c7be
  11. remove dead codeZappoMan committed 12 years agoe12d791
  12. Merge branch 'master' of https://github.com/worklist/hifi into menu_jsZappoMan committed 12 years ago263d682
  13. Bad merge fixstojce committed 12 years ago303fddd
  14. implement support for menu item positioningZappoMan committed 12 years ago0048099
  15. Merge branch 'master' of https://github.com/worklist/hifi into 19508stojce committed 12 years ago3ced4c9
  16. if the domain-server provides no auth, assume defaultStephen Birarda committed 12 years ago1163cfd
  17. remove more cruftZappoMan committed 12 years ago0b6e81b
  18. added support for MenuItemProperties for addMenuItem, removed some cruft, beginning support for menu item placementZappoMan committed 12 years ago74d48ab
  19. Merge pull request #2076 from birarda/authenticationPhilip Rosedale committed 12 years agoe637e48
  20. add separator supportZappoMan committed 12 years agocb01c1e
  21. added checkable menus and sub menusZappoMan committed 12 years ago374b129
  22. better support for shortcutsZappoMan committed 12 years agoa3d0c20
  23. first cut at menus JSZappoMan committed 12 years ago03f8885
  24. Added toggles for rendering bucky balls, particles.Andrzej Kapolka committed 12 years agoc71b10f
  25. remove option to drive from transmitterStephen Birarda committed 12 years agof20808b
  26. remove pairing logic from interfaceStephen Birarda committed 12 years ago4a4001a
  27. resolve conflicts on merge with upstream masterStephen Birarda committed 12 years ago9771e1b
  28. cleanup login/logout in menu, logout only when inStephen Birarda committed 12 years agoa8493ec
  29. Merge branch 'master' of https://github.com/worklist/hifi into 19508stojce committed 12 years ago46a1614
  30. Merge branch 'master' of https://github.com/worklist/hifi into 19508stojce committed 12 years ago2c0e285
  31. restyled preferences dialogstojce committed 12 years agoec73edb
  32. Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxelsAndrzej Kapolka committed 12 years agoe470b1c
  33. add a logout option to the menuStephen Birarda committed 12 years ago6165ca6
  34. hook to request user's location from data-serverStephen Birarda committed 12 years ago52a21d4
  35. resolve conflicts on merge with upstream masterStephen Birarda committed 12 years ago340248a