final product Mario is done

ethanJPope · Jun 29, 2024 · 96966f4 · 96966f4
1 parent 77a18c9
commit 96966f4
Show file tree

Hide file tree

Showing 16 changed files with 138,466 additions and 3,732 deletions.
diff --git a/build.gradle b/build.gradle
@@ -57,6 +57,18 @@ dependencies {
 }
 
 
+task copyAssets(type: Copy) {
+    copy {
+        from "assets"
+        into "${buildDir}/libs/assets"
+    }
+
+    copy {
+        from "level.txt"
+        into "${buildDir}/libs"
+    }
+}
+
 task fatJar(type: Jar) {
     manifest.from jar.manifest
     from {
@@ -66,9 +78,9 @@ task fatJar(type: Jar) {
         exclude "META-INF/*.DSA"
         exclude "META-INF/*.RSA"
     }
-    with jar
 }
 
+fatJar.dependsOn(copyAssets)
 
 artifacts {
     archives fatJar

diff --git a/imgui.ini b/imgui.ini
@@ -1,11 +1,11 @@
 [Window][Debug##Default]
-Pos=60,60
+Pos=60,37
 Size=400,400
 Collapsed=0
 
 [Window][Test window]
 Pos=8,3
-Size=1904,145
+Size=1904,132
 Collapsed=0
 DockId=0x00000009,0
 
@@ -27,8 +27,8 @@ Size=1920,1080
 Collapsed=0
 
 [Window][Game Viewport]
-Pos=511,150
-Size=1401,899
+Pos=502,3
+Size=1410,1046
 Collapsed=0
 DockId=0x00000002,0
 
@@ -39,8 +39,8 @@ Collapsed=0
 DockId=0x00000008,0
 
 [Window][Level Editor Stuff]
-Pos=8,150
-Size=501,663
+Pos=8,137
+Size=492,676
 Collapsed=0
 DockId=0x00000003,0
 
@@ -51,21 +51,21 @@ Collapsed=0
 DockId=0x00000003,1
 
 [Window][Scene Hierarchy]
-Pos=8,815
-Size=501,234
+Pos=8,3
+Size=492,1046
 Collapsed=0
 DockId=0x00000004,0
 
 [Docking][Data]
 DockSpace           ID=0x6D3A3A6E Window=0x091AB4BE Pos=8,26 Size=1904,1046 Split=Y
-  DockNode          ID=0x00000009 Parent=0x6D3A3A6E SizeRef=1904,145 Selected=0x8081D1E6
-  DockNode          ID=0x0000000A Parent=0x6D3A3A6E SizeRef=1904,899 Split=X
-    DockNode        ID=0x00000001 Parent=0x0000000A SizeRef=501,1981 Split=Y Selected=0xE927CF2F
+  DockNode          ID=0x00000009 Parent=0x6D3A3A6E SizeRef=1904,132 Selected=0x8081D1E6
+  DockNode          ID=0x0000000A Parent=0x6D3A3A6E SizeRef=1904,912 Split=X
+    DockNode        ID=0x00000001 Parent=0x0000000A SizeRef=492,1981 Split=Y Selected=0xE927CF2F
       DockNode      ID=0x00000005 Parent=0x00000001 SizeRef=708,991 Split=Y Selected=0xE927CF2F
         DockNode    ID=0x00000007 Parent=0x00000005 SizeRef=848,190 Split=Y Selected=0x9A68760C
-          DockNode  ID=0x00000003 Parent=0x00000007 SizeRef=472,139 Selected=0x4D7EC7FC
-          DockNode  ID=0x00000004 Parent=0x00000007 SizeRef=472,49 Selected=0x9A68760C
+          DockNode  ID=0x00000003 Parent=0x00000007 SizeRef=472,676 Selected=0x4D7EC7FC
+          DockNode  ID=0x00000004 Parent=0x00000007 SizeRef=472,234 Selected=0x9A68760C
         DockNode    ID=0x00000008 Parent=0x00000005 SizeRef=848,707 Selected=0xC89E3217
       DockNode      ID=0x00000006 Parent=0x00000001 SizeRef=708,988 Selected=0xF02CD328
-    DockNode        ID=0x00000002 Parent=0x0000000A SizeRef=1401,1981 CentralNode=1 Selected=0xAE7BB42F
+    DockNode        ID=0x00000002 Parent=0x0000000A SizeRef=1410,1981 CentralNode=1 Selected=0xAE7BB42F