Code

History

Commits on b36a39b2bcda94de87fdc831da884611f8a85eea to interface/src/Menu.cpp245+
  1. Merge branch 'master' of https://github.com/highfidelity/hifi into protocolStephen Birarda committed 11 years ago54edc6f
  2. Merge pull request #5337 from bwent/audioStatsDialogBrad Hefta-Gaub committed 11 years ago2df75f8
  3. Mute / un-mute face tracking when menu item is changed from scriptDavid Rowe committed 11 years ago550e922
  4. resolve conflicts on merge with upstream/masterStephen Birarda committed 11 years agoe572209
  5. Working on cleaning up diffBrad Davis committed 11 years ago7f6bb55
  6. merge with plugins, needs testingAnthony J. Thibault committed 11 years agoe8da4b9
  7. almost finished plugin architecture, general plugin improvements. menu actions don't work all the time, joint controllers need to be handled better, and activate/deactive aren't always called correctlyAnthony J. Thibault committed 11 years ago060f6c1
  8. Merge remote-tracking branch 'upstream/master' into pluginsBrad Davis committed 11 years agoae882c8
  9. input plugin architecture, fixed sixenseAnthony J. Thibault committed 11 years ago56e7af0
  10. Moved reload content item to nested Network menu item.Kevin M. Thomas committed 11 years ago6712639
  11. Move reload content item to developer menu.Kevin M. Thomas committed 11 years agob93ae7b
  12. more GlowEctomyZappoMan committed 11 years ago849b584
  13. first pass at GlowEctomyZappoMan committed 11 years ago819fa85
  14. Merge branch 'master' into audioStatsDialogbwent committed 11 years ago70e3e7c
  15. Clean up from previous commitbwent committed 11 years ago2c24251
  16. Added a dialog box to display audio network statisticsbwent committed 11 years ago5b0b722
  17. removed dead codeZappoMan committed 11 years agoe39ea72
  18. more dead code removal: NodeBoundsZappoMan committed 11 years agof1b85ae
  19. Merge branch 'atp' of github.com:birarda/hifi into receive_packetsRyan Huffman committed 11 years ago56b5c9a
  20. fix ref to qApp, connection to audioIOStephen Birarda committed 11 years agoe218841
  21. swap m for comma in MenuStephen Birarda committed 11 years ago4dd3dd6
  22. move NACK packet disabling to EntityEditPacketSenderStephen Birarda committed 11 years ago23548a9
  23. Merge branch 'sam/vive-hand-controllers' of github.com:hyperlogic/hifi into sam/vive-hand-controllersAnthony J. Thibault committed 11 years agoaa66691
  24. Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restartAtlante45 committed 11 years ago7bf4530
  25. merge with pluginsAnthony J. Thibault committed 11 years agodbc18ce
  26. Added "Standing HMD Sensor Mode" checkbox to menuAnthony J. Thibault committed 11 years ago9209e07
  27. Merge pull request #5307 from howard-stearns/remove-octreeFadesBrad Hefta-Gaub committed 11 years ago049419c
  28. Merge branch 'master' into pluginsBrad Davis committed 11 years agof8144e4
  29. Add an "is looking at me" indicator above avatars' headsDavid Rowe committed 11 years ago59f456a
  30. Remove old octreeFade code that wasn't working anyway.Howard Stearns committed 11 years ago51be245
  31. Move and rename menu itemAtlante45 committed 11 years agoec7e1df
  32. misc. changesAnthony J. Thibault committed 11 years ago2ac6b6c
  33. Rename to clear cache and restartAtlante45 committed 11 years agoed29685
  34. Clear cache and restart first draftAtlante45 committed 11 years ago39cb510
  35. added left/right hand click actions, vive controller should be able to emulate mouse eventsAnthony J. Thibault committed 11 years agod75353e