Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 19:42:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
81433 commits 71 branches 56 tags 1.2 GiB
Commit graph

1574 commits

Author SHA1 Message Date
David Rowe
ed5e77df37 Scale-in teleport target from zero size 2018-08-04 15:11:53 +12:00
SamGondelman
f1ca0411c0 drawInFront parabolas 2018-08-03 16:43:13 -07:00
David Rowe
653a281482 Use new teleport destination FBX 2018-08-04 10:11:22 +12:00
David Rowe
11b85e30db Merge branch 'master' into M17217-a 2018-08-04 09:44:39 +12:00
David Rowe
5be945715f Include the teleporter target in the occlusion 2018-08-03 08:22:36 +12:00
David Rowe
29dbc01361 Add alternative code to position Oculus sensors at correct elevation 2018-08-03 08:12:44 +12:00
David Rowe
57da0fef63 Show occluded parts of the play area overlays 2018-08-02 15:21:56 +12:00
David Rowe
eed0159b5e Scale-in play area from zero size 2018-08-02 14:45:09 +12:00
David Rowe
07049b9481 Update and tidy play area and Oculus sensor models 2018-08-02 11:08:21 +12:00
David Back
0b9e520b53 fix grab cloning parented entitiy 2018-08-01 16:00:25 -07:00
SamGondelman
e11030bbc3 mukul's changes, enable parabolic teleport 2018-08-01 09:46:17 -07:00
David Rowe
981b6fc4c9 Display play area and sensor about teleport target 2018-08-01 17:18:38 +12:00
David Rowe
cf12124b34 Merge remote-tracking branch 'SamGondelman/parabolic' into M17217-a 2018-08-01 10:14:15 +12:00
David Back
7bf7663f09 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues 2018-07-31 11:51:26 -07:00
David Back
4a722a62f7 use click handler only, remove triggerClicked 2018-07-31 11:51:16 -07:00
John Conklin II
8e277758ad
Merge pull request #13700 from danteruiz/fix-grabbing-problem 
Impove the way we checkForChildTooFarAway in nearParentGrabEntity.js
 2018-07-31 09:46:57 -07:00
David Back
bec54cc182 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues 2018-07-30 12:26:48 -07:00
SamGondelman
19cf2b0a29 mukul's changes, enable parabolic teleport 2018-07-30 11:28:59 -07:00
Sam Gondelman
8201997a16
Merge pull request #13660 from SamGondelman/parabolic 
Parabolic Picking + Pointers
 2018-07-30 10:49:02 -07:00
Dante Ruiz
0f46001f9a remove redundent variable 2018-07-30 10:29:53 -07:00
Dante Ruiz
4caf613269 making requested changes 2018-07-30 10:19:27 -07:00
David Back
398c530214 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues 2018-07-30 10:18:19 -07:00
Wayne Chen
c8845e1a23 Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192 2018-07-28 09:42:12 -07:00
Dante Ruiz
6320401308 somewhat better distance from bounding box 2018-07-27 17:49:49 -07:00
SamGondelman
1ef54b2fe6 back to ray teleport 2018-07-27 14:58:56 -07:00
Dante Ruiz
30b4815bf9 Merge branch 'master' of github.com:highfidelity/hifi into fix-grabbing-problem 2018-07-27 13:13:10 -07:00
David Rowe
3bfdd3ff58 Maintain virtual and real world orientations when teleport 2018-07-27 15:18:40 +12:00
David Back
cd842afc1c prevent both hands triggering same time, allow one to trigger after other 2018-07-26 17:52:25 -07:00
David Back
82e5d6ad29 use triggerClicks from controllers for edit handles 2018-07-26 16:38:25 -07:00
Dante Ruiz
74bb2301b0 minimize diff 2018-07-26 16:05:56 -07:00
Dante Ruiz
31d31af941 minimize diff 2018-07-26 16:05:18 -07:00
Dante Ruiz
6edd109dfe revert back to the old way we checkForChildTooFarAway 2018-07-26 15:23:54 -07:00
SamGondelman
74b3143bc3 remove scaling from teleport script 2018-07-26 12:23:14 -07:00
SamGondelman
9b41cb5554 improve model picking performance, scale parabola v/a with avatar, improve followNormal behavior, turn off followNormal on teleport, remove 1 m no teleport spot 2018-07-25 15:19:25 -07:00
SamGondelman
fbcddf1445 test gradual normal interpolation 2018-07-24 14:15:49 -07:00
SamGondelman
318ef907b8 parabola/polyvox, fixing some bugs 2018-07-24 10:08:35 -07:00
Wayne Chen
c0dfbac480 adding comment for possible solution - still WIP 2018-07-24 10:04:51 -07:00
Wayne Chen
e4a5be668a adding check function for pointing at near grabbable entity 2018-07-23 12:29:01 -07:00
Wayne Chen
1ec136a19c removing debug overlay statements 2018-07-23 12:18:26 -07:00
Wayne Chen
a2aeacab64 adding fix for near grabbing with web entity 2018-07-23 12:17:19 -07:00
Wayne Chen
89f9cd089f Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192 2018-07-23 11:51:39 -07:00
Seth Alves
a6a4dd3b8e
Merge pull request #13570 from danteruiz/fix-tablet-material-entities 
clean up tablet material entities  and don't display them in create menu
 2018-07-23 09:50:23 -07:00
