Merge branch 'master' of https://github.com/tomheeleynz/Arcane-Engine

tomheeleynz · Nov 11, 2022 · 7c6e4d2 · 7c6e4d2
2 parents c728864 + 99fb9ea
commit 7c6e4d2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/BuildScripts/build-windows.bat b/BuildScripts/build-windows.bat
diff --git a/EnchantingTable/imgui.ini b/EnchantingTable/imgui.ini
@@ -17,7 +17,7 @@ DockId=0x39930E19,0
 
 [Window][DockSpace Demo]
 Pos=0,0
-Size=2560,1377
+Size=1600,1200
 Collapsed=0
 
 [Window][Entity Panel]
@@ -33,26 +33,26 @@ Collapsed=0
 DockId=0x00000005,0
 
 [Window][File Browser]
-Pos=405,1000
-Size=1685,377
+Pos=254,516
+Size=1052,684
 Collapsed=0
 DockId=0x00000008,0
 
 [Window][Viewport]
-Pos=405,19
-Size=1685,979
+Pos=254,19
+Size=1052,495
 Collapsed=0
 DockId=0x00000007,0
 
 [Window][Scene]
 Pos=0,19
-Size=403,1358
+Size=252,1181
 Collapsed=0
 DockId=0x00000009,0
 
 [Window][Entity]
-Pos=2092,19
-Size=468,1358
+Pos=1308,19
+Size=292,1181
 Collapsed=0
 DockId=0x0000000D,0
 
@@ -64,16 +64,16 @@ DockId=0x0000000E,0
 
 [Docking][Data]
 DockSpace             ID=0x39930E19 Pos=184,152 Size=1072,842 CentralNode=1 Selected=0x4A17B156
-DockSpace             ID=0x3BC79352 Window=0x4647B76E Pos=0,19 Size=2560,1358 Split=X
+DockSpace             ID=0x3BC79352 Window=0x4647B76E Pos=0,19 Size=1600,1181 Split=X
   DockNode            ID=0x00000009 Parent=0x3BC79352 SizeRef=252,1181 Selected=0x18B8C0DE
   DockNode            ID=0x0000000A Parent=0x3BC79352 SizeRef=1346,1181 Split=X
     DockNode          ID=0x0000000B Parent=0x0000000A SizeRef=1052,1358 Split=X
       DockNode        ID=0x00000003 Parent=0x0000000B SizeRef=1857,1181 Split=X
         DockNode      ID=0x00000005 Parent=0x00000003 SizeRef=409,1181 Selected=0x18F2AEBA
         DockNode      ID=0x00000006 Parent=0x00000003 SizeRef=1774,1181 Split=X
           DockNode    ID=0x00000001 Parent=0x00000006 SizeRef=1262,1181 Split=Y Selected=0x995B0CF8
-            DockNode  ID=0x00000007 Parent=0x00000001 SizeRef=1178,979 CentralNode=1 Selected=0x995B0CF8
-            DockNode  ID=0x00000008 Parent=0x00000001 SizeRef=1178,377 Selected=0x2389D759
+            DockNode  ID=0x00000007 Parent=0x00000001 SizeRef=1178,495 CentralNode=1 Selected=0x995B0CF8
+            DockNode  ID=0x00000008 Parent=0x00000001 SizeRef=1178,684 Selected=0x2389D759
           DockNode    ID=0x00000002 Parent=0x00000006 SizeRef=336,1181 Selected=0x4A17B156
       DockNode        ID=0x00000004 Parent=0x0000000B SizeRef=360,1181 Selected=0x2DDDAD1E
     DockNode          ID=0x0000000C Parent=0x0000000A SizeRef=292,1358 Split=Y Selected=0x0984415E

diff --git a/build-windows.bat b/build-windows.bat
@@ -0,0 +1,3 @@
+cmake -G "Visual Studio 17 2022" -A x64 .
+echo "Build Finished"
+PAUSE