Ryan Huffman
e18d664204
Merge pull request #8238 from hyperlogic/bug-fix/jumbo-fish
...
Support for scale property on model overlays
2016-07-14 05:22:56 -07:00
Anthony J. Thibault
789297d849
Remove redundant isValid check.
2016-07-13 17:39:39 -07:00
Anthony Thibault
1d77cec125
Support for scale property on model overlays
...
If "scale" property is present but "dimensions" are not, the model is NOT scale to fit.
And the scale of the model's natural dimensions will be affected by the scale properties.
If only the "dimensions" property is present, the model will "scale to fit" the dimensions.
If both properties are present, the model still be "scale to fit" but the dimension will be scaled by the scale factor.
For example:
If a model is loaded that is 2cm tall, is loaded with no "dimensions" or "scale" properties.
It will be displayed as 2cm tall.
{"scale": 2}
The above properties will result in a model that is 4cm tall.
{"dimensions": 1}
This will result in a model that is 1cm tall.
{"scale": 2, "dimensions" 2}
Will result in a model that is 2cm tall.
2016-07-13 16:09:56 -07:00
Stephen Birarda
345478eb36
add removeButton API to ToolbarScriptingInterface
2016-07-13 15:06:31 -07:00
Stephen Birarda
609900f246
move ignore set handling to NodeList
2016-07-13 15:06:31 -07:00
Stephen Birarda
6b6513d5f9
immediately fade out ignored avatars
2016-07-13 15:06:31 -07:00
Stephen Birarda
bb68e777e6
add a scripting interface to ignore users
2016-07-13 15:06:31 -07:00
Brad Hefta-Gaub
487aacde3c
Merge pull request #8216 from huffman/feat/improved-domain-loading
...
Update max request limit and number of processing threads
2016-07-13 14:47:24 -07:00
Brad Hefta-Gaub
f8910d475e
Merge pull request #8225 from ZappoMan/codecPlugins
...
Audio codec plugins
2016-07-13 14:47:03 -07:00
Ryan Huffman
fcd59ea94f
Update target number of processing threads to be based on system
2016-07-12 17:44:23 -07:00
Brad Davis
6336362d40
Fixing decoration inflation
2016-07-12 17:23:13 -07:00
Brad Davis
f2220288fb
Expand frame decoration when mouse is over a window in HMD mode
2016-07-12 16:40:53 -07:00
Brad Hefta-Gaub
c4dba51337
Merge pull request #8226 from jherico/2d_glow
...
Add glow to UI hand lasers and termination points
2016-07-12 16:21:19 -07:00
Brad Hefta-Gaub
9fcecb6277
Merge pull request #8204 from hyperlogic/bug-fix/avatar-url-and-model-name-access-from-js
...
Fix MyAvatar name and url accessors.
2016-07-12 15:30:06 -07:00
Brad Hefta-Gaub
b8d79ec263
Merge pull request #8179 from SamGondelman/snapshotFix3
...
Various snapshot improvements
2016-07-12 15:28:51 -07:00
Brad Hefta-Gaub
819cab4aab
Merge pull request #8158 from sethalves/raypick-avatars
...
Raypick avatars
2016-07-12 15:27:30 -07:00
Brad Hefta-Gaub
84dfe1b0e9
Merge pull request #8219 from jherico/circles
...
Support alpha and color gradients in circle overlays
2016-07-12 15:25:49 -07:00
Brad Davis
6242816f68
Adding glow to hand lasers
2016-07-12 10:10:01 -07:00
Seth Alves
85cc5f8956
Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars
2016-07-11 18:02:18 -07:00
James B. Pollack
27f70e9d52
finish merge
2016-07-11 15:13:25 -07:00
Brad Hefta-Gaub
bcee128de0
Merge pull request #6959 from Triplelexx/20769
...
CR for Job #20769 - Touchscreen camera input for Interface
2016-07-11 14:24:52 -07:00
Brad Hefta-Gaub
f3f72f3c93
Merge branch 'master' of https://github.com/highfidelity/hifi into codecPlugins
2016-07-11 13:15:27 -07:00
Seth Alves
52a7c8e032
Merge branch 'feature/grab-script-polish' of github.com:hyperlogic/hifi into refresh-feature/grab-script-polish
2016-07-11 10:09:07 -07:00
Brad Davis
2c72037e81
Fixing warnings
2016-07-09 20:43:31 -07:00
Brad Davis
31948bce2d
Support alpha and color gradients in circle overlays
2016-07-09 20:43:30 -07:00
Seth Alves
5c69e55475
Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars
2016-07-08 17:43:52 -07:00
Clément Brisset
f7b3155178
Merge pull request #8213 from birarda/long-script-name
...
Interface changes for new Marketplace
2016-07-08 16:57:25 -07:00
Stephen Birarda
11aafc0f48
use endsWith for scriptURL check
2016-07-08 16:00:06 -07:00
Stephen Birarda
43967dc9a6
handle running of non .svo.json JSON files from mp CDN
2016-07-08 15:47:56 -07:00
Ryan Huffman
489d2e4ca5
Update max request limit and number of processing threads
2016-07-08 15:33:11 -07:00
Stephen Birarda
5bce924eda
keep signature for askToLoadScript
2016-07-08 14:34:42 -07:00
Anthony J. Thibault
9242147394
Merge branch 'master' into feature/grab-script-polish
2016-07-08 13:40:01 -07:00
Brad Hefta-Gaub
d78eb19e44
Merge pull request #8194 from jherico/glow_lines
...
Support for glowing 3D line overlays
2016-07-08 12:50:35 -07:00
Anthony J. Thibault
1ec3472230
Model overlay dimensions fixes
...
At the moment model overlays will ALWAYS scale to fit their dimensions
Update handControllerGrab to account for this behavior.
2016-07-08 11:36:43 -07:00
Stephen Birarda
216e47b29a
hide the long URL prefix of scripts from marketplace
2016-07-08 09:43:11 -07:00
Brad Davis
829a871d6f
Merge pull request #8208 from SamGondelman/qmlFixes
...
Fixed issues in Browser.qml and UpdateDialog.qml
2016-07-07 19:51:37 -07:00
Seth Alves
11542aeca2
pick against avatar's capsule and then against the T-pose mesh
2016-07-07 16:36:25 -07:00
Brad Hefta-Gaub
4c100ecc95
Merge pull request #8203 from jherico/zorder
...
Ensure newly shown windows are popped to the top of the zorder
2016-07-07 16:14:50 -07:00
SamGondelman
99fc472d77
fixed errors in Browser.qml and UpdateDialog.qml
2016-07-07 14:06:57 -07:00
Brad Davis
828be94089
Fix rendering of overlay spheres with alpha
2016-07-07 14:04:59 -07:00
Brad Davis
8ca3630cfa
Support glow effect in 3D line overlays
2016-07-07 13:36:48 -07:00
Anthony J. Thibault
aba6924dc7
Fix MyAvatar name and url accessors to JS.
...
Q_INVOKABLE does not support returning references.
MyAvatar.getFullAvatarURLFromPreferences() now returns a QUrl instead of a reference.
MyAvatar.getFullAvatarModelName() now returns a QString instead of reference.
This should fix the JS API for these methods, they will now receive a JS string instead of undefined.
2016-07-07 13:33:36 -07:00
Brad Davis
23700dc90f
Ensure newly shown windows are popped to the top of the zorder
2016-07-07 13:16:59 -07:00
Ryan Huffman
d2fedee656
Add missing loading images for Asset Browser
2016-07-07 10:22:52 -07:00
Seth Alves
6786a07ac2
Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars
2016-07-07 09:53:24 -07:00
Brad Hefta-Gaub
ac2d3e1cc7
Merge branch 'master' of https://github.com/highfidelity/hifi into codecPlugins
2016-07-07 09:47:19 -07:00
Brad Hefta-Gaub
abcd1e0062
Merge pull request #8164 from SamGondelman/macHMDPreview
...
Added Mac preview image if VSync is enabled
2016-07-07 09:01:40 -07:00
James B. Pollack
3c3bad4d3b
Merge remote-tracking branch 'upstream/master' into viveteleporter
2016-07-07 01:36:39 -07:00
SamGondelman
d05a27e0e6
embed image locally
2016-07-06 17:27:53 -07:00
Brad Hefta-Gaub
41a74f7652
Merge pull request #8193 from huffman/fix/model-overlay-dims
...
Fix model overlays not correctly scaling
2016-07-06 16:17:22 -07:00