Wayne Chen
1880c49d03 removing garbage file 2018-07-20 17:18:58 -07:00
Wayne Chen
32886d67d9 optimizing near-/far- grabbable entities a bit 2018-07-20 17:17:36 -07:00
Wayne Chen
be5fdef974 adding check in isReady for grabbing non-web entitys 2018-07-20 15:26:55 -07:00
Wayne Chen
4e3a6cb320 adding ignore for far-/near- grabbable entities when operating on web surface 2018-07-20 11:18:20 -07:00
SamGondelman
763e6465a2 followNormal, fixin stuff 2018-07-20 10:41:24 -07:00
Wayne Chen
5276d84aa5 pushing what i coded out loud - it broke the way grabbing works 2018-07-19 17:08:12 -07:00
SamGondelman
956c1511b6 Merge remote-tracking branch 'upstream/master' into parabolic 2018-07-19 15:23:25 -07:00
Wayne Chen
1942eaf68f Merge branch 'fixGrabWebSurface-case-16192' of https://github.com/wayne-chen/hifi into fixGrabWebSurface-case-16192 2018-07-19 13:47:48 -07:00
Wayne Chen
b60d650843 Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192 2018-07-19 13:47:38 -07:00
SamGondelman
39fa3420ec pointer rendering, update teleport.js 2018-07-19 12:02:39 -07:00
Qliemillar
2163bf1ef0
Merge pull request #13628 from r3tk0n/16726-Vive-Blackboxes 
16726 - Remove Black Boxes ( HMD.requestShowHandControllers() )
 2018-07-19 12:34:38 -06:00
r3tk0n
a9eb8103f6 Clean up comments a bit. 2018-07-18 09:52:25 -07:00
r3tk0n
f7b49598b5 Disabled tip boxes for Vive controllers, as per experience team request. 2018-07-18 09:50:59 -07:00
Qliemillar
080d664341
Merge pull request #13619 from luiscuenca/handTouchDisabler 
Allow creators to disable hand touch from javascript
 2018-07-18 08:16:37 -06:00
Wayne Chen
ac642f126a adding extra conditional to ensure all modules are checked 2018-07-17 20:52:50 -07:00
Wayne Chen
30ca5a8cbd code cleanup to use web laser if laser is not pointing at grabbable entity 2018-07-17 16:44:49 -07:00
Wayne Chen
eb7bde1bfc switching near grab priority to be before web surface laser 2018-07-17 15:38:56 -07:00
Wayne Chen
2c16c6579f Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192 2018-07-17 11:54:15 -07:00
Wayne Chen
813c58a1fb adding check to see if near grabbing is ready 2018-07-17 11:53:55 -07:00
luiscuenca
82a3b73de8 Added disable hand touch for entityID 2018-07-17 07:06:48 -07:00
luiscuenca
84dac94379 Allow creator to disable hand touch 2018-07-16 17:03:50 -07:00
Dante Ruiz
20a8275343 min diff 2018-07-16 11:43:29 -07:00
Dante Ruiz
fa2b975e8f undo some wrong changes 2018-07-16 11:42:38 -07:00
Dante Ruiz
0fa2a71d0f actually fix requested changes 2018-07-16 11:35:53 -07:00
Dante Ruiz
d81420542c making PR requests 2018-07-16 11:00:27 -07:00
Dante Ruiz
47eb7a0899 Merge branch 'master' of github.com:highfidelity/hifi into fix-parent-grab-and-flickering 2018-07-16 10:04:42 -07:00
Dante Ruiz
df4d81277f clean up tablet material entities and don't show them in edit 2018-07-09 16:59:32 -07:00
John Conklin II
81f5631ce9
Merge pull request #13386 from ElderOrb/FB13949 
AvatarApp
 2018-07-09 15:20:18 -07:00
David Back
f815ad1ddd tabs 2018-07-06 17:02:41 -07:00
David Back
c271e1aae4 fix triggering at non-web overlays 2018-07-06 17:02:29 -07:00
Dante Ruiz
ae03dcb57a fix parent grab dropping and cullig flickering 2018-07-06 15:42:21 -07:00
Alexander Ivash
5990d2725a disallow to scale avatar with controllers 2018-07-06 21:00:55 +03:00
Seth Alves
73071df857 when displaying the in-world controller model, make buttons and joysticks be children of the base controller model, rather than children of the avatar 2018-07-05 10:07:49 -07:00
Wayne Chen
2bbc5b6137 remove ray pick print statement - it bloats the debug window 2018-07-03 09:11:57 -07:00
John Conklin II
2da3192c33
Merge pull request #13402 from ctrlaltdavid/21895 
Make desktop left and right mouse button actions independent
 2018-06-27 12:46:11 -07:00
