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

633 commits

Author SHA1 Message Date
Wayne Chen
18b86d550d adding PushToTalk action 2019-03-08 16:07:48 -08:00
r3tk0n
5f48a6d104 Fix typo. 2019-03-08 16:07:47 -08:00
r3tk0n
24d6646e8d Fix activation / deactivation criteria for PTT controller module. 2019-03-08 16:07:47 -08:00
r3tk0n
f6add9cafd Add pushToTalk.js controllerModule. 2019-03-08 16:02:15 -08:00
Shannon Romano
e776cf2627
Merge pull request #15127 from danteruiz/fix-websurface-module 
Case 20734: HMD lasers on 3D overlay do not appear + trigger event does not get called
 2019-03-07 16:04:57 -08:00
danteruiz
87cfbe48d1 fix webSurfaceIntersection 2019-03-07 13:11:18 -08:00
danteruiz
272ca5dc1c disable entity scaling 2019-03-05 16:23:40 -08:00
r3tk0n
12ffa41984 Prevent HUD and Web Surface lasers from interrupting FarGrab. 2019-03-02 13:55:06 -08:00
Jason Najera
d41c2d296b
Merge pull request #15043 from r3tk0n/fargrab-manipulation 
FarGrab Entity Rotation with Off-Hand
 2019-03-01 14:42:59 -08:00
danteruiz
f715dbe243 fix tablet scaling 2019-02-28 13:32:12 -08:00
r3tk0n
a72b02cd25 Clean up code and add comments. 2019-02-28 13:08:05 -08:00
r3tk0n
3a5698236b Swap FarGrab from superpower to alternative version from PR#15043 2019-02-27 10:57:35 -08:00
r3tk0n
1ec887ffc2 Fix teleportation play area indicator not hiding on cancel. 2019-02-27 10:51:38 -08:00
r3tk0n
fcdfae5a67 Fix notion of hand dominance. 2019-02-27 08:39:35 -08:00
r3tk0n
7c515ccd45 Add 2x rotation multiplier. 2019-02-26 19:16:45 -08:00
r3tk0n
ca740c6254 Add a 2x multiplier for controller movement to entity rotation when manipulating with fargrab. 2019-02-26 18:44:00 -08:00
r3tk0n
52d80476a8 Fix activation criteria. 2019-02-26 17:55:16 -08:00
r3tk0n
9559f9ffd3 Add off-hand controller manipulation to fargrab. 2019-02-26 17:52:18 -08:00
r3tk0n
2077e012db Fix case of repeated manipulations with fargrab. 2019-02-26 15:00:44 -08:00
r3tk0n
f3b65d06ad Fix frame of reference for rotations. 2019-02-26 12:46:46 -08:00
r3tk0n
2a04d2b9c5 Closer... 2019-02-26 12:39:51 -08:00
r3tk0n
0b651a8d63 Fix fargrab rotation with dominant hand, need to fix activation criteria next. 2019-02-26 11:29:06 -08:00
r3tk0n
52b62784d6 Incremental, broken progress. 2019-02-25 14:10:48 -08:00
r3tk0n
a66c76bf38 Fixing typos. 2019-02-25 13:47:31 -08:00
r3tk0n
d79681470e Saving changes before merging master... 2019-02-25 13:10:25 -08:00
r3tk0n
c6a3496b25 Add utility functions for adjusting target rotation and position. 2019-02-24 12:36:44 -08:00
r3tk0n
58906d84eb Add grip button polling. 2019-02-21 15:22:21 -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
03058775f6 Remove debug prints. 2019-02-19 11:27:13 -08:00
r3tk0n
f52b096bb9 Change far grab to chorded input 'superpower' 2019-02-19 11:26:42 -08:00
SamGondelman
7677e3bf44 just in case 2019-02-16 20:41:57 -08:00
SamGondelman
71653f95d7 working on overlay bugs 2019-02-16 20:08:36 -08:00
r3tk0n
1751864042 Fix this references in module run function. 2019-01-29 16:13:11 -08:00
r3tk0n
4d2ee07512 Change deactivation criteria as per conversation between Joshua and Mukul. 2019-01-29 12:02:23 -08:00
r3tk0n
80abfbab5e Modify teleport to 'superpower' spec. 2019-01-24 14:22:01 -08:00
Jeff Clinton
3776472550
Merge pull request #14731 from AndrewMeadows/fix-mexico-hats 
cases 20709 and 20715: wear and see mexico hats
 2019-01-22 12:58:56 -08:00
