diff --git a/examples/entityScripts/portal.js b/examples/entityScripts/portal.js index e1f00b0afc..5dd7849c38 100644 --- a/examples/entityScripts/portal.js +++ b/examples/entityScripts/portal.js @@ -1,6 +1,7 @@ (function(){ var teleport; var portalDestination; + var animationURL; function playSound() { Audio.playSound(teleport, { volume: 0.40, localOnly: true }); @@ -11,6 +12,7 @@ var properties = Entities.getEntityProperties(entityID); portalDestination = properties.userData; + animationURL = properties.modelURL; print("The portal destination is " + portalDestination); } @@ -25,7 +27,7 @@ this.leaveEntity = function(entityID) { Entities.editEntity(entityID, { - animationURL: "http://hifi-public.s3.amazonaws.com/models/content/phonebooth.fbx", + animationURL: animationURL, animationSettings: '{ "frameIndex": 1, "running": false }' }); @@ -34,7 +36,7 @@ this.hoverEnterEntity = function(entityID) { Entities.editEntity(entityID, { - animationURL: "http://hifi-public.s3.amazonaws.com/models/content/phonebooth.fbx", + animationURL: animationURL, animationSettings: '{ "fps": 24, "firstFrame": 1, "lastFrame": 25, "frameIndex": 1, "running": true, "hold": true }' }); }; diff --git a/examples/libraries/entityCameraTool.js b/examples/libraries/entityCameraTool.js index bbd28dd38a..da6a35b273 100644 --- a/examples/libraries/entityCameraTool.js +++ b/examples/libraries/entityCameraTool.js @@ -477,7 +477,7 @@ CameraManager = function() { // Last mode that was first or third person var lastAvatarCameraMode = "first person"; Camera.modeUpdated.connect(function(newMode) { - if (newMode == "first person" || newMode == "third person") { + if (newMode != "independent") { lastAvatarCameraMode = newMode; that.disable(true); } else { diff --git a/examples/notifications.js b/examples/notifications.js index 287bfd0b36..f9d2ba83ed 100644 --- a/examples/notifications.js +++ b/examples/notifications.js @@ -84,7 +84,7 @@ var users = []; var ctrlIsPressed = false; var ready = true; -var randomSounds = new SoundArray({}, true); +var randomSounds = new SoundArray({ localOnly: true }, true); var numberOfSounds = 2; for (var i = 1; i <= numberOfSounds; i++) { randomSounds.addSound(HIFI_PUBLIC_BUCKET + "sounds/UI/notification-general" + i + ".raw"); diff --git a/interface/resources/html/img/devices.png b/interface/resources/html/img/devices.png new file mode 100644 index 0000000000..fc4231e96e Binary files /dev/null and b/interface/resources/html/img/devices.png differ diff --git a/interface/resources/html/img/models.png b/interface/resources/html/img/models.png new file mode 100644 index 0000000000..b09c36011d Binary files /dev/null and b/interface/resources/html/img/models.png differ diff --git a/interface/resources/html/img/move.png b/interface/resources/html/img/move.png new file mode 100644 index 0000000000..4444ebbec5 Binary files /dev/null and b/interface/resources/html/img/move.png differ diff --git a/interface/resources/html/img/run-script.png b/interface/resources/html/img/run-script.png new file mode 100644 index 0000000000..941b8ee9f1 Binary files /dev/null and b/interface/resources/html/img/run-script.png differ diff --git a/interface/resources/html/img/talk.png b/interface/resources/html/img/talk.png new file mode 100644 index 0000000000..682e034ab0 Binary files /dev/null and b/interface/resources/html/img/talk.png differ diff --git a/interface/resources/html/img/write-script.png b/interface/resources/html/img/write-script.png new file mode 100644 index 0000000000..dae97e59b1 Binary files /dev/null and b/interface/resources/html/img/write-script.png differ diff --git a/interface/resources/html/interface-welcome-allsvg.html b/interface/resources/html/interface-welcome-allsvg.html deleted file mode 100644 index d025f8059b..0000000000 --- a/interface/resources/html/interface-welcome-allsvg.html +++ /dev/null @@ -1,628 +0,0 @@ - -
- - -Welcome to Interface -Created with Sketch (http://www.bohemiancoding.com/sketch) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Use your best headphones and microphone for high fidelity audio. Chat via text by pressing the Enter key. - -Use two fingers to look around. Turn this off by opening Running Scripts (Cmnd/Cntrl+J) and clicking the X next to lookWithTouch.js - -Move around with WASD & fly up or down with E & C.Cmnd/Cntrl+G will send you home. @ (Shift+2) will let you teleport to a user or location. - -Have an Oculus Rift, a Razer Hydra, or a PrimeSense 3D camera? We support them all. - -Use the editVoxels.js script to build with your mouse – use the tab key to toggle the tools on/off. - - - - - - - - - - - - - - - - - - -Write a script; we’re always adding new features. Cmnd/Cntrl+J will launch a Running Scripts dialog to help manage your scripts. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A - C - D - S - - W - - - - - - - - - E - - - - - - - - - - - - - - -
diff --git a/interface/resources/html/interface-welcome.html b/interface/resources/html/interface-welcome.html new file mode 100644 index 0000000000..d632cb0e5c --- /dev/null +++ b/interface/resources/html/interface-welcome.html @@ -0,0 +1,190 @@ + + + + + + + Welcome to Interface + + + + + +
+
+

Move around

+ +

+ Move around with WASD & fly
+ up or down with E & C.
+ Cmnd/Ctrl+G will send you
+ home. Hitting Enter will let you
+ teleport to a user or location. +

+
+
+

Listen & talk

+ +

+ Use your best headphones
+ and microphone for high
+ fidelity audio. Chat via text by
+ pressing the \ key. +

+
+
+

Connect devices

+ +

+ Have an Oculus Rift, a Razer
+ Hydra, or a PrimeSense 3D
+ camera? We support them all. +

+
+
+

Run a script

+ +

+ Cmnd/Cntrl+J will launch a
+ Running Scripts dialog to help
+ manage your scripts and search
+ for new ones to run. +

+
+
+

Script something

+ +

+ Write a script; we're always
+ adding new features.
+ Cmnd/Cntrl+J will launch a
+ Running Scripts dialog to help
+ manage your scripts. +

+
+
+

Import models

+ +

+ Use the editEntitles.js script to
+ add FBX models in-world. You
+ can use grids and fine tune
+ placement-related parameters
+ with ease. +

+
+
+
+

Read the docs

+

+ We are writing documentation on
+ just about everything. Please,
+ devour all we've written and make
+ suggestions where necessary.
+ Documentation is always at
+ docs.highfidelity.io +

+
+
+
+
+ + + + + \ No newline at end of file diff --git a/interface/src/Application.h b/interface/src/Application.h index f5c5397f6e..f7a71e1e7c 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -111,7 +111,7 @@ static const float MIRROR_FIELD_OF_VIEW = 30.0f; static const quint64 TOO_LONG_SINCE_LAST_SEND_DOWNSTREAM_AUDIO_STATS = 1 * USECS_PER_SECOND; -static const QString INFO_HELP_PATH = "html/interface-welcome-allsvg.html"; +static const QString INFO_HELP_PATH = "html/interface-welcome.html"; static const QString INFO_EDIT_ENTITIES_PATH = "html/edit-entities-commands.html"; #ifdef Q_OS_WIN diff --git a/interface/src/ui/InfoView.cpp b/interface/src/ui/InfoView.cpp index 607b222207..b62b8f3f2d 100644 --- a/interface/src/ui/InfoView.cpp +++ b/interface/src/ui/InfoView.cpp @@ -11,6 +11,7 @@ #include #include +#include #include #include #include @@ -32,6 +33,9 @@ InfoView::InfoView(bool forced, QString path) : QString absPath = QFileInfo(PathUtils::resourcesPath() + path).absoluteFilePath(); QUrl url = QUrl::fromLocalFile(absPath); + page()->setLinkDelegationPolicy(QWebPage::DelegateExternalLinks); + connect(this, SIGNAL(linkClicked(QUrl)), this, SLOT(linkClickedInfoView(QUrl))); + load(url); connect(this, SIGNAL(loadFinished(bool)), this, SLOT(loaded(bool))); } @@ -83,3 +87,8 @@ void InfoView::loaded(bool ok) { setAttribute(Qt::WA_DeleteOnClose); show(); } + +void InfoView::linkClickedInfoView(QUrl url) { + close(); + QDesktopServices::openUrl(url); +} diff --git a/interface/src/ui/InfoView.h b/interface/src/ui/InfoView.h index 47d5dac9ce..1198a703e4 100644 --- a/interface/src/ui/InfoView.h +++ b/interface/src/ui/InfoView.h @@ -27,6 +27,7 @@ private: private slots: void loaded(bool ok); + void linkClickedInfoView(QUrl url); }; #endif // hifi_InfoView_h