Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-10 00:04:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/amerhifi/hifi

Browse source
This commit is contained in:
amer cerkic 2019-02-21 11:42:21 -08:00
commit 52849101a2
4 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/ui/Keyboard.h
View file

@ -179,7 +179,12 @@ private:
mutable ReadWriteLockable _handLaserLock;
mutable ReadWriteLockable _preferMalletsOverLasersSettingLock;
mutable ReadWriteLockable _ignoreItemsLock;
#ifdef Q_OS_ANDROID
Setting::Handle<bool> _use3DKeyboard { "use3DKeyboard", false };
#else
Setting::Handle<bool> _use3DKeyboard { "use3DKeyboard", true };
#endif
QString _typedCharacters;
TextDisplay _textDisplay;

2
scripts/system/html/js/SnapshotReview.js
View file

@ -450,7 +450,7 @@ function updateShareInfo(containerID, storyID) {
facebookButton.setAttribute("href", 'https://www.facebook.com/dialog/feed?app_id=1585088821786423&link=' + shareURL);
twitterButton.setAttribute("target", "_blank");
twitterButton.setAttribute("href", 'https://twitter.com/intent/tweet?text=I%20just%20took%20a%20snapshot!&url=' + shareURL + '&via=highfidelityinc&hashtags=VR,HiFi');
twitterButton.setAttribute("href", 'https://twitter.com/intent/tweet?text=I%20just%20took%20a%20snapshot!&url=' + shareURL + '&via=highfidelityVR&hashtags=VR,HiFi');
hideUploadingMessageAndMaybeShare(containerID, storyID);
}

6
tools/jsdoc/.gitignore vendored
View file

@ -1,2 +1,6 @@
out
out/*
!out/README.md

1
tools/jsdoc/out/README.md Normal file
View file

@ -0,0 +1 @@
This is the output directory for the JavaScript API documentation generated by jsdoc.