Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 01:59:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
61688 commits 76 branches 59 tags 1.2 GiB
Commit graph

4671 commits

Author SHA1 Message Date
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