Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 02:43:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
76815 commits 76 branches 59 tags 1.2 GiB
Commit graph

2823 commits

Author SHA1 Message Date
Roxanne Skelly
be98fb1ac7 Standalone Tags - checkpoint 2019-02-15 11:21:40 -08:00
Howard Stearns
490ef3542e update for marketplace-in-qml, and make specific to username 2019-02-15 10:58:09 -08:00
Brad Davis
0b171ffe13 Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-15 10:31:04 -08:00
Howard Stearns
30c0dda9ed Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory 2019-02-15 09:27:48 -08: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
Brad Davis
292602afd7 Resolving more master differences 2019-02-14 12:55:28 -08:00
Brad Davis
0f4d1f073b Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-14 12:49:56 -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
Roxanne Skelly
20d7e00ea8 Standalone Tags - Checkpoint 2019-02-14 08:48:37 -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
Brad Davis
db121957d2 Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-12 15:00:03 -08:00
Roxanne Skelly
a82221d2a5 Case 21118 - descending sorts don't work in new (qml) marketplace 2019-02-12 13:20:47 -08:00
Brad Davis
a6f23f48d6 Merge branch 'feature/quest_custom_plugins' into feature/quest 2019-02-12 09:53:12 -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
Roxanne Skelly
4f8de7ed0b Case 21123, Case - marketplace license display has weird crud in it (new qml version) 2019-02-11 12:48:04 -08:00
Roxanne Skelly
a0199c5884 Case 21119, 21120 
Case 21119 - text filter doesn't change as you type in new (qml) marketplace
Case 21120 - text filter doesn't clear in new (qml) marketplace
 2019-02-11 12:27:02 -08:00
Simon Walton
44c163b7cc Tweak inventory-delete message to be more accurate 2019-02-11 10:30:51 -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
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
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
danteruiz
95d30e5cbf Merge branch 'master' of github.com:highfidelity/hifi into feature/quest 2019-02-07 10:41:44 -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
Brad Davis
8b70f1771e Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-06 13:16:22 -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
Brad Davis
91e18f569b Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-06 10:15:36 -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
Dante Ruiz
f4118213b1 give tablet root color 2019-02-01 10:12:04 -08:00
Brad Davis
10a7403d44 Merge remote-tracking branch 'upstream/master' into feature/quest 2019-01-30 10:19:46 -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
d2af7eed3d Don't update PAL namecard with empty strings 2019-01-28 17:44:04 -08:00
Brad Davis
b1e4e17f47 Santa Cruz 2019-01-28 15:52:36 -08:00
Roxanne Skelly
2fe78383ed QmlMarketplace - Fix issues found during test 
* command line --url hifiapp:MARKET was not bringing up correct
marketplace
* Search field was not being cleared when 'home' button was clicked
after a search
* tablet button was not lit when marketplace was launched
 2019-01-28 15:14:49 -08:00
Roxanne Skelly
d3cffa50d6 Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace 2019-01-28 11:11:28 -08:00
Roxanne Skelly
8357f1f9b5 CR fixes 2019-01-28 11:10:35 -08:00
Shannon Romano
f084021fdf
Merge pull request #14678 from hyperlogic/feature/hmd-avatar-alignment-type 
Added HMD Avatar Alignment Type
 2019-01-25 17:32:41 -08:00
Shannon Romano
fe874ca5b1
Merge pull request #14511 from danteruiz/spinbox-fixes 
case 20100: fix SpinBox.qml in ControlsUit and adjusting OpenVrConfiguration SpinBoxes
 2019-01-25 17:30:16 -08:00
Roxanne Skelly
dfac0d88a2 QmlMarketplace - Add 'logged out' behavior, fix issue with search scope 
display
 2019-01-25 16:41:13 -08:00
Howard Stearns
49a3a13d57 use space a bit better 2019-01-25 14:13:58 -08:00
Howard Stearns
52a43ca4cd support artist's stocking to inventory 2019-01-25 14:09:00 -08:00
Roxanne Skelly
6123c4ec96 Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace 2019-01-25 13:45:04 -08:00
Roxanne Skelly
ff2d51701e QML Marketplace 
Add keyboard while in search
General cleanup
 2019-01-25 13:41:16 -08:00
Roxanne Skelly
cfaf01b22a Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace 2019-01-24 17:21:16 -08:00
Roxanne Skelly
c1ff51a02d QML Marketplace 
Checkpoint full functionality
 2019-01-24 17:20:42 -08:00
Anthony Thibault
a7a71e4286 Merge branch 'master' into feature/hmd-avatar-alignment-type 2019-01-23 15:52:20 -08:00
Dante Ruiz
df34d8dcc0 fix spinbox and adjusting OpenVrConfiguration spin boxes 2019-01-23 14:59:37 -08:00
Clement
61be5a3cc4 Enable "Add To World" Asset Browser button for glTF 2019-01-22 17:01:06 -08:00
Roxanne Skelly
8010d86210 QML Marketplace support 
Support QML UI for the Marketplace as some devices do not handle
web on 3d surfaces.
Checkpoint code
 2019-01-21 13:39:16 -08:00
