Wayne Chen
cf3694e8e3
fixing error in master + getting ptt to show up
2019-03-10 19:00:41 -07:00
Wayne Chen
15eb90f634
Merge pull request #16 from wayne-chen/pttSwitchToItem
...
fixng ptt checkbox
2019-03-10 17:18:47 -07:00
Wayne Chen
54973375a4
fixng ptt checkbox
2019-03-10 17:18:18 -07:00
Wayne Chen
3dcc53a945
Merge branch 'master' into ptt
2019-03-10 17:14:54 -07:00
Wayne Chen
2eaa1e63d3
switch from column layout to item
2019-03-10 17:07:02 -07:00
Roxanne Skelly
74320fe7be
Case 20622 - Qml Marketplace - Fix categories dropdown UI issues
2019-03-08 17:24:43 -08:00
Shannon Romano
ca87e217bd
Merge pull request #15097 from wayne-chen/audioSettingsModified
...
Case 21562: Audio settings screen
2019-03-08 16:22:52 -08:00
Wayne Chen
88d8163b04
updating compile failure + icons/settings update
2019-03-08 16:07:46 -08:00
Wayne Chen
39db3979b9
changing text display
2019-03-08 16:07:09 -08:00
Wayne Chen
cb0fdd2ef2
laying groundwork for audio app + fixing deadlocks
2019-03-08 16:06:45 -08:00
r3tk0n
88a125aff0
Initial implementation (deadlocks still occurring in Audio.cpp)
2019-03-08 16:05:24 -08:00
Wayne Chen
b7d44403e1
updating compile failure + icons/settings update
2019-03-08 16:02:15 -08:00
Wayne Chen
8a5924077a
changing text display
2019-03-08 16:02:15 -08:00
Wayne Chen
7cb17b2d6e
laying groundwork for audio app + fixing deadlocks
2019-03-08 16:02:14 -08:00
r3tk0n
15d49fd9a9
Initial implementation (deadlocks still occurring in Audio.cpp)
2019-03-08 16:02:14 -08:00
Shannon Romano
c3b8f6ed93
Merge pull request #15145 from roxanneskelly/StandaloneTags
...
Case 21642 - verification dialog when user hits return in goto search
2019-03-08 15:29:34 -08:00
Howard Stearns
1d52ed1524
Merge pull request #15146 from howard-stearns/do-not-scroll-under-letterbox
...
do not scroll inventory items underneath modal dialog
2019-03-08 15:27:44 -08:00
Howard Stearns
fac162c2bc
Merge pull request #15144 from howard-stearns/about-blockchain
...
Change "about" blockchain from Elements to EOS
2019-03-08 15:17:31 -08:00
Shannon Romano
cc154be12d
Merge pull request #15090 from danteruiz/oculus-tracking-controllers
...
Case 21167: When using Oculus HMD, continue to track hand position and movement when focus is off High Fidelity
2019-03-08 14:56:56 -08:00
Roxanne Skelly
b3f5d76d0f
CR Fix
2019-03-08 14:37:15 -08:00
Howard Stearns
8791252acd
do not scroll inventory items underneath modal dialog
2019-03-08 14:27:56 -08:00
Roxanne Skelly
88a4b5c983
Case 21642 - verification dialog when user hits return in goto search
...
text entry+return should throw up verification dialog for first time to
non-optimized domain
2019-03-08 14:01:47 -08:00
Howard Stearns
24b08bd25d
Change "about" blockchain from Elements to EOS
2019-03-08 13:59:16 -08:00
Roxanne Skelly
70cc6594c7
CR fixes
2019-03-08 12:43:43 -08:00
Roxanne Skelly
c33d2aafda
Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags
2019-03-08 11:41:34 -08:00
Roxanne Skelly
750dbfae21
Stand-alone Tags: Throw up popup for first unoptimized domain
...
Throw up a popup in stand-alone builds when user attempts to go to
an unoptimized domain.
2019-03-08 10:48:42 -08:00
Roxanne Skelly
cce43357d0
Case 21315, Case 21326, Case 21370
...
Case 21315 - Clicking on item picture from Inventor Items list does not
always display the Marketplace item page.
Case 21326 - See All Markets page is missing its footer and the two
Explore buttons no longer work
Case 21370 - QML Marketplace - For unavailable items (no more editions
for sale), marketplace item list 'buy' button is not disabled
Also, a few minor font sizing and other graphics tweaks
2019-03-07 13:58:51 -08:00
Roxanne Skelly
b38fc65372
Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags
2019-03-07 10:06:05 -08:00
Howard Stearns
c6b2697b44
cleanup
2019-03-06 13:28:55 -08:00
Howard Stearns
8ebab88613
Merge branch 'master' of github.com:highfidelity/hifi into stock-to-master
2019-03-06 13:08:19 -08:00
Shannon Romano
3600b98bd0
Merge pull request #15013 from thoys/feat/avatarTools/avatarDoctorProjectStatus
...
Case 21340: avatar doctor project page status
2019-03-06 12:36:18 -08:00
Howard Stearns
ddfd437696
ensure error message when marketplace update fails
2019-03-06 11:37:17 -08:00
Howard Stearns
366dd935dd
trading in has nothing to do with whether you own the new item
2019-03-06 11:36:34 -08:00
Howard Stearns
416cde4c1f
fix uses of updated_item_id that got lost
2019-03-06 11:36:08 -08:00
Howard Stearns
f5afc2033f
work through stocking vs update issues, and cleanup
2019-03-06 11:35:36 -08:00
Thijs Wenker
a84a43320c
added spacing between lines
2019-03-06 19:15:01 +01:00
Thijs Wenker
59200103af
Not for sale explanation
2019-03-06 07:06:48 +01:00
danteruiz
1941e53cc3
track oculus controllers while in oculus home
2019-03-05 15:32:18 -08:00
Wayne Chen
f1cf11de85
moving gain slider to audio settings
2019-03-05 10:53:55 -08:00
Wayne Chen
a00d6ec9f6
removing debug statement
2019-03-04 19:42:30 -08:00
Wayne Chen
0f2792930a
adding switches and buttons to testing audio
2019-03-04 19:28:12 -08:00
Wayne Chen
a68aaaa7a4
adding timer and ui color changes
2019-03-04 16:06:50 -08:00
Wayne Chen
4187104b17
culling mute state
2019-03-04 14:12:09 -08:00
Seth Alves
9614216006
don't disable server echo when audio qml page is closed
2019-03-04 13:47:55 -08:00
Seth Alves
d5e8cba1ee
make server-audio-loopback button work in HMDs
2019-03-04 13:47:55 -08:00
Seth Alves
6ee236e783
added a button to enable server loopback of audio
2019-03-04 13:47:55 -08:00
Seth Alves
3ecd86caee
add a way to disble muted warning from audio panel.
...
fix positioning of warning. hide warning when removing timer.
2019-03-04 13:47:55 -08:00
Wayne Chen
7860db68eb
culling hearing oneself and testing sound
2019-03-04 13:33:16 -08:00
Seth Alves
0523a0d06d
don't disable server echo when audio qml page is closed
2019-03-04 11:08:07 -08:00
Seth Alves
9ff99c7213
make server-audio-loopback button work in HMDs
2019-03-04 11:08:07 -08:00
Seth Alves
6f40079621
added a button to enable server loopback of audio
2019-03-04 11:08:07 -08:00
Seth Alves
38256df0f2
add a way to disble muted warning from audio panel.
...
fix positioning of warning. hide warning when removing timer.
2019-03-04 11:08:06 -08:00
Wayne Chen
028cce5394
change short username to 14 characters, displaying as normal text
2019-02-26 12:26:50 -08:00
Wayne Chen
650b34c463
adding clock
2019-02-25 18:00:56 -08:00
Roxanne Skelly
292ac88c96
Update with new standalone-optimized icon
2019-02-25 11:36:45 -08:00
Thijs Wenker
79d0a0a0a8
avatar doctor project status
2019-02-25 19:28:38 +01:00
Roxanne Skelly
8c058f147e
Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags
2019-02-20 14:24:47 -08:00
Roxanne Skelly
dca166f821
Stand-alone Optimized Tagging - Add tagging for GOTO User Stories
2019-02-20 14:23:54 -08:00
Brad Davis
d60dcb99d2
Merge remote-tracking branch 'upstream/master' into feature/quest
2019-02-19 12:37:30 -08:00
Roxanne Skelly
d957b38f10
Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags
2019-02-19 12:34:10 -08:00
Howard Stearns
d7d6ff53ca
Merge pull request #14765 from howard-stearns/artist-stocking-inventory
...
Case 20657: artist stocking inventory
2019-02-19 10:46:01 -08:00
Howard Stearns
e9b323a807
fix HFC symbol location at checkout, and the display of unavailable items
2019-02-15 16:56:31 -08:00
John Conklin II
4520236873
Merge pull request #14917 from thoys/feat/avatarTools/avatarDoctor
...
Case 21012: Avatar Doctor
2019-02-15 15:43:18 -08:00
Howard Stearns
f16eb1c029
Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory
2019-02-15 15:15:13 -08:00
Thijs Wenker
e900d3784b
fixes
2019-02-15 23:58:42 +01:00
Roxanne Skelly
2c4f485079
QmlMarketplace invert arrow direction on sort.
2019-02-15 12:31:01 -08:00
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
Roxanne Skelly
fb524f8900
Merge branch 'QmlMarketplace' of https://github.com/roxanneskelly/hifi into QmlMarketplace
2019-02-15 11:35:06 -08:00
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
Thijs Wenker
1a38abe230
- add jointIndexes to new
...
- attempt to fix OSX / linux build
- ability to actually load a recent project (previously was only able to load the top recent project)
2018-12-27 21:47:10 +01:00
Ryan Huffman
882975f01c
Update icons in avatar packager
2018-12-27 12:43:43 -08:00
Thijs Wenker
2f32458f72
recent projects
2018-12-27 19:52:56 +01:00
Ryan Huffman
1da179dc04
Update avatar packager styling
2018-12-27 00:13:45 -08:00
vladest
8d9cff3c58
Merge branch 'master' into avatar_app_warnings
2018-12-23 16:45:59 +01:00
Ryan Huffman
8c56e35f69
Add granular status to avatar upload
2018-12-23 00:13:01 -08:00
Ryan Huffman
b717188ed0
Update avatar project styling
2018-12-22 21:57:09 -08:00
Ryan Huffman
9955de6288
Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager
2018-12-21 11:43:49 -08:00
Ryan Huffman
748135eef9
Fix login-required size and projectFiles warning
2018-12-21 11:43:20 -08:00
Thijs Wenker
ad2d9bc79a
- fst read/write should work
...
- images are being copied into the correct directory
- scripts are added to fst upon project load
- modal overlay fix
2018-12-21 19:34:54 +01:00
Thijs Wenker
1da5b3fae2
Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager
2018-12-21 19:20:16 +01:00
Ryan Huffman
7602da6f92
Add AvatarProjectUpload.qml
2018-12-21 08:16:18 -08:00
Thijs Wenker
ea901aa179
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
2018-12-21 14:11:57 +01:00
Thijs Wenker
dab4a621a3
Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager
2018-12-21 01:59:11 +01:00
Ryan Huffman
556f516be6
Update uploader screen
2018-12-20 16:30:08 -08:00
Shannon Romano
21ec4e0c53
Merge pull request #14524 from SamGondelman/NOverlays3
...
Case 20132, Case 16928: First class Image Entities
2018-12-20 21:20:49 +00:00
Thijs Wenker
79a9c82168
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
2018-12-20 18:56:33 +01:00
Jeff Clinton
3d4311b7d4
Merge pull request #14613 from zfox23/MS20253_eventBridge
...
MS20253: Only emit screenChanged once screen has changed
2018-12-20 08:58:53 -08:00
Zach Fox
b0ce3a54d5
Merge branch 'MS20187_itemTrash' of github.com:zfox23/hifi into MS20187_itemTrash
2018-12-19 15:16:55 -08:00
Zach Fox
d0998174ff
Un-wear things when trashing them if worn
2018-12-19 15:16:48 -08:00
Zach Fox
46e00cf1b3
Merge branch 'master' of github.com:highfidelity/hifi into MS20187_itemTrash
2018-12-19 15:03:36 -08:00
Ryan Huffman
202326dbac
Merge branch 'feat/avatarTools/avatarPackager' of https://github.com/thoys/hifi into feat/avatarTools/avatarPackager
2018-12-19 12:03:30 -08:00
Sam Gondelman
e890fc6980
Merge branch 'master' into NOverlays3
2018-12-19 11:37:10 -08:00
Ryan Huffman
c2aca64b11
Add start of opening uploaded avatar in inventory
2018-12-19 11:30:21 -08:00
Thijs Wenker
cb74313de8
create projects / style changes
2018-12-19 19:23:24 +01:00
Zach Fox
7fee0fc1e4
Fix MS20253: Only emit screenChanged once screen has changed
2018-12-19 09:50:52 -08:00
Zach Fox
116edcc224
I have no idea how this happened
2018-12-19 09:36:05 -08:00
Jeff Clinton
a7e7a2426e
Merge pull request #14538 from ElderOrb/FB19355
...
FB19355 - When I have avatar entities as children of my avatar, the A…
2018-12-19 09:09:54 -08:00
Zach Fox
f407042f3e
Quick polish fix to prevent UI flashing
2018-12-18 17:11:10 -08:00
Ryan Huffman
720cd90dc7
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
2018-12-18 13:17:28 -08:00
Ryan Huffman
ad471387f7
Integrate marketplace upload API
2018-12-18 13:08:55 -08:00
vladest
63aa27475e
Merge branch 'master' into avatar_app_warnings
2018-12-15 19:08:56 +01:00
Shannon Romano
a89c53cc52
Merge pull request #14581 from zfox23/MS20308_unknownItems
...
Fix MS20308: Allow users to checkout uncertifiable items
2018-12-15 00:44:50 +00:00
Zach Fox
47a46c1d1b
Fix MS20308: Allow users to checkout uncertifiable items
2018-12-14 11:17:56 -08:00
Shannon Romano
131b53e4df
Merge pull request #14315 from wayne-chen/loginInitiative2
...
2nd initiative for encouraging login
2018-12-14 01:59:35 +00:00
Ryan Huffman
2269447741
Fix AvatarPackager QML size
2018-12-13 15:27:10 -08:00
Shannon Romano
3e10bea1ce
Merge pull request #14567 from davidkelly/dk/18639
...
Return more connections in pal
2018-12-13 22:48:00 +00:00
Ryan Huffman
78c4c2599e
Add start of marketplace uploading and project file list
2018-12-13 13:27:31 -08:00
Wayne Chen
4116f6ca9a
Merge branch 'master' into loginInitiative2
2018-12-12 18:00:07 -08:00
Jeff Clinton
5a81d8c093
Merge pull request #14453 from danteruiz/keyboard-menus
...
Keyboard interaction menus
2018-12-12 17:53:59 -08:00
Thijs Wenker
96673bb5b9
show project page
2018-12-12 21:15:44 +01:00
Dante Ruiz
51bdf1bf78
adding keyboards settings
2018-12-12 11:55:13 -08:00
Thijs Wenker
c0bd9121fb
open avatar projects
2018-12-12 19:55:14 +01:00
Wayne Chen
2f07a0eb5d
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-12-11 20:01:19 -08:00
Zach Fox
dff7804cdc
Change username to trashbot
2018-12-11 16:26:49 -08:00
Zach Fox
d74f7eb098
Implement MS20187: Add trash can feature to Inventory
2018-12-11 15:44:42 -08:00
David Kelly
b2645bc23b
Return more connections in pal
2018-12-11 14:47:18 -08:00
Shannon Romano
efedc1f0b5
Merge pull request #14563 from danteruiz/teleport-settings
...
Adding menu settings to disable teleporting
2018-12-11 21:08:23 +00:00
Zach Fox
826644ef08
Merge pull request #14559 from zfox23/MS20161_updatesDot
...
Fix MS20161: Fix INVENTORY notification dot state
2018-12-11 13:03:26 -08:00
Dante Ruiz
deaf3e8e44
adding option to disable teleportring
2018-12-11 11:06:13 -08:00
Zach Fox
75ba1cb3c7
I forgot to clear dot immediately
2018-12-11 10:30:12 -08:00
Thijs Wenker
3943fe2861
avatar packager initial
2018-12-10 21:29:03 +01:00
Jeff Clinton
40f50eccb1
Merge pull request #14550 from zfox23/MS20208_assetsToInventory
...
Fix MS20208: Change an instance of 'ASSETS' to 'INVENTORY'
2018-12-10 10:49:06 -08:00
Wayne Chen
4c9c785c24
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-12-10 07:57:44 -08:00
vladest
c05e3e7d09
Fix Avatar apps warnings. Added notification for HMD.active property
2018-12-08 19:12:02 +01:00
Sam Gondelman
4c5ff0dc3e
Merge branch 'master' into NOverlays3
2018-12-07 14:26:59 -08:00
Jamil Akram
bc5166d1d8
Merge pull request #14531 from hyperlogic/feature/drop-after-delay-out-of-range-tracking
...
Added DropAfterDelay strategy to Vive Tracker Calibration Dialog
2018-12-07 12:09:44 -08:00
Zach Fox
4cc5fc755f
Fix MS20208: Change an instance of 'ASSETS' to 'INVENTORY'
2018-12-07 11:42:03 -08:00
Wayne Chen
4e6f162e01
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-12-07 10:12:46 -08:00
Zach Fox
7dcf5da954
Merge pull request #14503 from zfox23/payOut1
...
Pay-Out API Frontend, Part One
2018-12-06 15:25:54 -08:00
Sam Gondelman
d30dd4c26c
Merge branch 'master' into NOverlays3
2018-12-06 11:23:50 -08:00
Jeff Clinton
43f84a9577
Merge pull request #14426 from ElderOrb/FB19400
...
FB19400 during shutdown -- TypeError: Cannot read property 'buttons' of null
2018-12-06 11:18:39 -08:00
Zach Fox
a2af50a9d0
Show pre-auth'd transactions in Recent Activity before redemption
2018-12-06 11:07:26 -08:00
Zach Fox
235b27a198
Merge branch 'master' of github.com:highfidelity/hifi into payOut1
2018-12-05 16:35:07 -08:00
Zach Fox
02307d2308
Secret to Coupon ID
2018-12-05 16:34:53 -08:00
Alexander Ivash
090bc4fc0d
FB19355 - When I have avatar entities as children of my avatar, the Avatar app is not consistent in displaying wearables
2018-12-05 23:33:34 +03:00
Wayne Chen
a30f4ed0b3
Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2
2018-12-05 08:17:06 -08:00
Wayne Chen
2a77a29f8a
Delete LoginScreenDialog.qml
2018-12-04 17:07:03 -08:00
Wayne Chen
57b21730de
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-12-04 17:01:56 -08:00
Anthony Thibault
7f2e427584
Added DropAfterDelay strategy to Vive Tracker Calibration Dialog
...
This is a hybrid of None and Drop strategies.
Basically, if the puck is out of range for less then 1/2 a second we still use it, however any longer then that and we mark it as invalid.
2018-12-03 18:56:45 -08:00
Zach Fox
ab184c5c2b
Authorized Script to Coupon
2018-12-03 15:16:06 -08:00
SamGondelman
3ce6f7f3d6
real image entities
2018-12-03 11:50:59 -08:00
Anthony Thibault
c0bf832e39
Head and Hand offsets for Vive Trackers now function as expected
...
In the Settings > Controller... > Calibration menu, when using head or hand trackers
The provided Y and Z offsets should function correctly now. This gives you the ability to adjust
the offsets of the pucks to the hands/head. For example: this allows you to wear the hand pucks on your forearms
rather then the backs of your palms.
2018-12-02 16:18:36 -08:00
Zach Fox
0d66d230c5
Merge branch 'master' of github.com:highfidelity/hifi into payOut1
2018-11-30 16:45:03 -08:00
Wayne Chen
09bc886c20
Merge branch 'master' into loginInitiative2
2018-11-30 13:05:17 -08:00
Shannon Romano
1f29423a58
Merge pull request #14423 from vladest/qml_warning_fix
...
Fix QML achoring warnings on Layouts
2018-11-30 10:50:30 -08:00
Zach Fox
bc39dbba8b
Finish out the feature
2018-11-29 12:44:30 -08:00
Wayne Chen
9deb15b9f6
Merge branch 'master' into loginInitiative2
2018-11-28 19:10:20 -08:00
Zach Fox
371c50b2ab
Start work on Pay Out UI
2018-11-28 11:01:40 -08:00
Zach Fox
a4175b0428
Error handling in checkout
2018-11-27 14:17:28 -08:00
Zach Fox
67dfccafec
Show item name when sending item
2018-11-27 10:19:14 -08:00
Zach Fox
a9fd443f28
'improve' UI slightly
2018-11-26 16:03:07 -08:00
Zach Fox
31f7d747c8
Bugfixes; enable purchase asset from marketplace screen raise
2018-11-26 15:48:49 -08:00
Zach Fox
8df5db4239
Allow scripts to open SendAsset screen with pre-filled info
2018-11-26 13:26:17 -08:00
Wayne Chen
b8d8710604
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-19 09:02:16 -08:00
vladest
db82994b4d
Merge branch 'master' into qml_warning_fix
2018-11-18 16:10:21 +01:00
Alexander Ivash
fe43c733f8
FB19400 during shutdown -- TypeError: Cannot read property 'buttons'
2018-11-17 22:56:59 +05:30
vladest
53b7cc1376
Fix QML achoring warnings on Layouts
2018-11-17 15:06:25 +01:00
Shannon Romano
6425a474ac
Merge pull request #14378 from danteruiz/fix-case-of-infinate-loading
...
Fixing case of interstitial not finishing loading
2018-11-16 14:53:01 -08:00
Howard Stearns
8e1785bd90
security settings post-oculus-store wording
2018-11-15 15:59:52 -08:00
John Conklin II
1ea2ab338e
Merge pull request #13975 from ElderOrb/FB16697
...
Fix multiple issues on 'Calibration' tab of 'Controls' dialog
2018-11-15 14:54:26 -08:00
Dante Ruiz
20ad05726e
entity server timout
2018-11-15 10:52:40 -08:00
Jeff Clinton
c72dd3d690
Merge pull request #14395 from ctrlaltdavid/M19859
...
Fix Goto app clicks not working
2018-11-15 09:56:56 -08:00
Wayne Chen
c85b840db0
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-14 14:47:56 -08:00
John Conklin II
b08283d9e9
Merge pull request #14401 from sethalves/rc76-revert-pr-14238
...
revert PR-14238 "TypeError: Cannot read property 'buttons'" until we can adjust it.
2018-11-14 14:38:34 -08:00
David Rowe
9c5d318341
Fix highlighting
2018-11-15 10:15:30 +13:00
Seth Alves
1593c1185a
revert PR-14238 "TypeError: Cannot read property 'buttons'" until we can adjust it.
2018-11-14 12:29:09 -08:00
David Rowe
010f7121a3
Fix Goto app clicks not working
...
Includes better card highlighting fix.
2018-11-14 15:27:18 +13:00
Thijs Wenker
0248323bee
fix test path
2018-11-14 01:05:38 +01:00
Thijs Wenker
afd69d04dd
Make ctrl+shift shortcuts work for create app
2018-11-14 01:05:37 +01:00
John Conklin II
79e67ad45f
Merge pull request #14238 from ElderOrb/FB19400
...
FB19400 during shutdown -- TypeError: Cannot read property 'buttons' …
2018-11-13 15:07:21 -08:00
Howard Stearns
545b85bc9d
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
2018-11-13 09:55:54 -08:00
Seth Alves
e5114c9b43
Merge pull request #14283 from ctrlaltdavid/M14836
...
Make tablet page indicators clickable to scroll tablet
2018-11-13 09:38:43 -08:00
Seth Alves
4ac719a87f
Merge pull request #14298 from ctrlaltdavid/M17640
...
Fix Goto app cards staying highlighted if move off dialog while dragging
2018-11-13 09:32:24 -08:00
Alexander Ivash
b16efb2afb
set minimum shoulder width to 25 cm (based on discussion with Tony)
2018-11-13 19:06:10 +05:30
Alexander Ivash
3a62184afd
specify min/max/stepsize
2018-11-13 19:06:09 +05:30
Alexander Ivash
95c51c2ffa
unfocus spinboxes on finishing editing
2018-11-13 19:05:20 +05:30
Alexander Ivash
a9ff1f4ecd
add onscreen keyboard into 'Calibration' tab of Settings=>Controls dialog
2018-11-13 19:03:50 +05:30
Howard Stearns
3431bdbb0e
new inventory icons, and align message waiting light in items tab
2018-11-12 14:51:32 -08:00
Howard Stearns
66ae01e0c3
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
2018-11-12 12:55:20 -08:00
Wayne Chen
ea325acef9
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-12 10:28:03 -08:00
Seth Alves
500b2b7adf
Merge pull request #14381 from zfox23/MS19803_retry
...
Actually fix MS19803: Replace missing imports
2018-11-09 16:38:26 -08:00
Jeff Clinton
12b833d121
Merge pull request #14167 from ElderOrb/FB18859
...
Make material entities to be presented in avatarapp
2018-11-09 15:32:27 -08:00
Zach Fox
8d325d8dd9
Actually fix MS19803: Replace missing imports
2018-11-09 15:02:57 -08:00
Zach Fox
1ce6079c5a
Remove extra as
2018-11-09 11:26:18 -08:00
Wayne Chen
f66326fc4d
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-08 15:51:24 -08:00
Wayne Chen
e266532888
Merge branch 'master' into loginInitiative2
2018-11-08 11:17:24 -08:00
Zach Fox
142dfab9ac
CR round 1
2018-11-08 10:05:57 -08:00
Dante Ruiz
358aa547b1
feedback changes
2018-11-08 09:58:53 -08:00
Dante Ruiz
501746b156
3D Keyboard
2018-11-08 09:58:53 -08:00
Zach Fox
1ab1cb95d8
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
2018-11-08 09:57:10 -08:00
Zach Fox
48d3450c5a
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-11-07 14:59:23 -08:00
Zach Fox
3cbaec818d
Merge pull request #14360 from zfox23/MS19743_updateCheckoutBug
...
Fix MS19743: Fix case where user couldn't update certain items
2018-11-07 14:57:35 -08:00
Wayne Chen
a05d70cd8b
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-07 14:21:13 -08:00
Jeff Clinton
e507e91bfd
Merge pull request #14227 from ElderOrb/FB19396
...
FB19396 - QML warning qrc:///qml/hifi/tablet/WindowRoot.qml:132: Type…
2018-11-07 13:36:41 -08:00
Wayne Chen
51586625e7
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-07 12:02:38 -08:00
Zach Fox
8776028259
Prepend "root" to "currentUpdatesPage"
2018-11-06 16:10:49 -08:00
Zach Fox
f22bbff505
Fix MS19743: Fix case where user couldn't update certain items
2018-11-06 15:47:47 -08:00
Wayne Chen
7c2dd973b7
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-06 15:34:34 -08:00
Zach Fox
e80468e423
Remove URL logging from JS and QML
2018-11-06 15:09:24 -08:00
Zach Fox
58dd690c0a
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-11-06 10:29:05 -08:00
Alexander Ivash
a3dfc873b7
rsolve rebase conflict
2018-11-06 14:21:14 +05:30
Alexander Ivash
9623753416
change imports (how could I miss this place?)
2018-11-06 14:21:14 +05:30
Alexander Ivash
c6764c6244
cherry-picking
2018-11-06 14:21:14 +05:30
Alexander Ivash
27bb8a0de7
rename stylues-uit => stylesUit & controls-uit => controlsUit
...
note:
the idea is to make imports like 'import controlsUit 1.0' to work
with 'styles-uit'/'controls-uit' it is not possible because of two reasons:
1. import controls-uit 1.0 is invalid syntax
2. qmldir inside controls-uit is 'module controlsUit'
2018-11-06 14:21:14 +05:30
Howard Stearns
335947598f
Merge branch 'oculus-store-commerce' of github.com:howard-stearns/hifi into tabless
2018-11-05 15:48:52 -08:00
Zach Fox
5b042ec3df
My items to my submissions
2018-11-05 15:23:25 -08:00
Zach Fox
3631e304ba
Acquisition
2018-11-05 14:58:12 -08:00
Zach Fox
f10b9ae30c
Squashed commit of the following:
...
commit 515ff016a4a4d36b38458906b909ebd0181283ddd0181283ddbe17ed0910643026abd6#14308 from sabrina-shanman/fbx2hfm
(case 19302) Re-name FBXGeometry to HFMGeometry and do the same for related classes
commit 643026abd60b7ddca5f6becee7f010
2018-11-05 13:12:43 -08:00
Zach Fox
515ff016a4
Fix seven bugs
2018-11-05 13:03:34 -08:00
Wayne Chen
2dd20de1bd
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-05 09:13:25 -08:00
howard-stearns
4f713b038e
Merge branch 'oculus-store-commerce' into tabless
2018-11-04 12:17:21 -08:00
howard-stearns
ae51b95ca1
fix bad tab reference
2018-11-04 11:15:46 -08:00
Zach Fox
a87142b8b7
Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce
2018-11-02 16:49:20 -07:00
Zach Fox
2b50c40224
Minor changes found by Chang
2018-11-02 09:33:06 -07:00
Zach Fox
917fc4ad58
Update language
2018-11-02 09:23:31 -07:00
Zach Fox
20cd1df22c
Lotsa changes
2018-11-01 16:48:08 -07:00
Howard Stearns
8256bfbc55
icons
2018-11-01 15:20:50 -07:00
Zach Fox
0a15e94fe4
New colors
2018-11-01 13:27:31 -07:00
Zach Fox
b43ad15fa7
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-11-01 11:32:38 -07:00
Howard Stearns
8f2f27f468
Merge branch 'oculus-store-commerce' into tabless
2018-11-01 11:22:28 -07:00
Zach Fox
6e470d5c1c
Merge branch 'oculus-store-commerce' of github.com:howard-stearns/hifi into oculus-store-commerce
2018-11-01 10:30:01 -07:00
Zach Fox
d481f081bb
Fix four bugs; truncate some logs
2018-11-01 10:29:38 -07:00
Roxanne Skelly
a1eee351e9
Change "Proofs" to "My Submissions" in assets filter.
2018-10-31 16:24:57 -07:00
Zach Fox
162a08b993
Restore certain images
2018-10-31 16:14:26 -07:00
Zach Fox
d4e9a70564
Almost there
2018-10-31 16:12:16 -07:00
David Kelly
e6c3e7e67f
initial purge of security tab from wallet
2018-10-31 15:33:28 -07:00
Zach Fox
41a0d09389
First pass
2018-10-31 15:31:51 -07:00
Wayne Chen
f62c8ae87a
overlay HMD implementation
2018-10-31 15:26:49 -07:00
Howard Stearns
ce0ad48a28
tabless wallet
2018-10-31 13:58:26 -07:00
Zach Fox
34fb849536
Cleanup FIXME
2018-10-31 13:53:18 -07:00
Zach Fox
efcda129b7
Merge branch 'oculus-store-commerce' of github.com:howard-stearns/hifi into oculus-store-commerce
2018-10-31 13:24:06 -07:00
Zach Fox
448be8847f
Notifications are working!
2018-10-31 13:23:58 -07:00
Roxanne Skelly
628ec8ec2b
Removed QmlCommerce.cpp, Ledger.cpp changes as requested
2018-10-31 10:09:01 -07:00
Roxanne Skelly
e5f06690b5
Strip out references to 'my purchases' vs 'my items' code
2018-10-30 17:31:31 -07:00
Roxanne Skelly
0e639f4e34
Merge branch 'oculus-store-commerce' of https://github.com/howard-stearns/hifi into oculus-store-commerce
2018-10-30 16:29:43 -07:00
Roxanne Skelly
91b199a456
Checkpoint Proofs Filter in Inventory
2018-10-30 16:29:20 -07:00
Zach Fox
b6344acc1d
Big checkpoint. be aware - things may be broken
2018-10-30 15:08:13 -07:00
David Rowe
1a129335dd
Fix Goto app cards staying highlighted if move off dialog while dragging
2018-10-30 19:57:07 +13:00
Zach Fox
d47fd44a47
Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce
2018-10-29 14:57:23 -07:00
Wayne Chen
af04630642
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-10-26 17:53:13 -07:00
David Rowe
51d56ddf22
Make tablet page indicators clickable to scroll tablet
2018-10-26 12:17:04 +13:00
Howard Stearns
9095df4641
fix getting inventory back after showing my items
2018-10-25 12:59:49 -07:00
Howard Stearns
936c2b2cab
don't show price for free items
2018-10-25 12:46:30 -07:00
Howard Stearns
3503d79b05
missed a buy/purchase
2018-10-25 12:39:33 -07:00
Howard Stearns
e3b1e14db6
nix "buy" where possible.
2018-10-25 12:37:08 -07:00
Howard Stearns
8b79795247
nix the word "purchase" where possible
2018-10-25 12:31:01 -07:00
Howard Stearns
6284c902be
use the switch
2018-10-25 11:29:10 -07:00
Jeff Clinton
eb383b1d09
Merge pull request #14040 from hyperlogic/feature/acceleration-limit-filter
...
Quality Improvements to Avatars driven by Vive Trackers
2018-10-25 08:51:59 -07:00
Howard Stearns
993cb0cfa0
restore separation of inventory vs proofs.
2018-10-24 12:00:17 -07:00
Howard Stearns
c1cb41875a
Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce
2018-10-24 09:56:37 -07:00
Wayne Chen
331b09c8d1
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-10-24 09:16:24 -07:00
unknown
06aff231a3
Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor
2018-10-23 20:19:06 -07:00
Howard Stearns
7707d92a95
connect wiring on purchases
2018-10-23 16:07:35 -07:00
Zach Fox
d1556ae4e8
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-10-23 15:51:34 -07:00
John Conklin II
e21e7d30d7
Merge pull request #14126 from amantley/squattyPottyFix
...
Sit State for the seated user in HMD: Squatty Potty Fix
2018-10-23 15:20:49 -07:00
Kerry Ivan Kurian
e7d1c2873a
Merge branch 'master' into log-resource-requests-2
2018-10-23 13:46:59 -07:00
David Back
9df8ea35bb
Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor
2018-10-23 13:28:35 -07:00
Zach Fox
897d21bea2
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-10-23 13:18:08 -07:00
Howard Stearns
95b86bf5b7
initial limited commerce for oculus store prototype
2018-10-23 13:08:39 -07:00
Brad Hefta-Gaub
405b1d5725
Revert "Better imports for controls and styles"
2018-10-23 10:58:28 -07:00
Zach Fox
22c3321400
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
2018-10-23 09:52:37 -07:00
amantley
3e8663f8e9
removed the dropdown from the avatar app, because it is in settings controls now
2018-10-22 22:31:26 -07:00
Wayne Chen
84001ae208
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-10-22 17:59:33 -07:00
amantley
472ab1c613
Merge remote-tracking branch 'origin/squattyPottyFix' into squattyPottyFix
2018-10-22 17:50:56 -07:00
amantley
cce2f295a1
fixed conflict in myskeletonmodel.cpp
2018-10-22 17:49:30 -07:00
Zach Fox
1d8994993c
Whitelist TTS scripting interface to TTS app, which is now a default script
2018-10-22 17:05:31 -07:00
David Back
e8bda1793f
Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor
2018-10-22 15:12:45 -07:00
Zach Fox
f9cc4f5a69
Count unique source and url pairs
2018-10-22 14:00:01 -07:00
Zach Fox
de93bbb08b
Only show unique resources
2018-10-22 13:59:59 -07:00
Zach Fox
d44f9e2ccc
Tons of improvements
2018-10-22 13:59:57 -07:00
Zach Fox
55c1a88404
Merge branch 'log-resource-requests-2' of github.com:kkurian/hifi into log-resource-requests-2
2018-10-22 13:59:50 -07:00
Zach Fox
7be5d5674d
Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2
2018-10-22 13:59:35 -07:00
John Conklin II
e40a021339
Merge pull request #13401 from ElderOrb/better_imports_for_controls_and_styles
...
Better imports for controls and styles
2018-10-22 11:50:09 -07:00
amantley
dfdc6aee7e
Merge branch 'master' into squattyPottyFix
2018-10-20 13:39:55 -07:00
Ryan Huffman
9d13902cd3
Improve paramater names in model dialog window
2018-10-20 11:26:12 -07:00
amantley
a427ddb235
removed extraneous print statements
2018-10-20 09:16:05 -07:00
amantley
55daeb11cd
moved the radio buttons on the avatar settings to even them out better. will be corrected I'm sure
2018-10-19 18:43:02 -07:00
amantley
070a517423
changed the recenterModel variables to userRecenterModel
2018-10-19 18:07:03 -07:00
Ryan Huffman
f1258e4445
Add a 'grabbable' option to the new-model dialog
2018-10-19 16:42:45 -07:00
amantley
a43985ef64
combo box for recenter model is added
2018-10-19 16:03:53 -07:00
Alexander Ivash
5fef331995
address CR comment
2018-10-19 19:35:12 +03:00
Wayne Chen
e32460ed96
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-10-19 09:25:57 -07:00
Alexander Ivash
5d8a253785
FB19400 during shutdown -- TypeError: Cannot read property 'buttons' of null
...
note: change also resolve a lot of other shutdown errors from QML (related to null parent)
2018-10-19 18:57:07 +03:00
amantley
0837f790eb
combo box changes
2018-10-19 07:46:16 -07:00
John Conklin II
3210a4ec39
Merge pull request #14109 from zfox23/purchasesNoSnap
...
Fix MS18154: Don't snap to cards in My Purchases
2018-10-18 18:24:23 -07:00
John Conklin II
86cc612d73
Merge pull request #14185 from howard-stearns/keyboard-vs-submit
...
make room for keyboard and help in SendAsset
2018-10-18 17:53:52 -07:00
amantley
b9a2f19d30
made all the suggested corrections except the dropdown qml.
2018-10-18 16:39:50 -07:00
Kerry Ivan Kurian
d7d49ed84e
Remove cruft
2018-10-18 16:25:26 -07:00
Kerry Ivan Kurian
4d7bc3094a
Fix regression
2018-10-18 16:14:53 -07:00
Zach Fox
9f91238945
UX/UI improvements
2018-10-18 15:27:16 -07:00
Alexander Ivash
a4987e494a
update imports
2018-10-18 21:05:20 +03:00
Alexander Ivash
740123b853
rename stylues-uit => stylesUit & controls-uit => controlsUit
...
note:
the idea is to make imports like 'import controlsUit 1.0' to work
with 'styles-uit'/'controls-uit' it is not possible because of two reasons:
1. import controls-uit 1.0 is invalid syntax
2. qmldir inside controls-uit is 'module controlsUit'
2018-10-18 21:05:20 +03:00
Kerry Ivan Kurian
89a5da80e0
Do not display incomplete metadata
2018-10-18 01:39:20 -07:00
Kerry Ivan Kurian
3b15548ea3
Display resource-access events in marketplace item tester
...
Includes refactoring marketplace item tester into a single-page app.
2018-10-18 01:04:47 -07:00
Alexander Ivash
0ab8a0ba5f
FB19396 - QML warning qrc:///qml/hifi/tablet/WindowRoot.qml:132: TypeError: Cannot read property of null
2018-10-18 01:23:10 +03:00
David Back
50becb5c37
merge particle explorer into properties, resurrect sliders, other tidying/fixes
2018-10-16 12:39:34 -07:00
amantley
67afc86222
cleanup
2018-10-11 18:39:44 -07:00
Howard Stearns
6c6d29152f
new images for My Purchases rez tutorial
2018-10-11 12:36:43 -07:00
Howard Stearns
30971cd766
make room for keyboard and help in SendAsset
2018-10-10 15:43:20 -07:00
Wayne Chen
35eb857ea6
adding non-working login screen
2018-10-09 16:30:47 -07:00
Alexander Ivash
6e66f289fe
take 'materialData?materialName' cases into account
2018-10-09 23:08:14 +03:00
Anthony Thibault
7777f3edd0
Added OutOfRangeDataStrategy parameter to Controller Settings
...
The openvr SDK provides a way to gauge the quality of tracking on a given device via the eTrackingResult enum.
* Drop - Only Running_OK is considered valid, all other eTrackingResults will return invalid poses.
* Freeze - Only Running_OK is considered valid, but other valid TrackingResults will return the last Running_OK pose.
In esseces this will freeze the puck in place at the last good value.
* None - All valid eTrackingResults will be valid, including OutOfRange and Calibrating results. This is the default.
2018-10-09 10:51:02 -07:00
amantley
c4187f0d60
Merge remote-tracking branch 'upstream/master' into squattyPottyFix
2018-10-08 17:07:55 -07:00
Alexander Ivash
7d470cf161
FB18859 - Avatar App Bug when material entity is added as avatar entity
2018-10-09 01:59:41 +03:00
John Conklin II
afe6d97b00
Merge pull request #14100 from danteruiz/soft-entities-updates
...
update soft entities and fix deadlock from qml.
2018-10-04 13:33:34 -07:00
Dante Ruiz
613a6ab8cd
removing unneeded code
2018-10-04 12:18:18 -07:00
Dante Ruiz
676293c880
trying another fix
2018-10-03 16:19:47 -07:00
Dante Ruiz
5734c24af4
another PR fix
2018-10-03 13:52:40 -07:00
John Conklin II
4805d3564a
Merge pull request #14075 from ctrlaltdavid/M18586
...
Teleport with play area
2018-10-03 11:02:33 -07:00
John Conklin II
05609384b7
Merge pull request #14111 from zfox23/newConnectionsQuery
...
Fix MS18608: Use new connections api endpoint
2018-10-03 09:04:58 -07:00
Brad Davis
ffbb144a7c
Fix avatar thumbnails
2018-10-02 16:31:24 -07:00
Dante Ruiz
182c92b951
fix mac issue
2018-10-02 11:24:09 -07:00
David Rowe
f7fd76b316
Merge branch 'master' into M18586
...
# Conflicts:
# interface/src/scripting/HMDScriptingInterface.h
2018-10-02 16:49:16 +13:00
John Conklin II
878d2a6f25
Merge pull request #14102 from howard-stearns/account-managed-wallet-punchlist2
...
Account-managed wallet flow improvements
2018-10-01 16:43:01 -07:00
John Conklin II
87b39f690c
Merge pull request #14106 from jherico/fix/mac_gl1
...
Fix some Mac rendering issues
2018-10-01 16:35:57 -07:00
Brad Hefta-Gaub
8b03a21799
Merge pull request #14025 from ElderOrb/FB18061
...
use current wearable index, not joint index!
2018-10-01 16:14:33 -07:00
David Rowe
6ccd73ea47
Merge branch 'master' into M18586
2018-10-02 10:17:24 +13:00
Dante Ruiz
ad92b172cb
removing comment
2018-10-01 09:47:07 -07:00
Dante Ruiz
31baa46ee0
merging from master
2018-10-01 09:44:54 -07:00
amantley
1a0e2c6ea1
clean up for pr
2018-10-01 08:30:51 -07:00
amantley
bdd6befef9
Merge remote-tracking branch 'upstream/master' into squattyPottyFix
2018-09-29 15:39:36 -07:00
Zach Fox
59eabbbb5d
Fix MS18608: Use new connections api endpoint
2018-09-28 14:28:50 -07:00
Zach Fox
5b72e17981
Fix MS18154: Don't snap to cards in My Purchases
2018-09-28 11:33:22 -07:00
Kerry Ivan Kurian
440e2062f5
Fix application uninstall in marketplace item tester
2018-09-27 22:14:02 -07:00
David Rowe
545c2591e3
Merge branch 'master' into M18586
2018-09-28 16:19:44 +12:00
David Rowe
868a3a9219
Tweak vertical spacing
2018-09-28 15:42:48 +12:00
Bradley Austin Davis
3dea4fd10a
Fix some Mac rendering issues
2018-09-27 19:21:50 -07:00
David Rowe
4813f4d042
Show/hide jumping & flying checkbox depending on movement mode
2018-09-28 13:02:27 +12:00
amantley
52355e53f1
adding the menu item to the avatar app for the sit state.
2018-09-27 16:44:55 -07:00
Howard Stearns
75de305ec3
remove dead code
2018-09-27 16:37:07 -07:00
Howard Stearns
7616639a40
Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2
2018-09-27 16:12:21 -07:00
Dante Ruiz
c1c853790b
update soft entities and fix deadlock
2018-09-27 14:53:28 -07:00
David Rowe
5ab22a1f40
Change play area option text for Oculus
2018-09-27 17:07:42 +12:00
Howard Stearns
da5f77afcd
Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2
2018-09-26 15:26:52 -07:00
Zach Fox
6a3fa28fad
Merge branch 'master' of github.com:highfidelity/hifi into notificationsForFourApps
2018-09-26 15:12:04 -07:00
Howard Stearns
e1659ed520
fix old bad merge, and if told referrer while already setup, follow
...
immediately
2018-09-26 14:57:47 -07:00
Kerry Ivan Kurian
276125937c
Eliminate double equals
2018-09-25 15:18:12 -07:00
Kerry Ivan Kurian
4e7b03883f
Use triple equals
2018-09-25 15:13:26 -07:00
Kerry Ivan Kurian
ff83713365
Use persistent object id counter
2018-09-25 00:58:01 -07:00
Kerry Ivan Kurian
ca1da9c830
Implement delete-from-list functionality in marketplace item tester
2018-09-25 00:57:59 -07:00
Kerry Ivan Kurian
505e08b841
Resolve merge conflicts
2018-09-25 00:57:43 -07:00
Kerry Ivan Kurian
0a43c17ce0
Use entity-specific glyphs in marketplace item tester
2018-09-24 21:15:08 -07:00
Kerry Ivan Kurian
697f556a60
Persist list of marketplace items in test
...
The list of resources between runs of the marketplace item tester now persist between runs of the tester.
2018-09-24 16:30:49 -07:00
Kerry Ivan Kurian
f9c25f2f32
Allow user to select asset type in marketplace item tester
2018-09-20 16:36:06 -07:00
Kerry Ivan Kurian
c1cc031bd0
Remove cruft and refactor
2018-09-20 14:50:27 -07:00
Kerry Ivan Kurian
ae4352f450
Rez entity in marketplace item tester
2018-09-20 13:55:22 -07:00
Kerry Ivan Kurian
afa8e44e66
Refactor
2018-09-20 10:53:32 -07:00
Howard Stearns
391128ef77
Merge branch 'followWalletSetupReferrer' of github.com:zfox23/hifi into account-managed-wallet-punchlist2
2018-09-19 16:46:09 -07:00
Zach Fox
ed84b49ece
Small bugfixes and using original endpoints
2018-09-19 16:15:59 -07:00
Kerry Ivan Kurian
5445d6f670
Switch to localhost before replacing content
2018-09-19 16:06:43 -07:00
Howard Stearns
d644a63990
consistent/usefull checkout flow when you don't have enough money.
2018-09-19 16:00:40 -07:00
Kerry Ivan Kurian
38fd9523ee
Attempt to load content set
...
This does not result in the user seeing the content set.
2018-09-19 15:57:29 -07:00
Kerry Ivan Kurian
5bc7d944f9
Remove whitespace
2018-09-19 15:17:13 -07:00
Alexander Ivash
e5b7b7f12a
FB18061 - Avatar favorites cannot be moved to a different joint - At Save the wearable jumps to the original joint
2018-09-19 23:07:21 +03:00
Zach Fox
55a0f77697
Notifications for MARKET
2018-09-18 14:45:14 -07:00
Kerry Ivan Kurian
cfa9d185f0
Add full resource paths to list in marketplace item tester
2018-09-18 14:02:16 -07:00
Kerry Ivan Kurian
a592565b7b
Enable marketplace item test for avatar file
2018-09-18 13:25:01 -07:00
Kerry Ivan Kurian
645ad2bb7a
Enable marketplace item test for avatar url
2018-09-18 12:36:03 -07:00
Kerry Ivan Kurian
8f5923d562
Show installed apps on start of marketplace item tester
...
Also, refactor a bit.
2018-09-18 11:23:32 -07:00
Kerry Ivan Kurian
f2a046da91
Install marketplace item tester
2018-09-18 00:08:09 -07:00
Zach Fox
23fab0985b
Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi
2018-09-17 11:11:21 -07:00
Zach Fox
68e6142f8b
Follow wallet setup referrer when autogenerating new wallet
2018-09-14 15:34:00 -07:00
Zach Fox
9c5544af39
Merge in big work from appui_notifications branch
2018-09-14 14:37:04 -07:00
Dante Ruiz
ff52639bc3
fix update
2018-09-14 14:10:36 -07:00
Dante Ruiz
4eb5c9714b
fix snapshot settings
2018-09-14 12:59:28 -07:00
Zach Fox
de2548d926
Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi
2018-09-12 09:30:00 -07:00
Wayne Chen
63ad85215b
Merge branch 'master' into interstitalMerged
2018-09-11 17:17:33 -07:00
Seth Alves
3b3006efb0
Merge pull request #13911 from ElderOrb/FB17982_master
...
Avatar App: stop reloading existing selected bookmarks on app relaunch (master)
2018-09-11 14:04:19 -07:00
Zach Fox
ea04ee6d35
Wallet now uses AppUi
2018-09-11 12:37:53 -07:00
Brad Hefta-Gaub
299e9d0d38
Merge pull request #13897 from ElderOrb/filter_out_hands_from_joints
...
filter out left/right hands from joints list in avatarapp
2018-09-11 09:34:48 -07:00
John Conklin II
9c546fc780
Merge pull request #13957 from ElderOrb/FB18024
...
fix keyboard collapsing in VR/goto
2018-09-10 13:09:28 -07:00
Seth Alves
cb33222fea
Merge pull request #13886 from ctrlaltdavid/M17901
...
Improve HMD Menu page navigation
2018-09-10 11:34:21 -07:00
Alexander Ivash
7058b07aea
FB18024: 2 users report that while in VR and in GoTo menu, keyboard is unable to be minimized
2018-09-07 12:41:39 +03:00
Wayne Chen
72818f3729
Merge branch 'master' of https://github.com/highfidelity/hifi into interstitalMerged
2018-09-06 17:37:36 -07:00
Zach Fox
0e785f9bdb
Fix MS17877: Persist Connections table sort choice
2018-09-06 15:35:26 -07:00
David Rowe
ab47e16be1
Fix up titles and leading white space of some dev menu tablet dialogs
2018-09-06 14:35:08 +12:00
David Rowe
8420afd143
Fix title not not going back to "Settings" upon Save or Cancel
2018-09-06 14:00:33 +12:00
David Rowe
a7099025dc
Fix up some Settings dialogs' titles
2018-09-06 11:15:14 +12:00
David Rowe
960bf00e12
Modify look of HMD mode Settings dialogs' titles
2018-09-06 11:02:24 +12:00
David Kelly
b022697dfa
volume slider on users fixed
2018-09-05 15:36:07 -07:00
David Rowe
398724de73
Make Save in HMD settings dialogs return to previous dialog
...
Same as Cancel key does.
2018-09-06 10:23:45 +12:00
David Rowe
f144308334
Make tablet menu page title navigation go back a level
2018-08-31 16:58:59 +12:00
Alexander Ivash
07739453c5
coding standards
2018-08-31 01:51:13 +03:00
Alexander Ivash
cb1855b0d7
filter out left/right hands from joints list in avatarapp
...
should fix:
FB17884 - Wearable disappears when added to some joints
FB17885 - Changing werable joint moves the model and detaches from avatar body
2018-08-31 01:51:13 +03:00
Alexander Ivash
daf81bbcb8
FB17982 Avatar App reloads existing selected bookmark on app relaunch
2018-08-31 00:36:52 +03:00
Wayne Chen
6cdcae3349
switching address syntax, updating redirection domain
2018-08-29 16:11:51 -07:00
David Rowe
c29c9f98c1
Make Cancel in HMD settings dialogs return to Settings dialog
2018-08-28 11:15:57 +12:00
Zach Fox
dddb2141f0
Implement Wallet Security feature - Auto Logout checkbox
2018-08-23 15:45:29 -07:00
Zach Fox
a1d88a8588
Merge howard/wallet-locker2 into my branch
2018-08-23 14:45:16 -07:00
John Conklin II
32562511e8
Merge pull request #13782 from ElderOrb/FB17184
...
Add Support for Managing Avatar Entities to the Avatar App
2018-08-22 10:20:04 -07:00
Alexander Ivash
cfb820762d
bulk adjusting to coding guidelines
2018-08-22 00:42:01 +03:00
Alexander Ivash
9f92ff5de9
fix for duplicating wearables on saving
...
note: the issue was caused by newly-introduced code converting between attachments & entities
fix removes attachments-related code because attachments are deprecated and converted into entities on the fly
2018-08-18 16:38:35 +03:00
Alexander Ivash
3bcd6f4a25
take 'relayParentJoints' into account during wearables comparison
2018-08-18 16:33:30 +03:00
Alexander Ivash
877bce23d2
explicitely specify localRotations on joint change, otherwise it will be updated by engine
2018-08-18 16:32:31 +03:00
John Conklin II
02f53c4ee5
Merge pull request #13808 from dback2/createEntitiesGrabbable
...
Use Create Entities as Grabbable option when adding asset to world
2018-08-16 09:22:23 -07:00
elderorb
ea22fdb400
Merge branch 'master' into FB17184
2018-08-16 02:08:47 +03:00
Kerry Ivan Kurian
6a34bde49c
Merge pull request #13825 from roxanneskelly/autoScroll
...
Auto scroll
2018-08-14 20:56:53 -07:00
Roxanne Skelly
50b0a458ce
Changes as requested by zfox23 - Start and stop timers on hover only if scroll is enabled.
2018-08-14 16:32:56 -07:00
Roxanne Skelly
5a8da4ce97
Fix 'hover-to-pause' functionality of AutoScroll Featured Stories list in the goto app
2018-08-14 15:28:22 -07:00
Roxanne Skelly
987d8569ae
Merge branch 'autoScrollGoTo' of https://github.com/zfox23/hifi into autoScroll
2018-08-14 15:27:22 -07:00
