Code

History

Commits on master to interface/src/Menu.cpp1505+
  1. Merge pull request #1627 from ey6es/metavoxelsAndrewMeadows committed 12 years ago6120416
  2. Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interactionAndrew Meadows committed 12 years agoafa1134
  3. more NodeList QSet changes, closes #1660Stephen Birarda committed 12 years agoed9118f
  4. complete migration of Avatar list to AvatarManagerStephen Birarda committed 12 years ago2e548fb
  5. Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxelsAndrzej Kapolka committed 12 years agob5cba27
  6. Adding option to disable hand collisions against their own avatar.Andrew Meadows committed 12 years agofa3c344
  7. Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interactionAndrew Meadows committed 12 years ago5565263
  8. MetavoxelEditorDialog -> MetavoxelEditor.Andrzej Kapolka committed 12 years agof2cfd86
  9. Added menu options for more detailed collision preferences.Andrew Meadows committed 12 years ago09b2d4a
  10. Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxelsAndrzej Kapolka committed 12 years agod473b00
  11. More work on metavoxel editing.Andrzej Kapolka committed 12 years ago5b4447d
  12. resolve conflicts in merge with upstream/masterStephen Birarda committed 12 years agof13aa32
  13. more DataServerClient API tweaksStephen Birarda committed 12 years agoe08f4d2
  14. Starting on metavoxel editor dialog.Andrzej Kapolka committed 12 years agod9589cd
  15. cleanup DSC api, add scripting interfaceStephen Birarda committed 12 years ago3613773
  16. scripts save on exit and load on entryaw committed 12 years ago0eed041
  17. add data-server to hifi repo, abstract DataServerClientStephen Birarda committed 12 years agod405d31
  18. Merge pull request #1585 from AndrewMeadows/paddle-fixesPhilip Rosedale committed 12 years ago317af4c
  19. Removing menu option for where to hold the ball -- we always hold from the finger tip (approximately).Andrew Meadows committed 12 years ago0921999
  20. Merge branch 'master' of https://github.com/worklist/hifi into 19484stojce committed 12 years ago13f223f
  21. fix 3d mode switch on/off issueBrad Hefta-Gaub committed 12 years ago1cfbfe6
  22. Merge branch 'master' of https://github.com/worklist/hifi into deboneAndrzej Kapolka committed 12 years ago865b495
  23. WL job #19484stojce committed 12 years ago150a667
  24. merge of windows-buildAndrew Meadows committed 12 years ago1266ffd
  25. Skeleton removal checkpoint; compiles, but there are a few bits missing.Andrzej Kapolka committed 12 years ago2c7b6b9
  26. added option to disable local cache fileBrad Hefta-Gaub committed 12 years agof1e9872
  27. Merge branch 'master' of git://github.com/worklist/hifi into windows_buildBrad Hefta-Gaub committed 12 years ago4778409
  28. Merge branch 'master' of git://github.com/worklist/hifi into windows_buildBrad Hefta-Gaub committed 12 years ago170dbe6
  29. Merge branch 'master' of git://github.com/worklist/hifi into 19485Lucas Crisman committed 12 years ago73dfc5d
  30. initial newline removal from all QDebug callsStephen Birarda committed 12 years ago987c639
  31. Merge branch 'master' of git://github.com/worklist/hifi into windows_buildBrad Hefta-Gaub committed 12 years ago392ff94
  32. more surgical removal of WebCam with HAVE_LIBVPXBrad Hefta-Gaub committed 12 years agob947d1e
  33. Merge branch 'master' of https://github.com/worklist/hifiAndrzej Kapolka committed 12 years ago7abb7d9
  34. allow fade scale to get smaller than minimum avatar scaleStephen Birarda committed 12 years ago42e3bcf
  35. Persist the user orientation as well as the position, show up a couple meters in front of (and facing) target. Closes #1367.Andrzej Kapolka committed 12 years ago2d5df38