SamGondelman
d6f0fbd17b fix snap app issue 2019-01-18 10:48:20 -08:00
Anthony Thibault
0ab13f1e48
Merge pull request #14705 from luiscuenca/changeCollisionDesignOnAvatarApp 
Change Avatar App design for avatar collisions
 2019-01-17 16:06:17 -08:00
Adam Smith
f955313afc
Merge pull request #14687 from SamGondelman/cancel 
Case 20580: Trying to fix wearables and avatar app
 2019-01-17 11:25:30 -08:00
Shannon Romano
eed53f60ba
Merge pull request #14556 from vladest/avatar_app_warnings 
Fix Avatar apps warnings.
 2019-01-15 11:03:43 -08:00
SamGondelman
68e15c6c07 fixes from 78 2019-01-14 13:36:21 -08:00
luiscuenca
824a93f900 Fix menu update on app reopened 2019-01-14 12:27:59 -07:00
luiscuenca
43d967329c Change Avatar App design for avatar collisions 2019-01-14 10:13:12 -07:00
Anthony Thibault
5d606981de Added HMD Avatar Alignment Type 
Adds a new API to set this type, and an option to the Avatar App.

* "eye" - Match the user eyes with the avatar eyes. The previous default behavior.
  If the avatar skull is larger then the user, it can cause the avatars body to lift off of the ground when the user looks down.
* "head" - Match the user head with the avatar head.  The new default behavior.
  This prevents the body from lifting off of the ground while wearing a large headed avatar.  But can cause an offset between the users eyes and the avatars eyes.
 2019-01-08 18:35:28 -08:00
Jeff Clinton
75d26dc45f
Merge pull request #14659 from luiscuenca/addAvatarToAvatarCollisionOption 
Add menu checkbox to toggle collisions with other avatars
 2019-01-07 08:58:09 -08:00
luiscuenca
d630fe9dbd Add menu checkbox to toggle collisions with other avatars 2019-01-04 16:38:48 -07:00
Thijs Wenker
5d40e1e480 - CR/style fixes 
- Moved the old Avatar Packager tool to Developer -> Avatar -> ..
 2019-01-04 23:39:04 +01:00
Thijs Wenker
a3f72a7a08 Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager 2019-01-04 21:10:35 +01:00
Ryan Huffman
6d5b9a88e4 Remove dead code in AvatarUploadStatusItem 2019-01-04 11:29:07 -08:00
Ryan Huffman
c2ceeb3d76 Apply AvatarPackager code review cleanup 2019-01-04 09:41:31 -08:00
Ryan Huffman
f27ee1767c Fix rename not working correctly in AvatarPackager 2019-01-04 08:43:43 -08:00
Thijs Wenker
8625037285 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2019-01-04 15:29:07 +01:00
Ryan Huffman
93f53cf43d Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager 2019-01-03 14:18:40 -08:00
Ryan Huffman
847496048f Fix waiting-for-inventory sticking around on avatar uploader 2019-01-03 13:51:45 -08:00
Thijs Wenker
68521e11a7 Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager 
# Conflicts:
#	interface/resources/qml/hifi/avatarPackager/AvatarPackagerHeader.qml
#	interface/resources/qml/hifi/avatarPackager/InfoBox.qml
 2019-01-03 22:13:04 +01:00
Thijs Wenker
ecc578c2dd - error messages 
- style changes
 2019-01-03 22:00:22 +01:00
Ryan Huffman
7953507cb8 Update avatar project rename to have audio and highlighting 2019-01-03 11:59:16 -08:00
Ryan Huffman
c13badcbc8 Fix project rename focus and create project not initializing 2019-01-03 10:20:13 -08:00
Ryan Huffman
9c96f7bd01 Add RalewayButton 2019-01-03 08:21:52 -08:00
Ryan Huffman
61ac9d0050 Update various styling in Avatar Packager 2019-01-02 16:47:09 -08:00
Anthony Thibault
95c93e59a7 Make the Out of Range Strategy drop down wider 
So the "DropAfterDelay" item is not cut off on the Settings > Controlls > Calibration screen.
 2018-12-31 09:23:33 -08:00
Thijs Wenker
cb33a91a34 - rename functionality 
- avatar packager works in tablet now
 2018-12-29 03:31:56 +01:00
Ryan Huffman
24aaeee5fd Disable back button on avatar upload page 2018-12-27 22:55:54 -08:00
Ryan Huffman
83a60a541b Fix styling and flow issues in avatar uploader 2018-12-27 18:53:07 -08:00
Ryan Huffman
c21d037800 Fix marketplace uploader not working with projects larger than 128MB 2018-12-27 17:51:27 -08:00
Ryan Huffman
9e7f89e2b0 Update link text for avatar project files 2018-12-27 14:38:46 -08:00
Ryan Huffman
89b03a3cdc Add info popup box for avatar project files 2018-12-27 14:30:44 -08:00
Thijs Wenker
656d96c725 Merge branch 'feat/avatarTools/avatarPackager' of github.com:huffman/hifi into feat/avatarTools/avatarPackager 
# Conflicts:
#	interface/resources/qml/hifi/avatarPackager/AvatarProjectCard.qml
 2018-12-27 21:52:57 +01:00