Commit graph

257 commits

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