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

516 commits

Author SHA1 Message Date
Mike Moody
7de164f1ab moved below a check that returns. 2017-07-24 15:06:45 -07:00
Mike Moody
a4585b9400 Merge branch 'master' of git://github.com/highfidelity/hifi into 21374 2017-07-24 13:31:27 -07:00
Leander Hasty
26cc8134eb WL21463 - entitySelectionTool: use multiarg findRayIntersection instead of editOverlay. 
We're seeing the ignoreRayIntersection flag not take effect before findRayIntersection calls.  This may be due to editOverlay and editOverlays becoming non-blocking in 1f7d2b2 .

This altered the flow in mousePressEvent significantly; the first block, intended to handle scale/clone only, started handling rotation (should have been second block) and sometimes selection (should have been third block).

Similarly, in the various rotate grabbers' onMove methods, the pickRay will no longer intersect anything other than rotateOverlayTarget; this avoids some awful behavior when scrubbing over the size and clone grabbers.

This also reverts unnecessary parts of the prior commits to keep the diff for this WL cleaner, and adds a few TODO comments to revisit about redundant statements and incorrect names.

In addition, we've noticed but not fixed herein:

* There is a minor edgecase near 0 and 180, where it's difficult to get within a degree or two of the poles occasionally.
* The scale/clone grabbers don't stay disappeared for rotation in some cases.  This doesn't impact usability anymore, but it'd be nice to determine why they come back when they hide briefly.
* The addGrabbers for yaw/pitch/roll could be deduplicated, and yaw has some multiselect "reposition" enable/disable logic that pitch and roll lack.

Reviewed-by: LaShonda Hopper <lashonda@1stplayable.com>
 2017-07-21 10:56:24 -04:00
Mike Moody
c56450b986 Moved function to a differnt location that handles both mouse and controller inputs. 2017-07-19 01:49:39 -07:00
Dante Ruiz
f5abb4a090 trying new tablet position spwan 2017-07-17 23:18:16 +01:00
Mike Moody
53f581c3d4 Fixed Icons not being selectable while not highlighted. 2017-07-08 02:52:27 -07:00
Mike Moody
d9706452ac added ability to drag ParticleEffects and Light Entities around via Overlay Icon. 2017-07-06 23:32:22 -07:00
Mike Moody
be68d99bed added ability to drag ParticleEffects and Light Entities around via Overlay Icon. 2017-07-06 23:17:23 -07:00
Seth Alves
55b7c2d767 avoid doing a lot of work during mouse-move event-handlers 2017-07-05 15:50:05 -07:00
Clément Brisset
8e62bdea40 Merge pull request #10538 from ctrlaltdavid/21345 
Position tablet relative to hand
 2017-06-09 17:01:37 -07:00
David Rowe
fff8876b21 Code review 2017-06-10 09:33:45 +12:00
Seth Alves
dcbd279bd8 Merge pull request #10589 from vladest/create_in_landscape 
Implements landscape mode for tablet as rotation instead of stretching [DO NOT MERGE]
 2017-06-05 12:46:03 -07:00
Clément Brisset
5f91d2dcb7 Merge pull request #10569 from ctrlaltdavid/21312 
Improve positioning of assets when added / imported
 2017-06-02 15:45:18 -07:00
Vladyslav Stelmakhovskyi
8068e7201d Fix position after rotation. May be fix rotation in HMD mode 2017-06-02 18:58:18 +02:00
Vladyslav Stelmakhovskyi
b0e4b752d5 Implements landscape mode for tablet as rotation instead of stretching 2017-06-01 19:07:17 +02:00
David Rowe
1e8698aee1 Snap imported JSON to grid 2017-05-30 15:23:18 +12:00
David Rowe
31df18ff5b Fix snap-to-grid elevation 2017-05-29 18:43:49 +12:00
Vladyslav Stelmakhovskyi
bcee25acc7 Make sure that there is only one connection created for web events, so downloads from CLARA IO not duplicated 2017-05-28 19:54:41 +02:00
David Rowe
367b3ec603 Handle nonvertical avatar orientation 2017-05-28 09:59:32 +12:00
David Rowe
f1dca5019a Fix making the tablet horizontal 2017-05-25 11:48:28 +12:00
David Rowe
6452e92ac9 Hand controller data may not be valid 2017-05-25 11:28:26 +12:00
David Rowe
925cca97db Make the tablet horizontal 2017-05-25 09:16:17 +12:00
David Rowe
39654779fb Position tablet relative to hand 2017-05-24 13:35:00 +12:00
Philip Rosedale
6e82343b29 Merge pull request #10406 from amvmoody/21289 
21289 - Edit: Add the ability to duplicate an object with hand controller
 2017-05-13 20:43:52 -07:00
Thijs Wenker
0a3a2705af Merge pull request #10426 from huffman/fix/tablet-invisible-by-default 
Fix tablet showing up for a short period of time on launch
 2017-05-11 15:03:52 +02:00
