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
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
