Merge branch 'main' into mobile

Author: Lily

.gitignore

@@ -13,6 +13,8 @@ export/*
 # Local history which shouldn't be shared.
 .history
 .ionide
+# macOS file attribute which can cause problems when uploading.
+*.DS_Store
 # ! means a file should be added regardless of it it gets ignored prior.
 # Including to allow others to use already set-up configuration tweaked for the project.
 !.vscode/settings.json

.vscode/launch.json

@@ -0,0 +1,13 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Lime",
+            "type": "lime",
+            "request": "launch"
+        }
+    ]
+}

Project.xml

@@ -110,27 +110,37 @@
 		<assets path='art/ffmpeg-android/ffmpeg-x86_64' rename="ffmpeg-x86_64" />
 	</section>
 
+	<!-- OpenAL config -->
+	<section if="desktop">
+		<assets path="alsoft.txt" rename="plugins/alsoft.ini" type="text" if="windows"/>
+		<assets path="alsoft.txt" rename="plugins/alsoft.conf" type="text" unless="windows"/>
+	</section>
+
 	<assets path="assets/fonts" />
 	<!-- _______________________________ Libraries ______________________________ -->
 
 	<haxelib name="lime" />
 	<haxelib name="flixel" />
-	<haxelib name="flixel-ui" />
-	<haxelib name="flixel-addons" />
-	<haxelib name="away3d" />
+	<haxelib name="flixel-ui" version="2.6.1" />
+	<haxelib name="flixel-addons" version="3.2.3" />
+	<haxelib name="away3d" version="git"/>
 
 	<!--JS stuff needed-->
 	<haxelib name="hscript" />
 	<haxedef name="hscriptPos" />
 	<haxelib name="linc_luajit" if="LUA_ALLOWED"/>
-	<haxelib name="hxCodec" if="VIDEOS_ALLOWED"/>
+	<!--<haxelib name="hxCodec" if="VIDEOS_ALLOWED"/>-->
+
+	<haxelib name="hxvlc" if="VIDEOS_ALLOWED" version="1.9.2"/>
 
 	<haxelib name="hxdiscord_rpc" if="DISCORD_ALLOWED" />
 	<haxelib name="flxanimate"/>
 	<haxelib name="extension-androidtools" if="android" />
 
 	<!-- Enables a terminal log prompt on debug builds -->
 	<haxelib name="hxcpp-debug-server" if="debug"/>
+	<haxedef name="HXC_LIBVLC_LOGGING" if="VIDEOS_ALLOWED debug" />
+	<haxedef name="HXVLC_NO_SHARE_DIRECTORY" if="VIDEOS_ALLOWED" />
 
 	<!--Disable the Flixel core focus lost screen-->
 	<haxedef name="FLX_NO_FOCUS_LOST_SCREEN" />

README.md

@@ -100,7 +100,8 @@ same goes for *Lua Scripts*, comment out or delete the line with `LUA_ALLOWED`,
 * SqirraRNG - Crash Handler and Base code for Chart Editor's Waveform
 * KadeDev - Fixed some cool stuff on Chart Editor and other PRs
 * iFlicky - Composer of Psync and Tea Time, also made the Dialogue Sounds
-* PolybiusProxy - .MP4 Video Loader Library (hxCodec)
+* PolybiusProxy - Former .MP4 Video Loader Library (hxCodec)
+* MAJigsaw77 - .MP4 Video Loader Library (hxVLC)
 * Keoiki - Note Splash Animations
 * Smokey - Sprite Atlas Support
 * Nebula the Zorua - LUA JIT Fork and some Lua reworks

THECHANGELOG.md

@@ -1,11 +1,8 @@
-1.40.0;
+1.42.0;
 
-Merry Christmas!
-
-Added a rare Santa startup that ONLY shows between the dates 12/16 to 12/31!
-The default menu theme is now a Christmas remix!
-Removed everything related to SB Engine
-Fixed camera pointer not showing in the Character Editor
-Noteskins now change to your default skin if you call "Change Character" and the character doesn't have a noteskin field
-Sustain lengths are now rounded instead of floored
-Fixed a bug where some users wouldn't be able to scroll in the Options menu. Additionally, scrolling between the option categories is now more centered.
+Added an option to have.. no menu music
+New tips and botplay text AND new crash text
+(Windows only) New Windows Notification Event (just like in Exploitation!)
+OpenFL downgraded to 9.3.3, 9.4.0 caused some shaders to implode
+Changed the video library from hxCodec to hxvlc
+Fixed note alpha not working correctly again

alsoft.txt

@@ -0,0 +1,14 @@
+[general]
+sample-type=float32
+stereo-mode=speakers
+stereo-encoding=panpot
+hrtf=false
+cf_level=0
+resampler=fast_bsinc24
+front-stablizer=false
+output-limiter=false
+volume-adjust=0
+[decoder]
+hq-mode=false
+distance-comp=false
+nfc=false

assets/preload/data/botplayText.txt

@@ -31,6 +31,7 @@ this is not Nice! - Vs Dave And Bambi: Golden Apple Edition OST
 imagine using botplay
 oh noo, cringehh
 You Motherfucker-
+hey did u know that girl you like is 12-
 you're about to die in 30 seconds
 dfgsmhbwkufygsmwas
 Okay so what do I Say? I Lost my Lines :(((((
@@ -168,6 +169,7 @@ uh oh! stinky!
 hi youtube
 you have 10 seconds to run.
 [BUTTPLUG]
+"Ha! I like your style. You make up your own rules, just like me." - Cheater Johnson Portal 69
 This is why your mom left. because of your big ass SKILL ISSUE
 skincare routine by Sky! on YouTube
 sparkle on! its Wednesday.
@@ -359,4 +361,6 @@ dawg this isn't just botplay it's AI MODE :skull:
 you probably just added a lot of spam into your "chart" :sob:
 did you go outside today
 practice mode better + ratio
-WHY ARE YOU NOT GETTING A NULL REFERENCE :sob:
+WHY ARE YOU NOT GETTING A NULL REFERENCE :sob:
+1 line for every day of the year! (line 365)
+IVE USED BOTPLAY ON THESE SONGS BEFORE!!

assets/preload/data/funnyTips.txt

@@ -65,14 +65,14 @@ Stefan's grammar is so bad and un-understandable for real
 2006archives says: "Penis"
 Mario is the best rythm gamer on mania charts. Go subscribe him tho btw.
 Mays, you know what happend if you gonna ignore Trollge?
-69th line, nice.
 I challenge you to make a 2 million note chart and save the chart :troll: if that works then what
+69th line, nice.
 Wanna find your song but theres like 1000 of them and you cant find where it is but you know the song name?? then Use the freeplay search bar!! Fast and easy.
 In 2025, you can load a 1 million note chart in 1 second, probably.
 Did you know that the name of the file that's loading this tip is named "funnyTips.txt"?
 Chart a dave and bambi song and make it 100,000+ notes, it will be super awesome.
-Imagine fnf psych engine rtx mode 
-Imaging fnf psych engine 3d support
+Imagine fnf psych engine rtx mode
+Imagine fnf psych engine 3d support, WAIT, JS ENGINE ALREADY HAS IT????
 I challenge you to learn lua and code a 250kb lua file, trust me you need to be a master to do it.
 "I dare you to beat my record (7,070,000 notes)" -Nael2xd
 Tip: Don't use botplay when it has <30 nps, if you do, do you have skill issue?
@@ -95,11 +95,7 @@ Did you know that if you press 7 twice while on this menu, nothing will happen?
 If your game is lagging, try changing "Anti-Aliasing" to false
 If your game is lagging, try closing some process in your peecee
 If your game is lagging, just buy a new pc!
-Jordan when added buldi JSE 1.39.0 Jordan
+Jordan when added buldi JSE 2.63.0 Jordan
 JS Engine is mentioned in the Funkipedia Mods Wiki exactly 7 times.
 This is the 100th fact that was added in here.
-meow meow nya~ :3
-*explodes from karim's patpat*
-Lily's here!!! mnya :3
-yo really think so?
-gay sex
+whatr if expung invades all world.

assets/preload/data/introText.txt

@@ -83,3 +83,4 @@ stevan--love cats
 skibidi--gyatt
 linux--tested
 yes--I use Arch Linux
+portal--best game series