Mike Moody
89d93ee56d Updated HMD grab Clone to work with all entity types. 2017-05-11 04:16:22 -07:00
Philip Rosedale
f9567d0330 Merge pull request #10182 from CraftsmanMG/master 
hifi: #21216 - Resize entities with hand controllers while editing
 2017-05-10 22:03:35 -07:00
Ryan Huffman
51db0cef98 Fix tablet showing up for a short time on launch 2017-05-09 15:12:12 -07:00
Mike Moody
dae652d3db v1 HMD duplication overlay. 2017-05-08 11:25:24 -07:00
Mike Moody
03490c81da v1 with bug, looking into. 2017-05-06 15:36:18 -07:00
Seth Alves
960bab6e4e Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire 2017-05-04 16:42:57 -07:00
Seth Alves
ed09dcbdc9 don't call editEntity on overlays 2017-05-03 21:32:06 -07:00
Delanir
27029eb8db Fix Code Standard 
Fix indent lines 2799-2800
Fix one line that had more than 128 columns wide
 2017-04-27 18:24:49 +01:00
Seth Alves
93f9716557 merge from upstream 2017-04-27 10:17:00 -07:00
Seth Alves
15661987be load tablet overlay models with higher priority 2017-04-27 10:16:08 -07:00
Zach Fox
9ace7a7488 Merge pull request #10279 from andrewd440/21174 
21174 Make the Particle Emitter Easier to Use
 2017-04-26 15:35:29 -07:00
Andrew Lowry
8479d835b2 Adds laser selection of particle systems while in edit mode in HMD. 2017-04-24 13:35:37 -04:00
Stephen Birarda
f64efe18c0 add an isBaked column to edit.js 2017-04-20 14:21:13 -07:00
Delanir
956d1e9d95 Fix Code Standard 2017-04-19 16:30:49 +01:00
Dante Ruiz
daf25c1fe8 fix crashes when clicking in the homebutton 2017-04-11 00:25:08 +01:00
Delanir
fcde85e51b Fix Style 
- Replace tabs by 4 spaces;
- Add indents and spaces;
- Formated multi/line statement
- Removed out-of-scope comments.
 2017-04-10 22:16:56 +01:00
Delanir
25a89a631b hifi: #21216 - Resize entities with hand controllers while editing 
hifi: #21216 - Resize entities with hand controllers while editing
Modified StretchTool to allow for movement in 3D
- uses data from motion controller (position and rotation) to
stretch/resize the entities/primitives in 3D.
- the range of the resize depends on distance to the object.
 2017-04-10 20:25:30 +01:00
Seth Alves
715493922e code review 2017-03-30 17:33:01 -07:00
Seth Alves
c62b07d26f add setLandscape call to tablet 2017-03-30 11:36:21 -07:00
Seth Alves
ce9eb1a377 more tablet landscape changes 2017-03-29 14:21:38 -07:00
Seth Alves
371df35013 remove code related to tablet being a model rather than an overlay. start on landscape mode 2017-03-29 14:16:14 -07:00
Anthony J. Thibault
29a159b90d WebTablet.js: Don't remove or add mouse callbacks onHMDChanged 
This should prevent the exception on destroy, caused by disconnecting a signal that is not attached.
 2017-03-28 09:27:13 -07:00
Seth Alves
902e3d41d6 merge from upstream 2017-03-24 08:20:35 -07:00
Anthony J. Thibault
2c38d7ff89 Tablet spawn orientation now takes hand orientation into account. 
Perhaps this will make the tablet spawn location feel more predictable and consistent to the user.
 2017-03-22 11:03:03 -07:00
Triplelexx
2d1ca99e2e change variable names that use Quat.getForward 2017-03-22 17:00:12 +00:00
Triplelexx
a964edee91 change all references of Quat.getFront to Quat.getForward in scripts directory 2017-03-21 22:25:30 +00:00
Seth Alves
1da6349505 merge from upstream 2017-03-21 10:26:02 -07:00
Ryan Huffman
13222468e3 Merge pull request #9712 from huffman/feat/edit-particle-icon 
Add particle system overlay in edit.js
 2017-03-21 10:02:52 -07:00
Seth Alves
bc90e9081b Merge pull request #9957 from hyperlogic/bug-fix/tablet-scale 
Tablet scale settings now take effect soon after they are changed.
 2017-03-20 15:05:47 -08:00
