Code

History

  1. merge from masterSamGondelman committed 9 years agofa838e4
  2. fix hudlaser moduledruiz17 committed 9 years ago6b3d89d
  3. grab attachmentsdruiz17 committed 9 years ago33e9a71
  4. Merge pull request #11496 from howard-stearns/certificate-propertiesHoward Stearns committed 9 years ago22f0ef3
  5. 2D overlays can no longer be laseredDavid Rowe committed 9 years ago5145107
  6. ESLintDavid Rowe committed 9 years agoa59d590
  7. propertly determine is laser intersects with HUD UIdruiz17 committed 9 years ago8a0ecf4
  8. saving workdruiz17 committed 9 years ago2091864
  9. Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-propertiesHoward Stearns committed 9 years ago73c8da9
  10. Merge branch 'master' into vr-edit-aDavid Rowe committed 9 years ago7536584
  11. move hud rendering to render thread, still need to separate out hud overlaysSamGondelman committed 9 years agob59ec07
  12. working checkpoint, but with a lot of debug/development stuffHoward Stearns committed 9 years agod1350a0
  13. remove update stylusdruiz17 committed 9 years ago1947f2b
  14. fixing grabbing and tablet bugsdruiz17 committed 9 years ago3b05317
  15. Change teleport.js to update render state more frequently.Daniela committed 9 years ago13eb7db
  16. Merge branch 'master' into vr-edit-aDavid Rowe committed 9 years ago30c4a22
  17. Merge pull request #11470 from sethalves/fix-grab-vs-triggerSeth Alves committed 9 years ago3016ce0
  18. improving far rotatedruiz17 committed 9 years agocea3c00
  19. Merge branch 'master' of github.com:highfidelity/hifi into fix-grab-vs-triggerSeth Alves committed 9 years agoeb6c994
  20. Merge branch 'master' into vr-edit-aDavid Rowe committed 9 years ago6b3b2be
  21. Merge pull request #11465 from hyperlogic/bug-fix/teleporter-near-scaleSeth Alves committed 9 years agoae42d56
  22. set grabbable and other checkboxes correctly if userData is blank or malformed. near-trigger blocks near-grabSeth Alves committed 9 years agoce3e5eb
  23. Merge pull request #11467 from sethalves/fix-near-triggerSeth Alves committed 9 years agof384cde
  24. use same trigger test as in isReadySeth Alves committed 9 years ago8180acb
  25. Merge branch 'master' of github.com:highfidelity/hifi into fix-near-triggerSeth Alves committed 9 years agoa478506
  26. only send startNearTrigger onceSeth Alves committed 9 years ago644532d
  27. fix spelling errordruiz17 committed 9 years ago5a1242a
  28. fix auto droppingdruiz17 committed 9 years ago76c1fe6
  29. teleport.js: fix for TELEPORT_CANCEL_RANGE with large/small avatar scaleAnthony J. Thibault committed 9 years agoa7cfb5d
  30. Teleport.js: Fix message bugs, and made eslint cleanAnthony J. Thibault committed 9 years agoc26d04d
  31. Merge pull request #11430 from sethalves/fix-parent-grabSeth Alves committed 9 years agoa871a6d
  32. Merge pull request #11444 from druiz17/module-handcontrollerPointerSeth Alves committed 9 years ago81f74f9
  33. fix cloning equipingdruiz17 committed 9 years ago2cc8a55
  34. able to grab tablet in 3rd persondruiz17 committed 9 years ago6332a53
  35. unmangle mergeSeth Alves committed 9 years ago5da5b24