diff --git a/interface/resources/html/help.html b/interface/resources/html/help.html new file mode 100644 index 0000000000..4956dc20ea --- /dev/null +++ b/interface/resources/html/help.html @@ -0,0 +1,71 @@ + + + + + + Welcome to Interface + + + + + + +
+ + + + +
+ + + diff --git a/interface/resources/html/img/controls-help-gamepad.jpg b/interface/resources/html/img/controls-help-gamepad.jpg new file mode 100644 index 0000000000..339e155f82 Binary files /dev/null and b/interface/resources/html/img/controls-help-gamepad.jpg differ diff --git a/interface/resources/html/img/controls-help-keyboard.jpg b/interface/resources/html/img/controls-help-keyboard.jpg new file mode 100644 index 0000000000..7de9ae6d59 Binary files /dev/null and b/interface/resources/html/img/controls-help-keyboard.jpg differ diff --git a/interface/resources/html/img/controls-help-vive.jpg b/interface/resources/html/img/controls-help-vive.jpg new file mode 100644 index 0000000000..6f308aebf3 Binary files /dev/null and b/interface/resources/html/img/controls-help-vive.jpg differ diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 610144b2cc..7f396ad690 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -198,8 +198,9 @@ 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.html"; +static const QString INFO_WELCOME_PATH = "html/interface-welcome.html"; static const QString INFO_EDIT_ENTITIES_PATH = "html/edit-commands.html"; +static const QString INFO_HELP_PATH = "html/help.html"; static const unsigned int THROTTLED_SIM_FRAMERATE = 15; static const int THROTTLED_SIM_FRAME_PERIOD_MS = MSECS_PER_SECOND / THROTTLED_SIM_FRAMERATE; @@ -1999,11 +2000,11 @@ void Application::setFieldOfView(float fov) { } void Application::aboutApp() { - InfoView::show(INFO_HELP_PATH); + InfoView::show(INFO_WELCOME_PATH); } void Application::showHelp() { - InfoView::show(INFO_EDIT_ENTITIES_PATH); + InfoView::show(INFO_HELP_PATH); } void Application::resizeEvent(QResizeEvent* event) {