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
ZappoMan
8ffd9412f3
cleanup simpleBot
2017-01-23 13:23:05 -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
ZappoMan
e0bad95257
some cleanup
2017-01-23 13:18:55 -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
1802e1520d
change some dynamic_cast to static_cast for DomainServerNodeData
2017-01-23 13:15:48 -08:00
Stephen Birarda
fb8d2e34fb
fix needless reinterpret_cast for DomainServerNodeData
2017-01-23 13:14:53 -08:00
ZappoMan
29fff2e556
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-23 13:09:59 -08:00
howard-stearns
0a4634446d
typo
2017-01-23 13:09:28 -08:00
howard-stearns
f34f90841d
example
2017-01-23 13:08:33 -08:00
ZappoMan
292d472a59
checkpoint - got first cut at distance based rotation tolerance working
2017-01-23 13:06:29 -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
3c9c78ae14
add threadcount to audio-mixer stats
2017-01-23 15:50:54 -05:00
howard-stearns
3358d58d01
Merge branch 'master' of https://github.com/highfidelity/hifi into minimum-edit-entity-filter
2017-01-23 12:21:32 -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
Stephen Birarda
d7651e9838
move value sanitizing to WebEntityItem
2017-01-23 11:45:21 -08:00
Stephen Birarda
99e0c8c0e7
use fromUserInput in web entity URL set to avoid crashable URLs
2017-01-23 11:37:54 -08:00
Zach Pomerantz
9605379265
Merge pull request #9472 from zzmp/cmake/revert-libquazipd
...
Revert "Use supplied libquazip5.so for Debug builds" for WIN32/OSX
2017-01-23 14:31:09 -05:00
Stephen Birarda
8c5c1f32a0
Merge pull request #9471 from birarda/bug/places-paths-anchor
...
fix Places / Paths anchor in domain settings
2017-01-23 10:31:37 -08:00
Seth Alves
882723d3a0
Merge pull request #9473 from sethalves/tablet-ui
...
Tablet ui
2017-01-23 10:14:57 -08:00
