Code

History

Commits on b36a39b2bcda94de87fdc831da884611f8a85eea to interface/src/Menu.cpp1085+
  1. ADDED the fields in interface-preferences for display name edittingJose Carlos committed 12 years agoc957dcc
  2. Merge branch 'master' of https://github.com/highfidelity/hifi into mesh-through-mixerStephen Birarda committed 12 years ago4554420
  3. scriptable cameraZappoMan committed 12 years ago77e7f33
  4. Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interactionAndrew Meadows committed 12 years ago082b7cf
  5. Merge branch 'master' of https://github.com/highfidelity/hifi into authenticationStephen Birarda committed 12 years agof92f9ec
  6. remove local cache optionZappoMan committed 12 years agof657a3e
  7. fix skeleton setting on parsing of identity packetStephen Birarda committed 12 years ago53170d3
  8. complete movement of URLs to AvatarData for re-usabilityStephen Birarda committed 12 years ago3959209
  9. initial movement of mesh/skeleton URLs out of data-server through avatar-mixerStephen Birarda committed 12 years ago8bf3b75
  10. Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interactionAndrew Meadows committed 12 years ago466a43c
  11. Merging upstreammatsukaze committed 12 years ago259b285
  12. Completed worklist job #19486matsukaze committed 12 years agobbf4f88
  13. #19493 - @ function can jump to locations as well as avatarsstojce committed 12 years agod2464d8
  14. Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interactionAndrew Meadows committed 12 years agof093a57
  15. resolve conflicts on merge with upstream masterStephen Birarda committed 12 years ago10cfd62
  16. Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interactionAndrew Meadows committed 12 years agoc33a437
  17. Merge pull request #1627 from ey6es/metavoxelsAndrewMeadows committed 12 years ago6120416
  18. Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interactionAndrew Meadows committed 12 years agoafa1134
  19. more NodeList QSet changes, closes #1660Stephen Birarda committed 12 years agoed9118f
  20. complete migration of Avatar list to AvatarManagerStephen Birarda committed 12 years ago2e548fb
  21. Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxelsAndrzej Kapolka committed 12 years agob5cba27
  22. Adding option to disable hand collisions against their own avatar.Andrew Meadows committed 12 years agofa3c344
  23. Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interactionAndrew Meadows committed 12 years ago5565263
  24. MetavoxelEditorDialog -> MetavoxelEditor.Andrzej Kapolka committed 12 years agof2cfd86
  25. Added menu options for more detailed collision preferences.Andrew Meadows committed 12 years ago09b2d4a
  26. Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxelsAndrzej Kapolka committed 12 years agod473b00
  27. More work on metavoxel editing.Andrzej Kapolka committed 12 years ago5b4447d
  28. resolve conflicts in merge with upstream/masterStephen Birarda committed 12 years agof13aa32
  29. more DataServerClient API tweaksStephen Birarda committed 12 years agoe08f4d2
  30. Starting on metavoxel editor dialog.Andrzej Kapolka committed 12 years agod9589cd
  31. cleanup DSC api, add scripting interfaceStephen Birarda committed 12 years ago3613773
  32. scripts save on exit and load on entryaw committed 12 years ago0eed041
  33. add data-server to hifi repo, abstract DataServerClientStephen Birarda committed 12 years agod405d31
  34. Merge pull request #1585 from AndrewMeadows/paddle-fixesPhilip Rosedale committed 12 years ago317af4c
  35. Removing menu option for where to hold the ball -- we always hold from the finger tip (approximately).Andrew Meadows committed 12 years ago0921999