Anthony J. Thibault
f5c3d41f2c Tablet scale settings now take effect soon after they are changed. 2017-03-20 14:51:47 -07:00
Ryan Huffman
df644edde4 Fix hand controller not able to select light/particle icons 2017-03-20 09:45:50 -07:00
Faye Li
197a06c423 changes in TWO entityList.js to register the export event 2017-03-17 16:17:21 -07:00
Seth Alves
a5d19439f9 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-16 16:32:07 -07:00
Ryan Huffman
d4ade8278c Fix js linting errors in entityIconOverlayManager.js 2017-03-13 11:27:12 -07:00
Ryan Huffman
dbcd7fd9e9 Fix light icon overlay not updating to represent light type 2017-03-13 10:10:53 -07:00
Ryan Huffman
42d518fafb Remove debug log in entityIconOverlayManager 2017-03-13 10:10:53 -07:00
Ryan Huffman
ce5ee42961 Update LightOverlayManager to work with particles 2017-03-13 10:10:53 -07:00
Anthony J. Thibault
07e10ae862 Merge branch 'tablet-ui' into feature/can-touch-this 2017-03-10 17:05:26 -08:00
Anthony J. Thibault
1acc5ea760 Finger now points when near tablet + deadspot added when touching the tablet 2017-03-08 19:03:56 -08:00
Seth Alves
de2dd7383d didn't need invis flag, after all 2017-03-08 15:30:49 -08:00
Seth Alves
371c20ee25 hide tablet by making it not visible rather than destroying it 2017-03-08 10:33:59 -08:00
Anthony J. Thibault
836c701cb3 More accurate and responsive stylus and finger touching. 
The algorithm used to detect when and where the stylus or finger is touching the tablet has been improved.

* hovering the finger/stylus over the surface of the tablet should cause buttons to highlight.
* flicking or using the stylus like a drum stick, should more accurately click buttons on the tablet.
* stabbing the tablet quickly, should also more accurately trigger button presses.
* moving the hand/stylus from behind the tablet should be less likely to cause press events.
 2017-03-07 18:19:32 -08:00
Thijs Wenker
b21bd3afa9 Make the time and slider follow the record.js toolbar 2017-03-08 01:14:11 +01:00
David Rowe
854292b193 Merge branch 'tablet-ui-edit-js' into 21199 2017-03-03 17:51:12 +13:00
Seth Alves
3b581a8dfe merge from upstream 2017-03-02 16:35:44 -08:00
Seth Alves
10cb7aab06 Merge pull request #9684 from Menithal/parent-hotkey 
WL#20856 Added Parenting Hotkeys to Edit.js Among Visual tweaks
 2017-03-02 16:30:43 -08:00
Seth Alves
c2085ebb6e Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-28 13:33:51 -08:00
Dante Ruiz
d5714bfa6e Merge branch 'master' into menuFix 2017-02-28 16:55:44 +00:00
Seth Alves
117be16c31 pull from upstream 2017-02-27 16:48:23 -08:00
Dante Ruiz
21c15927cf Homebutton dimension and position scales with tablet 2017-02-27 19:33:52 +00:00
Dante Ruiz
73c337efd0 Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix 2017-02-25 00:42:22 +00:00
Dante Ruiz
835b23832f some modal clean up 2017-02-25 00:40:38 +00:00
Seth Alves
fcd3c09404 Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js-tablet-as-overlay 2017-02-24 14:27:30 -08:00
Seth Alves
b2a35f45db when tablet is an overlay, use the model-fbx from the distribution (local disk copy) rather than the one on s3 2017-02-24 13:04:43 -08:00
Seth Alves
70060eb464 in 2d mode, clicks on tablet don't get used for other things 
Conflicts:
	scripts/system/libraries/entitySelectionTool.js
 2017-02-24 11:37:04 -08:00
Seth Alves
e43c4c17f5 in 2d mode, clicks on tablet don't get used for other things 2017-02-23 21:27:25 -08:00
Seth Alves
ce717d04e9 merge in tablet-as-overlay code 2017-02-23 18:40:20 -08:00
Seth Alves
610c20e01a Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-23 17:41:38 -08:00
Seth Alves
9c0104a060 don't use Entities.getEntityProperties on tablet when it's an overlay 2017-02-23 14:55:52 -08:00
Seth Alves
37004e4347 steps toward making mouse work on tablet 2017-02-23 08:11:31 -08:00
Dante Ruiz
63a78a73db Merge branch 'master' into menuFix 2017-02-23 15:45:30 +00:00
Seth Alves
84f95e6776 oops 2017-02-22 19:18:42 -08:00
Seth Alves
b4be942348 trying to get tablet overlay to show up in the right place 2017-02-22 19:18:03 -08:00
Seth Alves
bcf1f9ab4c Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay 2017-02-22 16:50:29 -08:00
Seth Alves
bfc4853947 make overlays near-grabbable. make tablet be an overlay 2017-02-22 16:50:02 -08:00
Chris Collins
94517057d6 Merge pull request #9721 from hyperlogic/bug-fix/tablet-ui-tablet-placement 
More consistent tablet angle when first creating the tablet.
 2017-02-22 15:00:17 -08:00
Seth Alves
5bff2034c3 cleanups, attempt to get particle explorer to work right 2017-02-22 12:07:18 -08:00
Anthony J. Thibault
4866be1f52 More consistent tablet angle when first creating the tablet. 
The tablet should more constantly be placed above your hand, while facing your head.
It fixes the issue where the tablet would appear almost horizontal when your hand was close to your HMD and at eye level.
 2017-02-21 16:01:46 -08:00