John Conklin II
47f907f44e
Merge pull request #13441 from wayne-chen/collisionlessGrab-case-12661 
Fixing collisionless grabbing
 2018-06-26 13:05:25 -07:00
David Back
6fa191742c
Merge pull request #13390 from dback2/editHandleDebugWindowFix 
Prevent edit press events when pointing at tablet or desktop windows
 2018-06-25 11:11:37 -07:00
Wayne Chen
1239472f2d adding line for allowing grabbing of collisionless overlays 2018-06-22 11:35:01 -07:00
Wayne Chen
5b36449edd allowing grabbing of collisionless entities 2018-06-22 09:54:25 -07:00
David Back
0c644c0504 Merge branch 'master' of https://github.com/highfidelity/hifi into autoLaserFix2 2018-06-18 11:06:56 -07:00
David Back
175e4b7013 also check tabletID 2018-06-18 11:06:33 -07:00
David Rowe
ffd66f4377 Make desktop left and right mouse button actions independent 2018-06-18 20:55:13 +12:00
David Back
bc06b88afc tabs 2018-06-15 14:31:18 -07:00
David Back
9b33e6757f prevent edit press events when pointing at desktop window or tablet 2018-06-15 14:29:47 -07:00
David Back
fcccaaea48 tabs 2018-06-14 17:49:02 -07:00
David Back
ed5b05eef4 fix auto laser on locked web entity, only auto laser at tablet or web overlays 2018-06-14 17:43:45 -07:00
Dante Ruiz
a6202cf3cb fixing invisible cursor 2018-06-13 11:31:14 -07:00
Anthony Thibault
717093abf7
Merge pull request #13171 from luiscuenca/handTouchToDefault 
Enable Avatar Hand Touch Script by Default
 2018-06-12 14:54:26 -07:00
Luis Cuenca
9126a6f66d
hide debug lines 2018-06-12 10:12:28 -07:00
John Conklin II
9db71fb40d
Merge pull request #13322 from dback2/fixEquipMessage 
Fix Hifi-Grab-Hand message for equipping
 2018-06-11 13:16:39 -07:00
David Rowe
54b96cd602 Fix incomplete transition from far-grabbing entity to grabbing tablet 2018-06-09 11:32:10 +12:00
David Rowe
dc46c2077d Fix function name 2018-06-09 11:01:18 +12: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
David Back
8f5de7b16a use messageGrabEntity flag instead 2018-06-06 18:05:26 -07:00
David Back
0ee55a09b6 fix tabs 2018-06-06 17:35:25 -07:00
David Back
048872c79a use messageEquip flag to fix Hifi-Hand-Grab 2018-06-06 17:32:52 -07:00
Wayne Chen
9f20d52d01 adding alternate solution. 2018-05-31 15:05:33 -07:00
Wayne Chen
d66b548fc5 fixing typo in script file. 2018-05-31 15:04:29 -07:00
Wayne Chen
89f7eb0b30 Adding fix for enabling saved front/back advanced controls. 2018-05-25 09:21:01 -07:00
John Conklin II
3e665fb616
Merge pull request #13179 from dback2/cloneables 
Server-Managed Cloneables + Cloneable Properties
 2018-05-23 12:40:27 -07:00
Liv Erickson
604b3cac1c check for null entities in grab, add conversion for old userdata cloneable 2018-05-21 16:19:43 -07:00
Dante Ruiz
249d22b4b4 Merge branch 'master' of github.com:highfidelity/hifi into menu-updates 2018-05-21 10:31:24 -07:00
David Rowe
801a4b9aba Make laser click in sky deselect entity 2018-05-17 15:09:23 +12:00
David Back
06fa4efe05 add comment 2018-05-16 11:39:53 -07:00
David Back
6c946d7ac5 prevent continuous clone calls 2018-05-16 11:36:57 -07:00
Dante Ruiz
37c51a7246 Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates 2018-05-16 10:41:40 -07:00
Dante Ruiz
e676348c4f fixing some menu reog bugs 2018-05-16 10:40:28 -07:00
David Back
f8fc7bedd7 Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables 2018-05-15 17:31:43 -07:00
David Back
f74e219029 rename properties, add clone avatar entity, remove worldEntityProps arg, fix clone ID cleanup on delete 2018-05-15 17:24:14 -07:00
vladest
7ea6181520 Merge branch 'master' into menu-updates 2018-05-15 21:54:45 +02:00
Seth Alves
6da59d15e5
Merge pull request #13167 from dback2/lowercaseUnequip 
Desktop equip: fix unequipping with capital U
 2018-05-15 10:55:19 -07:00
