Code

History

Commits on master to interface/src/Menu.cpp560+
  1. Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updatesHoward Stearns committed 11 years agod3106de
  2. Avatar animations on by default. (Using the now old animation machinery.) Default robot avatar consistent with the animations. Don't require all the bones to be present.Howard Stearns committed 11 years ago086afc4
  3. resolve conflicts on merge with upstream/masterStephen Birarda committed 11 years agoed19987
  4. Merge branch 'master' into ajt/new-anim-systemAnthony J. Thibault committed 11 years agodf28c7b
  5. Merge pull request #5684 from rabedik/fxaaBrad Hefta-Gaub committed 11 years ago20bd14c
  6. Menu item to switch between threaded and not (without restart!).Howard Stearns committed 11 years agoc0fec44
  7. Added animation debug draw items to menu.Anthony J. Thibault committed 11 years ago30264e9
  8. Merge branch 'master' into ajt/new-anim-systemAnthony J. Thibault committed 11 years agod151474
  9. First pass integration of new anim system into rig.Anthony J. Thibault committed 11 years ago7b4cb86
  10. Merge branch 'master' of https://github.com/highfidelity/hifi into protocolStephen Birarda committed 11 years ago33f6933
  11. remove menu items for legacy IK optionsAndrew Meadows committed 11 years agofba7478
  12. resolve conflicts on merge with upstream/masterStephen Birarda committed 11 years agofa0abe2
  13. Add AA state to RenderContext and MenuRaffi Bedikian committed 11 years ago59a758b
  14. Merge pull request #5674 from birarda/masterBrad Davis committed 11 years agob7dd47e
  15. cleaned up some warningsStephen Birarda committed 11 years ago1d6f43e
  16. use existing AssetUploadDialogFactory refStephen Birarda committed 11 years ago777e6c3
  17. resolve conflicts on merge with origin/protocolStephen Birarda committed 11 years agoe3e529c
  18. resolve conflicts on merge with upstream/masterStephen Birarda committed 11 years ago80cf7b6
  19. Enable Rig Animations is now a developer menu item (rather than requiring javascript to set). Also turning it off resets you to bind pose and deliberately throws away old animations. Default animations are the new ones for our standard T-pose. (Had been for the double-A pose fightbot.) Rig state machine now does "backup", and doesn't apply strafe while turning.Howard Stearns committed 11 years ago96c74eb
  20. don't allow asset-server upload if no server presentStephen Birarda committed 11 years ago229015a
  21. Merge pull request #5648 from ctrlaltdavid/20663Brad Hefta-Gaub committed 11 years ago79a9694
  22. move asset upload to AssetUploadDialogFactoryStephen Birarda committed 11 years ago5b5941f
  23. Fixing framerate limit, moving vsync to 2d pluginBrad Davis committed 11 years ago270f2f7
  24. Fix bugs in Menu.cppRyan Huffman committed 11 years agoaed1ba3
  25. Merge branch 'protocol' of github.com:birarda/hifi into atp-serverRyan Huffman committed 11 years agoaa7d867
  26. Add asset uploader to MenuRyan Huffman committed 11 years agod90ceb2
  27. Remove items from the QML version of the menu when they are removed from the main menuBrad Davis committed 11 years ago0aaa07a
  28. Add Developer > Display Crash Options menu itemDavid Rowe committed 11 years agof6cf77a
  29. Add Developer > Crash Interface menu itemDavid Rowe committed 11 years ago07c9a0e
  30. Merge branch 'master' of https://github.com/worklist/hifi into 20660Thijs Wenker committed 11 years ago0f8cf80
  31. "View -> World Axes" menu optionThijs Wenker committed 11 years ago7486253
  32. Stereo rendering workBrad Davis committed 11 years agod3135dc
  33. Add menu item that disables adjusting eyelids to follow pupilDavid Rowe committed 11 years agoe9b3d48
  34. make enable-avatar-collisions menu item work againSeth Alves committed 11 years ago940390e
  35. remove HMD Tools as menu item, automatically hide/show it when display plugin is an hmdZappoMan committed 11 years ago6a80256