Code

History

Commits on master to interface/src/Menu.cpp630+
  1. Merge branch 'master' of https://github.com/highfidelity/hifi into 20618Kevin M. Thomas committed 11 years ago5f7fe30
  2. completely remove six sense lasersZappoMan committed 11 years ago720f6ec
  3. working on plugin menu manipulationSamGondelman committed 11 years agoe3bc4b3
  4. Merge remote-tracking branch 'upstream/master' into pluginsBrad Davis committed 11 years ago5744200
  5. correcting comments, removing dead code + back slashSamGondelman committed 11 years agod985d02
  6. Merge branch 'plugins' of github.com:highfidelity/hifi into sam/vive-hand-controllersAnthony J. Thibault committed 11 years ago80dea68
  7. Merge pull request #5359 from birarda/protocolAndrew Meadows committed 11 years ago7578a70
  8. Merge branch 'homer' into pluginsBrad Davis committed 11 years ago9fafc92
  9. Merge branch 'master' into homerBrad Davis committed 11 years ago488a449
  10. Merge branch 'master' into pluginsBrad Davis committed 11 years ago359abd6
  11. resolve conflicts on merge with upstream/masterStephen Birarda committed 11 years ago0177513
  12. Merge pull request #5366 from jherico/margeBrad Hefta-Gaub committed 11 years agoc41e20b
  13. Removing AO effect (temporarily) and wireframe modeBrad Davis committed 11 years agodcaaeec
  14. resolve conflicts on merge with upstream masterStephen Birarda committed 11 years ago6b11495
  15. More header cleanupBrad Davis committed 11 years ago35f7307
  16. Merge pull request #5357 from ctrlaltdavid/scriptable-mutingPhilip Rosedale committed 11 years ago61c2b17
  17. Default Throttle FPS to disabledDavid Rowe committed 11 years ago7b11d02
  18. Add menu item, Developer > Render > Throttle FPS If Not FocusDavid Rowe committed 11 years agod0489bf
  19. cleaning up plugin architecture, fixed hand controllersAnthony J. Thibault committed 11 years ago01c740f
  20. Merge branch 'master' of https://github.com/highfidelity/hifi into protocolStephen Birarda committed 11 years ago54edc6f
  21. Merge pull request #5337 from bwent/audioStatsDialogBrad Hefta-Gaub committed 11 years ago2df75f8
  22. Mute / un-mute face tracking when menu item is changed from scriptDavid Rowe committed 11 years ago550e922
  23. resolve conflicts on merge with upstream/masterStephen Birarda committed 11 years agoe572209
  24. Working on cleaning up diffBrad Davis committed 11 years ago7f6bb55
  25. merge with plugins, needs testingAnthony J. Thibault committed 11 years agoe8da4b9
  26. 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
  27. Merge remote-tracking branch 'upstream/master' into pluginsBrad Davis committed 11 years agoae882c8
  28. input plugin architecture, fixed sixenseAnthony J. Thibault committed 11 years ago56e7af0
  29. Moved reload content item to nested Network menu item.Kevin M. Thomas committed 11 years ago6712639
  30. Move reload content item to developer menu.Kevin M. Thomas committed 11 years agob93ae7b
  31. more GlowEctomyZappoMan committed 11 years ago849b584
  32. first pass at GlowEctomyZappoMan committed 11 years ago819fa85
  33. Merge branch 'master' into audioStatsDialogbwent committed 11 years ago70e3e7c
  34. Clean up from previous commitbwent committed 11 years ago2c24251
  35. Added a dialog box to display audio network statisticsbwent committed 11 years ago5b0b722