Menithal
f5d266a562 Updated 2017-02-17 23:28:28 +02:00
Seth Alves
39e1edafd2 merge from upstream 2017-02-17 13:16:12 -08:00
Seth Alves
5ddcbae934 save tablet web-overlay ID in HMD interface. don't trigger edit affordances if the click was intented for the tablet 2017-02-17 11:51:23 -08:00
Seth Alves
47cdade1e9 fix home-button on tablet 2017-02-17 11:47:37 -08:00
Seth Alves
b6b6ad780d allow isSpotlight to be 0 or 1 2017-02-16 17:15:52 -08:00
Menithal
d96f95a7e9 Updated edit.js and selection tool 
Last selected entity will now be yellow instead of orange
 2017-02-16 10:05:59 +02:00
Seth Alves
076b0ed3ab get particle explorer working, again 2017-02-15 15:00:25 -08:00
Seth Alves
792c7ff51f PointerEvent will now relay keyboard modifiers 2017-02-15 10:41:56 -08:00
Seth Alves
3a23ec86d5 handles etc work better 2017-02-14 13:57:48 -08:00
Seth Alves
d40402faae Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-14 06:53:34 -08:00
Atlante45
512bb4765f Add entity clicks capture capabilities 2017-02-13 11:34:30 -08:00
Seth Alves
44aa3e044b make it so near grabbing while edit is active doesn't select a new entity 2017-02-10 16:56:53 -08:00
Seth Alves
24fc9bbe67 honor HUDUIEnabled setting 2017-02-09 15:12:01 -08:00
Seth Alves
e12c77e576 move the edit tabs into tablet 2017-02-09 14:43:44 -08:00
Anthony J. Thibault
cb58c567b8 In desktop mode create tablet near mouse click location. 
But prevent the tablet from being displayed off screen.
 2017-02-07 18:18:34 -08:00
Seth Alves
f635cd8a07 use tablet models from s3 until relative model urls work 2017-02-03 15:17:33 -08:00
Chris Collins
bac5bd5c0e Merge pull request #9595 from hyperlogic/bug-fix/tablet-ui-bugfixes 
tablet-ui: Bug fixes
 2017-02-02 17:53:47 -08:00
Anthony J. Thibault
6bef9e888b Merge branch 'master' into bug-fix/tablet-ui-no-domain 2017-02-02 17:21:20 -08:00
Anthony Thibault
59b33bbc53 Merge pull request #9585 from sethalves/use-local-tablet-model 
use tablet model from distribution rather than from s3
 2017-02-02 16:01:15 -08:00
Anthony J. Thibault
b44e5b5a1f tablet-ui: preferences for tablet ui scaling 
One for the tablet in HMD mode, one for desktop mode.
The default desktop mode scaling factor is now 75%, which should
reduce the size of the for users with low resolution monitors,
while still being somewhat readable.
 2017-02-02 14:05:07 -08:00
Anthony J. Thibault
5890503ec0 Can now grab tablet in 2d mode even when it embedded in geometry 2017-02-02 10:56:56 -08:00
Dante Ruiz
2af72f1a50 fixed tablet buliding up when flying fast 2017-02-02 17:03:53 +00:00
Seth Alves
d9bdbb92ef use tablet model from distribution rather than from s3 2017-02-01 16:55:29 -08:00
Seth Alves
ab8be15ce0 Merge pull request #9570 from highfidelity/tablet-ui 
Tablet ui
 2017-02-01 09:38:13 -08:00
Anthony J. Thibault
3c04f54e75 more fixes to third person tablet usage. 2017-01-31 18:22:38 -08:00
Anthony J. Thibault
008a58f9d7 Only reposition the tablet when camera mode changes, in HMD mode. 2017-01-31 18:03:48 -08:00
Anthony J. Thibault
c147b9bec0 Fix for tablets in third-person HMD mode. 2017-01-31 18:00:18 -08:00
Anthony J. Thibault
e2e19884bb Tablet should work even when not connected to any domain. 
handControllerGrab.js and WebTablet.js now parents objects to the
AVATAR_SELF_ID parentID, instead of using MyAvatar.sessionUUID, which
is unavailable when not connected to any domain.

I removed several early returns handControllerGrab.js that prevented
grabbing from working if MyAvatar.sessionUUID was invalid.

There were places in the EntityItem.cpp and EntityScriptingInterface.cpp
C++ that would log an error if parentID was set to AVATAR_SELF_ID.
This was to prevent AVATAR_SELF_ID from ever going over the network.
Instead, we now prevent this by replacing all outgoing references of
AVATAR_SELF_ID with the sessionID of the current node.
 2017-01-31 13:52:12 -08:00
Dante Ruiz
7a4a769015 fix more editing bugs 2017-01-31 16:53:57 +00:00
Anthony J. Thibault
98b53d1d29 Don't allow mouse dragging the tablet in HMD mode. 2017-01-30 12:07:18 -08:00
Anthony J. Thibault
39d68828ab Disable FXAA on tablet overlay in desktop mode. 
This introduces the "isAA" property to 3d overlays. When false, the overlay is rendered after
the "Antialiasing" render pass.  Ironically, disabling FXAA makes the text more readable, which is
essential in 2D desktop mode.