luiscuenca
acd1721c88 Load handTouch.js as a default script 2018-05-14 17:26:03 -07:00
David Back
ac78e14585 fix unequipping with capital U 2018-05-14 11:44:25 -07:00
Seth Alves
898dec29cb don't cache value of getControllerJointIndex at startup, because the script may run before the data is available. Instead, refresh the data every few seconds 2018-05-11 17:07:51 -07:00
vladest
62aa2df836 Merge branch 'master' into menu-updates 2018-05-10 10:36:38 +02:00
Dante Ruiz
a593209ec1 remove highlight when point to the sky 2018-05-07 15:33:12 -07:00
Dante Ruiz
607de3dfb4 Merge branch 'RC67' of github.com:highfidelity/hifi into RC67 2018-05-04 14:20:57 -07:00
Dante Ruiz
6414fcaae5 fix-another-highlighting-issue 2018-05-04 14:20:17 -07:00
Dante Ruiz
a57c72df6e fix entity highlighting during edit mode 2018-05-04 08:53:49 -07:00
Dante Ruiz
cffb008c31 fixing edge case 2018-05-03 13:07:32 -07:00
Dante Ruiz
4793cddde6 fix highlighting issues 2018-05-03 11:27:07 -07:00
vladest
617b49fe14 Added mouse sensivity UI. Reworked advanced movements. TODO: properties interface complitely broken in Tablet mode 2018-05-01 21:22:48 +02:00
David Back
61afd12eeb change to not left button 2018-04-27 16:06:27 -07:00
David Back
0962e1fc16 ignore right clicks 2018-04-27 16:06:14 -07:00
David Back
8d49d1c118 change to not left button 2018-04-27 13:32:05 -07:00
David Back
78436ebcbf ignore right clicks 2018-04-27 11:30:45 -07:00
David Back
71dc75b208 fix disconnect clear entities 2018-04-24 14:25:33 -07:00
David Back
e21c451815 ensure deleted or cleared entities properly unequipped 2018-04-23 16:56:18 -07:00
David Back
8950c31378 fix mouse equipping while someone else far grabbing 2018-04-19 16:29:49 -07:00
David Back
8cbe0f4633 safer clear grab actions 2018-04-19 11:17:26 -07:00
David Back
d1bb11562b Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip 2018-04-19 09:36:19 -07:00
David Back
bf21a4cf56 tabs 2018-04-18 15:05:29 -07:00
David Back
4a37c4ba18 add entityIsEquipped utils for grab.js check 2018-04-18 15:00:10 -07:00
Dante Ruiz
cf22f61361 adding cleanup of selection 2018-04-18 13:30:14 -07:00
unknown
278a6b763f ensure target mouse entity has equip data 2018-04-17 16:26:33 -07:00
unknown
9e4914975b missing reset flag on end equip, remove mouseEquip check on unequip via U 2018-04-17 16:13:10 -07:00
David Back
e86ef1c2d6 fix bracket 2018-04-16 13:33:17 -07:00
David Back
ad85e2b053 pre PR adjustments 2018-04-16 13:12:33 -07:00
David Back
78c0ec5770 remove animations 2018-04-16 12:56:22 -07:00
Dante Ruiz
08ea72d71f Merge branch 'master' of github.com:highfidelity/hifi into feature-entity-highlighting 2018-04-13 15:39:14 -07:00
David Back
76c7ec69ce Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip 2018-04-13 14:28:14 -07:00
David Back
243b3637c4 fix grab.js change 2018-04-12 12:41:36 -07:00
Dante Ruiz
43b92299d6 changing highlighting percentage 2018-04-12 10:35:29 -07:00
Dante Ruiz
7243160dac making requested changes 2018-04-11 14:42:26 -07:00
Dante Ruiz
cdc248129c fix grab.js 2018-04-11 14:25:06 -07:00
Dante Ruiz
ba9d5d18bc make requested changes 2018-04-11 13:30:21 -07:00
David Back
59971869f5 desktop equip 2018-04-10 19:06:27 -07:00
Dante Ruiz
447163bd07 clean up scripts 2018-04-10 09:23:40 -07:00
Dante Ruiz
2e1ebac03f clean up functionality 2018-04-09 18:07:03 -07:00
Dante Ruiz
1113202a90 reverting file 2018-04-09 16:51:20 -07:00
Dante Ruiz
2c20593b6d editing equip code 2018-04-06 16:30:45 -07:00
Dante Ruiz
fd47832857 saving changes 2018-04-06 11:47:09 -07:00
Dante Ruiz
07b1a6be01 saving work 2018-04-06 11:01:40 -07:00
Dante Ruiz
893832f4c7 Merge branch 'master' of github.com:highfidelity/hifi into feature-entity-highlighting 2018-04-05 16:01:36 -07:00
Dante Ruiz
cc341e8ad7 highlight nearby entities 2018-04-05 15:38:56 -07:00
Dante Ruiz
42149e295d editing seletion style 2018-04-04 12:55:28 -07:00
Zach Fox
b641f87792
Merge pull request #12778 from zfox23/MS13792 
Prevent Context Overlay from flashing when briefly hovering over certified entity
 2018-04-04 09:31:33 -07:00
