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

477 commits

Author SHA1 Message Date
Dante Ruiz
269afb9a49 remove tablet material entities code remove create 2018-08-07 11:19:22 -07:00
David Rowe
c9c23b8db3 Fix entity stay highlighted after hand leaves when far grabbing another 2018-08-07 15:34:17 +12:00
David Rowe
e008f057eb Fade play area after teleport 2018-08-04 18:19:59 +12:00
David Rowe
c0dc70c076 Parent play area to teleport target unless underneath avatar 2018-08-04 17:26:18 +12:00
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
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
SamGondelman
39fa3420ec pointer rendering, update teleport.js 2018-07-19 12:02:39 -07: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
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
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
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
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 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
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
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
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
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
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
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
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
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
4793cddde6 fix highlighting issues 2018-05-03 11:27:07 -07: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
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
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
7243160dac making requested changes 2018-04-11 14:42:26 -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
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
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
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
fd83e00df4 fix tablet interaction and far grab functionallity 2018-01-08 11:30:21 -08: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
David Rowe
5431b7137b Code review 2018-01-06 08:27:24 +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