Code

History

Commits on master to scripts/system/controllers/controllerModules525+
  1. Merge remote-tracking branch 'upstream/master' into HEADBrad Davis committed 9 years agobefe583
  2. resolve conflicts and cleanupSamGondelman committed 9 years ago7686948
  3. generalized scripting interfacesSamGondelman committed 9 years agofb96996
  4. Merge pull request #11612 from highfidelity/pointersBrad Hefta-Gaub committed 9 years ago26ea8be
  5. Merge pull request #11626 from Delanir/BubbleScaleMasterBrad Hefta-Gaub committed 9 years agoe2ccfb8
  6. Merge pull request #11591 from ctrlaltdavid/21568Melissa Brown committed 9 years ago1a3821e
  7. Merge BubbleScale for IPD with hifi master.Daniela committed 9 years agoe9f3dd6
  8. merge from masterSamGondelman committed 9 years ago58172cf
  9. Replace usages of AVATAR_SELF_ID previously missedDavid Rowe committed 9 years ago8d4e979
  10. Merge branch 'master' into 21568David Rowe committed 9 years ago1e3a2b3
  11. update scripts to use ignoreItems, fix caching bugSamGondelman committed 9 years ago429905d
  12. scale end sphere in c++ for controller modulesSamGondelman committed 9 years agoaee817f
  13. Merge pull request #11562 from druiz17/fix-release-grabSeth Alves committed 9 years agofe9f142
  14. Update system scripts to use new propertiesDavid Rowe committed 9 years agofc4e440
  15. fix stylusdruiz17 committed 9 years ago6799b9c
  16. Merge branch 'master' of github.com:highfidelity/hifi into fix-release-grabdruiz17 committed 9 years ago67944c4
  17. Merge branch 'stable' of https://github.com/highfidelity/hifi into new-masterAtlante45 committed 9 years ago6dd49f5
  18. Merge pull request #11542 from SamGondelman/bubbleBoySam Gateau committed 9 years agof143c28
  19. include release messagedruiz17 committed 9 years agoe77ac9f
  20. made requested changesdruiz17 committed 9 years ago013e15c
  21. remove commentsdruiz17 committed 9 years agod0eb6a3
  22. removing whitespacedruiz17 committed 9 years ago003395b
  23. saving workdruiz17 committed 9 years agofc41155
  24. Merge pull request #10892 from ctrlaltdavid/vr-edit-aThijs Wenker committed 9 years ago77a36bf
  25. merge with masterSamGondelman committed 9 years ago7e6d5d9
  26. improve mouseHMD exit logicdruiz17 committed 9 years ago3139f5e
  27. fix mouse dissapearing in desktop modedruiz17 committed 9 years agoba50fcc
  28. fixing laser staying on in edit modedruiz17 committed 9 years ago3476453
  29. Code reviewDavid Rowe committed 9 years agob526ec0
  30. Merge branch 'master' into vr-edit-aDavid Rowe committed 9 years ago63e7521
  31. Merge pull request #11523 from Atlante45/new-masterClément Brisset committed 9 years ago74fd69a
  32. allow farGrab module to run when stylus is visibledruiz17 committed 9 years ago9de1ca4
  33. Merge branch 'master' into RC-56Brad Hefta-Gaub committed 9 years agoa1979a2
  34. remove update stylusdruiz17 committed 9 years ago13feec8
  35. fixing grabbing and tablet bugsdruiz17 committed 9 years agoad9677f