Code

History

Commits on master to scripts/system/controllers/controllerModules350+
  1. Merge pull request #13570 from danteruiz/fix-tablet-material-entitiesSeth Alves committed 8 years agoa6a4dd3
  2. removing garbage fileWayne Chen committed 8 years ago1880c49
  3. optimizing near-/far- grabbable entities a bitWayne Chen committed 8 years ago32886d6
  4. adding check in isReady for grabbing non-web entitysWayne Chen committed 8 years agobe5fdef
  5. adding ignore for far-/near- grabbable entities when operating on web surfaceWayne Chen committed 8 years ago4e3a6cb
  6. followNormal, fixin stuffSamGondelman committed 8 years ago763e646
  7. pushing what i coded out loud - it broke the way grabbing worksWayne Chen committed 8 years ago5276d84
  8. Merge remote-tracking branch 'upstream/master' into parabolicSamGondelman committed 8 years ago956c151
  9. pointer rendering, update teleport.jsSamGondelman committed 8 years ago39fa342
  10. adding extra conditional to ensure all modules are checkedWayne Chen committed 8 years agoac642f1
  11. code cleanup to use web laser if laser is not pointing at grabbable entityWayne Chen committed 8 years ago30ca5a8
  12. switching near grab priority to be before web surface laserWayne Chen committed 8 years agoeb7bde1
  13. Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192Wayne Chen committed 8 years ago2c16c65
  14. adding check to see if near grabbing is readyWayne Chen committed 8 years ago813c58a
  15. min diffDante Ruiz committed 8 years ago20a8275
  16. undo some wrong changesDante Ruiz committed 8 years agofa2b975
  17. actually fix requested changesDante Ruiz committed 8 years ago0fa2a71
  18. making PR requestsDante Ruiz committed 8 years agod814205
  19. Merge branch 'master' of github.com:highfidelity/hifi into fix-parent-grab-and-flickeringDante Ruiz committed 8 years ago47eb7a0
  20. clean up tablet material entities and don't show them in editDante Ruiz committed 8 years agodf4d812
  21. tabsDavid Back committed 8 years agof815ad1
  22. fix triggering at non-web overlaysDavid Back committed 8 years agoc271e1a
  23. fix parent grab dropping and cullig flickeringDante Ruiz committed 8 years agoae03dcb
  24. Merge pull request #13390 from dback2/editHandleDebugWindowFixDavid Back committed 8 years ago6fa1917
  25. Merge branch 'master' of https://github.com/highfidelity/hifi into autoLaserFix2David Back committed 8 years ago0c644c0
  26. also check tabletIDDavid Back committed 8 years ago175e4b7
  27. tabsDavid Back committed 8 years agobc06b88
  28. prevent edit press events when pointing at desktop window or tabletDavid Back committed 8 years ago9b33e67
  29. tabsDavid Back committed 8 years agofcccaae
  30. fix auto laser on locked web entity, only auto laser at tablet or web overlaysDavid Back committed 8 years agoed5b05e
  31. fixing invisible cursorDante Ruiz committed 8 years agoa6202cf
  32. Merge pull request #13322 from dback2/fixEquipMessageJohn Conklin II committed 8 years ago9db71fb
  33. Fix incomplete transition from far-grabbing entity to grabbing tabletDavid Rowe committed 8 years ago54b96cd
  34. Fix function nameDavid Rowe committed 8 years agodc46c20
  35. use messageGrabEntity flag insteadDavid Back committed 8 years ago8f5de7b