Commit graph

61 commits

Author SHA1 Message Date
85262dfe28 Fixed grabbing in VR 2023-05-19 00:17:40 +02:00
David Rowe
c05225ca2f Reinstate nearParentGrabOverlay controller module
Fixes regression where tablet becomes large when grabbed if avatar is
small.
2020-05-26 14:58:13 +12:00
Seth Alves
600c2c3947 double OK to open/close tablet. touch thumb-tips to walk backwards 2020-04-26 12:23:43 -07:00
Seth Alves
865584e7e3 put tracked hand walk into a controller-dispatcher module 2020-04-26 12:23:40 -07:00
Seth Alves
63dcf0e1c9 use same near-grab module to grab entities and overlays 2020-04-26 12:22:53 -07:00
r3tk0n
108e8b9994 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-03-21 15:17:56 -07:00
r3tk0n
39342b9771 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-03-11 16:27:05 -07:00
r3tk0n
3b274c2b6e Enable pushToTalk.js controller module. 2019-03-08 16:02:16 -08:00
danteruiz
272ca5dc1c disable entity scaling 2019-03-05 16:23:40 -08:00
r3tk0n
ebbf48a11b Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-02-19 12:02:50 -08:00
r3tk0n
d3c1843d45 Disable toggleAdvancedMovementForHandControllers.js until such time the Controller.Standard.RY binding can be fixed. 2019-01-21 15:40:12 -08:00
Seth Alves
2515c7f73e remove old-style grabbing scripts 2019-01-15 13:43:52 -08:00
Seth Alves
895e8cdba1 fix off-hand adjustment of equipped entities. make traits-based grabbing be enabled by default, again 2019-01-03 08:17:52 -08:00
Seth Alves
905af34564 disable traits-based grabbing by default 2019-01-03 08:17:52 -08:00
Seth Alves
9900040ece enable trait-based grabbing by default 2019-01-03 08:17:52 -08:00
Seth Alves
78aff6e95c grab js api; send grab information through trait system 2019-01-03 08:17:52 -08:00
Dante Ruiz
d6fbcb1668 remove entity highlighting 2018-11-19 11:04:09 -08:00
David Rowe
eb179363f6 Merge branch 'master' into M17853
# Conflicts:
#	scripts/system/controllers/controllerDispatcher.js
2018-10-20 11:19:26 +13:00
Seth Alves
834699fa12 Move grab pseudo-properties (userData) into first-class EntityItemProperties. 2018-10-02 08:54:12 -07:00
David Rowe
f84f3b20cd Disable near and far lasers when tablet is grabbable 2018-08-31 10:25:12 +12:00
Seth Alves
527b27da96 pseudo-joints for far-grab positions 2018-08-14 08:55:20 -07:00
Alexander Ivash
5990d2725a disallow to scale avatar with controllers 2018-07-06 21:00:55 +03:00
luiscuenca
df32fe60e4 using RayPick API 2018-06-07 11:44:59 -07:00
luiscuenca
5403db6d51 Merge branch 'master' into handTouchToDefault 2018-06-07 11:42:26 -07:00
luiscuenca
acd1721c88 Load handTouch.js as a default script 2018-05-14 17:26:03 -07:00
Dante Ruiz
ba9d5d18bc make requested changes 2018-04-11 13:30:21 -07:00
Dante Ruiz
cc341e8ad7 highlight nearby entities 2018-04-05 15:38:56 -07:00
Dante Ruiz
05fb3cfd9a fixing hyper link for entities 2018-03-02 14:03:24 -08:00
Dante Ruiz
8779d52ad3 making requested changes 2017-11-14 13:04:09 -08:00
Dante Ruiz
5852224a31 clean up code and finialize changes 2017-11-13 13:37:53 -08:00
Dante Ruiz
43c6d71236 fix stylus module 2017-11-10 17:28:55 -08:00
Dante Ruiz
0580e23686 fixed edit mode and allow to scroll off tablet 2017-11-01 15:16:02 -07:00
Dante Ruiz
f44025a8b1 completely removed non-need laserPointers 2017-10-31 15:57:57 -07:00
David Rowe
6b3b2beae0 Merge branch 'master' into vr-edit-a 2017-09-27 15:34:52 +13:00
David Rowe
428efa571e Merge branch 'master' into vr-edit-a 2017-09-26 10:40:07 +13:00
druiz17
dda20c1ef5 fixing merge conflict 2017-09-25 09:45:29 -07:00
druiz17
2c7b8cdb4f fixing script issues 2017-09-22 16:26:41 -07:00
druiz17
e965b7fff1 hand controller pointer 2017-09-22 15:32:40 -07:00
druiz17
53efe6bfb2 working on fix 2017-09-21 18:17:05 -07:00
druiz17
e2921661e9 scaling entities 2017-09-19 09:35:22 -07:00
David Rowe
6c5a1c0460 Address laser and controller interactions with HUD overlays and tablet 2017-09-16 15:45:44 +12:00
Seth Alves
a9aa6df93e Merge branch 'controller-dispatcher-1' of github.com:sethalves/hifi into controller-dispatcher-1 2017-09-12 10:44:29 -07:00
Seth Alves
315f874824 add profiling to controller-dispatcher 2017-09-12 10:44:09 -07:00
druiz17
a46e41607c fixed teleport, added avatar scaling, allow laser to be used on tablet when stylus is shown 2017-09-11 15:07:14 -07:00
druiz17
ef050a09f9 made requested changes and also allow entities/overlays to be grabbed by the grip button 2017-09-07 14:42:46 -07:00
druiz17
0d66bfca05 added far trigger 2017-09-06 14:58:04 -07:00
Dante Ruiz
3b357ad61e finshed handControllerGrab refactoring 2017-09-01 17:07:26 -07:00
Dante Ruiz
3960ec7d5a finish main handControllerGrab refactoring 2017-08-30 15:20:03 -07:00
Dante Ruiz
4b592687b7 finished webEntityLaserInput, now working on cloning 2017-08-28 17:35:34 -07:00
Dante Ruiz
0eceb7b382 unviersial web3d vs laser 2017-08-25 17:40:30 -07:00