Commit graph

283 commits

Author SHA1 Message Date
David Rowe
8205b0d9d2 Merge branch 'master' into vr-edit-a 2017-08-31 15:45:15 +12:00
howard-stearns
5b264a867a fix wallet login (and share code with snapshot login) 2017-08-29 16:05:01 -07:00
SamGondelman
4a49801217 web overlays and entities are always nonAA 2017-08-24 14:23:21 -07:00
David Rowe
cddb054066 Merge branch 'master' into vr-edit-h
# Conflicts:
#	libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
#	scripts/system/controllers/handControllerGrab.js
2017-08-20 18:41:29 +12:00
druiz17
8eabf46a30 Merge pull request #11165 from 1P-Cusack/FogBugz/Case_6491_Part1
[Case 6491] Part 1 of entitySelectionTool clean up
2017-08-16 13:05:27 -07:00
LaShonda Hopper
cc2ff565ac [Case 6491] Ran lint on entitySelectionTool.js (details below).
Prior Issue Count: 35
Current Issue Count: 3

Resolved:
* 17 used out of scope issues.
* 11 already defined issues.
* 2 missing semicolon issues.
* 1 implicit comparison against null issue.
* 1 readability warning.

Remaining Issues as of this commit:
* 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

One notable item was a chunk of code from makeStretchTool's onMove
function which wasn't in scope of the vars being utilized.

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
2017-08-16 15:21:30 -04:00
LaShonda Hopper
48e327815d [Case 6491] Resolves arg order to centerToZero and centerToIntersection vectors.
Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
2017-08-09 11:38:44 -04:00
David Rowe
f88191b7b3 Merge branch 'master' into vr-edit-a 2017-08-08 16:43:20 +12:00
beholder
06c9378b03 fix for 6760: Create Mode turns to Portrait when Reopening tablet 2017-08-05 04:07:04 +03:00
David Rowe
52bb4a0f77 Merge branch 'master' into vr-edit-a 2017-07-27 20:37:46 +12:00
David Rowe
450badf023 Merge branch 'master' into vr-edit-a 2017-07-25 12:21:49 +12:00
Mike Moody
036a16c0b3 readded line that caused colflict. 2017-07-24 16:51:23 -07:00
Mike Moody
697830b80b Merge branch 'master' of git://github.com/highfidelity/hifi into 21374 2017-07-24 16:50:38 -07:00
Mike Moody
4c78fba2cc Removed line that caused colflict. 2017-07-24 16:50:33 -07:00
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
David Rowe
c57b51235e Merge branch 'master' into vr-edit-a
# Conflicts:
#	scripts/system/controllers/handControllerGrab.js
2017-07-19 18:56:04 +12:00
Dante Ruiz
f5abb4a090 trying new tablet position spwan 2017-07-17 23:18:16 +01:00
David Rowe
283976fd87 Merge branch 'master' into vr-edit-a 2017-07-11 14:51:25 +12: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
David Rowe
a863e37eb5 Communicate VR edit enabled state to hand controller script 2017-06-30 12:11:06 +12: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