Seth Alves
c8e9bff03a fix releaseGrab call on grabbed entity when a nearGrab ends 2019-01-17 13:34:36 -08:00
Seth Alves
b5326936d8 grab.js will now ignore click-to-equip entities 2019-01-15 14:17:51 -08:00
Seth Alves
2515c7f73e remove old-style grabbing scripts 2019-01-15 13:43:52 -08:00
Seth Alves
b2f25629eb don't allow scaling of others' equipped entities 2019-01-03 08:19:18 -08:00
Seth Alves
bf46960dc3 fix timing on startNearGrab entity-method call for cloned entities. Don't allow grabbing of other's equipped or worn entities 2019-01-03 08:17:52 -08:00
Seth Alves
9bf9e379a3 fix far-grab initial rotation and entity-method call 2019-01-03 08:17:52 -08:00
Seth Alves
0967a94557 get grabbing and scaling to get along better 2019-01-03 08:17:52 -08:00
Seth Alves
6a547d042c port over PR-14276 2019-01-03 08:17:52 -08:00
Seth Alves
1c1e648b8b port over PR-14429 2019-01-03 08:17:52 -08:00
Seth Alves
70b68294ff port over PR-14464 2019-01-03 08:17:52 -08:00
Seth Alves
6f25c59a0c turn-off nearEntityGrab when scaleEntity is active 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
Jeff Clinton
5a81d8c093
Merge pull request #14453 from danteruiz/keyboard-menus 
Keyboard interaction menus
 2018-12-12 17:53:59 -08:00
Dante Ruiz
089a223c2d more CR changes 2018-12-12 15:29:01 -08:00
Dante Ruiz
f3fad52e1d make CR changes 2018-12-12 13:29:32 -08:00
Dante Ruiz
51bdf1bf78 adding keyboards settings 2018-12-12 11:55:13 -08:00
Dante Ruiz
deaf3e8e44 adding option to disable teleportring 2018-12-11 11:06:13 -08:00
Brad Hefta-Gaub
1e9faa7754
Merge pull request #14276 from ctrlaltdavid/M19345 
Make create apps not grab tablet if editing an entity with hand
 2018-12-09 17:21:10 -08:00
David Rowe
dc05cdee5a Merge branch 'master' into M17406 
# Conflicts:
#	scripts/system/controllers/controllerModules/nearParentGrabEntity.js
 2018-11-30 09:44:09 +13:00
Seth Alves
87e4c17194
Merge pull request #14429 from danteruiz/disable-highlighting 
Remove entity highlighting
 2018-11-29 09:04:56 -08:00
David Rowe
c96cd422e1 Fix near parent grab tear away calc for avatar scale 2018-11-24 11:58:40 +13:00
David Rowe
f2abf8e398 Debounce haptic pulses at start of near parent grab 2018-11-24 11:43:05 +13:00
David Rowe
29c268df5a Remove extraneous grab entity haptic pulses 2018-11-24 11:38:54 +13:00
David Rowe
f1dad3c465 Add hystersis between near parent grabbing and tearing away 2018-11-24 08:35:02 +13:00
David Rowe
1362e7f361 Fix near parent grab entity tear away distance calc 2018-11-24 08:26:54 +13:00
David Rowe
5e51ba051a Improve code responsibilities 2018-11-22 11:12:22 +13:00
David Rowe
c3a0805db1 Make far grab ignore tablet while grabbing an entity 2018-11-21 10:28:46 +13:00
David Rowe
44efd18882 Make Create and Shapes lasers ignore tablet while editing 2018-11-21 08:38:30 +13:00
John Conklin II
87cac67c75
Merge pull request #14280 from ElderOrb/FB17381 
FB17381 - Reticle.setVisible isn't working
 2018-11-20 09:53:52 -08:00
Dante Ruiz
d6fbcb1668 remove entity highlighting 2018-11-19 11:04:09 -08:00
David Rowe
b24c482743 Terminate Create far grab etc. upon laser intersecting tablet 2018-11-16 16:29:57 +13:00
David Rowe
f2868fec3f Merge branch 'master' into M19345 2018-11-16 09:11:11 +13:00
Seth Alves
7ffba9d987
Merge pull request #14204 from ctrlaltdavid/M12661 
Fixes for collisionless entities
 2018-11-13 09:42:07 -08:00
John Conklin II
0370c60398
Merge pull request #14358 from AndrewMeadows/fix-capsuleY 
Case 18436: consistent handling of CapsuleShape dimensions
 2018-11-12 15:25:42 -08:00
Jeff Clinton
ee9154a801
Merge pull request #14341 from sethalves/fix-mouse-equip 
only equip an entity to a hand-controller joint if the hand-controllers are in use, else use avatar hand
 2018-11-09 12:54:36 -08:00