Two new shaders were introduced.

simple_opaque_web_browser_overlay.slf
simple_transparent_web_browser_overlay.slf

These are tailored to write into the main framebuffer instead of the g-buffer.
 2017-01-30 11:24:59 -08:00
Dante Ruiz
2c7cbb1bd9 close tablet with mouse in HMD 2017-01-27 20:58:36 +00:00
Seth Alves
e2b1f4b2ab include tablet fbx with interface distribution rather than get it from s3 2017-01-26 10:20:46 -08:00
Anthony J. Thibault
2af59630fb Better legibility of tablet in 2D with small window sizes. 2017-01-25 16:43:36 -08:00
Seth Alves
c317ba8054 merge from upstream 2017-01-25 15:57:53 -08:00
Atlante45
f540c94113 Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr 2017-01-25 13:06:49 -08:00
Anthony J. Thibault
3db8c5b4a7 Fix tilt on tablet for HMD users without hand controllers 2017-01-23 16:36:04 -08:00
Seth Alves
c958314918 merge from upstream 2017-01-23 13:52:01 -08:00
Philip Rosedale
45a4ec349e Merge pull request #9467 from humbletim/21139 
Code Review for Job #21139 - Do not allow grab or far-grab or click while editing objects
 2017-01-23 13:20:57 -08:00
Seth Alves
be8bc9652b Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-23 09:44:04 -08:00
humbletim
15394056eb * add isInEditMode to utils.js 
* update grab.js to use the latest Settings edit mode detection approach
* add edit guards to handControllerGrab.js and grab.js
* update edit.js to consistently initialize Setting's edit flag
 2017-01-20 22:29:40 -05:00
Dante Ruiz
41bf65ed5e home button improvments 2017-01-20 16:35:41 -08:00
Ryan Huffman
ad70431c26 Fix edit.js server script status getting reset when changing properties 2017-01-20 15:34:38 -08:00
Seth Alves
2f08972578 Merge pull request #9460 from druiz17/touchUp 
Tablet button clickable in desktop mode && correct icons for switch
 2017-01-20 12:58:41 -08:00
Anthony J. Thibault
3ebf2ebc9b Updated tablet dimensions to better reflect mockup and 3d model 2017-01-20 12:27:44 -08:00
Dante Ruiz
58e04f8e35 home button works in desktop mode 2017-01-20 19:43:13 +00:00
Seth Alves
6641f9bafd Merge pull request #9444 from druiz17/homeButtonFix 
Home button is now an overlay
 2017-01-20 10:32:31 -08:00
Seth Alves
2d220a557f unmangle merge 2017-01-20 10:29:18 -08:00
Zach Fox
c83cd4a94a Complex checkpoint 2017-01-20 10:24:51 -08:00
Anthony J. Thibault
4e4545ac00 Updated orientation of tablet when no hand controllers are present. 2017-01-19 20:27:06 -08:00
Anthony J. Thibault
8304aa7b19 Added ability to mouse move the tablet in 2d desktop mode. 2017-01-19 18:04:08 -08:00
Dante Ruiz
e1c2c73e5f clean up 2017-01-20 01:04:14 +00:00
Dante Ruiz
1e7e4576cc comparing with ID instead of strings 2017-01-19 16:38:55 -08:00
Seth Alves
47b59ffae3 don't save tablet to Settings when logging out or switching domains 2017-01-19 14:10:48 -08:00
Seth Alves
41ddfbfd27 clean up grab.js. provide a way to delete old tablets that got saved into Settings on exit 2017-01-19 11:34:38 -08:00
Anthony J. Thibault
c6f3eb138a Adjusted tablet spawn position and orientation to be more natural 2017-01-17 18:16:40 -08:00
Seth Alves
c2d6bf10d2 hard-code dimensions on home-button so that it doesn't sometimes show-up with the wrong size 2017-01-16 06:47:50 -08:00
Seth Alves
e46b40e729 adjust overlay position so that it shows up on new tablet fbx 2017-01-13 16:14:12 -08:00
Dante Ruiz
71083645e9 branch update 2017-01-12 20:51:25 +00:00
Dante Ruiz
a16b229c65 begining to remove hud items 2017-01-12 10:49:45 -08:00
Dante Ruiz
2d8d5401dc updated tablet position 2017-01-11 08:41:07 -08:00
Anthony J. Thibault
3f0860f9c3 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui 2017-01-10 13:35:29 -08:00
Anthony J. Thibault
9db6806026 In desktop mode, tablet is in front of camera. 
* added a new fauxJointIndex for the camera. CAMERA_MATRIX_INDEX = -7
  this can be used to attach objects to the camera.
* WebTablet.js has been changed to detect when entering and exiting HMD mode
  to move the tablet appropriately.

There's a known bug with the tablet entity position lagging the camera by one frame.
 2017-01-10 11:31:45 -08:00
