Faye Li
5bed68ac4c
button toggle
2017-01-24 14:56:58 -08:00
Faye Li
95a92fc5eb
added tablet button
2017-01-24 14:42:28 -08:00
Anthony J. Thibault
432bb27119
The tablet Help button should be active if window is visible
2017-01-23 18:37:08 -08:00
Anthony J. Thibault
e30d77eba1
Tablet goto button now properly tracks address bar shown state
2017-01-23 18:37:07 -08:00
Seth Alves
353b38286a
Merge pull request #9490 from hyperlogic/tablet-ui
...
For for Tablet Tilt and Oculus Touch A B buttons sending UINav events
2017-01-23 18:14:53 -08:00
Seth Alves
3496e4cc7a
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-23 16:50:41 -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
f2ff6fd9e7
allow stylus to work when edit.js is running
2017-01-23 15:52:40 -08:00
Ryan Downe Karpf
3f151cb3d7
Merge pull request #9483 from Atlante45/fix/rescale
...
Fix Edit.js rescale for decimal values
2017-01-23 15:44:10 -08:00
Ryan Downe Karpf
e080746990
Merge pull request #9481 from huffman/fix/edit-collision-names
...
Update the name of the collision shapes used in edit.js properties
2017-01-23 15:10:01 -08:00
Seth Alves
9d77e9937c
only make the last cm of the stylus active to avoid accidently closing tablet when grabbing base
2017-01-23 14:38:48 -08:00
Atlante45
a1962e274d
Fix rescale for 0.x values
2017-01-23 14:35:16 -08:00
Ryan Huffman
f6d5a59c8a
Fix width of edit.js dropdown to accomodate collision options
2017-01-23 14:18:56 -08:00
Ryan Huffman
d108fabd0b
Update the name of the collision shapes used in edit.js properties
...
Update the names to be consistent with what is shown on the add model
dialog.
2017-01-23 13:56:48 -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
Dante Ruiz
d5427f8722
close tablet bug fix
2017-01-23 17:33:33 +00:00
humbletim
d20ac20ff2
move isInEditMode guard to setState
2017-01-23 01:31:11 -05: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
5c55b86be6
fix bug
2017-01-21 01:56:06 +00:00
Dante Ruiz
41bf65ed5e
home button improvments
2017-01-20 16:35:41 -08:00
Seth Alves
87ea9161e4
avoid bad interaction between far-grab and equip
2017-01-20 14:49:49 -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
7f25135633
try again on haptics from touching tablet overlay with stylus
2017-01-20 11:06:35 -08:00
Dante Ruiz
672deb903c
correct switch icons
2017-01-20 10:34:09 -08: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
Seth Alves
c492319be2
merge from upstream
2017-01-20 10:14:11 -08:00
Seth Alves
caae804318
re-enable haptic pulse when stylus touches tablet overlay
2017-01-20 10:12:15 -08:00
Ryan Downe Karpf
03851d4188
Merge pull request #9441 from davidkelly/dk/makeUsSomeAnalytics
...
Some initial analytics for PAL usage
2017-01-20 08:30:46 -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
David Kelly
5adc2cc593
Couple improvements
...
Only send one message when gain is changed. Eliminated the bool and
now just sending un-personalMute, etc...
2017-01-19 17:22:39 -08:00
Dante Ruiz
e1c2c73e5f
clean up
2017-01-20 01:04:14 +00:00
Dante Ruiz
a319db3cb4
removed duplicate code
2017-01-20 00:57:48 +00:00
Dante Ruiz
1e7e4576cc
comparing with ID instead of strings
2017-01-19 16:38:55 -08:00
Anthony J. Thibault
2c3c96b600
Fix for broken entity scrolling introduced by 23ea65e2
...
this.grabbedEntity was being cleared before entityTouchingExit transition could send the release event.
2017-01-19 14:23:43 -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
Zach Fox
64ef3d5665
Merge pull request #9426 from zfox23/PAL_AdminLabel
...
PAL: Admin Labels, Updated Letterboxes
2017-01-19 13:48:05 -08:00
Seth Alves
18e9b476c5
Merge pull request #9439 from hyperlogic/tablet-ui
...
Improved stylus and laser input deadspot
2017-01-19 12:43:02 -08:00
David Kelly
d9fbf832e2
Some initial analytics for PAL usage
2017-01-19 11:35:17 -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
Zach Fox
534fcd9399
Potential fix
2017-01-19 10:20:36 -08:00
Seth Alves
0e9ff7f7fc
make tablet be an avatar-entity
2017-01-19 10:12:06 -08:00
Seth Alves
eb25e1c12d
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-19 09:41:49 -08:00
Chris Collins
601223aa98
Merge pull request #9402 from ctrlaltdavid/clara-tidying
...
Remove a line of old code in Clara.io download
2017-01-19 09:15:58 -08:00
