Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-25 10:36:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
63838 commits 76 branches 59 tags 1.2 GiB
Commit graph

5041 commits

Author SHA1 Message Date
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
SamGondelman
f970eb2302 merge with pointers branch 2017-11-06 14:49:50 -08:00
David Rowe
b272b2e6c8 Fix import from URL adding multiple copies of imported entities 2017-11-07 11:28:35 +13:00
Nissim Hadar
650df24761 Improved Haze UI in Create menu 2017-11-06 14:27:02 -08:00
Brad Davis
544c54b8ee Merge remote-tracking branch 'upstream/master' into HEAD 2017-11-06 10:07:22 -08:00
Midnight
e2ca3c6de0
Fix lib file path 
Changed the include to what should be the correct file path. it does not exist in the controllers folder.
 2017-11-05 13:39:26 -07:00
Brad Davis
d162e1cff6 Whitelist functionality for tablet apps 2017-11-04 15:14:06 -07:00
SamGondelman
55ac585cd9 Merge remote-tracking branch 'upstream/master' into ui 2017-11-03 17:32:13 -07:00
Dante Ruiz
539cf35f30 saving work 2017-11-03 17:14:27 -07:00
Olivier Prat
fcf1c301b6 Merge branch 'master' of git://github.com/highfidelity/hifi into bloom 2017-11-03 18:12:15 +01:00
Olivier Prat
fbcb2924e8 Merge branch 'master' of git://github.com/highfidelity/hifi into shadow 2017-11-03 15:08:15 +01:00
Olivier Prat
4b598a6e24 Working stencil mask with object bounding boxes 2017-11-03 14:26:36 +01:00
Dante Ruiz
b6e3262164 removing the last remaining laserPointers 2017-11-02 11:31:13 -07:00
Olivier Prat
f2444f9a30 Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-11-02 09:25:07 +01:00
howard-stearns
76e06a6214 Update to stable-v-staging metaverse switching, to handle marketplace 
injection.
 2017-11-01 15:28:28 -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
Zach Fox
82816b5551
Merge pull request #11720 from zfox23/commerce_getToBuy 
Change 'GET' to 'BUY' when hovering over costed items
 2017-11-01 09:49:39 -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
Zach Fox
f9a410de87 Change 'GET' to 'BUY' when hovering over costed items 2017-10-31 14:53:37 -07:00
Dante Ruiz
30332c3d00 removing more laserPointers 2017-10-31 14:13:42 -07:00
Bradley Austin Davis
55d819d7e3
Merge pull request #11699 from SamGondelman/ui 
Pointers generate PointerEvents (WIP)
 2017-10-31 10:01:15 -07:00
Nissim Hadar
f3147fc24f Merge branch 'master' into hazeZone 2017-10-30 21:41:23 -07:00
Brad Hefta-Gaub
c1a808e726
Merge pull request #11703 from AndrewMeadows/circles-and-quads 
fix Circles and quads
 2017-10-30 18:03:32 -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
Andrew Meadows
0f1139343c
Merge pull request #11709 from druiz17/equip-adjustment 
Remember adjustment made to equipped entities
 2017-10-30 15:45:28 -07:00
Nissim Hadar
1357877618 Replaced separate RGB components of colours with vec3's. 2017-10-30 12:41:09 -07:00
Nissim Hadar
6391282680 Swapped location of keylight attenuation and the blending factor. 2017-10-30 12:05:23 -07:00
Nissim Hadar
349e12c065 Merge branch 'master' into hazeZone 2017-10-30 10:08:35 -07:00
Brad Davis
23653f08ca Merge remote-tracking branch 'upstream/master' into HEAD 2017-10-30 09:20:58 -07:00
Ryan Downe Karpf
28a99fe685
Merge pull request #11655 from dback2/tabletcontextualmode 
add a tablet contextual mode flag to HMDScriptingInterface used to keep tablet in place
 2017-10-30 08:56:26 -07:00
Nissim Hadar
fb6c5b98d6 Merge branch 'master' into hazeZone 2017-10-27 15:40:03 -07:00
samcake
7e149fe30d Remove unecessary comments 2017-10-27 15:18:50 -07:00
samcake
8a3b1a20cc merge with upstream 2017-10-27 14:57:25 -07:00
Dante Ruiz
e9298b6ff8 Merge branch 'master' of github.com:highfidelity/hifi into equip-adjustment 2017-10-27 14:46:18 -07:00
Dante Ruiz
bea0df8e60 implemented remebering equiping entities offset 2017-10-27 14:46:04 -07:00
Zach Fox
5ab737f66d
Merge pull request #11658 from zfox23/pop_dynamicTestsMaster 
Commerce: Owner Verification for Certified Entities
 2017-10-27 12:28:04 -07:00
samcake
715cf301d5 cleaning the layout finally 2017-10-27 12:00:10 -07:00
Nissim Hadar
420b0f321c Merge branch 'master' into hazeZone 2017-10-27 09:14:53 -07:00
Nissim Hadar
66c31caf4b Refactoring of the haze 2017-10-27 09:08:58 -07:00
Daniela
9dbe349867 Merge branch 'master' of https://github.com/highfidelity/hifi into Gizmos 2017-10-27 11:29:59 +01:00
Daniela
2ceba76ba2 yaw tool 2017-10-27 11:28:44 +01:00
Olivier Prat
bced566510 Merged from master and disable scissor testing with define macro until I figure out how to make it work in stereo 2017-10-27 10:45:43 +02:00
Sam Gateau
a2765cffbd adjusting the qml again ? i just hate the layout / anchor system 2017-10-26 23:22:06 -07:00
Andrew Meadows
5ed58d5e5d enable Quad in ShapeEntityItem properties 2017-10-26 22:59:25 -07:00
samcake
1dbeac7b88 Adding the idons for Luci and cleaning up the scripts 2017-10-26 19:55:59 -07:00
samcake
79338f4316 removing the the unecessary files and trying using qrc:///qml 2017-10-26 17:12:49 -07:00
Zach Fox
8cb60fc62c Small edit.js changes 2017-10-26 16:44:21 -07:00
SamGondelman
f0c15e874c merge with master 2017-10-26 14:52:17 -07:00
samcake
b9112024b8 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-26 14:27:23 -07:00
Zach Fox
3e95484c4c Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting 2017-10-26 13:58:50 -07:00
SamGondelman
a44e8efb99 merge from master 2017-10-26 12:14:53 -07:00
SamGondelman
cf34fe3345 laserpointers generate pointerevents 2017-10-26 12:01:09 -07:00
beholder
ddd25da430 8315 Stylus appears in wrong place on hand 2017-10-26 19:39:15 +03:00
Daniela
a1110bf28d Rotations now happen using the correct axis taking into account the avatar referential 2017-10-26 16:52:58 +01:00
Olivier Prat
186b531be6 Merge branch 'master' of git://github.com/highfidelity/hifi into shadow 2017-10-26 15:12:09 +02:00
Seth Alves
0f31631f17 Merge pull request #11677 from druiz17/fix-fargrab 
Make non-dynamic entities collisionless during far-grab
 2017-10-25 17:31:02 -07:00
Zach Fox
2f28cf1443 Remove unnecessary newline 2017-10-25 15:20:31 -07:00
Zach Fox
3f0108528d Remove unnecessary newline 2017-10-25 15:19:56 -07:00
samcake
5b0bbbb21e Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-25 13:14:47 -07:00
Zach Fox
14150c09ac Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting 2017-10-25 12:59:36 -07:00
ZappoMan
226b974ce8 DPI is not a decimal 2017-10-25 11:59:29 -07:00
Dante Ruiz
2ec8f3f625 made non-dynamic entities collisionless during far-grab 2017-10-25 11:29:32 -07:00
Zach Fox
91333cdf7b Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-25 10:26:50 -07:00
Olivier Prat
ae8a9e68c8 Added debug tool to view shadow & view frustums 2017-10-25 11:58:16 +02:00
Brad Hefta-Gaub
18a74cea91 Merge pull request #11659 from zfox23/mergeRC57IntoMaster_20171023 
2017-10-23: Merge RC57 into Master
 2017-10-24 21:19:01 -07:00
