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

117 commits

Author SHA1 Message Date
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
63dcf0e1c9 use same near-grab module to grab entities and overlays 2020-04-26 12:22:53 -07:00
Seth Alves
296617977c get near-grab working with camera-tracked hands 2020-04-26 12:22:52 -07:00
Seth Alves
3d4de67c49 allow thumb+index finger pinch to mean same as trigger click 2020-04-26 12:20:05 -07:00
RebeccaStankus
092424569d Added flag to ensure mouse event signals are not connected twice 2019-10-08 12:01:47 -07:00
sabrina-shanman
abac1787a6 Fix using invalid pick API functions on HMD ray pointer 2019-07-23 12:58:07 -07:00
sabrina-shanman
e043d181cd Disable picks in controllerDispatcher when not in HMD 2019-07-16 17:46:54 -07:00
Seth Alves
195472bd43 make equipping of clonables more reliable 2019-03-26 09:40:22 -07:00
r3tk0n
f444f383eb Enable pushToTalk.js controller module. 2019-03-07 11:31:48 -08:00
danteruiz
b00746c096 Trim picks in use during quest: 2019-02-15 16:24:17 -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
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
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
5e51ba051a Improve code responsibilities 2018-11-22 11:12:22 +13:00
David Rowe
44efd18882 Make Create and Shapes lasers ignore tablet while editing 2018-11-21 08:38:30 +13:00
Dante Ruiz
d6fbcb1668 remove entity highlighting 2018-11-19 11:04:09 -08:00
David Rowe
791ee04aea Merge branch 'master' into M12661 2018-10-30 13:33:53 +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
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
7d3eca57bb Fix mouse pointer not recognizing or highlighting collisionless entities 2018-10-13 10:22:41 +13:00
David Rowe
ca4fe0682e Fix collisionless entities not being able to be far grabbed 2018-10-13 10:22:05 +13:00
Seth Alves
834699fa12 Move grab pseudo-properties (userData) into first-class EntityItemProperties. 2018-10-02 08:54:12 -07:00
sabrina-shanman
67dc526ee2 Merge branch 'master' of github.com:highfidelity/hifi into stt_parenting2 2018-10-01 17:17:32 -07:00
David Rowe
45993ba475 Provide mini tablet details via API instead of messages 2018-09-28 14:23:08 +12:00
sabrina-shanman
411dbbbad3 Make scripts use the default scaleWithParent when creating ray/parabola 
picks
 2018-09-27 17:34:06 -07:00
David Rowe
d98e7cea4e Fix not being able to grab tablet with other hand 2018-09-28 11:09:16 +12:00
David Rowe
eac1666e01 Disable grabbing the mini tablet with the grip button 2018-09-21 12:44:55 +12:00
David Rowe
0ae7fdc7b1 Remove ability to grab the mini tablet with the other hand 2018-09-21 12:02:46 +12:00
David Rowe
992b9f847c Reduce near grab distance of tablet so that stylus works on tablet 2018-09-11 09:58:19 +12:00
David Rowe
9203bbc5d8 Don't highlight tablet when it is grabbed 2018-08-31 11:02:36 +12:00
David Rowe
4830ba24ae Highlight tablet when it is near-grabbable 2018-08-28 09:53:54 +12:00
David Rowe
5e7f68d4b7 Use a smaller near grab radius for tablet and mini-tablet 2018-08-21 14:00:20 +12:00
Seth Alves
527b27da96 pseudo-joints for far-grab positions 2018-08-14 08:55:20 -07:00
Dante Ruiz
cf22f61361 adding cleanup of selection 2018-04-18 13:30:14 -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
c9c3d8f332 adding entity selection for far grabbing 2018-04-04 08:07:35 -07:00
Dante Ruiz
654770af51 fix controller dispatacher error 2018-03-05 09:39:26 -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
adb6f66a05 Handle tablet entities and overlays not being available 2018-02-08 09:51:48 +13:00
John Conklin II
455090d2b9
Revert "Display both lasers on tablet and Web surfaces" 2018-01-19 15:15:52 -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
e0e6fc711b Replace Pointers API function setNonHoverItems() with setDoesHover() 2018-01-19 16:05:09 +13:00
David Rowe
403dd3d7d0 Only first laser highlights 2018-01-18 22:31:12 +13:00
Dante Ruiz
125eb9ce44 add new tablet model and adjust screen offset 2018-01-09 14:31:57 -08:00