Dante Ruiz
c9c3d8f332 adding entity selection for far grabbing 2018-04-04 08:07:35 -07:00
Zach Fox
5f47d51171 Prevent Context Overlay from flashing when briefly hovering over certified entity 2018-04-03 15:35:46 -07:00
Seth Alves
5f13df4102
Merge pull request #12722 from druiz17/fix-entities-outline 
fix ContextOverlayInferface highlighing unspecified entities.
 2018-04-03 12:29:19 -07:00
Dante Ruiz
16749df83a fix highlighting edge case 2018-03-30 14:14:13 -07:00
Dante Ruiz
3d7f7f0e62 fix parent tree grabbing 2018-03-27 14:05:43 -07:00
Dante Ruiz
654770af51 fix controller dispatacher error 2018-03-05 09:39:26 -08:00
John Conklin II
3f751bb5ca
Merge pull request #12546 from druiz17/fix-hyperlink 
Fix hyperlink when far/near grabbing enitities
 2018-03-05 08:23:51 -08:00
Dante Ruiz
d12a4f0c18 little change 2018-03-02 14:30:02 -08:00
Dante Ruiz
5dc336bfae remove dead code and eslint files 2018-03-02 14:23:35 -08:00
Dante Ruiz
05fb3cfd9a fixing hyper link for entities 2018-03-02 14:03:24 -08:00
Dante Ruiz
1f4aed31f1 adding hyperlink 2018-03-01 16:16:47 -08:00
Andrew Meadows
27c6e7915e purge LaserPointers refs from scripts that don't use it 2018-03-01 08:43:30 -08:00
Andrew Meadows
b4f941af03 finish purge of RayPick from grab.js 2018-03-01 08:42:08 -08:00
Andrew Meadows
181944d5db fix bugs in controllerDispatcher.js 2018-03-01 08:41:13 -08:00
David Rowe
2ff78493db A further guard 2018-02-13 10:11:18 +13:00
David Rowe
b1f49be790 Merge branch 'master' into 21742 
# Conflicts:
#	scripts/system/libraries/entitySelectionTool.js
 2018-02-13 10:04:32 +13:00
Dante Ruiz
0dac851def fixing case when grabbed target is destroyed 2018-02-08 17:08:51 -08:00
David Rowe
adb6f66a05 Handle tablet entities and overlays not being available 2018-02-08 09:51:48 +13:00
Dante Ruiz
601914180d fixing teleport module for sit script 2018-02-05 11:52:35 -08:00
Seth Alves
c4f57877dd if hand is already in 'drop gesture' position when equipping something, don't unequip until the hand has been upright 2018-01-31 10:06:20 -08:00
John Conklin II
455090d2b9
Revert "Display both lasers on tablet and Web surfaces" 2018-01-19 15:15:52 -08:00
John Conklin II
db5bf68431
Merge pull request #12203 from ctrlaltdavid/21703 
Display both lasers on tablet and Web surfaces
 2018-01-19 15:15:44 -08:00
David Rowe
7898aa2c4b Code review 2018-01-20 10:32:42 +13:00
David Rowe
94e6a68d41 Code review 2018-01-20 09:50:24 +13:00
David Rowe
45bc6b8dab Dominant hand gets the highlight if both start pointing simultaneously 2018-01-19 16:41:23 +13:00
David Rowe
e0e6fc711b Replace Pointers API function setNonHoverItems() with setDoesHover() 2018-01-19 16:05:09 +13:00
Dante Ruiz
d88ff701b5 reduce calls to isPointOnDesktopWindow 2018-01-18 10:48:35 -08:00
David Rowe
403dd3d7d0 Only first laser highlights 2018-01-18 22:31:12 +13:00
David Rowe
5878e36ea8 Display both lasers 2018-01-18 14:24:23 +13:00
Dante Ruiz
125eb9ce44 add new tablet model and adjust screen offset 2018-01-09 14:31:57 -08:00
Anthony Thibault
f4c38b91b3
Merge pull request #12071 from luiscuenca/handTouch 
Touch feeling for near grab
 2018-01-08 12:50:30 -08:00
