Merge branch 'internal-merge' into imgui

Author: Raltyro

assets/shaders/engine/editorWaveforms.frag

@@ -1,5 +1,9 @@
+// this causes issues apparently?? need to check GLSLSourceAssembler
+// but it could just be unnecessary too anyway
+// if not, put this also in editorWaveformsRainbow.frag
+//#version 120
+
 #pragma header
-#version 120 // this shader doesnt require expensive calculations
 
 const vec3 gradient1 = vec3(114.0/255.0, 81.0/255.0, 135.0/255.0);
 const vec3 gradient2 = vec3(144.0/255.0, 80.0/255.0, 186.0/255.0);

building/libs.xml

@@ -15,13 +15,13 @@
 		<!-- CNE Core Libraries -->
 		<git name="flixel-animate" url="https://github.com/CodenameCrew/cne-flixel-animate" skipDeps="true"/>
 		<git name="hscript-improved" url="https://github.com/CodenameCrew/hscript-improved" ref="codename-dev"/>
-		<git name="away3d" url="https://github.com/CodenameCrew/away3d" skipDeps="true"/>
 		<lib name="hxWebSockets"/>
 
 		<!-- Other Libraries -->
 		<git name="hxdiscord_rpc" url="https://github.com/CodenameCrew/cne-hxdiscord_rpc" skipDeps="true"/>
 		<git name="hxvlc" url="https://github.com/CodenameCrew/cne-hxvlc" skipDeps="true"/>
 		<git name="funkin-modchart" url="https://github.com/CodenameCrew/FunkinModchart" skipDeps="true"/>
+		<git name="foxlite" url="https://github.com/dwdvIl/foxlite" skipDeps="true"/>
 		<lib name="hxcpp-debug-server"/>
 		<lib name="format"/>
 		<lib name="markdown"/>

project.xml

@@ -74,7 +74,7 @@
 	<!-- Comment this out to use the default OpenFL assets system for the assets/ folder. !-->
 	<define name="USE_ADAPTED_ASSETS" unless="web"/>
 
-	<!-- Comment this out to disable support for Away3D Flixel Integration (reduces compile times) !-->
+	<!-- Comment this out to disable support for 3D rendering (reduces compile times) !-->
 	<define name="THREE_D_SUPPORT" unless="STRIPPED_COMPILE"/>
 
 	<!-- Comment this out to disable support for Nape integration (flixel.addons.nape) (reduces compile times) !-->
@@ -137,8 +137,8 @@
 
 	<haxelib name="hxvlc" if="VIDEO_CUTSCENES"/>
 	<haxelib name="hxdiscord_rpc" if="DISCORD_RPC"/>
-	<haxelib name="away3d" if="THREE_D_SUPPORT"/>
-	<!--<haxelib name="foxlite" if="THREE_D_SUPPORT"/>-->
+	<!--<haxelib name="away3d" if="THREE_D_SUPPORT"/>-->
+	<haxelib name="foxlite" if="THREE_D_SUPPORT"/>
 	<haxelib name="nape-haxe4" if="NAPE_ENABLED"/>
 
 	<haxelib name="hxcpp-debug-server" if="debug"/>