Sam Gateau
f38fa14a39 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-24 21:00:44 -07:00
Zach Fox
7998984d8e Missed tons of spots! 2017-10-24 14:30:47 -07:00
Zach Fox
4b50454104 Missed a spot 2017-10-24 14:13:14 -07:00
Zach Fox
c64c2e17c8 First pass at consolidation 2017-10-24 12:01:05 -07:00
Brad Davis
befe583c5e Merge remote-tracking branch 'upstream/master' into HEAD 2017-10-24 11:50:07 -07:00
Zach Fox
1f6d989044 Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171023 2017-10-23 17:37:43 -07:00
David Back
80dc98b2c2 remove prints 2017-10-23 14:23:45 -07:00
David Back
b5f1793863 add a tablet contextual mode flag to HMDScriptingInterface used to keep tablet in place 2017-10-23 14:21:18 -07:00
Zach Fox
cda43ec1ea Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-23 11:52:59 -07:00
Daniela
f15038c54f Re-add isFacingAvatar to true and delete rotation of the grabbermoveup tool. 2017-10-23 19:11:32 +01:00
Daniela
32b5776743 Merge branch 'master' of https://github.com/highfidelity/hifi into Gizmos 2017-10-23 18:51:40 +01:00
Olivier Prat
7011fd3731 Removed Mac and Ubuntu warnings 2017-10-23 15:46:11 +02:00
Olivier Prat
43f9db5b70 Fixed small bug due to half texel offset in outline shader 2017-10-23 11:08:13 +02:00
Olivier Prat
0f120a1a2a Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-10-23 10:08:02 +02:00
Sam Gateau
50a3ccdbca Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-21 10:01: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
Zach Fox
ae1b2bd931 'Tis a silly hack 2017-10-20 11:11:23 -07:00
vladest
ea6c2e1bb5 Merge branch 'master' into tablet_extended_sounds 2017-10-20 14:46:02 +02:00
Olivier Prat
2d49cc1a75 Fixed bug in debugOutline script 2017-10-20 12:04:20 +02:00
Olivier Prat
732fe3b8db Improved outline debugging script for easier test plan 2017-10-20 11:32:43 +02:00
Olivier Prat
8229c41622 Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-10-20 09:59:07 +02:00
Zach Fox
0dc6211a7d Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-19 14:43:33 -07:00
Ryan Huffman
894e91ea23 Merge pull request #10702 from CraftsmanMG/master 
Fingerpaint  PR
 2017-10-19 13:13:59 -07:00
Zach Fox
24d109cfe7 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-19 12:13:38 -07:00
samcake
902334e1ec Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-19 12:04:01 -07:00
Daniela
832e30ad1c Edited Packet headers. 2017-10-19 19:53:47 +01:00
Zach Fox
9537e19ad4 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-19 10:58:55 -07:00
Zach Fox
aa48215933 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_OctoberFixes2 2017-10-19 10:54:31 -07:00
Daniela
b28a99c2af Merge branch 'master' of https://github.com/highfidelity/hifi into Gizmos 2017-10-19 18:06:23 +01:00
Daniela
a02ee5b7d5 Grabber Tool Move up, remove billboard on grabbermoveupoverlay 2017-10-19 18:05:51 +01: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
Olivier Prat
32df0209f3 Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-10-19 17:38:05 +02:00
Olivier Prat
410b1904cd Fixed bug in outline.qml that associated outline tab to wrong outline job config 2017-10-19 17:36:16 +02:00
Olivier Prat
fc66dcfdea Added outline to statsGPU script 2017-10-19 16:52:29 +02: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
samcake
1d1651be25 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-18 18:26:25 -07:00
Seth Alves
28d0da51b9 Merge pull request #11628 from luiscuenca/case8269 
8269  controllerDispatcher is creating log spam with web entities
 2017-10-18 18:11:13 -07:00
samcake
b29f276db3 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-18 16:42:30 -07:00
Sam Gateau
4d7accabdf Merge pull request #11439 from NissimHadar/hazeZone 
Adding haze component to the zone entity.
 2017-10-18 16:14:28 -07:00
luiscuenca
6e8756e8af Debug mode has been turned off 2017-10-18 15:40:03 -07:00
Zach Fox
6c7096b0d7 Fix login button injection on individual item page 2017-10-18 14:53:39 -07:00
Daniela
e9f3dd6e44 Merge BubbleScale for IPD with hifi master. 2017-10-18 22:29:12 +01:00
Zach Fox
de50eef9c7 Fix rez certified... 2017-10-18 13:54:46 -07:00
Zach Fox
949da17046 Wear It button for items with category 'Wearables' 2017-10-18 13:51:58 -07:00
Zach Fox
a669aff453 Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171018 2017-10-18 10:45:30 -07:00
Zach Fox
3f0b08aea8 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-18 10:37:47 -07:00
Olivier Prat
f63b4a64b0 Working debugging script with tabs 2017-10-18 16:02:38 +02:00
Olivier Prat
25b3549e04 Working multiple outlines except debugging scripts which applies config to all outlines and graphics bug when filled 2017-10-18 15:00:53 +02:00
David Rowe
f31e014e8b Quat.ZERO --> Quat.IDENTITY 2017-10-18 20:34:55 +13:00
David Rowe
5b6d33bcb2 Missing semicolon 2017-10-18 20:29:34 +13:00
David Rowe
f74c33f597 Fix importing entities from URL 2017-10-18 17:44:36 +13:00
SamGondelman
58172cfbd4 merge from master 2017-10-17 18:05:59 -07:00
Bradley Austin Davis
9e46e288b1 Merge pull request #11604 from SamGondelman/endSphere 
Scale LaserPointer end overlay in C++
 2017-10-17 16:37:35 -07:00
