Seth Alves
c93d83dadd
update lasers when distance-scrolling a web entity/overlay
2017-01-10 16:41:07 -08:00
Dante Ruiz
0b3a7d90f1
removed committed code
2017-01-10 23:26:37 +00:00
Dante Ruiz
d0baa0e303
home button works with the stylus
2017-01-10 14:51:46 -08:00
druiz17
ad48e79053
Merge pull request #9346 from hyperlogic/tablet-ui
...
In desktop mode, tablet is in front of camera.
2017-01-10 14:48:15 -08:00
druiz17
85c143e64d
Merge pull request #9347 from sethalves/tablet-ui-grab-no-patch
...
remember previous parentID in the script and try to put it back when releasing
2017-01-10 14:08:08 -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 Thibault
e7a88b5a3c
Merge pull request #9343 from druiz17/menuApp
...
Moved the context menu to the tablet
2017-01-10 13:34:44 -08:00
Seth Alves
0fc1abc068
remember previous parentID in the script and try to put it back when releasing
2017-01-10 13:00:49 -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
Seth Alves
bff9e9be38
put back code that replaces previous parentID on release
2017-01-10 09:22:36 -08:00
Dante Ruiz
2fc76d64fd
clean up unused code and files
2017-01-10 09:13:46 -08:00
Dante Ruiz
6c51edec77
added context menu to tablet
2017-01-10 09:13:45 -08:00
Dante Ruiz
c99f897db1
first commit
2017-01-10 09:13:45 -08:00
Seth Alves
eb4a2b0af5
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-grab-no-patch
2017-01-10 09:13:34 -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
Seth Alves
61f0c56a36
remove code that remembers previous state in userData
2017-01-09 14:20:03 -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
Anthony J. Thibault
6794ed7cc4
Merge remote-tracking branch 'upstream/master' into tablet-ui
2017-01-09 10:37:46 -08:00
Seth Alves
fa803aebe9
use /~/ style to reference includes
2017-01-09 10:21:07 -08:00
Seth Alves
635dc0411c
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-grab-no-patch
2017-01-09 09:47:07 -08:00
Seth Alves
a9194e1bdb
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-grab-no-patch
2017-01-08 11:41:32 -08:00
Chris Collins
215659c695
Enabled the ability to have other marketplaces.
...
Enabled the ability to have other marketplaces.
2017-01-07 08:17:13 -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
20a84e7288
Merge pull request #9322 from sethalves/tablet-ui-reenable-web-lasers
...
Tablet ui reenable web lasers
2017-01-06 15:23:16 -08:00
Seth Alves
ad6175857d
Merge pull request #9328 from hyperlogic/tablet-ui
...
Allow Hifi.SoundEffect to be used in all qml
2017-01-06 15:21:08 -08:00
Anthony J. Thibault
0860c50a49
Allow Hifi.SoundEffect to be used in all qml
...
Including webEntities, webOverlays and the system tablet.
We might want to add this to enable spatial sound effects for the web keyboard.
2017-01-06 14:01:13 -08:00
Seth Alves
d32866c8cd
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-reenable-web-lasers
2017-01-06 13:32:47 -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
36c99a604b
Merge pull request #9319 from howard-stearns/edit-button-to-select-in-pal
...
Edit button to select in pal
2017-01-06 13:17:29 -08:00
Clément Brisset
48459be13c
Merge pull request #9312 from ZappoMan/fixMouseLasers
...
fix competition between seek mouse and lasers
2017-01-06 13:11:01 -08:00
howard-stearns
2f5f53c8e4
cr
2017-01-06 10:28:09 -08:00
howard-stearns
b149fa3d79
Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal
2017-01-06 10:21:22 -08:00
Howard Stearns
220880d6f8
Merge pull request #9311 from davidkelly/dk/prettierPAL
...
Somewhat prettier node overlays for PAL
2017-01-06 09:54:38 -08:00
Brad Hefta-Gaub
349f0763e5
Merge pull request #9310 from PhilipRosedale/chair
...
Simple chair script
2017-01-06 08:18:31 -08:00
David Kelly
a107b2f06e
lost my - sign
2017-01-06 08:44:22 -07:00
David Kelly
88ed96918a
Merge branch 'master' of github.com:highfidelity/hifi into dk/prettierPAL
2017-01-05 18:30:28 -07:00
David Kelly
4504b31c1d
Bugfix, plus minor cr stuff
...
Seems to solve the 'due north' issue - we now have the main overlay as
the sphere, and it is the only thing clickable. The model is no longer
clickable, so you cannot click clouds to select things. Prevents some
confusion when opaque objects have ignoreRayIntersection, allowing you
to select a cloud you cannot see (i.e clicking near but not on the
sphere you can see).
2017-01-05 18:20:40 -07:00
howard-stearns
83685740c4
change wording for common case
2017-01-05 16:37:40 -08:00
howard-stearns
f5c4535115
Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal
2017-01-05 16:29:34 -08:00
Seth Alves
4b3a5171d3
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-reenable-web-lasers
2017-01-05 15:43:46 -08:00
Seth Alves
2bff5582bc
Merge pull request #9321 from hyperlogic/tablet-ui
...
Made back button entity collisionless
2017-01-05 15:43:14 -08:00
