Code

History

Commits on master to scripts/system/controllers/controllerModules595+
  1. Merge branch 'master' into vr-edit-aDavid Rowe committed 9 years ago428efa5
  2. fix tablet grabbing and eslint changesdruiz17 committed 9 years agoec40df7
  3. fix mouse visiblitydruiz17 committed 9 years agob1b3144
  4. fixing merge conflictdruiz17 committed 9 years agodda20c1
  5. merge from upstreamSeth Alves committed 9 years ago5741782
  6. Merge pull request #11401 from druiz17/module-scale-entitiesBrad Hefta-Gaub committed 9 years ago030da7d
  7. Merge branch 'master' of github.com:highfidelity/hifi into fix-parent-grabSeth Alves committed 9 years ago90954a4
  8. Merge pull request #11431 from zfox23/contextOverlayInterface_fixEnabledZach Fox committed 9 years ago921ebc2
  9. fixing script issuesdruiz17 committed 9 years ago2c7b8cd
  10. Merge branch 'master' of github.com:highfidelity/hifi into module-handcontrollerPointerdruiz17 committed 9 years ago28d8af0
  11. hand controller pointerdruiz17 committed 9 years agoe965b7f
  12. Fix hover -> unhover overlay behaviorZach Fox committed 9 years ago0eafdea
  13. Updates to behavior and shader appearanceZach Fox committed 9 years agobb9db3e
  14. Merge branch 'master' into vr-edit-aDavid Rowe committed 9 years agoe0658c7
  15. working on fixdruiz17 committed 9 years ago53efe6b
  16. back out bad changeSeth Alves committed 9 years ago3c22c9e
  17. oopsSeth Alves committed 9 years ago24bfb3f
  18. merge from upstreamSeth Alves committed 9 years ago363a2a3
  19. fix some parent-grab bugs, re-enable adjusting equipped entities, don't trigger guns right when they are equippedSeth Alves committed 9 years ago473db92
  20. Merge pull request #11420 from druiz17/fix-parenting-overlay-moduleSeth Alves committed 9 years ago61efaf7
  21. small changedruiz17 committed 9 years ago65e0c99
  22. fixing merge conflictsdruiz17 committed 9 years ago2d7d6f8
  23. Merge branch 'master' into vr-edit-aDavid Rowe committed 9 years agoc05ccd2
  24. Merge pull request #11416 from druiz17/stylus-posAnthony Thibault committed 9 years ago03e278c
  25. fixing nearGrabParentModule switching grabbed overlaysdruiz17 committed 9 years ago949c343
  26. move the stylus back a bitdruiz17 committed 9 years ago92f3dfe
  27. fixed tablet grabbing issuedruiz17 committed 9 years agoc20c5ee
  28. fixing spelling errordruiz17 committed 9 years ago2ce6dcf
  29. make changes requests and slight fixesdruiz17 committed 9 years ago5d87036
  30. fixing and cleanup tablet inputsdruiz17 committed 9 years ago9c66a25
  31. scaling entitiesdruiz17 committed 9 years agoe292166
  32. Merge branch 'master' into vr-edit-aDavid Rowe committed 9 years agoc56fda8
  33. Merge branch 'master' into feature/ant-manAnthony J. Thibault committed 9 years ago0757f51
  34. Merge pull request #11380 from ctrlaltdavid/fix-controller-typosSeth Alves committed 9 years ago095cd03
  35. Address laser and controller interactions with HUD overlays and tabletDavid Rowe committed 9 years ago6c5a1c0