Dante Ruiz
fd83e00df4 fix tablet interaction and far grab functionallity 2018-01-08 11:30:21 -08:00
luiscuenca
8a7c68829d Optimizations, cleanings and globals 2018-01-07 11:56:30 -07:00
Zach Fox
0c38a5598f
Merge pull request #12085 from zfox23/commerce_fixHandControllerInspection 
Fix bugs related to inspecting entities with hand controllers
 2018-01-05 15:50:00 -08:00
luiscuenca
4f6a804fd1 Fix magic numbers 2018-01-05 16:27:48 -07:00
David Rowe
5431b7137b Code review 2018-01-06 08:27:24 +13:00
luiscuenca
108748ca96 smooth transitions and slower back to default 2018-01-05 09:55:50 -07:00
David Rowe
69dff9ac09 Remove unused code 2018-01-05 16:16:55 +13:00
David Rowe
936b5f3571 Laser on tablet bezel as well as screen and "x" button 2018-01-05 16:15:59 +13:00
David Rowe
67eb282815 Don't swap hands if both triggers are squeezed 2018-01-05 12:12:36 +13:00
David Rowe
27bed8d1f1 Tidying 2018-01-05 11:05:49 +13:00
David Rowe
fb09a9724e Change laser hand with trigger squeeze 2018-01-05 11:04:09 +13:00
David Rowe
9f7a2b18e6 Use laser from dominant hand if both hands are pointing at the tablet 2018-01-05 10:04:39 +13:00
David Rowe
02f4085368 Fix magic number 2018-01-05 09:00:53 +13:00
luiscuenca
367e2266f7 Fix eslint 2018-01-04 12:04:52 -07:00
luiscuenca
ef0164c272 Fix tabs 2018-01-04 11:43:51 -07:00
luiscuenca
28d9409bf0 Fix default hand poses 2018-01-04 11:37:37 -07:00
David Rowe
6095a90e69 Don't display default lasers when Shapes app is active 2018-01-04 21:09:38 +13:00
David Rowe
6c16fcfe65 Fix tablet laser when Shapes app is running 2018-01-04 16:37:20 +13:00
David Rowe
efa6f1f02f Use "Prefer Stylus Over Laser" setting 2018-01-04 15:00:17 +13:00
Zach Fox
ff4f582c7d Thanks Howard 2018-01-03 17:23:35 -08:00
Zach Fox
8d4a6f01cb Fix bugs related to inspecting entities with hand controllers 2018-01-03 16:03:37 -08:00
David Rowe
6e43497e14 Merge tag 'RELEASE-7602' into 21661 
Jenkins Git plugin tagging with RELEASE-7602
 2018-01-03 16:46:10 +13:00
luiscuenca
47dbb0c168 load script manually 2017-12-29 15:35:44 -07:00
luiscuenca
49bd62ca29 Touch feeling for near grab 2017-12-29 14:04:36 -07:00
luiscuenca
53e1c57e3b Make lasers scale with avatar 2017-12-15 13:46:15 -07:00
Seth Alves
3a00d31c15 oops 2017-12-12 12:59:35 -08:00
Seth Alves
dba05ae8e2 try harder to keep setTimeout loop going in controller-dispatcher 2017-12-12 12:38:01 -08:00
Dante Ruiz
f4a9acab92
Merge pull request #11833 from druiz17/controllerDispatcher-interval 
change controllerDispatcher to setTimeOut update
 2017-12-08 16:36:46 -08:00
Seth Alves
a7a6dee8e0
Merge pull request #11950 from hyperlogic/bug-fix/hand-scaling 
Fix for hand controller avatar scaling.
 2017-12-08 07:17:59 -08:00
Anthony J. Thibault
542af47e9e Fix for hand controller avatar scaling. 
* Added getDomainMaxScale() and getDomainMinScale() to JS api.
* Updated scaleAvatar controller module to use this to prevent scaling past the limits.
* Made sure that getDomainMaxScale() getDomainMinScale() and getUnscaledEyeHeight are thread safe,
  so that they can be invoked on the script thread.
* Added signals to Model class that can be used to let observers know when the Rig has finished initializing it's skeleton.
  and also when the skeleton is no longer valid.  These hooks are used to cache the unscaled eye height of the avatar.
 2017-12-07 17:08:13 -08:00