Nissim
935180bf09 Fixed my bloody stupid mistake... 2017-10-17 15:02:05 -07:00
Zach Fox
f3b641a833 Edit.js caused a testing fail :( 2017-10-17 11:30:15 -07:00
Nissim
afa93f46e5 Merge branch 'master' into hazeZone 2017-10-17 09:28:07 -07:00
Nissim
a641d6de66 Variable rename. 2017-10-17 09:18:29 -07:00
Olivier Prat
76589316df Working debug script with multiple selection 2017-10-17 10:24:05 +02:00
Olivier Prat
9ed5185a3e Multiple outline group config working 2017-10-17 10:01:06 +02:00
Sam Gateau
74b02a3e9b Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-16 20:58:11 -07:00
David Rowe
8d4e979dc8 Replace usages of AVATAR_SELF_ID previously missed 2017-10-17 16:38:05 +13:00
David Rowe
ed1c974f75 Use MyAvatar.SELF_ID instead of Uuid.SELF 2017-10-17 15:58:51 +13:00
David Rowe
1e3a2b3e4e Merge branch 'master' into 21568 2017-10-17 15:15:49 +13:00
SamGondelman
429905de51 update scripts to use ignoreItems, fix caching bug 2017-10-16 15:52:17 -07:00
Nissim
1b42572f99 Merge branch 'hazeZone' of https://github.com/NissimHadar/hifi into hazeZone 
# Conflicts:
#	scripts/system/html/js/entityProperties.js
 2017-10-16 14:29:56 -07:00
SamGondelman
aee817fbbc scale end sphere in c++ for controller modules 2017-10-16 13:31:25 -07:00
milad
97c255c59e Fix for fogbugz:8382 to shutdown debug window on reload scripts 2017-10-16 16:12:54 -04:00
Nissim
fd2b0da76d First version. 2017-10-16 12:20:31 -07:00
Zach Fox
1cf816a261 Fix Wallet notification appearing when taking screenshots 2017-10-16 11:15:09 -07:00
Olivier Prat
f716d0cc44 Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-10-16 09:00:59 +02:00
Nissim Hadar
afb8b2d8e7 Merge branch 'master' into hazeZone 2017-10-13 13:40:06 -07:00
Nissim Hadar
9c9dfc7211 Replace light blend with glare. 2017-10-13 13:36:46 -07:00
Zach Fox
17a0dd2a76 Elide long usernames in injected code 2017-10-13 13:32:55 -07:00
Seth Alves
fe9f142bf6 Merge pull request #11562 from druiz17/fix-release-grab 
include release message to controller modules
 2017-10-13 13:06:18 -07:00
Brad Hefta-Gaub
9f3331ec19 Merge pull request #11587 from druiz17/stylus-fix 
Fix Stylus in Tablet + Grab with Hand Results in the other Stylus being Dysfunctional
 2017-10-13 12:42:26 -07:00
David Rowe
fc4e440dc4 Update system scripts to use new properties 2017-10-14 08:32:14 +13:00
Nissim Hadar
c76229934c Changed blend-in colour and blend-out colour to colour and glare colour 2017-10-13 12:21:00 -07:00
Dante Ruiz
d14e6b6e5a Merge pull request #11450 from ElderOrb/case7722 
7722 Add onHover Outline to Tablet "X" Button
 2017-10-13 11:38:38 -07:00
druiz17
6799b9ca13 fix stylus 2017-10-13 09:34:08 -07:00
Olivier Prat
2658d65814 Preparing for outline color mask 2017-10-13 12:02:21 +02:00
Sam Gateau
18287ed45b Banging my head against qml... 2017-10-13 01:06:40 -07:00
samcake
8994200d01 Trying to integrate the tool scripts as an app 2017-10-12 17:57:30 -07:00
Nissim Hadar
b1174ce40c Merge branch 'master' into hazeZone 2017-10-12 17:04:42 -07:00
Nissim Hadar
7eb9dade6a Added hazeTestInitialPose.js 2017-10-12 17:03:33 -07:00
Brad Hefta-Gaub
1bba5ff812 Merge pull request #11554 from sethalves/import-av-entities 
Import av entities
 2017-10-12 13:30:53 -07:00
beholder
8c7462f012 fine-tuning based on discussion with Anshuman 2017-10-12 22:21:40 +03:00
Nissim Hadar
dc45c7af75 Implemented radio-buttons. 2017-10-12 11:18:18 -07:00
vladest
2d010980b0 Removed special sound for Mute and replace it with hover and click sounds 2017-10-12 19:15:09 +02:00
vladest
da734b628c Remove sound on stylus show and hide 2017-10-12 18:54:40 +02:00
vladest
145149fedd Merge branch 'master' into tablet_extended_sounds 2017-10-12 18:01:23 +02:00
Nissim Hadar
d0deaa631c Trying to pretty-up. 2017-10-12 07:54:03 -07:00
Nissim Hadar
00609c9547 Name correction. 2017-10-12 07:37:44 -07:00
beholder
9c15af9fbe raise highlight above button overlay to reduce flickering 2017-10-12 14:46:01 +03:00
Nissim Hadar
30fdf9d08e Merge branch 'master' into hazeZone 2017-10-11 22:12:52 -07:00
Nissim Hadar
a21995db24 Added checkbox for altitude effect. 2017-10-11 22:10:58 -07:00
Nissim Hadar
3ec8faa1b9 Added checkbox for altitude effect of haze. 2017-10-11 20:47:39 -07:00
Nissim Hadar
96fd3123e8 Changed haze altitude to ceiling. 2017-10-11 20:36:24 -07:00
Nissim Hadar
2f4ddd84f8 Renamed haze colours and moved checkbox for glare. 2017-10-11 19:32:09 -07:00
Nissim Hadar
748f97364b Moved Bakground Blend to end of Haze fields. 2017-10-11 19:20:46 -07:00
Nissim Hadar
832f9fb6e3 Renamed HAZE_MODE_RANGE_ONLY to HAZE_MODE_ENABLED. 2017-10-11 19:10:51 -07:00
Nissim Hadar
ea6b9ed28e Removed ...ALTITUDE_MODE from combo. 2017-10-11 18:58:59 -07:00
Zach Fox
99109fe8e5 Merge pull request #11567 from zfox23/commerce_daveIntegration3 
2017-10-10 Commerce Frontend Updates
 2017-10-11 11:07:03 -07:00
Zach Fox
c2733a4186 Fix notification bug 2017-10-11 09:47:16 -07:00
druiz17
67944c40a1 Merge branch 'master' of github.com:highfidelity/hifi into fix-release-grab 2017-10-11 09:13:01 -07:00
Atlante45
6dd49f5c32 Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2017-10-10 16:53:34 -07:00
Sam Gateau
f143c28625 Merge pull request #11542 from SamGondelman/bubbleBoy 
Move HUD and HUD overlay rendering out of display plugin
 2017-10-10 14:26:20 -07:00
druiz17
e77ac9fd10 include release message 2017-10-10 13:47:33 -07:00
Zach Fox
1c0a564155 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_daveIntegration3 2017-10-10 12:36:06 -07:00
Zach Fox
b105248dd7 Merge pull request #11555 from zfox23/commerce_daveIntegration2 
2017-10-09 Commerce Frontend Updates
 2017-10-10 12:34:30 -07:00
Seth Alves
4a3b59ea61 Merge pull request #11560 from druiz17/far-grab-nondynamic 
Far grab non-dynamic entities
 2017-10-10 12:29:38 -07:00
Zach Fox
be2b241629 Lots of progress; don't yet have some things 2017-10-10 12:20:48 -07:00
druiz17
013e15c9a2 made requested changes 2017-10-10 10:54:56 -07:00
Zach Fox
8d0d9a159f Bugfixes 2017-10-10 10:38:19 -07:00
Melissa Brown
662bb6c103 Merge pull request #11338 from 1P-Cusack/FogBugz/Case_6491_Part7 
[Case 6491] Remainder of entitySelectionTool clean up (details below).
 2017-10-10 10:36:14 -07:00
druiz17
a179df29fb mouse grab non-dynamic entities 2017-10-10 10:31:40 -07:00
druiz17
d0eb6a3ad0 remove comments 2017-10-10 09:45:41 -07:00
druiz17
003395b256 removing whitespace 2017-10-10 09:43:02 -07:00
Daniela
a46ef56af9 Merge with hifi:master. Packet Headers version were increased. 2017-10-10 17:26:33 +01:00
druiz17
fc41155ce1 saving work 2017-10-10 09:17:01 -07:00
Olivier Prat
76305c5285 Better debugging options for bloom 2017-10-10 14:49:04 +02:00
Nissim Hadar
1a932fbaf0 Corrected error in html. 2017-10-09 19:10:30 -07:00
Nissim Hadar
71f567f15a Merge branch 'master' into hazeZone 2017-10-09 17:28:10 -07:00
Nissim Hadar
7d5a887f43 Refactoring. 2017-10-09 17:25:19 -07:00
Zach Fox
733df8391f Round 2 2017-10-09 12:27:56 -07:00
Seth Alves
23f41457be Revert "Revert "fix importing of avatar entities"" 
This reverts commit 28a8b18060.
 2017-10-09 11:52:43 -07:00
Olivier Prat
0261265330 Working bloom but still visually unstable with geometry aliasing 2017-10-09 19:17:51 +02:00
Olivier Prat
98d39ff9e0 Merged with master 2017-10-09 09:37:18 +02:00
Olivier Prat
27a0fb62d3 Multiple gaussians as Unreal. First draft 2017-10-09 09:35:38 +02:00
Thijs Wenker
895f79fd80 Merge pull request #11548 from ctrlaltdavid/move-shapes 
Move Shapes app files from scripts directory to marketplace directory
 2017-10-09 02:37:15 +02:00
Thijs Wenker
bd74386997 Merge pull request #11543 from ctrlaltdavid/21496 
Add script that tests setting your listening position and orientation
 2017-10-09 01:15:22 +02:00
David Rowe
765f3fc381 Move Shapes app files from scripts directory to marketplace directory 2017-10-09 10:38:40 +13:00
Seth Alves
28a8b18060 Revert "fix importing of avatar entities" 2017-10-07 16:54:05 -07:00
David Rowe
596ce8e9c1 Add script that tests setting your listening position and orientation 2017-10-07 21:46:56 +13:00
Brad Hefta-Gaub
62fc193bff Merge pull request #11532 from sethalves/import-av-entities 
fix importing of avatar entities
 2017-10-06 17:59:54 -07:00
Thijs Wenker
77a36bf788 Merge pull request #10892 from ctrlaltdavid/vr-edit-a 
VR edit app
 2017-10-07 02:19:00 +02:00
David Rowe
3fbaf250a4 Increase delay in kicking off physics 2017-10-07 11:50:31 +13:00
SamGondelman
b4a3ab9204 fix debugDeferredLighting 2017-10-06 15:46:10 -07:00
SamGondelman
7e6d5d9d98 merge with master 2017-10-06 14:57:08 -07:00
Nissim Hadar
bfdd489682 Fixed color selector bug. 2017-10-06 13:18:12 -07:00
Seth Alves
8d00731620 Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities 2017-10-06 07:20:34 -07:00
LaShonda Hopper
2f082d9e86 [Case 6491] Fixes issue in normalizeDegrees from last commit (details below). 
The range of the function is targeting (-180, 180] such that
the statement:
    if (degrees < -180)
should be:
    if (degrees <= -180)
to account for degrees being -180.

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-10-06 10:11:26 -04:00
LaShonda Hopper
707569b230 [Case 6491] More efficient version of normalizeDegrees function (details below). 
Refactoring the original normalizeDegrees function to be
more efficient as suggested via:
    https://github.com/highfidelity/hifi/pull/11338#pullrequestreview-67520585

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-10-06 09:50:24 -04:00
Nissim Hadar
76aace980a Merge branch 'master' into hazeZone 2017-10-05 20:32:43 -07:00
Nissim Hadar
320c888ce4 Added checkbox to allow separate control of keylight attenuation. 2017-10-05 20:31:45 -07:00
Nissim Hadar
3afab3c1d3 Keylight attenuation implemented. 2017-10-05 18:25:02 -07:00
Nissim Hadar
f261477aa2 Adding sun attenuation. 2017-10-05 17:55:24 -07:00
David Rowe
105457b388 Don't unbusubscribe from possibly shared channel 2017-10-06 13:27:08 +13:00
David Rowe
5c72a41163 Delete some redundant code 2017-10-06 11:14:07 +13:00
David Rowe
5587a2fdf8 Fix creating an entity while a tool is active 2017-10-06 11:13:53 +13:00
druiz17
3139f5ef2a improve mouseHMD exit logic 2017-10-05 15:12:58 -07:00
druiz17
ba50fcc509 fix mouse dissapearing in desktop mode 2017-10-05 15:07:49 -07:00
David Rowe
1673c08353 Update undo for grouping 2017-10-06 10:42:23 +13:00
Nissim Hadar
e15699192d Added blend angle and altitude reference base. 2017-10-05 14:18:03 -07:00
David Rowe
21d286b422 Fix undo not coping with cloning with both hands simultaneously 2017-10-06 10:04:14 +13:00
Nissim Hadar
2e2364e03f WIP - adding haze blend out colour 2017-10-05 13:20:21 -07:00
Nissim Hadar
cbaae2c79b WIP - haze colour. 2017-10-05 12:59:56 -07:00
Nissim Hadar
395d9cbd6b WIP - haze colour. 2017-10-05 12:13:37 -07:00
Seth Alves
b96fac2f00 Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities 2017-10-05 11:43:25 -07:00
Seth Alves
53a49272dc fix importing of avatar-entities 2017-10-05 11:43:19 -07:00
Nissim Hadar
512b469dc6 Added haze colour selector. 2017-10-05 11:31:49 -07:00
Nissim Hadar
595530161a WIP - adding background blend. 
Haze altitude works.
 2017-10-05 09:28:55 -07:00
Nissim Hadar
b7af6a58a6 WIP - adding background blend 2017-10-05 09:16:14 -07:00
druiz17
347645329e fixing laser staying on in edit mode 2017-10-05 09:11:02 -07:00
Nissim Hadar
794cb961d5 Merge branch 'master' into hazeZone 2017-10-04 23:03:59 -07:00
Nissim Hadar
8b72e3044a WIP - implementing range+altitude mode. 2017-10-04 22:26:53 -07:00
David Rowe
b526ec0d93 Code review 2017-10-05 18:21:04 +13:00
David Rowe
4855e0f528 Fix children's rotations drifting when scale group 2017-10-05 14:36:25 +13:00
LaShonda Hopper
18d884f6c4 [Case 6491] eslint pass: Fixes no-multiple-empty-lines issues. 
* eslint pass using .eslintrc.js

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-10-04 20:51:06 -04:00
LaShonda Hopper
e9ae2099f3 [Case 6491] eslint pass: Fixes indent issues. 
* eslint pass using .eslintrc.js

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-10-04 20:37:57 -04:00
LaShonda Hopper
ac81b22cc9 [Case 6491] eslint pass: Fixes references to SelectionManager (details below). 
SelectionManager was being referred to as selectionManager.

* eslint pass used .eslintrc.js

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-10-04 20:24:20 -04:00
David Rowe
63e7521711 Merge branch 'master' into vr-edit-a 2017-10-05 11:29:49 +13:00
Clément Brisset
74fd69ac2d Merge pull request #11523 from Atlante45/new-master 
RC56 into Master
 2017-10-04 15:17:52 -07:00
druiz17
9de1ca4e1a allow farGrab module to run when stylus is visible 2017-10-04 15:04:27 -07:00
LaShonda Hopper
a5b913a8b9 [Case 6491] Fixes minor spacing issue, on while loop missed previous eslint pass. 
Changes Committed:
    modified:   scripts/system/libraries/entitySelectionTool.js
 2017-10-04 17:36:28 -04:00
Nissim Hadar
71b49e5001 Merge branch 'master' into hazeZone 2017-10-04 10:25:06 -07:00
Brad Hefta-Gaub
a1979a2600 Merge branch 'master' into RC-56 2017-10-03 18:16:21 -07:00
Nissim Hadar
d4acb00aa5 Merge branch 'master' into hazeZone 2017-10-03 17:44:31 -07:00
druiz17
13feec89c2 remove update stylus 2017-10-03 16:12:37 -07:00
druiz17
ad9677f63e fixing grabbing and tablet bugs 2017-10-03 16:11:51 -07:00
SamGondelman
fa838e4715 merge from master 2017-10-03 15:53:33 -07:00
druiz17
6b3d89d18f fix hudlaser module 2017-10-03 14:13:37 -07:00
druiz17
33e9a71000 grab attachments 2017-10-03 12:51:51 -07:00
Zach Fox
ea3da6c9dd Merge pull request #11495 from zfox23/pop_interfaceChanges2 
Commerce: One step closer!
 2017-10-03 11:56:00 -07:00
Nissim Hadar
86c497a12f Merge branch 'master' into hazeZone 
# Conflicts:
#	libraries/networking/src/udt/PacketHeaders.cpp
#	libraries/networking/src/udt/PacketHeaders.h
 2017-10-03 10:34:33 -07:00
Howard Stearns
22f0ef33ed Merge pull request #11496 from howard-stearns/certificate-properties 
Certificate properties
 2017-10-03 10:06:48 -07:00
Daniela
b55e416ccf Remove fingerpaint app from scripts/system. 2017-10-03 15:28:05 +01:00
Daniela
2b18296cfd Merge remote-tracking branch 'upstream/master' 
# the commit.
 2017-10-03 15:26:22 +01:00
David Rowe
06f0e23bf9 There no longer is a handControllerGrab.js 2017-10-03 21:44:56 +13:00
David Rowe
5145107f8c 2D overlays can no longer be lasered 2017-10-03 21:36:40 +13:00
David Rowe
31e72c5503 Work around bug undoing physics where entities can end at wrong position 2017-10-03 16:26:00 +13:00
David Rowe
a59d590111 ESLint 2017-10-03 13:33:20 +13:00
David Rowe
46ce68a893 Fix lasers 2017-10-03 13:33:11 +13:00
Zach Fox
11d0062104 Progress on buy endpoint 2017-10-02 16:57:41 -07:00
druiz17
8a0ecf4e6f propertly determine is laser intersects with HUD UI 2017-10-02 16:46:43 -07:00
druiz17
68780f56b7 Merge branch 'master' of github.com:highfidelity/hifi into fix-hud-module 2017-10-02 14:06:26 -07:00
Zach Fox
1050d2851d Modify injected code to add to dropdown menu 2017-10-02 12:37:49 -07:00
Zach Fox
15c0a21e0e Varied commit - styling changes, beginnings of new Wallet endpoint, etc 2017-10-02 12:19:24 -07:00
LaShonda Hopper
cb264b5552 [Case 6491] eslint pass: Addresses curly bracket, keyword spacing issues. 
* eslint pass using .eslintrc.js

Changes Committed:
  modified:   scripts/system/libraries/entitySelectionTool.js
 2017-10-02 13:28:43 -04:00
LaShonda Hopper
97ecf84f3d [Case 6491] eslint pass: Cleaning up comma-dangle noise. 
* eslint pass using .eslintrc.js

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-10-02 13:21:10 -04:00
Nissim Hadar
d1488ebfad Added .qml and .js for debug 2017-10-02 10:10:29 -07:00
LaShonda Hopper
c131686f1b [Case 6491] eslint pass: Addressing some comment issues. 
* This should reduces the noise for the eslint passes on this script.
* eslint pass using .eslintrc.js

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-10-02 12:55:51 -04:00
Howard Stearns
930832bb19 Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties 2017-10-02 09:44:29 -07:00
LaShonda Hopper
a610946af1 [Case 6491] eslint pass: fixes undefined center var in that.updateHandles. 
* eslint pass using .eslintrc.js

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-10-02 12:31:10 -04:00
Zach Fox
1ec0f5d9a0 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2 2017-10-02 09:26:59 -07:00
LaShonda Hopper
dbf8d19095 [Case 6491] eslint pass: fixes issues with equality checks. 
* Also adds some paren grouping to help with readability of some statements.
* eslint pass on script using .eslintrc.js

Changes to be committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-10-02 12:26:00 -04:00
vladest
e360c1363e Merge branch 'master' into tablet_extended_sounds 2017-10-02 18:03:49 +02:00
David Rowe
0bd67d494d Fix UI sometimes turning off/on/off as hand enters entity 2017-10-02 19:27:26 +13:00
David Rowe
829cc8e5e6 Merge branch 'master' into vr-edit-a 2017-10-02 17:08:27 +13:00
Nissim Hadar
449d7ae988 Merge branch 'master' into hazeZone 2017-10-01 19:18:16 -07:00
Anthony J. Thibault
7dfa80f666 Bug fix for offset of animated parts of oculus touch controller display 
Ensure position/rotations are updated with a consistent scale and
are animated correctly as the controller values change.
 2017-10-01 17:52:59 -07:00
David Rowe
680235a7b1 += 1 ==> ++ 2017-10-01 13:22:48 +13:00
David Rowe
03e0e21ce0 JSLint ==> ESLint 2017-10-01 13:19:54 +13:00
David Rowe
659b2d8a99 Disable debug log info 2017-09-30 15:14:07 +13:00
David Rowe
229c186901 Rename script from vr-edit.js to shapes.js 2017-09-30 15:09:35 +13:00
David Rowe
b56b3a2e61 Change app name from "VR EDIT" to "SHAPES" and use new icon 2017-09-30 15:01:21 +13:00
druiz17
20918641f4 saving work 2017-09-29 16:48:25 -07:00
Howard Stearns
73c8da99dc Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties 2017-09-29 16:46:43 -07:00
Zach Fox
1e52e7824b Fix injection 2017-09-29 16:39:07 -07:00
Zach Fox
255cede808 Correctly determine if we're on a marketplace screen 2017-09-29 16:05:26 -07:00
LaShonda Hopper
6571aef997 [Case 6491] makeStretchTool: Fix z undefined issue (details below). 
z:z appears to have been a typo, as there's no var z.  Should likely be z:1.

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-09-29 18:52:39 -04:00
Nissim Hadar
2e1919eba5 Merge branch 'master' into hazeZone 2017-09-29 15:16:46 -07:00
Anthony J. Thibault
9273e02497 Bug fix for offset of animated parts of oculus touch controller display 
Ensure position/rotations are updated with a consistent scale and
are animated correctly as the controller values change.
 2017-09-29 14:01:50 -07:00
Zach Fox
63396a2fc3 WalletScriptingInterface; wallet status refactor 2017-09-29 13:42:04 -07:00
David Rowe
75365847a1 Merge branch 'master' into vr-edit-a 2017-09-30 09:30:38 +13:00
SamGondelman
b59ec07171 move hud rendering to render thread, still need to separate out hud overlays 2017-09-29 09:49:08 -07:00
Seth Alves
7645808694 Merge pull request #11479 from druiz17/more-bugs 
fixing grabbing and tablet bugs
 2017-09-28 20:02:47 -07:00
Seth Alves
3d05a0c07c Merge pull request #11484 from druiz17/grab-js 
disable grab.js in HMD
 2017-09-28 17:27:26 -07:00
Howard Stearns
d1350a03c2 working checkpoint, but with a lot of debug/development stuff 2017-09-28 17:06:07 -07:00
druiz17
45b8bfdb1f disbale grab.js in HMD 2017-09-28 16:17:39 -07:00
Thijs Wenker
cabd68a63a Every time a dialog opened in edit.js a new callback is created, which wasn't disconnected after the event happened, this caused lots of entities to be created after each next import. 2017-09-28 16:03:09 -07:00
Zach Fox
2cff5c1fa6 First time Purchases tutorial 2017-09-28 15:12:55 -07:00
Zach Fox
66be558a04 My Items Interface 2017-09-28 14:04:57 -07:00
druiz17
1947f2ba99 remove update stylus 2017-09-28 13:23:28 -07:00
Zach Fox
68c08969ae Update Purchases 2017-09-28 12:49:38 -07:00
LaShonda Hopper
ff051db79a [Case 6491] Minor: Fixes some paren spacing. 
Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-09-28 15:06:09 -04:00
LaShonda Hopper
0deabf54ef [Case 6491] Minor: fixes some coding standard spacing with wantDebug statements. 2017-09-28 15:04:28 -04:00
LaShonda Hopper
2bb76a357a [Case 6491] Some adjustments to isActiveTool (details below). 
* isActiveTool now respects null and undefined args.
    * If null or undefined toolHandle is passed, activeTool
      is directly tested against those values.  Rather than
      explicitly returning false.
* Added some clarification to unknown tool warning message.

Reviewed-by: Leander Hasty <leander@1stplayable.com>

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-09-28 15:04:28 -04:00
LaShonda Hopper
bed50dda2f [Case 6491] Fixes consistency issue with lights (details below). 
Fixes issue with light selection actions having inconsistent ui
in comparison to other selections from an earlier commit change.

As of this commit:
* When translating point lights, the edge grabbers are no longer be visible.
* When rotating or translating spot lights, the edge grabbers are no longer visible.

Note:
* For both point & spot lights, when translating and/or rotating, their circle
  and/or radial guides should remain visible.  This commit shouldn't have any
  influence on that behavior.

Tested:
* Rotating and translating spot lights.
* Translating point lights.  Didn't test rotation as only spot
  lights support rotation.

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-09-28 15:04:28 -04:00
LaShonda Hopper
9fb76340c7 [Case 6491] removes SelectionDisplay.mode (details below). 
This var isn't needed as the var essentially piggy backed
off of activeTool and activeTool.mode.

This also helps guard against the _majority_ of situations
where mode check fails due to typo inserted when composing
the check.

Most instances of manual string checks have been replaced by
querying activeTool via new isActiveTool function.  For instances
that still require a direct mode check getMode will return
the mode string associated with the current activeTool.

TODO:  Get this code reviewed.
 2017-09-28 15:04:28 -04:00
LaShonda Hopper
3a174780c2 [Case 6491] Minor: Move that.updateHandleSizes up (details below). 
It was down below the amidst the mouse event handlers. This just moves
it up with the other that.update handle functions definitions.

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-09-28 15:04:28 -04:00
LaShonda Hopper
9279290b2e [Case 6491] Remove dupe pickRay var (details below). 
Ran lint pass and found the dupe define.

As noted in a previous commit, the only remaining lint
issues are as follows:

* scripts/system/libraries/entitySelectionTool.js: line 17, col 1, Read only.
    * HIFI_PUBLIC_BUCKET assignment
* scripts/system/libraries/entitySelectionTool.js: line 19, col 1, Read only.
    * SPACE_WORLD assignment
* scripts/system/libraries/entitySelectionTool.js: line 30, col 1, Read only.
    * SelectionManager assignment

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-09-28 15:04:28 -04:00
LaShonda Hopper
c286ee95a4 [Case 6491] Zero state improvements (details below). 
Fixes issue where when translating the selected object(s),
user view was obstructed by grabber handles.

This also brings more consistency to the selection ui state between
rotation and translation user interactions.  Both types
of interactions feel nicer with the selection ui as concise
as possible during the action, limited only to that useful for
the current interaction.

Expected Behavior:
    Note the following presumes you're in creation mode.
* When the selection is clicked, the rotation, stretch, clone,
  and translateY handles should turn invisible.
* When moving a selection along either the x or z axis, the
  rotation, stretch, clone, and translateY handles should be
  invisible and remain that way until the user releases the selection.
* When the selection is released, the rotation, stretch, clone,
  and translateY handles should become visible.
* When the translateY handle is clicked, the rotation, stretch, and
  clone handles should turn invisible.  The translateY handle should
  remain visible.
* When moving the selection along the y axis, the rotation, stretch,
  and clone handles should be invisible and remain that way until the
  user releases the selection.  The translateY handle should be visible
  during the entire interaction.
* When the selection is released, the rotation, stretch, clone should
  become visible.  The translateY handle, visible the entire time, should
  already be visible.
* When the user click somewhere other than a selection, entity object,
  creation menu or tools, then any current selection should be
  unselected and all creation ui local to it should turn invisible.
* When the user exits creation mode, any current selection should be
  unselected and all creation ui local to it should turn invisible.

TODO:
* We may want to visit the scaling interaction ui as well; however,
  that could be a later task as it's tangential.  The changes here
  are a good first step.
    * The idea with that interaction is perhaps only showing the
      handle for the current scaling operation.  Currently when
      scaling all of the other handles remain visible, though
      their appearance does update.

Reviewed-by: Leander Hasty <leander@1stplayable.com>

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-09-28 15:04:27 -04:00
LaShonda Hopper
45c4a1081b [Case 6491] entityToolSelection logging/print review (details below). 
* Added some wantDebug guards to print sections without them.
* Normalized error logging statements to have script name
  and/or specific script function where reasonable.
    * All error statements contain at least the script name
      and a descriptive snippet of the error or clue to resolve it.
* Removed some stale todos.

Reviewed-by: Leander Hasty <leander@1stplayable.com>

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-09-28 15:04:27 -04:00
Leander Hasty
0b86169500 [Case 6491] remove rotateOverlayTarget. 
It is no longer used.

Reviewed-by: LaShonda Hopper <lashonda@1stplayable.com>
 2017-09-28 15:04:27 -04:00
Leander Hasty
74734f35e9 [Case 6491] more uniform grabber tools; more distrust of rotateOverlayTarget. 
Rotation tools' onMove methods now use rayPlaneIntersection rather than using the giant invisible rotateOverlayTarget.  It can likely be entirely removed in the next commit.

tool.onBegin's signature is now (event, pickRay, pickResult, ...) -- this allows us to avoid recomputing the ray or intersection when unnecessary.

translateXZTool is now a part of the grabberTools array; addGrabberTool and addStretchTool have been modified to return the tool reference (and not disassemble and reassemble the tools, so they can keep their own local functions and state).  This does make the array potentially less type-uniform, which may (?) undo some javascript optimizations, but allows us to eventually remove some state -- and they're only 1x/frame methods.

We now compute rotationNormal in rotation tool onBegin, rather than having many different normals lying around.

Merged the final branches in mousePressEvent.

Also fixed issue with mode TRANSLATE_XZ test within updateRotationHandles.

Reviewed-by: LaShonda Hopper <lashonda@1stplayable.com>
 2017-09-28 15:04:27 -04:00
Leander Hasty
fa74fbc986 [Case 6491] fixes rotation skip near 0 and 180. 
Previously, when rotating, it would be easy to achieve 1 degree granularity, except near the 0 degree and 180 degree "poles", where it would often e.g. jump from 10 to -10, or 174 to -175, or similar.

yawZero/pitchZero/rollZero were all based on the yawHandle/pitchHandle/rollHandle ray intersection, and were not necessarily coplanar with rotateOverlayTarget. As a result, centerToZero didn't lie on the expected plane, while centerToIntersect did.  This had the effect of distorting the rotation range.

We also have a possible issue in here with editOverlay(rotationOverlayTarget,{rotation:...}) not taking effect immediately.  Better to take the existing ray and cast against a known plane, as e.g. translateXZTool and such do.  No risk of stale rotation in that case.

This also cleans up rotationHelper args a bit to avoid some string switches and keep flow a little more readable.

TODO: propagate ray-plane test to helperRotationHandleOnMove rather than relying on ray hit location; normalize onBegin/onMove/etc across all tools to take queryRay and results args to avoid recreating the ray.

Reviewed-by: LaShonda Hopper <lashonda@1stplayable.com>
 2017-09-28 15:04:27 -04:00
LaShonda Hopper
fe171af31b [Case 6491] entitySelectionTool mousePressEvent refactor/cleanup (details below). 
Fixes situations where attempting to click on a rotate, grab,
or scale handle that was in front of others might unexpectedly
activate the obscured handle.

As of this commit the flow of mousePressEvent such that the
first item whether it be a tool or selection is what reacts
and absorbs the click/touch.  This is counter to the prior
behavior where whichever item or tool last passed the check
would determine what was hit and handled the touch _even_
when it wasn't the first thing to be touched.

* Got rid of some unused/stale vars
* Added some convenience functions
    * setRotationHandlesVisible function
    * setStretchHandlesVisible function
    * setGrabberMoveUpVisible function
* Removed checkIntersectWith helper functions as they're
  no longer used.
* Normalized onBegin signatures for all GrabberTools to
  support the new flow within mousePressEvent.
    * These are tools registered via addGrabberTool/makeStretchTool.
    * The onBegin signature changes from onBegin( event ) to
      onBegin( event, intersectResult ).
        * This allows for a simpler tool triggering where tools which
          utilized the additional information provided will have it,
          those which may need it the future shall have it with little
          issue, and those that don't care may ignore it.

NOTE(s):
* Tested normal movement within opening creation menu:  Passed
* With Creation Menu Open:
    * Tested clicking around the world in empty space: Passed
    * Tested single selection: Passed
    * Tested single selection rotation (pitch, yaw, roll): Passed
    * Tested single selection translation (xz, y): Passed
    * Tested multiple selection: Passed
    * Tested multiple selection rotation (pitch, yaw, roll): Passed
    * Tested multiple selection translation (xz, y): Passed

Reviewed-by: Leander Hasty <leander@1stplayable.com>

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-09-28 15:04:27 -04:00
LaShonda Hopper
96afbeca23 [Case 6491] Dedupe rotation handle tool code (details below). 
Pulled the common code shared between the rotation handle
tools out into helper funcs:
* helperRotationHandleOnBegin
* helperRotationHandleOnMove
* helperRotationHandleOnEnd

These functions either take in or derive the necessary info
needed to handle a specific rotation axis.

NOTE(s):
* Tested yaw, pitch, & roll handles using a box. The behavior
  remained consistent with that prior to this commit.

Reviewed-by: Leander Hasty <leander@1stplayable.com>

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-09-28 15:04:26 -04:00
LaShonda Hopper
926789437c [Case 6491] Propagates rotation reposition fix from YawHandle (details below). 
This wraps the selections rotation update handling into common helper
function utilized by all rotation handle tools (yaw,pitch,roll).

This function is the generalized fix previously exclusive to yawHandle.
This functions is now called within onMove for yaw, pitch, & rollHandle
tools.

NOTE(s):
* Tested yaw, pitch, & roll rotation didn't see any aberrant behavior.
** Tested overlapping shapes and selecting the overlapping portions followed
   by a rotation handle.  Only one took hold as a selection.
** Tested multiple selection and objects rotated & repositioned about the
   encapsulating bounding box's center point as expected.
* Tested translation with multiple items selected and it behaved as
  expected.

Reviewed-by: Leander Hasty <leander@1stplayable.com>

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-09-28 15:04:26 -04:00
LaShonda Hopper
18cc632df5 [Case 6491] Minor: Switching off wantDebug flags that were left on. 
Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-09-28 15:04:26 -04:00
LaShonda Hopper
196b665e22 [Case 6491] Cleanup of mousePressEvent/tool(s) onBegin (details below). 
* Removes unregister tools switch which was never reached.
* Rolls all code rotation handle related code within mousePressEvent
  to the respective rotation handler onBegin functions.
    * onBegin call site updated accordingly to provide intersection
      data that code depends upon.
* Moves all translateXZTool code explicitly within mousePressEvent
  to the tool's onBegin function.
    * onBegin signature updated accordingly to provide intersect
      results that the tool relies upon.
    * Found and fixed a bug with translateXZTool
      where its startingElevation and startingDistance properties
      were _only_ set when local _debug_ var was set.
          * This appears to have been responsible for being able
            to move the object farther than was visible.  Re-tested
            with fix and wasn't able to get that behavior any longer.
* Wrap intersect tests within more reader friendly functions.

NOTE(s):
* Tested GrabberMoveUp and Rotation Handles.  They work as they
  did previously as expected.
* Tested selection behavior and it currently maintains as expected.
* Tested translationXZTool and it maintains its prior behavior with
  the improvement noted above.

Reviewed-by: Leander Hasty <leander@1stplayable.com>

Changes Committed:
    modified:   scripts/system/libraries/entitySelectionTool.js
 2017-09-28 15:04:20 -04:00
LaShonda Hopper
ae8ae6f6cc [Case 6491] Grabbers stay invisible while rotating (details below). 
This fixes the issue where grabbers would re-appear when rotating
the selected object rather than staying hidden.

updateHandles will now take the mode into account when deciding
if the non-light grabber handles should be visible.  This can be
subverted by the user selecting a light source as in line with
the previous behavior.

Adds some debug prints in event handlers guarded by local
wantDebug checks.

Has some minor cleanup changes:
* Remove unused var within updateRotationHandles
* Readability improvement for light check within updateHandles
* Pulled up rotate mode check within updateHandles
* Added grabberCloner visibility flag within updateHandles

Changes Committed:
    modified:   scripts/system/libraries/entitySelectionTool.js
 2017-09-28 14:58:30 -04:00
LaShonda Hopper
15ff4ebecb [Case 6491] Adds some debugging prints. 
Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-09-28 14:58:30 -04:00
druiz17
3b05317db6 fixing grabbing and tablet bugs 2017-09-28 11:18:40 -07:00
Zach Fox
f0d668c5c3 Fix marketplace injection problems - yay! 2017-09-28 11:14:44 -07:00
Daniela
4a1dd975a9 Fix bubble scale issue for IPD Secondary Task List: bubble.js Scale. 2017-09-28 17:05:06 +01:00
Daniela
13eb7db462 Change teleport.js to update render state more frequently. 2017-09-28 16:12:20 +01:00
David Rowe
30c4a22441 Merge branch 'master' into vr-edit-a 2017-09-28 16:10:26 +13:00
David Rowe
47ab9d3221 Fix flash of color from laser target when turn on or jump distance 2017-09-28 16:04:22 +13:00
Nissim Hadar
4d8a1db895 Merge branch 'master' into hazeZone 
# Conflicts:
#	libraries/entities-renderer/src/RenderableModelEntityItem.cpp
 2017-09-27 17:50:51 -07:00
David Rowe
a74678a24d Improve size of scale handles for distant entities 2017-09-28 12:57:30 +13:00
David Rowe
9a51ce4b29 Simplification 2017-09-28 12:18:36 +13:00
David Rowe
57cec50583 Fix UI disappearing when inside complex model 2017-09-28 12:18:09 +13:00
Seth Alves
3016ce0a2b Merge pull request #11470 from sethalves/fix-grab-vs-trigger 
set grabbable and other checkboxes correctly if userData is blank
 2017-09-27 15:24:37 -07:00
Zach Fox
7ad3a5a1e3 Commerce: Tons of Interface changes (#11463) 
* canRez(Tmp)Certified()

* CertifiedItem beginnings

* Skeleton of verifyOwnerChallenge()

* Controlled failure; updateLocation() skeletion

* Controlled failure on checkout page with ctrl+f

* Skeleton Purchases first-use tutorial

* Initial progress on new setup

* Security pic tip

* Skeleton Certificate page

* Updates to Certificate

* General progress; setup is nearly complete

* Better buttons; last step almost done

* Initial progress on wallet home

* Completed recent transactions

* Security page

* Scrollbar

* Fix auth error text

* PassphraseSelection

* Change security pic

* Minor layout changes; beginnings of emulated header

* Various layout changes; wallet nav bar

* Help screen

* Quick onaccepted change

* First pass at new purchases

* Small style updates

* Some error progress

* Lightbox in purchases

* Collapse other help answers when clicking on another

* REZZED notif

* Commerce Lightbox

* Lots of new interactions in Purchases

* Hook up 'view certificate'

* Fix errors, fix close button on cert

* Purchases timer; much faster filter

* Add debugCheckout

* Purchase updates

* GlyphButton; separator; Checkout Success; Ledger fix; debug modes

* Lock glyph below security pic should be white

* Various fixes, round 1

* Circular mask

* Passphrase change button fix; TextField error edge highlighting

* Recent Activity fixes

* Various changes

* Standard Security Pic location

* Color changes

* Filter bar changes

* Styling for multiple owned items

* Minor language change

* Header dropdown (harder than expected)

* Small fixes

* View backup instructions

* marketplaces.js onCommerceScreen

* Beginnign of new injection

* Marketplace injection changes

* Purchase button style changes

* More button styling

* MY PURCHASES button

* marketplace onUsernameChanged

* New help QA

* Help text changes etc

* Downscale security image, reducing filesize

* Lots of bugfixes

* Cleanup before PR

* Only open cert during inspection if commerce switch is on

* Help text changes

* Purchase status incl. change to confirmed; Help text; Open Explorer to hifikey

* Quick glyph change

* New 'wallet not set up' flow for when entering Purchases or Checkout without set-up wallet
 2017-09-27 14:43:51 -07:00
druiz17
58a00a89d7 remove debug print 2017-09-27 12:58:11 -07:00
druiz17
cea3c002dd improving far rotate 2017-09-27 11:47:26 -07:00
druiz17
38096b48d9 fixing entitySelectionTool 2017-09-27 10:52:56 -07:00
Seth Alves
eb6c99456d Merge branch 'master' of github.com:highfidelity/hifi into fix-grab-vs-trigger 2017-09-27 10:01:24 -07:00
Daniela
b18ffe9508 Remove fingerPaint.js from defaultScripts.js. 2017-09-27 17:46:59 +01:00
Daniela
c22d2add17 Resolve conflict with hifi/master. 2017-09-27 17:06:12 +01:00
David Rowe
20b1ab0087 Tidying 2017-09-27 22:06:28 +13:00
David Rowe
ad838c6b3c Adjust position of wrist icon 2017-09-27 21:53:26 +13:00
David Rowe
c2471e340a Reduce number of calls to Script.resolvePath 2017-09-27 21:49:02 +13:00
David Rowe
e623b1e0a5 Alternative, more robust handle scaling method 2017-09-27 19:21:07 +13:00
Brad Hefta-Gaub
3500705d0c Merge pull request #11427 from ElderOrb/case7723 
7723 Tablet Should Rotate Faster when using Create app
 2017-09-26 22:05:45 -07:00
David Rowe
6b3b2beae0 Merge branch 'master' into vr-edit-a 2017-09-27 15:34:52 +13:00
David Rowe
d4fc26f3b7 Fix header highlighting if close and reeopen app with tool selected 2017-09-27 15:22:33 +13:00
David Rowe
895ffaf1f9 Fix group clear button messing up select-in-box state 2017-09-27 15:09:10 +13:00
Seth Alves
ae42d56cd6 Merge pull request #11465 from hyperlogic/bug-fix/teleporter-near-scale 
Teleport.js: can now teleport small distances with small avatar scale
 2017-09-26 19:05:14 -07:00
Seth Alves
ce3e5eb1a3 set grabbable and other checkboxes correctly if userData is blank or malformed. near-trigger blocks near-grab 2017-09-26 18:56:27 -07:00
Seth Alves
f384cde471 Merge pull request #11467 from sethalves/fix-near-trigger 
Fix near trigger
 2017-09-26 17:27:05 -07:00
Dante Ruiz
410baaf7bc Merge pull request #11464 from druiz17/controller-dispatacher-bugs 
fix auto dropping and re-grabbing loop
 2017-09-26 16:46:34 -07:00
Seth Alves
8180acbffc use same trigger test as in isReady 2017-09-26 16:29:22 -07:00
Andrew Meadows
dafadf82bb Merge pull request #11458 from jherico/fix/tablet_latency 
Fix long tablet lag on first load
 2017-09-26 16:18:31 -07:00
David Rowe
76889d1b67 Improve handle scaling of entity with near-zero dimension 2017-09-27 12:04:05 +13:00
Seth Alves
a478506da3 Merge branch 'master' of github.com:highfidelity/hifi into fix-near-trigger 2017-09-26 15:52:22 -07:00
Seth Alves
644532dd59 only send startNearTrigger once 2017-09-26 15:17:23 -07:00
beholder
ef732fb547 enable 'close' button overlay on hover/leave with stylys/lasers 2017-09-27 01:07:32 +03:00
beholder
6409580b03 ignore intersection for 'close' button highlight overlay 2017-09-27 01:06:47 +03:00
druiz17
5a1242a1ac fix spelling error 2017-09-26 15:06:31 -07:00
druiz17
76c1fe688c fix auto dropping 2017-09-26 14:52:01 -07:00
Anthony J. Thibault
a7cfb5d635 teleport.js: fix for TELEPORT_CANCEL_RANGE with large/small avatar scale 2017-09-26 14:21:25 -07:00
David Rowe
0f5adb488c Merge branch 'vr-edit-footer' into vr-edit-a 
# Conflicts:
#	scripts/vr-edit/modules/toolsMenu.js
 2017-09-27 10:04:31 +13:00
Anthony J. Thibault
c26d04dca1 Teleport.js: Fix message bugs, and made eslint clean 
* 'Hifi-Teleport-Ignore-Add' and 'Hifi-Teleport-Ignore-Remove' messages should now should work
* 'Hifi-Teleport-Disabler' message should now work
 2017-09-26 13:58:00 -07:00
Seth Alves
a871a6db1d Merge pull request #11430 from sethalves/fix-parent-grab 
Fix parent grab
 2017-09-26 13:00:16 -07:00
David Rowe
8bd0e464aa Merge branch 'vr-edit-group-box' into vr-edit-a 2017-09-27 08:48:44 +13:00
beholder
24a12a2f8f 7722 Add onHover Outline to Tablet "X" Button 2017-09-26 22:31:56 +03:00
Seth Alves
81f74f9297 Merge pull request #11444 from druiz17/module-handcontrollerPointer 
Made handControllerPointer into modules in hope of preventing mouse cursor interference with tablet
 2017-09-26 12:21:03 -07:00
Seth Alves
91f5f61ea3 Merge pull request #11456 from druiz17/bugs-handControllerGrab 
Correctly grab tablet in 3rd person
 2017-09-26 12:19:20 -07:00
Seth Alves
913d3c4d12 Merge pull request #11422 from hyperlogic/feature/ant-man2 
Secondary IPD fixes
 2017-09-26 11:53:45 -07:00
Seth Alves
216888aa03 Merge branch 'fix-parent-grab' of github.com:sethalves/hifi into fix-parent-grab 2017-09-26 11:08:40 -07:00
Seth Alves
737b583745 avoid unequipping things during a HMD snap-turn 2017-09-26 11:08:33 -07:00
Dante Ruiz
e397d49564 Merge pull request #11159 from vladest/modal_dialogs_async 
Modal dialogs async
 2017-09-26 11:07:42 -07:00
druiz17
2cc8a55151 fix cloning equiping 2017-09-26 10:37:36 -07:00
Daniela
e264503b9f Merge remote-tracking branch 'upstream/master' 2017-09-26 17:49:15 +01:00
Daniela
179a426389 Address QA comments. 2017-09-26 17:44:46 +01:00
David Rowe
9b7197cf3f Don't highlight entity you're inside unless you laser it 2017-09-26 15:36:40 +13:00
Seth Alves
0b60928dd3 fix rollup-to-parent code to only roll up to entity parents 2017-09-25 19:07:40 -07:00
Brad Davis
40c42d35a5 Fix long tablet lag on first load 2017-09-25 17:50:04 -07:00
druiz17
6332a53ee2 able to grab tablet in 3rd person 2017-09-25 16:36:29 -07:00
Seth Alves
5da5b24894 unmangle merge 2017-09-25 15:18:22 -07:00
David Rowe
d64e3aca55 Polyvoxels don't have a color property 2017-09-26 11:10:05 +13:00
David Rowe
428efa571e Merge branch 'master' into vr-edit-a 2017-09-26 10:40:07 +13:00
druiz17
ec40df711d fix tablet grabbing and eslint changes 2017-09-25 14:31:13 -07:00
druiz17
b1b31444f0 fix mouse visiblity 2017-09-25 11:34:18 -07:00
druiz17
dda20c1ef5 fixing merge conflict 2017-09-25 09:45:29 -07:00
Nissim Hadar
27af4685e7 Added range and altitude to UI. 2017-09-25 09:32:52 -07:00
Seth Alves
5741782f45 merge from upstream 2017-09-25 09:16:43 -07:00
Brad Hefta-Gaub
030da7d850 Merge pull request #11401 from druiz17/module-scale-entities 
ScaleEntity Module
 2017-09-25 09:10:32 -07:00
Seth Alves
90954a4e4f Merge branch 'master' of github.com:highfidelity/hifi into fix-parent-grab 2017-09-25 09:09:58 -07:00
vladest
1a2d38e31f Removed sounds for tablet in and out, added sounds for stylus instead. Added logging for testing semi-pressed laser and keyboard sounds 2017-09-25 17:11:44 +02:00
Nissim Hadar
1a9625d272 Merge branch 'master' into hazeZone 2017-09-24 18:27:36 -07:00
Nissim Hadar
6cbf087708 First version with combo for Haze Mode. 2017-09-24 15:08:22 -07:00
Andrew Meadows
cf0dd6f8c3 Merge pull request #11371 from cain-kilgore/21542 
WL 21542 - Allow Scripts to change Avatar Gravity [Experimental]
 2017-09-23 22:20:52 -07:00
David Rowe
bbc6e5d1b5 Fix bounding box isn't cleared when exit tool with header or grip click 2017-09-24 17:06:42 +13:00
David Rowe
4e0efdaa1a Automatically add entities in bounding box to currently selected groups 2017-09-24 16:55:15 +13:00
David Rowe
2afc84cf0b Display bounding box of currently selected groups 2017-09-24 12:06:04 +13:00
David Rowe
8976befaeb Use emissive FBX model for highlighted Tools menu header 2017-09-23 14:20:53 +12:00
David Rowe
64acc0d0a3 Press undo/redo and menu buttons when click them 2017-09-23 13:01:38 +12:00
Zach Fox
921ebc221e Merge pull request #11431 from zfox23/contextOverlayInterface_fixEnabled 
Enable Inspection Mode for all; change Commerce setting name
 2017-09-22 17:52:27 -07:00
druiz17
b8ee60a394 fix scripting error 2017-09-22 17:13:48 -07:00
David Rowe
bc5cd7415b Use emissive FBX models for header bars 2017-09-23 11:56:42 +12:00
David Rowe
f53f8c14fc Update wrist tool icon 2017-09-23 11:34:57 +12:00
druiz17
2c7b8cdb4f fixing script issues 2017-09-22 16:26:41 -07:00
druiz17
ee9ac3e7f9 undo unnessary changes 2017-09-22 15:38:39 -07:00
druiz17
28d8af0b44 Merge branch 'master' of github.com:highfidelity/hifi into module-handcontrollerPointer 2017-09-22 15:33:17 -07:00
druiz17
e965b7fff1 hand controller pointer 2017-09-22 15:32:40 -07:00
Zach Fox
0eafdeab14 Fix hover -> unhover overlay behavior 2017-09-22 13:32:11 -07:00
Zach Fox
bb9db3ef6d Updates to behavior and shader appearance 2017-09-22 11:24:30 -07:00
Nissim Hadar
5e1d470553 WIP 2017-09-22 09:48:22 -07:00
David Rowe
edd6310a07 Move undo/redo buttons to footer area and make persistent 2017-09-22 21:46:33 +12:00
David Rowe
ca000acf2a Add space for a footer to put undo/redo buttons in 2017-09-22 17:40:34 +12:00
David Rowe
e0658c7a2f Merge branch 'master' into vr-edit-a 2017-09-22 15:18:14 +12:00
druiz17
53efe6bfb2 working on fix 2017-09-21 18:17:05 -07:00
David Rowe
959d497079 Change group tool's "Cancel" button to "Clear" 2017-09-22 12:00:12 +12:00
David Rowe
e4a126461b Add extra Create palette items 2017-09-22 10:53:06 +12:00
Anthony J. Thibault
54e627e2c5 Merge branch 'master' into feature/ant-man2 2017-09-21 13:59:47 -07:00
David Rowe
a757012c10 Change default color to 100% white 2017-09-22 08:17:35 +12:00
Seth Alves
fc3e259f6f remove debug prints 2017-09-21 11:42:30 -07:00
Seth Alves
3c22c9ea3a back out bad change 2017-09-21 11:39:14 -07:00
Zach Fox
57b5a23373 Enable Inspection Mode for all; change Commerce setting name 2017-09-21 11:18:21 -07:00
Seth Alves
24bfb3f3b9 oops 2017-09-21 11:16:00 -07:00
Seth Alves
363a2a3a7a merge from upstream 2017-09-21 11:08:29 -07:00
Seth Alves
473db92a8e fix some parent-grab bugs, re-enable adjusting equipped entities, don't trigger guns right when they are equipped 2017-09-21 11:07:47 -07:00
Daniela
d054c6dc36 Merge branch 'master' of https://github.com/highfidelity/hifi 2017-09-21 18:29:45 +01:00
Daniela
adde847798 Fix code standard. 2017-09-21 17:57:02 +01:00
Seth Alves
61efaf7fc2 Merge pull request #11420 from druiz17/fix-parenting-overlay-module 
nearParentGrab module now sets the correct previous parent id when switching grabbed overlays from one hand to another
 2017-09-21 09:44:07 -07:00
Daniela
9787c31d70 Fix protect color pick from wrong user input. 2017-09-21 17:17:36 +01:00
druiz17
65e0c99618 small change 2017-09-21 09:07:49 -07:00
druiz17
2d7d6f85ba fixing merge conflicts 2017-09-21 09:04:13 -07:00
Daniela
d960a7c42e Merge branch 'master' of https://github.com/highfidelity/hifi 2017-09-21 16:20:51 +01:00
Daniela
7ccfac0b3b Protect stroke width from wrong user input. Protect color pick from wrong user input. 2017-09-21 15:54:53 +01:00
beholder
8085d0292d 7723 Tablet Should Rotate Faster when using Create app 2017-09-21 16:26:54 +03:00
David Rowe
f58b2a3bed Add group selection logic 2017-09-21 21:59:19 +12:00
David Rowe
2f9a314aa9 Implement group selection box button states 2017-09-21 19:07:13 +12:00
David Rowe
a56a155cc3 Add group selection box buttons 2017-09-21 17:31:32 +12:00
David Rowe
906595e4fa Automatically return to Tools menu after grouping or ungrouping 2017-09-21 16:15:06 +12:00
David Rowe
c05ccd2ed5 Merge branch 'master' into vr-edit-a 2017-09-21 14:08:16 +12:00
Anthony Thibault
03e278c5ae Merge pull request #11416 from druiz17/stylus-pos 
Pull back the stylus position in hand.
 2017-09-20 17:40:22 -07:00
druiz17
2c55419c60 change tablet forward offset 2017-09-20 16:49:45 -07:00
Seth Alves
90c97319ea Merge pull request #11408 from druiz17/fix-tablet-input 
fixing/improving and cleanup tablet inputs
 2017-09-20 16:36:07 -07:00
druiz17
949c343604 fixing nearGrabParentModule switching grabbed overlays 2017-09-20 15:34:01 -07:00
Cain Kilgore
a4655b9c73 Merge branch 'master' of https://github.com/highfidelity/hifi into 21542 2017-09-20 23:25:26 +01:00
Cain Kilgore
796e9e7ab3 Fixed things 2017-09-20 23:23:30 +01:00