Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4c103b1259ce2203c4af26f4e4f4fa9bf06af50614c949d7e59e0bdd688e7562
+size 1979
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c3082c3a282d8578b1ba9c9fe74857d7155ee918721d9bfed4ef3d00ee09211c
+size 1890
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b7f859801eca4bb6cac2566000a2bbae7a597c0d50caa00a83c4e15dc739f1d4
+size 1917
@@ -383,6 +383,9 @@
    <file>img/UI20/toolbar/Y_axis.svg</file>
    <file>img/UI20/toolbar/Z_axis.svg</file>
    <file>img/UI20/toolbar/XY2_copy.svg</file>
+    <file>img/triangle0.png</file>
+    <file>img/triangle0_highlighted.png</file>
+    <file>img/line.png</file>
 </qresource>
 <qresource>
    <file alias="Editor/Style/EditorStylesheetVariables_Dark.json">../../../../Sandbox/Editor/Style/EditorStylesheetVariables_Dark.json</file>
@@ -27,7 +27,7 @@ MenuPage::MenuPage(QWidget* parent)

    const auto actionText = QStringLiteral("Option");
    menu->addAction(actionText);
-    auto searchAction = menu->addAction(QIcon(QStringLiteral(":/stylesheet/img/search.svg")), QStringLiteral("Search"));
+    menu->addAction(QIcon(QStringLiteral(":/stylesheet/img/search.svg")), QStringLiteral("Search"));
    menu->addSeparator();

    auto shortcutAction = menu->addAction(actionText);
@@ -96,4 +96,4 @@ MenuPage::~MenuPage()
 {
 }

-#include <Gallery/moc_MenuPage.cpp>
+#include <Gallery/moc_MenuPage.cpp>
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Oval 6</title>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Inspector-2" transform="translate(-1724.000000, -285.000000)" fill="#FFFFFF" fill-rule="nonzero">
+            <g id="Group" transform="translate(1714.000000, 255.000000)">
+                <path d="M17.75,30.25 C22.0302068,30.25 25.5,33.7197932 25.5,38 C25.5,42.2802068 22.0302068,45.75 17.75,45.75 C13.4697932,45.75 10,42.2802068 10,38 C10,33.7197932 13.4697932,30.25 17.75,30.25 Z M21.9230842,36.8875321 C21.590362,36.5777872 21.1499255,36.4637717 20.393435,36.8875321 L20.393435,36.8875321 L20.393435,39.1247335 C20.3078139,39.3862214 19.5880467,39.0740522 19.5880467,39.3471973 L19.5880467,39.3471973 L19.5880467,40.1832625 C19.5880467,40.5490163 20.373798,40.4179507 20.9265311,40.4179507 C21.2398827,40.5640832 21.1499255,41.1654284 21.1499255,41.3219178 C20.8009407,41.3219178 20.8107092,42.1358461 19.7108476,42.1358461 C19.4749079,42.1358461 19.2067566,42.3782747 18.9063936,42.8631318 C18.5774755,42.9572 18.3585318,42.9572 18.2495624,42.8631318 C17.9917698,42.6405913 18.0639002,42.5929236 18.0639002,42.1358461 C17.7490706,42.0583816 17.2421758,42.0157944 16.5432157,42.0080847 L16.5432157,42.0080847 L16.5432157,41.3219178 L16.5432157,41.3219178 L15.7192213,41.3219178 C15.4649524,41.467548 15.2659138,41.7388575 15.1221055,42.1358461 L15.1221055,42.1358461 L13.4562289,42.1358461 C13.4562289,42.8631318 14.2746545,42.6643305 14.2746545,43.4057505 C14.2746545,43.70763 15.5932808,43.3136142 15.7192213,44.0188584 C15.8451617,44.7241026 18.0966562,44.6297834 19.5880467,44.2327119 C22.4562289,43.4690805 23.8820008,41.1463376 24.2040243,39.5905304 C24.5260478,38.0347231 24.343851,37.5466972 23.6034998,37.5466972 L23.6034998,37.5466972 L22.6881842,37.5466972 C22.2173073,37.5466972 22.8191026,38.3115454 22.4884098,38.3115454 C22.157717,38.3115454 21.9230842,38.3612916 21.9230842,37.7457914 L21.9230842,37.7457914 Z M17.4663725,31.3904088 C15.1901696,31.3764381 13.5194447,31.7569095 11.3640944,36.6864363 C11.3640944,37.0394323 11.4375107,37.3715778 11.6947367,37.4223367 C11.9057364,37.4639736 12.6046349,37.4223367 12.8218274,37.4223367 C13.3401431,37.4223367 13.4562289,37.4223367 13.4562289,38.1786887 C13.4562289,38.5903116 14.2573076,38.7864722 14.2573076,39.3471973 C14.2573076,39.9079225 14.7600011,40.1509551 15.1221055,40.5685872 L15.8282319,40.5685872 L15.8282319,40.5685872 L15.8282319,39.0899479 L15.8282319,39.0899479 C15.8282319,38.9733116 16.5432157,38.9733116 16.9178106,39.0064924 C17.4032805,39.0064924 17.4032805,38.3483287 17.1722779,38.301168 C16.741164,38.2131535 15.8282319,38.301168 15.8282319,37.9037493 L15.8282319,36.3094851 L15.8282319,36.3094851 C15.8282319,35.6193344 16.5432157,36.2438976 16.5432157,35.553747 L16.5432157,33.4007819 L16.5432157,33.4007819 C16.5432157,32.7363875 16.8954156,32.83074 17.4663725,32.83074 C18.2495624,32.3799956 17.9300811,31.7569095 17.4663725,31.3904088 Z M18.9263619,34.4814505 C18.2495624,34.3404349 17.832423,34.3404349 17.2855835,34.4814505 C17.1345093,34.795806 17.1345093,34.9935976 17.2855835,35.1536992 C18.2495624,35.1450754 18.9263619,35.3316464 18.9263619,35.8792081 C19.0692871,36.0410209 19.4229255,36.0410209 19.7108476,35.8792081 C19.683443,35.3640449 19.683443,34.9051922 18.9263619,34.4814505 Z" id="Oval-6"></path>
+            </g>
+        </g>
+    </g>
+</svg>
@@ -7,6 +7,9 @@
        <file alias="prefab.svg">Entity/prefab.svg</file>
        <file alias="prefab_edit.svg">Entity/prefab_edit.svg</file>
    </qresource>
+    <qresource prefix="/Level">
+        <file alias="level.svg">Level/level.svg</file>
+    </qresource>
    <qresource prefix="/Notifications">
        <file alias="checkmark.svg">Notifications/checkmark.svg</file>
        <file alias="download.svg">Notifications/download.svg</file>