Code

History

Commits on master to scripts/system/controllers/controllerModules455+
  1. TidyingDavid Rowe committed 8 years ago27bed8d
  2. Change laser hand with trigger squeezeDavid Rowe committed 8 years agofb09a97
  3. Use laser from dominant hand if both hands are pointing at the tabletDavid Rowe committed 8 years ago9f7a2b1
  4. Fix magic numberDavid Rowe committed 8 years ago02f4085
  5. Don't display default lasers when Shapes app is activeDavid Rowe committed 8 years ago6095a90
  6. Fix tablet laser when Shapes app is runningDavid Rowe committed 8 years ago6c16fcf
  7. Use "Prefer Stylus Over Laser" settingDavid Rowe committed 8 years agoefa6f1f
  8. Thanks HowardZach Fox committed 8 years agoff4f582
  9. Fix bugs related to inspecting entities with hand controllersZach Fox committed 8 years ago8d4a6f0
  10. Merge tag 'RELEASE-7602' into 21661David Rowe committed 8 years ago6e43497
  11. Merge pull request #11950 from hyperlogic/bug-fix/hand-scalingSeth Alves committed 8 years agoa7a6dee
  12. Fix for hand controller avatar scaling.Anthony J. Thibault committed 8 years ago542af47
  13. fix radius equipingDante Ruiz committed 8 years ago32fca16
  14. fix-far-to-equipDante Ruiz committed 8 years agobbc022d
  15. Merge branch 'RC60' of github.com:highfidelity/hifi into fix-equippingDante Ruiz committed 8 years agoeaa0498
  16. fixing adjusting equipped entitiesDante Ruiz committed 8 years agodb374b8
  17. fix-editDante Ruiz committed 8 years agob9f60af
  18. fix scrollingDante Ruiz committed 8 years ago024dbcd
  19. fix laser interaction on HUD in HMD modeDante Ruiz committed 8 years ago982fad5
  20. laser allways on prototypeDante Ruiz committed 8 years ago70820e6
  21. Merge pull request #11838 from druiz17/fix-grabbingBrad Hefta-Gaub committed 8 years ago068b93f
  22. Merge branch 'master' of github.com:highfidelity/hifi into fix-grabbingDante Ruiz committed 8 years ago56972d1
  23. re-added fix that when into master that this branch breaksDante Ruiz committed 8 years agoa201312
  24. Merge pull request #11844 from druiz17/stylus-near-grabBrad Hefta-Gaub committed 8 years ago95f59b0
  25. Merge remote-tracking branch 'upstream/master' into pointersSamGondelman committed 8 years ago033f658
  26. Merge pull request #11831 from misslivirose/feat/scale-emit-handsDante Ruiz committed 8 years ago8f6c781
  27. near grab entity while stylus is showingDante Ruiz committed 8 years ago4bbf2ff
  28. fixing setting incorrect parentDante Ruiz committed 9 years agob66153b
  29. fixing merge conflictsDante Ruiz committed 9 years agof6a74cc
  30. Merge remote-tracking branch 'upstream/pointers' into uiSamGondelman committed 9 years agoac72421
  31. merge with masterSamGondelman committed 9 years agoe3aa799
  32. Emit scale changed signal when scaled with hand controllersLiv Erickson committed 9 years agodda32f1
  33. Merge remote-tracking branch 'upstream/pointers' into uiSamGondelman committed 9 years ago3274c41
  34. merge with masterSamGondelman committed 9 years ago7eb22b3
  35. fixing tablet in 3d personDante Ruiz committed 9 years ago9564b75