Merge branch 'main' into mobile

Author: Lily

Project.xml

@@ -56,6 +56,7 @@
 		<library name="week6"         preload="true" />
 		<library name="week7"         preload="true" />
 		<library name="weekend1"      preload="true" />
+		<library name="models"        preload="true" />
 	</section>
 
 	<section if="NO_PRELOAD_ALL">
@@ -68,6 +69,7 @@
 		<library name="week6"         preload="false" />
 		<library name="week7"         preload="false" />
 		<library name="weekend1"      preload="false" />
+		<library name="models"        preload="false" />
 	</section>
 
 	<assets path="assets/videos"        library="videos"        if="VIDEOS_ALLOWED"/>
@@ -90,6 +92,8 @@
 	<assets path="assets/week7"         library="week7"         exclude="*.ogg" if="web"/>
 	<assets path="assets/week7"         library="week7"         exclude="*.mp3" unless="web"/>
 	<assets path="assets/weekend1"      library="weekend1"      exclude="*.mp3" unless="web"/>
+	<assets path="assets/preload/models"        library="models"        /> 
+	<assets path="assets/preload/models"        library="models"        />
 
 	<haxelib name="grig.audio"/>
 	<haxelib name="funkin.vis"/>
@@ -116,6 +120,7 @@
 	<haxelib name="flixel" />
 	<haxelib name="flixel-ui" />
 	<haxelib name="flixel-addons" />
+	<haxelib name="away3d" />
 
 	<!--JS stuff needed-->
 	<haxelib name="hscript" />
@@ -176,4 +181,4 @@
 	<icon path="art/icon32.png" size='32'/>
 	<icon path="art/icon64.png" size='64'/>
 	<icon path="art/iconOG.png" />
-</project>
+</project>

assets/preload/characters/dad.json

@@ -158,4 +158,4 @@
 		206
 	],
 	"scale": 1
-}
+}

assets/preload/models/Flixel Color.png

@@ -0,0 +1,13 @@
+# Blender 3.3.1 MTL File: 'flixel.blend'
+# www.blender.org
+
+newmtl Flixel
+Ka 1.000000 1.000000 1.000000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd Flixel Color.png
+map_Ns Flixel Roughness.png
+map_refl Flixel Metalness.png