Dante Ruiz
0286f4646a Merge branch 'master' of github.com:highfidelity/hifi into controllerDispatcher-interval 2017-12-07 16:19:03 -08:00
Dante Ruiz
32fca16c85 fix radius equiping 2017-12-06 14:16:32 -08:00
Dante Ruiz
bbc022da2d fix-far-to-equip 2017-12-05 14:09:46 -08:00
Dante Ruiz
eaa049863d Merge branch 'RC60' of github.com:highfidelity/hifi into fix-equipping 2017-11-30 14:49:24 -08:00
Dante Ruiz
db374b8c6d fixing adjusting equipped entities 2017-11-30 14:49:06 -08:00
Dante Ruiz
b9f60aff2a fix-edit 2017-11-30 13:22:26 -08:00
Dante Ruiz
6fd8fb1e5b Merge branch 'master' of github.com:highfidelity/hifi into controllerDispatcher-interval 2017-11-30 11:52:41 -08:00
Dante Ruiz
cbaf59d99e disable stylus 2017-11-30 11:13:17 -08:00
Dante Ruiz
024dbcd712 fix scrolling 2017-11-30 09:07:19 -08:00
Dante Ruiz
982fad5050 fix laser interaction on HUD in HMD mode 2017-11-29 10:42:35 -08:00
Dante Ruiz
70820e6075 laser allways on prototype 2017-11-28 15:37:36 -08:00
Brad Hefta-Gaub
068b93fc30
Merge pull request #11838 from druiz17/fix-grabbing 
fixing setting incorrect parent when grabbing entities
 2017-11-27 08:27:42 -08:00
Dante Ruiz
56972d1547 Merge branch 'master' of github.com:highfidelity/hifi into fix-grabbing 2017-11-21 13:09:45 -08:00
Dante Ruiz
9622fef149 fix controllerDispatcher time step 2017-11-21 09:48:19 -08:00
Dante Ruiz
5bb23ef1df Merge branch 'master' of github.com:highfidelity/hifi into controllerDispatcher-interval 2017-11-21 09:30:41 -08:00
Dante Ruiz
a201312dcf re-added fix that when into master that this branch breaks 2017-11-20 13:10:35 -08:00
Brad Hefta-Gaub
95f59b0ab8
Merge pull request #11844 from druiz17/stylus-near-grab 
allow near grabbing of entities while stylus module is running.
 2017-11-17 17:33:54 -08:00
SamGondelman
033f658fff Merge remote-tracking branch 'upstream/master' into pointers 2017-11-17 16:10:20 -08:00
Dante Ruiz
8f6c781014
Merge pull request #11831 from misslivirose/feat/scale-emit-hands 
Emit avatar scale changed signal when scaled with hand controllers
 2017-11-17 11:55:31 -08:00
Dante Ruiz
4bbf2ff482 near grab entity while stylus is showing 2017-11-17 11:32:02 -08:00
Dante Ruiz
cabe3819a3 fixing crash 2017-11-17 10:20:34 -08:00
Dante Ruiz
b66153b9cb fixing setting incorrect parent 2017-11-16 15:07:00 -08:00
Dante Ruiz
c82798673f change controllerDispatcher to setTimeOut update 2017-11-16 10:42:28 -08:00
Dante Ruiz
f6a74cc80e fixing merge conflicts 2017-11-16 10:04:36 -08:00
SamGondelman
ac7242102c Merge remote-tracking branch 'upstream/pointers' into ui 2017-11-16 09:47:29 -08:00
SamGondelman
e3aa79990b merge with master 2017-11-16 09:45:32 -08:00
Liv Erickson
dda32f1987 Emit scale changed signal when scaled with hand controllers 2017-11-16 09:26:42 -08:00
SamGondelman
3274c41aeb Merge remote-tracking branch 'upstream/pointers' into ui 2017-11-15 17:45:45 -08:00
SamGondelman
7eb22b372f merge with master 2017-11-15 14:35:30 -08:00
Dante Ruiz
9564b7567b fixing tablet in 3d person 2017-11-15 13:39:21 -08:00
Dante Ruiz
b026cfc42f make sure teleport pointers are deleted 2017-11-14 14:09:08 -08:00
Dante Ruiz
54075d4c9a make hud laser relative to camera 2017-11-14 13:09:16 -08:00
Dante Ruiz
8779d52ad3 making requested changes 2017-11-14 13:04:09 -08:00
Dante Ruiz
416a47cfc7 adding controller haptic feedback to tablet onPress 2017-11-14 09:34:17 -08:00
Dante Ruiz
b779c33a1b fixed lockEndUUID offset for scripts 2017-11-13 16:42:16 -08:00
Dante Ruiz
6173c33b51 fixing merge conflict 2017-11-13 15:02:25 -08:00
Dante Ruiz
132b33dbe7 disable stylus pointer when not being used 2017-11-13 14:53:54 -08:00
SamGondelman
60db24f2d3 merge with master 2017-11-13 14:36:24 -08:00
SamGondelman
2fb1981c4a merge with master 2017-11-13 14:34:39 -08:00
Dante Ruiz
7613bddefa fixing some issues with hud module 2017-11-13 14:26:34 -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
luiscuenca
7dfdc8da59 Redesign and clean of unused lineWidths 2017-11-09 17:50:38 -07:00
Dante Ruiz
ef55e3181d moveing controllerDispatchaer pointers to pointerUtils.js 2017-11-09 16:48:52 -08:00
Dante Ruiz
86439eff07 fixing merge conflict 2017-11-09 13:07:55 -08:00
SamGondelman
5a78c9ebfe integrated stylus into pointer system, need to update controller module 2017-11-09 11:59:17 -08:00
Luis Cuenca
6fb47eef85
Merge branch 'master' into case7587 2017-11-07 17:19:39 -07:00
luiscuenca
332cb48a41 Lasers and teleport scale with avatar 2017-11-07 16:57:55 -07:00
Seth Alves
ce7d0c324b
Merge pull request #11761 from ctrlaltdavid/21593 
Don't move or rotate entities if Alt or Meta keys are pressed
 2017-11-07 09:33:21 -08:00
