Code

History

Commits on b36a39b2bcda94de87fdc831da884611f8a85eea to interface/src/Menu.cpp1050+
  1. merged from masterJose Carlos committed 12 years agoe7b54a9
  2. Merge branch 'master' of https://github.com/worklist/hifi into 19497stojce committed 12 years agoc57cae6
  3. Merge branch 'master' of ssh://github.com/highfidelity/hifi into camera-occlusionAndrew Meadows committed 12 years ago48f28ec
  4. Split render options for head/body collision proxyAndrew Meadows committed 12 years agobca50a5
  5. Merge branch 'master' of https://github.com/worklist/hifi into 19497stojce committed 12 years ago1348506
  6. Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interactionAndrew Meadows committed 12 years ago4848aa1
  7. Helper method for adding avatar collision submenuAndrew Meadows committed 12 years agoe4ef09e
  8. Merge pull request #2002 from ZappoMan/lowerLODnoFPSdropPhilip Rosedale committed 12 years ago37e1c00
  9. Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interactionAndrew Meadows committed 12 years ago2d1218d
  10. Adding collisions options to menu at a second location.Andrew Meadows committed 12 years agob735233
  11. Added rect around the display name with proper size, paying attention to QFontMetrics data Fully wired up the message sending and receiving from serverJose Carlos committed 12 years ago19cb20f
  12. merged from masterJose Carlos committed 12 years ago04c59b8
  13. Merge branch 'master' of https://github.com/worklist/hifi into 19497stojce committed 12 years ago0ddc475
  14. Merge branch 'master' of https://github.com/worklist/hifi into 19494stojce committed 12 years agod5b87fb
  15. add Stop All Scripts and Reload All ScriptsZappoMan committed 12 years ago9d841ce
  16. Show "displayname" in correct position Show "displayname" when on mouse hover Persistant displayname dataJose Carlos committed 12 years agob899834
  17. add menu item for auto adjust LODZappoMan committed 12 years agocaab3af
  18. #19505 - Add domain & orientation parsing to hifi:// protocol handlerstojce committed 12 years agoab4164a
  19. Merge branch 'master' of https://github.com/worklist/hifi into lowerLODnoFPSdropZappoMan committed 12 years agoe9259db
  20. more tweaks, removed old cloudsZappoMan committed 12 years ago156fa6d
  21. tweaks to default menus for alpha, make Gravity false so we don't fall into abyssZappoMan committed 12 years ago6d75efd
  22. first cut at auto-LOD adjustmentZappoMan committed 12 years ago20a6f4e
  23. Merging upstream mastermatsukaze committed 12 years ago9e5c8b1
  24. Allow drag-and-drop of snapshots into Interfacestojce committed 12 years ago68584c6
  25. Wired up the send of the display data to the servers Added the renderDisplayName in AvatarJose Carlos committed 12 years ago319d1f6
  26. Merge branch 'master' of https://github.com/worklist/hifi into 19494stojce committed 12 years ago20026da
  27. Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interactionAndrew Meadows committed 12 years ago4edc6cd
  28. Merge remote-tracking branch 'upstream/master' into 19489Jose Carlos committed 12 years ago665971c
  29. Merge branch 'master' of https://github.com/worklist/hifi into 19494stojce committed 12 years ago1ac583e
  30. use shorter default URLs, set as placeholder text in prefsStephen Birarda committed 12 years ago3e90bcd
  31. Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interactionAndrew Meadows committed 12 years agobe1aaee
  32. Custom URL handlerstojce committed 12 years agob05967a
  33. Add Audio Noise ReductionPhilip Rosedale committed 12 years ago03bc5ad
  34. Fixes for style conformance: tabs to spacesmatsukaze committed 12 years agoab0b7bb
  35. Added new display mode to show culled faces.matsukaze committed 12 years agof15ddff