Code

History

Commits on master to interface/src/Menu.cpp1435+
  1. Merge remote-tracking branch 'upstream/master'matsukaze committed 12 years agoe800c80
  2. Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxelsAndrzej Kapolka committed 12 years ago4dab2eb
  3. resolve conflicts on merge with upstream/masterStephen Birarda committed 12 years ago6f84230
  4. indicate that both username or email can be passed for loginStephen Birarda committed 12 years agoc5b8ff1
  5. repair usage of INI file for QSettingsStephen Birarda committed 12 years ago5f13087
  6. merged from masterJose Carlos committed 12 years ago828508b
  7. resolve conflicts on merge with upstream masterStephen Birarda committed 12 years agoff7a49d
  8. Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxelsAndrzej Kapolka committed 12 years ago4e7a789
  9. Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxelsAndrzej Kapolka committed 12 years ago3c4d2aa
  10. Merge and resolve conflicts of remote-tracking branch 'upstream/master'matsukaze committed 12 years ago8aa645b
  11. Remove Avatar::_head, use AvatarData::_headDataAndrew Meadows committed 12 years ago4010f3a
  12. hook up request for domain registration information for InterfaceStephen Birarda committed 12 years ago949f79e
  13. Merge remote-tracking branch 'upstream/master' into 19489Jose Carlos committed 12 years ago59f8851
  14. Merge branch 'master' of ssh://github.com/highfidelity/hifi into camera-occlusionAndrew Meadows committed 12 years ago4b58d04
  15. complete access token request flow after login window presentationStephen Birarda committed 12 years agob57a5ce
  16. More spanner bits.Andrzej Kapolka committed 12 years ago55e2ebd
  17. more work on authentication, show login window when domain asksStephen Birarda committed 12 years ago8a0136e
  18. replace DataServerClient and Profile with AccountManagerStephen Birarda committed 12 years agoc762b92
  19. add a DomainInfo class to hold domain informationStephen Birarda committed 12 years ago37f1f7b
  20. merged from masterJose Carlos committed 12 years agoe7b54a9
  21. Merge branch 'master' of https://github.com/worklist/hifi into 19497stojce committed 12 years agoc57cae6
  22. Merge branch 'master' of ssh://github.com/highfidelity/hifi into camera-occlusionAndrew Meadows committed 12 years ago48f28ec
  23. Split render options for head/body collision proxyAndrew Meadows committed 12 years agobca50a5
  24. Merge branch 'master' of https://github.com/worklist/hifi into 19497stojce committed 12 years ago1348506
  25. Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interactionAndrew Meadows committed 12 years ago4848aa1
  26. Helper method for adding avatar collision submenuAndrew Meadows committed 12 years agoe4ef09e
  27. Merge pull request #2002 from ZappoMan/lowerLODnoFPSdropPhilip Rosedale committed 12 years ago37e1c00
  28. Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interactionAndrew Meadows committed 12 years ago2d1218d
  29. Adding collisions options to menu at a second location.Andrew Meadows committed 12 years agob735233
  30. 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
  31. merged from masterJose Carlos committed 12 years ago04c59b8
  32. Merge branch 'master' of https://github.com/worklist/hifi into 19497stojce committed 12 years ago0ddc475
  33. Merge branch 'master' of https://github.com/worklist/hifi into 19494stojce committed 12 years agod5b87fb
  34. add Stop All Scripts and Reload All ScriptsZappoMan committed 12 years ago9d841ce
  35. Show "displayname" in correct position Show "displayname" when on mouse hover Persistant displayname dataJose Carlos committed 12 years agob899834