Jeff Clinton
3d01949e43
Merge pull request #14305 from AndrewMeadows/zero-vel-neargrab-nondynamic 
Case 19495: zero velocities of non-dynamic entities on nearGrab release
 2018-11-09 10:10:49 -08:00
David Rowe
a34e1f69e0 Merge branch 'master' into M19345 
# Conflicts:
#	scripts/system/controllers/controllerModules/nearParentGrabOverlay.js
 2018-11-09 14:26:29 +13:00
Dante Ruiz
501746b156 3D Keyboard 2018-11-08 09:58:53 -08:00
Andrew Meadows
b38c263e60 use correct capsule dimensions in teleport.js 2018-11-06 12:44:14 -08:00
Seth Alves
a94fd2a1c9 only equip an entity to a hand-controller joint if the hand-controllers are in use, else use avatar hand 2018-11-03 13:14:08 -07:00
Alexander Ivash
dcf20d2a15 FB17381 - Reticle.setVisible isn't working 2018-11-01 22:39:02 +05:30
Andrew Meadows
225e8e0556 always zero velocity on far-grab release of non-dynamic 2018-10-31 10:20:21 -07:00
Andrew Meadows
90e944f130 always zero velocity on near-grab release of non-dynamic 2018-10-30 16:20:33 -07:00
David Rowe
791ee04aea Merge branch 'master' into M12661 2018-10-30 13:33:53 +13:00
Seth Alves
b8f1c96685 rats 2018-10-25 07:47:16 -07:00
Seth Alves
b93807b1a7 remove conversion code from equipEntity.js 2018-10-25 07:47:16 -07:00
David Rowe
1460e43f6e Make tablet highlight not display if editing an entity with hand 2018-10-25 15:04:59 +13:00
David Rowe
0eead13fb9 Make Create not grab tablet if editing an entity with hand 2018-10-25 15:03:47 +13:00
Brad Hefta-Gaub
04d251c321
Merge pull request #14249 from wayne-chen/mergedInterstitialBugFixes 
Merged interstitial bug fixes
 2018-10-23 14:30:55 -07:00
David Rowe
35c1241c98 Fix tablet highlighting not working if start up in HMD 2018-10-23 09:08:38 +13:00
Wayne Chen
d008bfa523 partial requested code changes 2018-10-22 11:29:36 -07:00
Wayne Chen
7284c3ad53 Merge branch 'intersttiial-do-not-intersect-web' of https://github.com/danteruiz/hifi into mergedInterstitialBugFixes 2018-10-22 10:28:35 -07:00
Wayne Chen
e2b90aac9d Merge branch 'interstitialIgnoreFix' of https://github.com/wayne-chen/hifi into mergedInterstitialBugFixes 2018-10-22 10:28:12 -07:00
Wayne Chen
d12ee393d7 Merge branch 'fix-some-more-interstitial-issues' of https://github.com/danteruiz/hifi into mergedInterstitialBugFixes 2018-10-22 10:27:13 -07:00
Wayne Chen
afd8baca87 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialIgnoreFix 2018-10-22 10:01:57 -07:00
David Rowe
71ec5f3612 Fix tablet highlighting when using the Create and Shapes apps 2018-10-20 11:57:46 +13:00
David Rowe
eb179363f6 Merge branch 'master' into M17853 
# Conflicts:
#	scripts/system/controllers/controllerDispatcher.js
 2018-10-20 11:19:26 +13:00
David Rowe
3e49d55dbf Merge branch 'master' into M12661 
# Conflicts:
#	scripts/system/controllers/controllerModules/farActionGrabEntity.js
 2018-10-19 11:24:43 +13:00
David Rowe
490c085eb8 Merge branch 'master' into M16440 
# Conflicts:
#	scripts/system/controllers/controllerModules/hudOverlayPointer.js
#	scripts/system/controllers/controllerModules/inVREditMode.js
 2018-10-19 09:06:33 +13:00
Brad Hefta-Gaub
0e0542ec6e
Merge pull request #13890 from sethalves/grab-properties-1 
move grab pseudo-properties (userData) into first-class EntityItemProperties
 2018-10-17 13:29:20 -07:00
David Rowe
3bc4581f82 Fix far grabbing collisionless entity removing collisionless property 2018-10-13 10:22:27 +13:00
Dante Ruiz
fa6b3019f6 fix js memory leak 2018-10-12 12:07:39 -07:00
Dante Ruiz
451142f9a3 fixing some more interstittial issues 2018-10-11 11:33:19 -07:00
Dante Ruiz
a47a1c03e6 ignore web entities 2018-10-10 14:08:47 -07:00