Thijs Wenker
74ce98a075
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarDoctor
2019-02-15 20:57:20 +01:00
Thijs Wenker
556a55ff16
Better scale and texture checks
2019-02-15 20:55:27 +01:00
Simon Walton
748747da2d
Merge pull request #14864 from SimonWalton-HiFi/pal-sort-loudness-persist
...
Case 19724: If sorting PAL by loudness re-sort upon loudness updates
2019-02-15 09:24:34 -08:00
Bradley Austin Davis
d45d87031d
Merge pull request #14782 from SamGondelman/NOverlaysFinal
...
Case 20723, Case 20334: Internally, replace all overlays with local entities
2019-02-14 13:49:47 -08:00
Sam Gateau
969c62d0df
Merge pull request #14907 from danteruiz/fix-qml-crash-on-mac
...
Case 21157: Fix Desktop.qml crash on local mac build
2019-02-14 12:15:50 -08:00
Thijs Wenker
3026fd625a
Avatar Doctor
2019-02-14 18:52:50 +01:00
danteruiz
562e159ab4
the proper fix for browser qml issues
2019-02-13 10:45:07 -08:00
danteruiz
a111aa1724
fix blocks app
2019-02-12 16:45:45 -08:00
Shannon Romano
10e5e9e0c3
Merge pull request #14900 from MarkBrosche/avatarAppKeyboardFix
...
Fixed MS21059: Avatar App Keyboard Raise in Desktop
2019-02-12 15:02:28 -08:00
Dante Ruiz
5e9b63b352
fix-qml-crash-on-mac
2019-02-12 13:56:56 -08:00
Mark
9d81ace243
Fixed MS21059: Avatar App Keyboard Raise in Desktop
2019-02-12 09:45:51 -08:00
Simon Walton
73296aa986
Change update rate to 1 Hz
2019-02-11 16:59:18 -08:00
Simon Walton
4f2223ced3
Change max update to 10 Hz
2019-02-11 14:17:55 -08:00
Simon Walton
44c163b7cc
Tweak inventory-delete message to be more accurate
2019-02-11 10:30:51 -08:00
SamGondelman
d988de4a17
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
2019-02-11 10:27:12 -08:00
Brad Hefta-Gaub
a23f436a9f
Merge pull request #14880 from kencooke/audio-meter-improvements
...
Case 21091: Improved audio metering
2019-02-08 19:08:31 -08:00
Roxanne Skelly
93665fa501
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
2019-02-08 14:21:29 -08:00
danteruiz
76a56c679a
making requested changes
2019-02-08 10:03:05 -08:00
Ken Cooke
5681a996a1
Fix meter color gradient, to encourage proper mic levels.
...
High levels are now yellow, actual digital clipping sets red indicator light.
2019-02-07 16:33:41 -08:00
Ken Cooke
d2abf1a56d
Add "clipping" indicator to audio level meter
2019-02-07 15:52:29 -08:00
Ken Cooke
52aa20b4d5
Add "gated" indicator to audio level meter
2019-02-07 15:47:56 -08:00
Roxanne Skelly
4bbb030ad7
Show only free items when running from the oculus store
2019-02-07 15:34:44 -08:00
danteruiz
d71fb2a100
moved missed QtWebEngine references to +webengines
2019-02-07 14:57:25 -08:00
SamGondelman
c217f8d80f
remove overlay picks from stats qml
2019-02-07 14:25:07 -08:00
Roxanne Skelly
c775a9b23f
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
2019-02-07 13:23:59 -08:00
Roxanne Skelly
d04445c244
Qml Marketplace - remove some quest incompatibilities and disable
...
links for quest
2019-02-07 13:22:49 -08:00
SamGondelman
e74ff18bef
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
2019-02-07 09:49:27 -08:00
SamGondelman
25ca52d892
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
2019-02-07 09:48:13 -08:00
Sam Gateau
632d6e8a73
Merge pull request #14863 from danteruiz/android-apps-directories
...
Case 20877: Support CMake time configuration of QmlFileSelectors
2019-02-07 09:30:49 -08:00
Simon Walton
58d8945aa5
Limit re-sort rate to 2 Hz.
2019-02-06 14:41:27 -08:00
Simon Walton
a2da59271d
If sorting PAL by loudness re-sort upon loudness updates
2019-02-06 11:38:48 -08:00
danteruiz
d0fecac0d8
+android -> +android_interface
2019-02-06 11:37:52 -08:00
Shannon Romano
61459d5756
Merge pull request #14775 from roxanneskelly/QmlMarketplace
...
Qml marketplace
2019-02-06 11:20:49 -08:00
Jeff Clinton
35608c35de
Merge pull request #14808 from danteruiz/webengine-fileselector
...
Case 20879: Migrate webEngine referencing QML into +webengine folder
2019-02-05 12:57:38 -08:00
Roxanne Skelly
d3bc536b58
Merge branch 'QmlMarketplace' of https://github.com/roxanneskelly/hifi into QmlMarketplace
2019-02-05 11:35:28 -08:00
Roxanne Skelly
2b40260953
QmlMarketplace - disable HTML for quest
2019-02-05 09:27:12 -08:00
Roxanne Skelly
364a1698fe
QmlMarketplace - Height of Marketplace Item was improperly calcualted with attributions
2019-02-04 17:24:30 -08:00
Roxanne Skelly
db9b44a71a
QmlMarketplace - The QML Text object has sufficient markup to handle
...
all of our needs, so use that instead of webengineview
2019-02-04 15:30:53 -08:00
Roxanne Skelly
78aa1783a0
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
2019-02-04 15:04:55 -08:00
Roxanne Skelly
e23c589de7
QmlMarketplace - fix issue with footer not appearing in marketplaces list
2019-02-04 15:04:18 -08:00
Roxanne Skelly
1840f874ab
Add Attributions to Qml Marketplace
2019-02-04 13:29:06 -08:00
Roxanne Skelly
39ad36a4d0
QmlMarketplace - bugfixes and Markup rendering of descriptions
...
* Render markup in descriptions (bold, italic, quote, etc.)
* Back button from marketplaces list now works properly
* Layout fixes
2019-02-01 15:27:17 -08:00
SamGondelman
b80d2a9b06
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
2019-02-01 13:33:04 -08:00
Dante Ruiz
f4118213b1
give tablet root color
2019-02-01 10:12:04 -08:00
Dante Ruiz
93a91cdba2
webengine fileselector
2019-01-30 13:57:49 -08:00
Jeff Clinton
0def57f2c8
Merge pull request #14805 from danteruiz/fix-qml-rendering
...
Case 20902: Give SendAsset.qml a background color
2019-01-30 08:54:03 -08:00
Dante Ruiz
ccf02d8b65
fix SendAssets.qml
2019-01-29 17:16:27 -08:00
Roxanne Skelly
0fdbca8ade
QmlMarketplace Bugfixes
...
* Fix upgrades
* Certificate 'View in Marketplace' wasn't working
* command-line hifiapp:MARKET wasn't launching
* Home link wasn't disappearing where it should
* Log In button on marketplace wasn't working
* Other minor UI bugfixes
2019-01-29 16:07:27 -08:00
Simon Walton
e45634d4ea
Merge remote-tracking branch 'upstream/master' into pal_username_update
2019-01-29 11:55:39 -08:00
SamGondelman
0d1e4bed66
merge with master
2019-01-28 18:13:05 -08:00