Dante Ruiz
bdd31b63ed update functions call names to match pointer API changes 2017-11-06 17:23:40 -08:00
Dante Ruiz
3e9eaa727b Merge branch 'ui' of github.com:SamGondelman/hifi into ui 2017-11-06 16:39:10 -08:00
David Rowe
60319e8d53 Don't move or rotate entities if Alt or Meta keys are pressed 2017-11-07 13:35:31 +13:00
Dante Ruiz
3b15897b12 fixed farGrab parent grabbing and laser LockEndUUID 2017-11-06 15:21:20 -08:00
Dante Ruiz
539cf35f30 saving work 2017-11-03 17:14:27 -07:00
Dante Ruiz
b6e3262164 removing the last remaining laserPointers 2017-11-02 11:31:13 -07:00
Dante Ruiz
0580e23686 fixed edit mode and allow to scroll off tablet 2017-11-01 15:16:02 -07:00
Dante Ruiz
66f07cb21b eslint controller modules 2017-11-01 11:36:36 -07:00
Brad Davis
f061b9c2da Add stylus functionality to pointer manager 2017-11-01 11:27:57 -07:00
Dante Ruiz
abb6f786fa added homebutton message and scripts cleanup 2017-11-01 11:03:48 -07:00
Dante Ruiz
cde5208151 fixing merge conflict 2017-11-01 08:56:55 -07:00
SamGondelman
5a7298f15b Merge remote-tracking branch 'upstream/master' into pointers 2017-10-31 17:33:52 -07:00
Dante Ruiz
f44025a8b1 completely removed non-need laserPointers 2017-10-31 15:57:57 -07:00
Dante Ruiz
30332c3d00 removing more laserPointers 2017-10-31 14:13:42 -07:00
Brad Hefta-Gaub
fbcd813d7b
Merge pull request #11694 from ElderOrb/FB8315 
8315 Stylus appears in wrong place on hand
 2017-10-30 18:00:56 -07:00
Dante Ruiz
e5600e4f1e one universal controller pointer for all modules 2017-10-30 16:58:14 -07:00
Dante Ruiz
bea0df8e60 implemented remebering equiping entities offset 2017-10-27 14:46:04 -07:00
SamGondelman
a44e8efb99 merge from master 2017-10-26 12:14:53 -07:00
beholder
ddd25da430 8315 Stylus appears in wrong place on hand 2017-10-26 19:39:15 +03:00
Dante Ruiz
2ec8f3f625 made non-dynamic entities collisionless during far-grab 2017-10-25 11:29:32 -07:00
Brad Davis
befe583c5e Merge remote-tracking branch 'upstream/master' into HEAD 2017-10-24 11:50:07 -07:00
SamGondelman
7686948daf resolve conflicts and cleanup 2017-10-20 15:23:17 -07:00
SamGondelman
fb969964f3 generalized scripting interfaces 2017-10-20 14:37:10 -07:00
Brad Hefta-Gaub
26ea8bea6a Merge pull request #11612 from highfidelity/pointers 
Fix tablet intersection bug and start of Pointer migration work (WIP)
 2017-10-20 13:53:52 -07:00
Brad Hefta-Gaub
e2ccfb84f9 Merge pull request #11626 from Delanir/BubbleScaleMaster 
7429 IPD Secondary Task List: bubble.js Scale
 2017-10-19 09:31:15 -07:00
Melissa Brown
1a3821e984 Merge pull request #11591 from ctrlaltdavid/21568 
Add some Quat and Uuid JavaScript helper properties
 2017-10-18 22:07:06 -07:00
luiscuenca
6e8756e8af Debug mode has been turned off 2017-10-18 15:40:03 -07:00
Daniela
e9f3dd6e44 Merge BubbleScale for IPD with hifi master. 2017-10-18 22:29:12 +01:00
SamGondelman
58172cfbd4 merge from master 2017-10-17 18:05:59 -07:00
David Rowe
8d4e979dc8 Replace usages of AVATAR_SELF_ID previously missed 2017-10-17 16:38:05 +13:00