David Rowe
4d35b7a736
Fix Clara marketplace button appearing on top of navigation footer
2016-12-20 07:43:48 -08:00
David Rowe
39d01b8755
Raise and lower keyboard on password fields
2016-12-20 07:43:48 -08:00
howard-stearns
8d300eac76
pal prototype
2016-12-20 07:43:48 -08:00
David Rowe
25651800dd
Code review
2016-12-20 07:43:48 -08:00
David Rowe
f9bd03dd56
Remove extra browse history item created by Clara download
2016-12-20 07:43:48 -08:00
Seth Alves
67093dc519
don't flutter tablet when menu button is pressed. start on a stylus
2016-12-20 07:43:48 -08:00
David Rowe
4ff3599351
Tidying
2016-12-20 07:43:48 -08:00
David Rowe
7a36e4eed8
Fix keyboard focus when switch highlight between overlays and entities
2016-12-20 07:42:21 -08:00
David Rowe
0accdddc8f
Fix Web overlay x, y coordinate calcs
2016-12-20 07:42:21 -08:00
David Rowe
f749c76ced
First pass at controller interaction with 3D Web overlay
2016-12-20 07:42:21 -08:00
David Rowe
be0ef820ff
Add "back" button to marketplaces footer
2016-12-20 07:40:28 -08:00
David Rowe
eef8c70f10
Remove e-mail message hyperlink if displaying on tablet
2016-12-20 07:40:28 -08:00
David Rowe
78c6441842
Inject navigation footer into Clara account createion page
2016-12-20 07:40:28 -08:00
David Rowe
6e0227f8f7
Improve text and robustness of marketplaces footer
2016-12-20 07:40:28 -08:00
David Rowe
2216ab6def
Delete redundant code
2016-12-20 07:40:28 -08:00
David Rowe
5843185683
Tidying
2016-12-20 07:40:28 -08:00
David Rowe
5fbdd64fff
Handle Clara marketplace downloads
2016-12-20 07:40:28 -08:00
David Rowe
0ef972c1e5
Inject Clara Web page modifications
2016-12-20 07:40:28 -08:00
David Rowe
2db0b4dc59
Fix navigation bar and opaqueness of Web page
2016-12-20 07:40:28 -08:00
David Rowe
bebedd8e51
Add JavaScript event bridge for Web 3D overlay
2016-12-20 07:40:28 -08:00
David Rowe
767b3ea8e9
Add script injection to Web 3D overlay
2016-12-20 07:40:28 -08:00
David Rowe
beddad5807
Fix Web tablet screen size
2016-12-20 07:40:08 -08:00
David Rowe
1a970dbd79
Use overlay instead of entity to display tablet Web content
2016-12-20 07:38:25 -08:00
David Rowe
4bc1616c07
Fix up navigation footer fonts
2016-12-20 07:33:55 -08:00
David Rowe
fd24d12bc1
Add navigation bar to marketplace pages
2016-12-20 07:33:55 -08:00
David Rowe
57ca34f866
Fix up script injection methods
2016-12-20 07:33:55 -08:00
David Rowe
ef488ec036
Get script injection working in new marketplaces window
2016-12-20 07:33:55 -08:00
David Rowe
4dbbb08c98
Update user instructions
2016-12-20 07:33:55 -08:00
David Rowe
196473f9fa
Provide keyboard in marketplaces window
2016-12-20 07:33:55 -08:00
David Rowe
1c6cb9f905
Tidying
2016-12-20 07:33:55 -08:00
David Rowe
9dbcb94a0c
Update Clara.io instructions
2016-12-20 07:33:55 -08:00
Chris Collins
61c60fca2d
Merge pull request #8968 from ctrlaltdavid/21089
...
Clara.io marketplace improvements
2016-12-19 18:21:45 -08:00
Dante Ruiz
fc4b4f85f4
added button to menu
2016-12-20 00:24:45 +00:00
Dante Ruiz
c0e82d3e05
moving buttons to tablet
2016-12-19 13:43:49 -08:00
Anthony J. Thibault
10f9233c90
Fixed js interface after recent Tablet.qml changes
...
* TabletButton.inDebugMode defaults to false
* TabletButton now listens to onIsActiveChanged event to flip state of button.
* Fixed help.js and tabletTest.js to compensate for the removal of the TabletButton.color property
2016-12-19 12:20:56 -08:00
Zach Fox
e940daf5b4
Comments and clarity
2016-12-19 10:20:08 -08:00
Zach Fox
aa837d8858
It's working! Untested on human avatars.
2016-12-19 10:20:08 -08:00
Zach Fox
2c5db54b08
Super close
2016-12-19 10:20:08 -08:00
Zach Fox
802e283508
Another checkpoint, getting closer
2016-12-19 10:20:08 -08:00
Zach Fox
c9dc91900f
Checkpoint
2016-12-19 10:20:08 -08:00
Ryan Huffman
9730d07f59
Cleanup tutorial scripts
2016-12-16 16:01:44 -08:00
Ryan Huffman
46d8130782
Cleanup variable naming in touch controller config
2016-12-16 16:01:26 -08:00
Ryan Huffman
009c982cdf
Cleanup implementation of touch controller config
2016-12-16 15:05:17 -08:00
Ryan Huffman
19a3fdcc01
Update Touch controller configuration
2016-12-16 15:05:17 -08:00
Ryan Huffman
f7ebda6931
Fix positioning of Oculus Touch controller visual
2016-12-16 15:05:17 -08:00
Ryan Huffman
b599ccea9e
Remove cache buster from touchControllerConfiguration
2016-12-16 15:05:17 -08:00
Ryan Huffman
188bf600d1
Fix oculus touch labels in tutorial
2016-12-16 15:05:17 -08:00
Ryan Huffman
46251e805a
Update oculus touch labels to be emissive
2016-12-16 15:05:17 -08:00
Ryan Huffman
46f5494af8
Fix emissive channel on touch models
2016-12-16 15:05:17 -08:00
Ryan Huffman
3df1819086
Fix right touch joystick
2016-12-16 15:05:17 -08:00
Ryan Huffman
2b88935812
Reenable disabling of hand controllers
2016-12-16 15:05:17 -08:00
Ryan Huffman
6fb39080e2
Update controller display to support non-string hardware resolution
2016-12-16 15:05:17 -08:00
Ryan Huffman
674bbe7de5
Add touch controller support to ControllerDisplay
2016-12-16 15:05:17 -08:00
Dante Ruiz
61e2fb2366
correct indentation for HomeButton.js
2016-12-16 21:51:01 +00: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
9459b967be
Merge branch 'master' into 21089
2016-12-16 20:02:43 +13:00
David Rowe
3d6fe6efe8
Move Clara download button when displaying on tablet
2016-12-16 14:58:22 +13:00
David Rowe
18a3555453
Fix flash of old desktop window content if reopen after closing with "x"
2016-12-16 12:21:32 +13:00
David Rowe
04aef641c5
Fix auto-downloads not happening after forced log in
2016-12-16 11:45:17 +13:00
David Rowe
a7e0135a6a
Continuously update Clara pages because content can change dynamically
2016-12-16 11:28:34 +13:00
Howard Stearns
ba8b585368
Merge pull request #9202 from howard-stearns/pal-proto
...
People Action List prototype
2016-12-15 13:56:12 -08:00
Anthony J. Thibault
8b99fa90e8
Merge branch 'master' into tablet-ui
2016-12-15 13:28:23 -08:00
Brad Hefta-Gaub
0923a79139
Merge pull request #9187 from PhilipRosedale/rescale
...
Rescale yourself or entities using the grip buttons
2016-12-15 12:32:04 -08:00
howard-stearns
0e81e71325
fix selection and hud-hiding issues
2016-12-15 11:00:32 -08:00
David Rowe
861ce2c27b
Reduce whitespace in Clara categories
2016-12-15 20:33:43 +13:00
Anthony J. Thibault
d2c4417b24
Hook up Help button to the new Tablet interface
2016-12-14 17:05:47 -08:00
Philip Rosedale
14c867fdbd
Can't resize if objects in both hands, avatar resize is seek + grips
2016-12-14 13:38:37 -08:00
Zach Fox
c53111781b
Fix the bug
2016-12-14 12:17:00 -08:00
howard-stearns
66e2c651c6
clean up avatar nodes properly (and add some logging)
2016-12-14 11:26:33 -08:00
Howard Stearns
d5c219a761
deal with bubble-bounces (and comment the code a bit)
2016-12-13 19:52:27 -08:00
David Rowe
eb7b2dbdcf
Improve robustness of navigation footer
2016-12-14 15:07:06 +13:00
David Rowe
2b0529bcea
Inform user if can't do Clara.io download because can't write to ATP
2016-12-14 14:45:33 +13:00
howard-stearns
a50b731faa
fix broken search for myself
2016-12-13 16:52:18 -08:00
howard-stearns
03d3e0b550
Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto
2016-12-13 16:03:00 -08:00
howard-stearns
b0547750b0
people.svg
2016-12-13 15:53:45 -08:00
howard-stearns
adbfa0752a
no debug printing
2016-12-13 15:09:46 -08:00
howard-stearns
c9827d1521
checkpoint
2016-12-13 15:05:08 -08:00
howard-stearns
86010af828
checkpoint
2016-12-13 13:01:45 -08:00
Jazmin
b7b4c685e7
Fixed typo
2016-12-13 11:48:06 -08:00
Jazmin
4effdd0394
Update Bubble model in script
2016-12-13 11:46:40 -08:00
Jazmin
0a031e204e
Delete old bubble model
2016-12-13 11:46:22 -08:00
Jazmin
efc9f6549b
Add new bubble model
2016-12-13 11:45:50 -08:00
Jazmin
d9fbde2f66
Update bubble height
...
This height allows my friends to stay in my view comfortably, even when the space bubble is on. Even though it's significantly lower, I don't think anyone is not going to look down when someone starts to shrink down in front of them.
2016-12-13 11:43:09 -08:00
Howard Stearns
7c92ad5ced
checkpoint
2016-12-13 09:15:28 -08:00
David Rowe
4890e92733
Start at HiFi marketplace page instead of directory page
2016-12-14 00:12:52 +13:00
David Rowe
8195393205
Fix Clara marketplace button appearing on top of navigation footer
2016-12-13 22:54:19 +13:00
David Rowe
20623ebddb
Raise and lower keyboard on password fields
2016-12-13 22:48:17 +13:00
David Rowe
1f3045ad30
Merge branch 'master' into 21089
...
Conflicts:
interface/src/Application.cpp
2016-12-13 14:05:24 +13:00
howard-stearns
712543a39a
Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto
2016-12-12 16:37:41 -08:00
howard-stearns
4b5aae3c55
pal prototype
2016-12-12 16:37:16 -08:00
Seth Alves
16128f5087
Merge pull request #9191 from druiz17/homeButton
...
Home button prototype
2016-12-12 16:27:06 -08:00
Seth Alves
d97be52542
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2016-12-12 16:24:17 -08:00
David Rowe
efb784f703
Code review
2016-12-13 13:11:21 +13:00