Dante Ruiz
a147ce3f5f
fixed load script issue
2017-01-25 08:00:41 -08:00
Dante Ruiz
096b2e876f
removing qml null print error
2017-01-25 08:00:40 -08:00
Seth Alves
d605ad0253
Merge pull request #9500 from sethalves/tablet-ui-close-tablet-upon-goto
...
Tablet ui close tablet upon goto
2017-01-24 16:05:24 -08:00
Seth Alves
b679d94585
remove commented-out code
2017-01-24 16:04:22 -08:00
Seth Alves
ced1b61b70
close rather than attempt to repair the tablet after a domain change
2017-01-24 16:03:22 -08:00
Seth Alves
827ae7ad4d
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-close-tablet-upon-goto
2017-01-24 15:50:12 -08:00
Seth Alves
601a35a9b6
try a different way of repairing tablet after a domain change
2017-01-24 15:49:49 -08:00
Seth Alves
de2335b13b
Merge pull request #9499 from fayeli/toggle-users-js
...
Porting Users.js into Tablet
2017-01-24 15:19:48 -08:00
Seth Alves
990c7e6b28
Merge pull request #9498 from hyperlogic/tablet-ui
...
Added username to tablet header
2017-01-24 15:19:16 -08:00
Faye Li
71b6096644
toggle menu item
2017-01-24 15:12:46 -08:00
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
bff0eeef75
Added username to tablet header
2017-01-24 14:31:57 -08:00
Seth Alves
19cf84dd5d
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-close-tablet-upon-goto
2017-01-24 12:49:47 -08:00
Anthony J. Thibault
d2f024e84d
Fix for "ReferenceError: globalPosition is not defined" warning
2017-01-24 11:40:20 -08:00
Seth Alves
e0779db1ab
Merge pull request #9494 from sethalves/tablet-ui
...
fix near-grab to equip handoff
2017-01-24 11:39:56 -08:00
Seth Alves
df9bc91f01
fix near-grab to equip handoff
2017-01-24 11:39:26 -08:00
Seth Alves
4de0b94b6c
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-close-tablet-upon-goto
2017-01-24 09:42:20 -08:00
Seth Alves
a28becfb1a
close tablet before changing domains
2017-01-24 09:42:12 -08:00
Seth Alves
48898f41b2
Merge pull request #9491 from hyperlogic/tablet-ui
...
Tablet Help and Goto Buttons bug fixes.
2017-01-23 20:04:10 -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
Anthony J. Thibault
0ab956a0c1
A and B buttons on oculus touch no longer trigger UI Nav events
2017-01-23 17:08:25 -08:00
Seth Alves
e3717f0fc5
Merge pull request #9489 from sethalves/tablet-ui
...
Tablet ui
2017-01-23 16:51:22 -08:00
Seth Alves
3496e4cc7a
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-23 16:50:41 -08:00
Seth Alves
9bf4cd7b8a
Merge pull request #9488 from sethalves/tablet-ui-close-tablet-upon-goto
...
Tablet ui close tablet upon goto
2017-01-23 16:50:12 -08:00
Seth Alves
281b7a6eca
close tablet anytime AddressManager::hostChanged fires
2017-01-23 16:49:05 -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
69252deb2e
close the tablet when going to a new domain
2017-01-23 16:28:56 -08:00
Seth Alves
200105c856
Merge pull request #9484 from hyperlogic/tablet-ui
...
UI navigation work with game pads
2017-01-23 16:01:45 -08:00
Seth Alves
d29abef9f5
Merge pull request #9485 from sethalves/tablet-ui
...
allow stylus to work when edit.js is running
2017-01-23 15:53:06 -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
Anthony J. Thibault
584a9a3c98
UI navigation work with game pads
...
The tablet UI can be long lived, unlike the previous VRMenu.
So instead of using a dynamic mapping that was only enabled when the VRMenu was shown, standard_navigation.json.
standard_navigation is always active. Also, standard_navigation.json has been changed.
Left and Right click and stick events never become UINav events. Only Dpad A, B, X, Y, LB and RB are mapped to UINav events.
2017-01-23 15:22:49 -08:00
Zach Pomerantz
445a97e07c
Merge pull request #9476 from zzmp/js/audio-injector-finished
...
Connect audio injector signal to scripting
2017-01-23 18:13:54 -05: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
613a88925d
Merge pull request #9482 from sethalves/tablet-ui-merge-upstream
...
Tablet ui merge upstream
2017-01-23 14:42:38 -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
cdb14e7662
put name of button-click file back
2017-01-23 13:55:11 -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
Clément Brisset
19622f86bf
Merge pull request #9475 from Atlante45/fix/injector-options
...
Fix invalid volume values in injector options silencing all injectors
2017-01-23 13:17:55 -08:00
Stephen Birarda
c8d505c482
Merge pull request #9474 from birarda/bug/web-entity-safe-url
...
use fromUserInput to avoid web entity crashes with bad URLs
2017-01-23 12:52:39 -08:00
Zach Pomerantz
cba0b295e8
connect audio injector signal to scripting
2017-01-23 15:09:08 -05:00
Stephen Birarda
f02832ca71
output the actual value set in WebEntityItem
2017-01-23 11:50:05 -08:00
Atlante45
3f8b2f9cbb
Fix invalid volume values in injector options
2017-01-23 11:49:07 -08:00