druiz17
28c8d527df Merge pull request #9340 from fayeli/tablet-hide-yellow 
Ability to disable yellow highlight around Web Overlays
 2017-01-10 09:11:51 -08:00
Faye Li Si Fi
32eda3a49c redo 2017-01-09 14:02:14 -08:00
Faye Li Si Fi
c39eb6294e undo 2017-01-09 14:01:59 -08:00
Faye Li Si Fi
5323e7f34d set showKeyboardHighlight to false when initialising tablet 2017-01-09 13:36:58 -08:00
Dante Ruiz
7205215baa coding standard fix 2017-01-07 00:38:39 +00:00
Dante Ruiz
07079ad78d fixed bug 2017-01-07 00:22:55 +00:00
Dante Ruiz
4ef5c76a65 fixed issues 3.0 2017-01-07 00:08:53 +00:00
Dante Ruiz
55e7b46790 fixed issues 2.0 2017-01-07 00:07:38 +00:00
Dante Ruiz
cec2692c77 fixed issues 2017-01-07 00:06:42 +00:00
Dante Ruiz
32938861cd indentation fix 2017-01-07 00:03:04 +00:00
Dante Ruiz
31e57a0dcd update branch 2017-01-06 15:35:32 -08:00
Dante Ruiz
19c6a672d9 re-did tablet position 2017-01-06 15:35:32 -08:00
Seth Alves
668bc35227 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-merge 2017-01-06 13:31:13 -08:00
howard-stearns
2f5f53c8e4 cr 2017-01-06 10:28:09 -08:00
howard-stearns
83685740c4 change wording for common case 2017-01-05 16:37:40 -08:00
Anthony J. Thibault
baf2fce2c3 Made back button entity collisionless 2017-01-05 15:33:21 -08:00
Anthony J. Thibault
85de0d3bbf Added local only spatialized button click sounds to tablet 2017-01-05 13:54:06 -08:00
Howard Stearns
bbf7d16537 process consistent select message 2017-01-05 13:45:03 -08:00
Howard Stearns
12fffe8530 messages 2017-01-04 20:37:56 -08:00
howard-stearns
9709bedca7 checkpoint 2017-01-04 16:55:58 -08:00
Dante Ruiz
4dd8a8aa0d added new model 2017-01-04 11:09:27 -08:00
Dante Ruiz
3f34cb863e removed whitespace 2017-01-04 11:09:26 -08:00
Dante Ruiz
f81402fb0f improved tablet position 2017-01-04 11:09:26 -08:00
Dante Ruiz
bf6178f500 diff minimize 2016-12-21 23:48:45 +00:00
Dante Ruiz
5ed8831bee all hud buttons on tablet 2016-12-21 23:25:40 +00:00
Seth Alves
dc996bee95 merge from upstream 2016-12-20 08:06:01 -08:00
Dante Ruiz
8f36090884 removed tabs and also remove script from host 2016-12-16 21:45:53 +00:00
Dante Ruiz
f7df9a64b2 remmoved tabs 2016-12-16 18:32:05 +00:00
Dante Ruiz
cb4b2473e1 remmoved tabs as whitespace 2016-12-16 18:30:15 +00:00
Dante Ruiz
a0a8ecc158 even more clean up 2016-12-16 17:28:02 +00:00
Dante Ruiz
f2d9f34993 more clean up 2016-12-16 17:25:38 +00:00
Dante Ruiz
889e9e854c clean up 2016-12-16 17:24:53 +00:00
Dante Ruiz
40a79867be removed unnessary comments 2016-12-16 17:24:09 +00:00
Dante Ruiz
571783b90d fixed home buttons issues 2016-12-16 09:19:22 -08:00
David Rowe
efb784f703 Code review 2016-12-13 13:11:21 +13:00
Dante Ruiz
cc0e25720e mimimize the git diffs 2016-12-12 23:29:11 +00:00
Dante Ruiz
6a8465a6ca removed more whitespace 2016-12-12 23:26:06 +00:00
Dante Ruiz
92993202a4 removed double variable definition 2016-12-12 23:24:56 +00:00
Dante Ruiz
ccecce77de removed unneeded whitespace 2016-12-12 23:21:14 +00:00
Dante Ruiz
737f11fb7a merge fix 2016-12-12 23:03:38 +00:00
Dante Ruiz
1b7c89c41d home button working 2016-12-12 14:34:42 -08:00
David Rowe
c87149cfc2 Tidying 2016-12-10 12:59:01 +13:00
Seth Alves
37b179b00b remove commented-out code 2016-12-09 09:55:02 -08:00
Seth Alves
369f61e172 bring over some previous tablet-ui work 2016-12-08 16:54:39 -08:00
David Rowe
2f42f4cfa5 Merge branch 'master' into 21089 2016-12-05 18:33:38 +13:00
David Rowe
f04c493e16 Fix navigation bar and opaqueness of Web page 2016-12-05 17:48:20 +13:00
David Rowe
a5bdd9066f Add JavaScript event bridge for Web 3D overlay 2016-12-05 17:20:30 +13:00
David Rowe
a8a04cfbba Add script injection to Web 3D overlay 2016-12-05 12:19:49 +13:00
David Rowe
b723f3d92e Fix Web tablet screen size 2016-12-05 10:03:30 +13:00
Chris Collins
19b5e7cd86 Merge pull request #9054 from howard-stearns/third-person-lasers 
make hand-controller ui work in third person
 2016-12-01 10:11:12 -08:00
