Merge branch 'dev' of https://github.com/XRFoundation/XREngine into dev

EtherealEngine · Jul 8, 2021 · 62815cd · 62815cd
2 parents 6b6f594 + 53e595c
commit 62815cd
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/packages/client-core/package.json b/packages/client-core/package.json
@@ -43,7 +43,7 @@
     "@styled-icons/fa-regular": "10.34.0",
     "@styled-icons/fa-solid": "10.34.0",
     "@styled-icons/material": "10.34.0",
-    "@types/react-infinite-scroller": "1.2.1",
+    "@types/react-infinite-scroller": "1.2.2",
     "@types/react-redux": "7.1.17",
     "@types/styled-components": "5.1.11",
     "@typescript-eslint/eslint-plugin": "4.28.2",

diff --git a/packages/client-core/src/world/components/editor/EditorContainer.tsx b/packages/client-core/src/world/components/editor/EditorContainer.tsx
@@ -878,21 +878,17 @@ class EditorContainer extends Component<EditorContainerProps, EditorContainerSta
         children: [
           {
             mode: 'vertical' as DockMode,
-            size: 7,
+            size: 8,
             children: [
               {
                 tabs: [{id: 'viewPanel', title: 'Viewport', content: <div />}],
-                size: 8,
-              },
-              {
-                tabs: [{id: 'assetsPanel', title: 'Elements', content: <AssetsPanel />}],
-                size: 2,
+                size: 1,
               }
             ]
           },
           {
             mode: 'vertical' as DockMode,
-            size: 3,
+            size: 2,
             children: [
               {
                 tabs: [{
@@ -907,14 +903,18 @@ class EditorContainer extends Component<EditorContainerProps, EditorContainerSta
               },
               {
                 tabs: [{
-                  id: 'propertiesPanel', 
+                  id: 'propertiesPanel',
                   title: (
                     <PanelDragContainer>
                       <PanelIcon as={SlidersH} size={12} />
                       <PanelTitle>Properties</PanelTitle>
                     </PanelDragContainer>
-                  ), 
+                  ),
                   content: <PropertiesPanelContainer />
+                }, {
+                  id: 'assetsPanel',
+                  title: 'Elements',
+                  content: <AssetsPanel />
                 }],
               }
             ]

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -35,7 +35,7 @@
     "socket.io": "4.1.2"
   },
   "dependencies": {
-    "@capacitor/core": "3.0.2",
+    "@capacitor/core": "3.1.1",
     "@feathersjs/client": "5.0.0-pre.4",
     "@material-ui/core": "4.12.1",
     "@material-ui/icons": "4.11.2",
@@ -90,7 +90,7 @@
     "redux-immutable": "4.0.0",
     "redux-thunk": "2.3.0",
     "reselect": "4.0.0",
-    "sass": "1.35.1",
+    "sass": "1.35.2",
     "semantic-ui-react": "2.0.3",
     "shaka-player": "3.1.1",
     "socket.io-client": "4.1.2",

diff --git a/packages/social/package.json b/packages/social/package.json
@@ -29,11 +29,11 @@
     "socket.io": "4.1.2"
   },
   "dependencies": {
-    "@capacitor/android": "3.0.2",
+    "@capacitor/android": "3.1.1",
     "@capacitor/app": "1.0.2",
-    "@capacitor/cli": "3.1.0",
-    "@capacitor/ios": "3.1.0",
-    "@capacitor/share": "1.0.2",
+    "@capacitor/cli": "3.1.1",
+    "@capacitor/ios": "3.1.1",
+    "@capacitor/share": "1.0.3",
     "@material-ui/core": "4.12.1",
     "@types/react-redux": "7.1.17",
     "@xrengine/client-core": "^0.3.30",
@@ -46,7 +46,7 @@
     "react-redux": "7.2.4",
     "react-video-recorder": "3.18.2",
     "redux": "4.1.0",
-    "sass": "1.35.1",
+    "sass": "1.35.2",
     "styled-components": "5.3.0",
     "volumetric": "https://github.com/XRFoundation/UniversalVolumetric",
     "webxr-native": "0.2.24"