Atlante45
e54e35fbbe
Temporarily remove AvatarList from EntityScriptServer
2017-01-24 11:49:54 -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
Ryan Huffman
fcaca8930a
Fix enum name in EntityScriptServer
2017-01-24 08:31:58 -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
Zach Pomerantz
39acba5455
throttle audio streams by count using PI controller
2017-01-23 21:30:41 -05: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
Howard Stearns
f3956b3fb0
Merge pull request #9477 from howard-stearns/minimum-edit-entity-filter
...
Minimum edit entity filter
2017-01-23 18:04:52 -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
Stephen Birarda
479aa93ab2
Merge pull request #9480 from birarda/bug/web-entity-safe-url
...
cleanup debug for safe web entity URLs
2017-01-23 16:53:07 -08:00
Brad Hefta-Gaub
e4c59472ee
Merge pull request #9468 from kencooke/audio-mixformat-float
...
Fix another audio failure
2017-01-23 16:52:54 -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
Stephen Birarda
9229a07f6a
avoid failing scheme check
2017-01-23 16:46:59 -08:00
ZappoMan
0655b47dd7
fix warnings
2017-01-23 16:44:55 -08:00
Stephen Birarda
7362bf16c1
use isParentOf to check script whitelist, clarify description in settings
2017-01-23 16:44:28 -08:00
ZappoMan
efdc82f194
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-23 16:39:42 -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
Ryan Huffman
f0f5f8871c
Fix Overlay-as-child of model entity with reg point
...
This fixes as issue where when you set the parent of an overlay to be a
model entity with a non-(0.5, 0.5, 0.5) registration point, the overlay would
still be positioned relative to the center of the model. The issue is
that the default parent joint index was 0, which is the center of the
model.
Entities had a default parent joint index of -1 (technically 65535
because it is a uint16). Avatars previously defaulted to 0, and that is
maintained here.
2017-01-23 16:08:01 -08:00
ZappoMan
6801099cd9
more cleanup
2017-01-23 16:03:07 -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
howard-stearns
ada685a376
cr changes
2017-01-23 15:31:55 -08:00
Faye Li Si Fi
f8162970ec
filter out yourself from user list
2017-01-23 15:24:33 -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
ZappoMan
81b5a3c585
more cleanup
2017-01-23 15:12:54 -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
ZappoMan
5f9f051c3c
more tweaks
2017-01-23 15:01:50 -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
Stephen Birarda
a8118e83ff
cleanup debug for safe web entity URLs
2017-01-23 13:54:43 -08:00
howard-stearns
24a9cf1f23
Merge branch 'edit-entity-filter' of https://github.com/highfidelity/hifi into minimum-edit-entity-filter
2017-01-23 13:52:39 -08:00
Seth Alves
c958314918
merge from upstream
2017-01-23 13:52:01 -08:00
Stephen Birarda
db398b7850
check URL host for script whitelist, not startsWith
2017-01-23 13:36:02 -08:00
ZappoMan
7ba41c72ef
cleanup debugAvatarMixer
2017-01-23 13:31:06 -08:00