David Rowe
0136534954 Use overlay instead of entity to display tablet Web content 2016-12-01 21:32:57 +13:00
Anthony J. Thibault
7f840d3a08 Can use 'xboxLaser' in third person camera 2016-11-30 10:01:11 -08:00
Ryan Jones
a59df5b04d one last indentation fix 2016-11-28 17:19:43 -08:00
Ryan Jones
3961dbcf55 revert changes to dev utils, apply changes to system utils 2016-11-28 17:18:31 -08:00
Ryan Jones
4be1922df5 add bind polyfill 2016-11-28 14:47:15 -08:00
Anthony J. Thibault
38ac6fff03 Hand Controller rendering is camera relative 
Basically, when using the third person camera in HMD mode.  If the controllers are shown.
They should be shown in front of the users camera, not in front of the users avatar.

To accomplish this, two new faux joint indices are introduced.
CAMERA_RELATIVE_CONTROLLER_RIGHTHAND_INDEX and CAMERA_RELATIVE_CONTROLLER_LEFTHAND_INDEX.

These joint indices can be used for Overlay parenting. (But not for entity parenting because they are not transmitted over the network).
They can also be queried for by using the MyAvatar.getAbsoluteJointRotationInObjectFrame() call.

These new indices are now used by the controllerDisplay.js for the hand controller rendering.
They are also used by system/libraries/controllers.js as the origin for hand controller grabbing and interaction lasers.
 2016-11-17 11:33:12 -08:00
howard-stearns
e2fded846f make hand-controller ui work in third person 2016-11-11 11:10:42 -08:00
Brad Hefta-Gaub
779f326452 cleanup 2016-10-24 15:03:41 -07:00
Brad Hefta-Gaub
0f8967970a Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers 2016-10-24 08:11:31 -07:00
Brad Hefta-Gaub
a282d83546 more work on extra lasers 2016-10-24 07:46:04 -07:00
Anthony J. Thibault
53864abaf2 edit.js: Fix for picking and manipulating objects via hand controllers. 
The ray picking was not using the proper grab sphere offset, so it became detached from the visual ray, making picking difficult.
 2016-10-20 13:37:31 -07:00
Brad Hefta-Gaub
1a28732b64 Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers 
Conflicts:
	libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
	libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
 2016-10-20 09:38:03 -07:00
Anthony J. Thibault
55c062098a Adjustment to position and visibility of grab sphere. 
* The grab sphere used to detect near grabbing is now 10cm in radius instead of 4cm.
* The visual representation of this grab sphere is always hidden, by default.
* This representation can be enabled in via the "Developer > Show Grab Sphere" menu item.
 2016-10-19 17:33:05 -07:00
Anthony J. Thibault
bcd31e3d99 Adjust size and offset of grab balls to better align with hand controllers. 
(cherry picked from commit d97a8c2e7eace2494d3142e8187022a33aedc060)
 2016-10-19 15:59:26 -07:00
Brad Hefta-Gaub
c082c74cc0 use head pose for controller in case there are no hand controllers available 2016-10-18 10:01:00 -07:00
howard-stearns
140caf84d8 never interact with hud elements while holding something 2016-10-14 18:30:52 -07:00
howard-stearns
d232d115d5 persist tablet data, and clean it up on startup 2016-10-13 16:53:44 -07:00
howard-stearns
b377127fc1 make marketplace tablet be clientOnly 2016-10-12 14:46:04 -07:00
Brad Hefta-Gaub
93d9cf7917 adjust grab indicators 2016-10-11 12:42:26 -07:00
howard-stearns
03a8af76e3 don't do hand-controller edit object-selection when pointed at a HUD 
element
 2016-09-14 12:02:33 -07:00
Seth Alves
e5e9bb0052 Merge branch 'master' of github.com:highfidelity/hifi into grab-point-adjustments 2016-09-14 11:28:10 -07:00
David Rowe
fe8b3b4d0d Merge branch 'master' into 21040 2016-09-13 09:12:47 +12:00
David Rowe
487cb7d893 Use findInFrustum in entities list and filter results per search radius 2016-09-09 18:58:38 +12:00
Seth Alves
9e99cc1f78 fix mod.js 2016-09-08 07:35:52 -07:00
David Rowe
28cfca993f Add and wire up "search in view" JavaScript API stub 2016-09-08 14:58:48 +12:00
David Rowe
7d6ab77c16 Merge branch 'master' into 21040 2016-09-08 11:30:19 +12:00
Seth Alves
746d0cd91c get various hand lasers to all line up with grab-point sphere 2016-09-07 16:10:37 -07:00
Anthony J. Thibault
9f0550ea7e Raised dpi of WebTablet to fit 480 width keyboard 2016-09-07 10:59:54 -07:00
SamGondelman
88d0aa3737 removed showButtonDown, which didn't exist 2016-09-06 17:36:55 -07:00
David Rowe
c44bd902c3 Display render info values only if provided 2016-09-03 13:07:40 +12:00
David Rowe
980df19db1 Merge branch 'master' into 21040 
Conflicts:
	libraries/entities/src/EntityItemProperties.cpp
 2016-09-03 11:38:27 +12:00
