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

530 commits

Author SHA1 Message Date
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
Dante Ruiz
296ea8a5af fix overlay issues during interstitial mode 2018-10-10 12:00:58 -07:00
Wayne Chen
6f9593dabd adding fix for far action grab 2018-10-08 16:59:39 -07:00
David Rowe
0b163ffaf8 Fix typos 2018-10-09 11:05:48 +13:00