Commit graph

17272 commits

Author SHA1 Message Date
howard-stearns
4a6132874f encodeURIComponent of the protocol signature 2016-07-19 13:43:28 -07:00
howard-stearns
57955a2b56 Expose protocol version to qml, and use it in query. 2016-07-18 18:12:27 -07:00
howard-stearns
17e64cf5e6 suggest only unrestricted domains, and also use server to sort 2016-07-18 16:58:29 -07:00
howard-stearns
abb63139f6 Merge branch 'master' of https://github.com/highfidelity/hifi into suggestions 2016-07-18 16:29:49 -07:00
Howard Stearns
cf025072e1 Only consider "active" domains for all purposes (which on the back end means at least one person connected). 2016-07-16 09:50:56 -07:00
Brad Davis
03cb6175ab Support triangle and hexagon shapes, add shape support to overlays. 2016-07-15 22:02:17 -07:00
Howard Stearns
d446e1bcf5 Phone home with suggestions activity usage. 2016-07-15 19:15:58 -07:00
Brad Davis
9ebc0c28c8 Fix hover states for toolbar buttons 2016-07-15 17:12:49 -07:00
howard-stearns
f73c2b884d Remove now-superflous Column. 2016-07-15 17:01:37 -07:00
howard-stearns
b106dee3e9 Provide our own default image. 2016-07-15 16:52:13 -07:00
howard-stearns
f00114e53e Make it work with laser pointers (selection at least), and fix magic
numbers.
2016-07-15 16:46:20 -07:00
Brad Davis
317dee1b23 Fix decoration inflation 2016-07-15 16:15:53 -07:00
howard-stearns
99e9a76803 Merge branch 'master' of https://github.com/highfidelity/hifi into suggestions 2016-07-15 16:14:48 -07:00
howard-stearns
289617d4ce styling 2016-07-15 16:14:29 -07:00
howard-stearns
cc367f7b49 We don't need HorizontalSpacer.qml. 2016-07-15 14:56:31 -07:00
howard-stearns
562446e7b8 use AddressManager, rather than adding a trampoline to hostname in
AddressBarDialog.
2016-07-15 14:44:27 -07:00
howard-stearns
87e54482dd check pictures only for the domains that have someone in them, but use all
domains when filtering (occupied or no, picture or no).
Also, make darn sure we use default picture if no data.
2016-07-15 14:30:28 -07:00
Sam Gondelman
e24b064ccd Merge pull request #8244 from BingShearer/logrolling
Delete Old Interface Logs If the Sum Size of Those Logs Exceeds Reasonable Size
2016-07-15 14:14:44 -07:00
Bing Shearer
9ee64d114b Sam's space. 2016-07-15 13:47:36 -07:00
howard-stearns
6fb2cedfe0 card default image: settable, use to start, and reset when needed 2016-07-15 13:42:31 -07:00
Brad Hefta-Gaub
574aaa9f28 Merge pull request #8248 from jherico/edit_toolbar
Migrate edit.js toolbar to the new toolbar API
2016-07-15 12:42:13 -07:00
Brad Hefta-Gaub
7bb31fe075 Merge pull request #8240 from jherico/hand_controller
Menu & hand controller polish
2016-07-15 12:36:31 -07:00
howard-stearns
99e229467b Don't show the word "suggesions" when there aren't any. 2016-07-15 11:49:21 -07:00
howard-stearns
8faa961c8d all domains, not just the 'active' ones, which turns out to be defined as
having at least one person in it.
2016-07-15 11:41:00 -07:00
howard-stearns
e974bad8f0 Merge branch 'master' of https://github.com/highfidelity/hifi into suggestions 2016-07-15 10:36:19 -07:00
howard-stearns
ce99146733 filter by typing 2016-07-15 10:27:52 -07:00
Brad Davis
43e045c22a Restore mouseover events for items in windows 2016-07-14 17:40:05 -07:00
Brad Davis
a6d71f508e Fix edit toolbar button vanishing, persistent edit button 2016-07-14 17:40:04 -07:00
Brad Davis
fdcbf71623 Remove fade effect from toolbar buttons 2016-07-14 17:40:02 -07:00
Brad Davis
ffdaadf13c Make toolbars work even when debugging a script 2016-07-14 17:40:02 -07:00
Brad Hefta-Gaub
45aa78702c Merge pull request #8217 from sethalves/fix-throwing
fix throwing
2016-07-14 15:52:41 -07:00
howard-stearns
1c2d13d1ee Don't show where you are now. 2016-07-14 15:38:22 -07:00
howard-stearns
3132cca482 prototype 2016-07-14 14:49:03 -07:00
Bing Shearer
4fb9d8801c More coding standard fun! 2016-07-14 13:55:26 -07:00
Bing Shearer
9641ae8cd8 Coding standard fun! 2016-07-14 13:22:43 -07:00
Brad Davis
8d5b60a266 Simulate LTClick/RTClick for Oculus Touch and Hydra controllers 2016-07-14 12:30:17 -07:00
Brad Davis
882139ebcf Allow scripts to override the navigation focus state set by QML dialogs 2016-07-14 12:10:46 -07:00
Brad Davis
cdffb453c6 Trigger 'nav select' on the new trigger click signal, not any trigger value 2016-07-14 12:07:38 -07:00
Bing Shearer
be0446f9a9 Delete old logs if the sum size of those logs exceeds reasonable size. 2016-07-14 11:36:48 -07:00
Brad Davis
656da16c4d Remove highlight animation duration on menus 2016-07-14 10:30:36 -07:00
Brad Davis
091e798267 Make hand pointer lasers 'click' on fully pressing and clicking the vive controller 2016-07-14 10:30:35 -07:00
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