Anthony J. Thibault
0f42943bfb Marketplace tablet is a bit larger and lower DPI. 
Bug fix for grabbing/equipping large objects, they no longer will drop immediately
if your grab point is too far away from the grabbed entity position.
 2016-08-29 11:55:04 -07:00
David Rowe
0d1daecf12 Provide count of textures for entity items 2016-08-27 12:13:34 +12:00
David Rowe
1147adae78 Add columns in entity list for render performance information 2016-08-26 15:16:23 +12:00
Anthony J. Thibault
c6ea64926c Sensor space entity support 
You can do this by parenting an entity to an avatar's -2 joint index.
This will mean that the entity will follow the avatar as it moves in the world, but
will not follow the avatar's position as it moves in sensor space.  Essentially, this
gives you the ability to place objects in the user's physical room.

WebTablets now are located in this feature and no longer jitter.
 2016-08-23 10:13:06 -07:00
Anthony J. Thibault
af2c31f29b Renamed WebBuddy to WebTablet 2016-08-23 10:10:29 -07:00
Anthony J. Thibault
eafae1fcf3 Added tablet shell around web-buddy 2016-08-23 10:10:28 -07:00
Anthony J. Thibault
31ed378dbf Added dpi entity property for web-entities 2016-08-23 10:10:26 -07:00
Anthony J. Thibault
6704ae9ad4 Added dpi parameter to userData (this is temporary) 2016-08-23 10:09:17 -07:00
Anthony J. Thibault
9bafd82b2c marketplace now pops up a marketplace web entity 2016-08-23 10:09:16 -07:00
SamGondelman
b23d3cd35a fixed messed up transparency on edit selection of shapes 2016-08-05 18:35:16 -07:00
Brad Davis
091e798267 Make hand pointer lasers 'click' on fully pressing and clicking the vive controller 2016-07-14 10:30:35 -07:00
howard-stearns
b8e6572ebf basic hand-controller editing 2016-07-05 17:00:54 -07:00
Ryan Downe Karpf
873b57219a Merge pull request #8167 from hyperlogic/feature/equip-hotspots 
equip-hotspots feature
 2016-07-01 09:55:49 -07:00
Brad Davis
dfb6cb1aa3 Updating entity list 2016-06-30 14:25:36 -07:00
Anthony J. Thibault
43d4dba4c0 iterate over hotspots not entities. 
This makes it possible to render multiple hotspots per entity.
Also, it will use the same logic to decide how to deal with overlapping entity
equip hotspots.
 2016-06-29 13:53:07 -07:00
Anthony J. Thibault
1b98c73473 WIP, equip-points work but they don't use the proper attach point. 2016-06-29 13:53:06 -07:00
Brad Hefta-Gaub
1af455b8b9 Merge pull request #8135 from SamGondelman/fixEditLockHMD 
Prevent entering independent camera mode through edit.js in HMD mode
 2016-06-27 15:50:25 -07:00
SamGondelman
d5feac94f4 coding standard fun 2016-06-24 16:23:15 -07:00
SamGondelman
5e69af83c6 can't enter independent mode through edit.js in HMD mode 2016-06-24 16:23:15 -07:00
Anthony J. Thibault
2a82dddc2b Draw attach points as if they were equip-hotspots 2016-06-21 17:36:36 -07:00
David Rowe
b6cb5617d3 Save toolbar position when moving it only when stopped moving it 2016-06-05 08:55:27 +12:00
Seth Alves
419c744bd4 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-19 09:49:18 -07:00
howard-stearns
acb56d0603 Larger edit handles, and more tolerance in click (vs drag). 2016-05-16 12:35:05 -07:00
Seth Alves
73c06b3bf4 updating attachedEntitiesManager to work with new system 2016-05-11 14:13:08 -07:00
Brad Hefta-Gaub
5314755e0d Merge pull request #7782 from ctrlaltdavid/20898 
Automatically upgrade toolbar position to bottom center of window
 2016-04-28 16:37:34 -07:00
James B. Pollack
795d866da9 re add locking/visibility tools to edit.js 2016-04-28 13:29:54 -07:00
David Rowe
1cf53829d3 Fix upgrading for all toolbar buttons 2016-04-29 08:20:20 +12:00
David Rowe
b7188bad30 Automatically upgrade toolbar position to bottom center of window 2016-04-29 07:13:56 +12:00
James B. Pollack
06171f6063 move default to system 2016-04-26 14:47:02 -07:00