Merge remote-tracking branch 'dev/main'

CodenameCrew · Mar 26, 2024 · 5395f46 · 5395f46
2 parents ad24f6b + c29e3d1
commit 5395f46
Show file tree

Hide file tree

Showing 128 changed files with 2,926 additions and 604 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -2,6 +2,7 @@
 name: Linux Build
 on:
   push:
+  workflow_dispatch:
 jobs:
   build:
     name: Linux Build
@@ -34,16 +35,18 @@ jobs:
       - name: Building the game
         run: |
           haxelib run lime build linux
+      - name: Tar files
+        run: tar -zcvf CodenameEngine.tar.gz export/release/linux/bin
       - name: Uploading artifact (entire build)
         uses: actions/upload-artifact@v2
         with:
           name: Codename Engine
-          path: export/release/linux/bin
-      - name: Uploading artifact (executable)
-        uses: actions/upload-artifact@v2
-        with:
-          name: Update-Linux
-          path: export/release/linux/bin/CodenameEngine
+          path: CodenameEngine.tar.gz
+      # - name: Uploading artifact (executable)
+      #   uses: actions/upload-artifact@v2
+      #   with:
+      #     name: Update-Linux
+      #     path: export/release/linux/bin/CodenameEngine
       - name: Clearing already existing cache
         uses: actions/github-script@v6
         with:

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -2,6 +2,7 @@
 name: Mac OS Build
 on:
   push:
+  workflow_dispatch:
 jobs:
   build:
     name: Mac OS Build
@@ -31,16 +32,18 @@ jobs:
       - name: Building the game
         run: |
           haxelib run lime build mac
+      - name: Tar files
+        run: tar -zcvf CodenameEngine.tar.gz export/release/macos/bin
       - name: Uploading artifact (entire build)
         uses: actions/upload-artifact@v2
         with:
           name: Codename Engine
-          path: export/release/macos/bin
-      - name: Uploading artifact (executable)
-        uses: actions/upload-artifact@v2
-        with:
-          name: Update-Mac
-          path: export/release/macos/bin/CodenameEngine
+          path: CodenameEngine.tar.gz
+      # - name: Uploading artifact (executable)
+      #   uses: actions/upload-artifact@v2
+      #   with:
+      #     name: Update-Mac
+      #     path: export/release/macos/bin/CodenameEngine
       - name: Clearing already existing cache
         uses: actions/github-script@v6
         with:

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -37,11 +37,11 @@ jobs:
         with:
           name: Codename Engine
           path: export/release/windows/bin
-      - name: Uploading artifact (executable)
-        uses: actions/upload-artifact@v2
-        with:
-          name: Update-Windows
-          path: export/release/windows/bin/CodenameEngine.exe
+      # - name: Uploading artifact (executable)
+      #   uses: actions/upload-artifact@v2
+      #   with:
+      #     name: Update-Windows
+      #     path: export/release/windows/bin/CodenameEngine.exe
       - name: Clearing already existing cache
         uses: actions/github-script@v6
         with:

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,6 +1,6 @@
 {
-    "editor.detectIndentation": false,
-    "editor.insertSpaces": false,
+	"editor.detectIndentation": false,
+	"editor.insertSpaces": false,
 	"files.associations": {
 		"*.hx": "haxe",
 		"*.hscript": "haxe",

diff --git a/FEATURES.md b/FEATURES.md
@@ -5,7 +5,7 @@ _**QOL = Quality of Life**_
 
 <details>
   <summary><h2>Player QOL Features</h2></summary>
-  
+
 - New input system
 - New accuracy and misses system, added to fix the base game UI.
 - New options, including:
@@ -72,7 +72,7 @@ _**QOL = Quality of Life**_
         - Weeks are located in `data/weeks/weeks/`
         - If you need to rearrange the weeks in-game, you can use the `data/weeks/weeks.txt` file.
 	- Editors for Charts and Characters (Stage coming soon)
-		- Undos/Redos supported 
+		- Undos/Redos supported
 		- Warning on closing unsaved work
 		- Clean UI (for ocd freaks)
 		- Mature Chart editor (Character editor rework soon)

diff --git a/README.md b/README.md
@@ -30,22 +30,10 @@ In the future (when the engine won't be a WIP anymore) we're gonna also publish
 
 ##### Tested on Windows 10 21H2
 1. Install [version 4.2.5 of Haxe](https://haxe.org/download/version/4.2.5/).
-2. Download [Visual Studio Build Tools](https://aka.ms/vs/17/release/vs_BuildTools.exe)
-3. Wait for the Visual Studio Installer to install
-4. On the Visual Studio installer screen, go to the "Individual components" tab and only select those options:
-    - MSVC v143 VS 2022 C++ x64/x86 build tools (Latest)
-    - Windows 10/11 SDK (any works)
-5. This is what your Installation details panel should look like. Once correct, press "Install".
-    - ⚠ This will download around 1.07 GB of data from the internet, and will require around 5.5 GB of available space on your computer.
-
-<p align="center">
-<img src="https://github.com/YoshiCrafter29/CodenameEngine/blob/main/art/github/windows-installation-details.png?raw=true" />
-</p>
-
-6. Once you finish downloading those components, download and install [`git-scm`](https://git-scm.com/download/win).
+2. Download and install [`git-scm`](https://git-scm.com/download/win).
     - Leave all installation options as default.
-7. Run `update.bat` using cmd or double-clicking it, and wait for the libraries to install.
-8. Once the libraries are installed, run `haxelib run lime test windows` to compile and launch the game (may take a long time)
+3. Run `update.bat` using cmd or double-clicking it, and wait for the libraries to install.
+4. Once the libraries are installed, run `haxelib run lime test windows` to compile and launch the game (may take a long time)
     - ℹ You can run `haxelib run lime setup` to make the lime command global, allowing you to execute `lime test windows` directly.
 </details>
 <details>
@@ -97,6 +85,5 @@ In the future (when the engine won't be a WIP anymore) we're gonna also publish
 - Credits to [Ne_Eo](https://twitter.com/Ne_Eo_Twitch) and the [3D-HaxeFlixel](https://github.com/lunarcleint/3D-HaxeFlixel) repository for Away3D Flixel support
 - Credits to the [FlxAnimate](https://github.com/Dot-Stuff/flxanimate) team for the Animate Atlas support
 - Credits to Smokey555 for the backup Animate Atlas to spritesheet code
-- Credits to MAJigsaw77 for [hxvlc](https://github.com/MAJigsaw77/hxvlc) for video cutscene/mp4 support
-- Credits to Aidan63 for [discord-rpc](https://github.com/Aidan63/linc_discord-rpc) for discord rpc integration
+- Credits to MAJigsaw77 for [hxvlc](https://github.com/MAJigsaw77/hxvlc) (video cutscene/mp4 support) and [hxdiscord_rpc](https://github.com/MAJigsaw77/hxdiscord_rpc) (discord rpc integration)
 </details>
diff --git a/art/readme.txt b/art/readme.txt
@@ -1,30 +1,30 @@
- __                 /                                  
-/ _   _ |_ |_ .  _                                     
-\__) (- |_ |_ | | )                                    
-                                                       
- __                                                    
-|_   _  _  _  |                                        
-|   |  (- (_| |( \/                                    
-                 /                                     
-                                                       
- _   _     _                                           
-(_) | )   (_|                                          
-                                                       
- __                                                    
-|_   _ .  _|  _        _  .  _  |_  |_       _  _  |_  
-|   |  | (_| (_| \/   | ) | (_) | ) |_   \/ (- (_| | ) 
-                 /          _/           /             
+ __                 /
+/ _   _ |_ |_ .  _
+\__) (- |_ |_ | | )
+
+ __
+|_   _  _  _  |
+|   |  (- (_| |( \/
+                 /
+
+ _   _     _
+(_) | )   (_|
+
+ __
+|_   _ .  _|  _        _  .  _  |_  |_       _  _  |_
+|   |  | (_| (_| \/   | ) | (_) | ) |_   \/ (- (_| | )
+                 /          _/           /
 
 HEY
 Thanks for downloadin Friday Night FUNKIN'
 If you downloaded this from any other place than ninja-muffin24.itch.io/FUNKIN
-You might be in DANGER!!! 
+You might be in DANGER!!!
 
 The Itch.io release is the only official source for the desktop (PC, Mac, Linux) versions of the game!
 As of right now, the game is FREE! If you paid for it, you got SCAMMED!
 
 Now that that's out of the way....
-THANKS FOR DOWNLOADIN. 
+THANKS FOR DOWNLOADIN.
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-
     PERMISSIONS XDDDD
@@ -77,16 +77,16 @@ I love Tom Fulp.
 - Cameron ♪(´▽｀)
 
 ##################################################################################
-                                                                                  
- _   _   _____   _      _    ____   ____     ___    _   _   _   _   ____    ____  
-| \ | | | ____| | |    | |  / ___| |  _ \   / _ \  | | | | | \ | | |  _ \  / ___| 
-|  \| | |  _|   | | /\ | | | |  _  | |_) | | | | | | | | | |  \| | | | | | \___ \ 
+
+ _   _   _____   _      _    ____   ____     ___    _   _   _   _   ____    ____
+| \ | | | ____| | |    | |  / ___| |  _ \   / _ \  | | | | | \ | | |  _ \  / ___|
+|  \| | |  _|   | | /\ | | | |  _  | |_) | | | | | | | | | |  \| | | | | | \___ \
 | |\  | | |___   \ V  V /  | |_| | |  _ <  | |_| | | |_| | | |\  | | |_| |  ___) |
-|_| \_| |_____|   \_/\_/    \____| |_| \_\  \___/   \___/  |_| \_| |____/  |____/ 
- _       _  _     ___    ___       __              _       _  _       _        _  
-|_ |  | |_ |_) \_/ | |_|  |  |\ | /__     |_      |_ |  | |_ |_) \_/ / \ |\ | |_  
+|_| \_| |_____|   \_/\_/    \____| |_| \_\  \___/   \___/  |_| \_| |____/  |____/
+ _       _  _     ___    ___       __              _       _  _       _        _
+|_ |  | |_ |_) \_/ | |_|  |  |\ | /__     |_      |_ |  | |_ |_) \_/ / \ |\ | |_
 |_  \/  |_ | \  |  | | | _|_ | \| \_| o   |_)\/   |_  \/  |_ | \  |  \_/ | \| |_ o
-                                      /      /                                    
-                                                                                  
+                                      /      /
+
 ##################################################################################
 i stole this from stamper.
diff --git a/assets/data/characters/gf.xml b/assets/data/characters/gf.xml
@@ -7,7 +7,7 @@
 	<anim name="singDOWN"   anim="GF Down Note"                 fps="24" loop="false" x="0" y="0" />
 	<anim name="danceLeft"  anim="GF Dancing Beat"              fps="24" loop="false" x="0" y="0" indices="30,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14" />
 	<anim name="danceRight" anim="GF Dancing Beat"              fps="24" loop="false" x="0" y="0" indices="15,16,17,18,19,20,21,22,23,24,25,26,27,28,29" />
-	<anim name="hairBlow"   anim="GF Dancing Beat Hair blowing" fps="24" loop="false" x="0" y="0" indices="0,1,2,3" />
+	<anim name="hairBlow"   anim="GF Dancing Beat Hair blowing" fps="24" loop="true" x="0" y="0" indices="0,1,2,3" />
 	<anim name="hairFall"   anim="GF Dancing Beat Hair Landing" fps="24" loop="false" x="0" y="0" indices="0,1,2,3,4,5,6,7,8,9,10,11" />
 	<anim name="scared"     anim="GF FEAR"                      fps="24" loop="true"  x="0" y="0" />
 	<anim name="sad"        anim="gf sad"                       fps="24" loop="true"  x="0" y="0" indices="0,1,2,3,4,5,6,7,8,9,10,11,12" />

diff --git a/assets/data/discord.hx b/assets/data/discord.hx
@@ -0,0 +1,50 @@
+import funkin.backend.utils.DiscordUtil;
+
+function onGameOver() {
+	DiscordUtil.changePresence('Game Over', PlayState.SONG.meta.displayName + " (" + PlayState.difficulty + ")");
+}
+
+function onDiscordPresenceUpdate(e) {
+	var data = e.presence;
+
+	if(data.button1Label == null)
+		data.button1Label = "Codename Engine Discord";
+	if(data.button1Url == null)
+		data.button1Url = "https://discord.gg/2NTCdsQvx4";
+}
+
+function onPlayStateUpdate() {
+	DiscordUtil.changeSongPresence(
+		PlayState.instance.detailsText,
+		(PlayState.instance.paused ? "Paused - " : "") + PlayState.SONG.meta.displayName + " (" + PlayState.difficulty + ")",
+		PlayState.instance.inst,
+		PlayState.instance.getIconRPC()
+	);
+}
+
+function onMenuLoaded(name:String) {
+	// Name is either "Main Menu", "Freeplay", "Title Screen", "Options Menu", "Credits Menu", "Beta Warning", "Update Available Screen", "Update Screen"
+	DiscordUtil.changePresenceSince("In the Menus", null);
+}
+
+function onEditorTreeLoaded(name:String) {
+	switch(name) {
+		case "Character Editor":
+			DiscordUtil.changePresenceSince("Choosing a Character", null);
+		case "Chart Editor":
+			DiscordUtil.changePresenceSince("Choosing a Chart", null);
+		case "Stage Editor":
+			DiscordUtil.changePresenceSince("Choosing a Stage", null);
+	}
+}
+
+function onEditorLoaded(name:String, editingThing:String) {
+	switch(name) {
+		case "Character Editor":
+			DiscordUtil.changePresenceSince("Editing a Character", editingThing);
+		case "Chart Editor":
+			DiscordUtil.changePresenceSince("Editing a Chart", editingThing);
+		case "Stage Editor":
+			DiscordUtil.changePresenceSince("Editing a Stage", editingThing);
+	}
+}
diff --git a/assets/data/global.hx b/assets/data/global.hx
@@ -1,3 +1,3 @@
 //
 function update(elapsed:Float)
-    if (FlxG.keys.justPressed.F5) FlxG.resetState();
+	if (FlxG.keys.justPressed.F5) FlxG.resetState();
diff --git a/assets/data/scripts/pixel.hx b/assets/data/scripts/pixel.hx
@@ -35,8 +35,8 @@ function onNoteCreation(event) {
 	note.updateHitbox();
 }
 
-function onPostNoteCreation(event) {  
-    var splashes = event.note;
+function onPostNoteCreation(event) {
+	var splashes = event.note;
 	if (pixelSplashes)
 		splashes.splash = "pixel-default";
 }

diff --git a/assets/data/splashes/default.xml b/assets/data/splashes/default.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE codename-engine-splashes>
-<splashes sprite="game/splashes/default" alpha="0.6"> 
+<splashes sprite="game/splashes/default" alpha="0.6">
 	<strum id="0"> <!-- LEFT -->
 		<anim name="splashleft1" anim="note impact 1 purple" fps="24" x="0" y="0" />
 		<anim name="splashleft2" anim="note impact 2 purple" fps="24" x="0" y="0" />

diff --git a/assets/data/splashes/pixel-default.xml b/assets/data/splashes/pixel-default.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE codename-engine-splashes>
 <!--Pixel Splashes by APurples!!-->
-<splashes sprite="stages/school/ui/pixel-splashes" alpha="0.6" antialiasing="false" scale="3.5"> 
+<splashes sprite="stages/school/ui/pixel-splashes" alpha="0.6" antialiasing="false" scale="3.5">
 	<strum id="0"> <!-- LEFT -->
 		<anim name="splashleft1" anim="splash purple 1" fps="24" x="-1" y="-2" />
 		<anim name="splashleft2" anim="splash purple 2" fps="24" x="-1" y="-2" />

diff --git a/assets/data/splashes/pixel-secret.xml b/assets/data/splashes/pixel-secret.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE codename-engine-splashes>
 <!--Pixel Splashes by APurples!!-->
-<splashes sprite="stages/school/ui/pixel-secret-splashes" alpha="0.6" antialiasing="false" scale="3.5"> 
+<splashes sprite="stages/school/ui/pixel-secret-splashes" alpha="0.6" antialiasing="false" scale="3.5">
 	<strum id="0"> <!-- LEFT -->
 		<anim name="splashleft1" anim="splash purple 1" fps="24" x="-3"/>
 	</strum>

diff --git a/assets/data/splashes/secret.xml b/assets/data/splashes/secret.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE codename-engine-splashes>
-<splashes sprite="game/splashes/secret" alpha="0.6" scale="0.75"> 
+<splashes sprite="game/splashes/secret" alpha="0.6" scale="0.75">
 	<strum id="0"> <!-- LEFT -->
 		<anim name="splash purple" anim="splash purple" fps="24" x="0" y="0" />
 	</strum>

diff --git a/assets/data/stages/limo.xml b/assets/data/stages/limo.xml
@@ -7,23 +7,23 @@
 	<!-- ONLY FOR INSTANCES WITH LOW MEMORY MODE DISABLED -->
 	<high-memory>
 		<!-- DANCERS !-->
-		<sprite name="dancer1" x="130" y="80" sprite="limoDancer" scroll="0.4" zoomfactor="0.55" type="onbeat">
+		<sprite name="dancer1" x="130" y="80" sprite="limoDancer" scroll="0.4" zoomfactor="0.55" type="onbeat" beatInterval="1">
 			<anim name="danceLeft" anim="bg dancer sketch PINK" loop="false" indices="0,1,2,3,4,5,6,7,8,9,10,11,12,13,14" />
 			<anim name="danceRight" anim="bg dancer sketch PINK" loop="false" indices="15,16,17,18,19,20,21,22,23,24,25,26,27,28,29" />
 		</sprite>
-		<sprite name="dancer2" x="500" y="80" sprite="limoDancer" scroll="0.4" zoomfactor="0.55" type="onbeat">
+		<sprite name="dancer2" x="500" y="80" sprite="limoDancer" scroll="0.4" zoomfactor="0.55" type="onbeat" beatInterval="1">
 			<anim name="danceLeft" anim="bg dancer sketch PINK" loop="false" indices="0,1,2,3,4,5,6,7,8,9,10,11,12,13,14" />
 			<anim name="danceRight" anim="bg dancer sketch PINK" loop="false" indices="15,16,17,18,19,20,21,22,23,24,25,26,27,28,29" />
 		</sprite>
-		<sprite name="dancer3" x="870" y="80" sprite="limoDancer" scroll="0.4" zoomfactor="0.55" type="onbeat">
+		<sprite name="dancer3" x="870" y="80" sprite="limoDancer" scroll="0.4" zoomfactor="0.55" type="onbeat" beatInterval="1">
 			<anim name="danceLeft" anim="bg dancer sketch PINK" loop="false" indices="0,1,2,3,4,5,6,7,8,9,10,11,12,13,14" />
 			<anim name="danceRight" anim="bg dancer sketch PINK" loop="false" indices="15,16,17,18,19,20,21,22,23,24,25,26,27,28,29" />
 		</sprite>
-		<sprite name="dancer4" x="1240" y="80" sprite="limoDancer" scroll="0.4" zoomfactor="0.55" type="onbeat">
+		<sprite name="dancer4" x="1240" y="80" sprite="limoDancer" scroll="0.4" zoomfactor="0.55" type="onbeat" beatInterval="1">
 			<anim name="danceLeft" anim="bg dancer sketch PINK" loop="false" indices="0,1,2,3,4,5,6,7,8,9,10,11,12,13,14" />
 			<anim name="danceRight" anim="bg dancer sketch PINK" loop="false" indices="15,16,17,18,19,20,21,22,23,24,25,26,27,28,29" />
 		</sprite>
-		<sprite name="dancer5" x="1610" y="80" sprite="limoDancer" scroll="0.4" zoomfactor="0.55" type="onbeat">
+		<sprite name="dancer5" x="1610" y="80" sprite="limoDancer" scroll="0.4" zoomfactor="0.55" type="onbeat" beatInterval="1">
 			<anim name="danceLeft" anim="bg dancer sketch PINK" loop="false" indices="0,1,2,3,4,5,6,7,8,9,10,11,12,13,14" />
 			<anim name="danceRight" anim="bg dancer sketch PINK" loop="false" indices="15,16,17,18,19,20,21,22,23,24,25,26,27,28,29" />
 		</sprite>

diff --git a/assets/data/stages/mall.xml b/assets/data/stages/mall.xml
@@ -1,17 +1,17 @@
 <!DOCTYPE codename-engine-stage>
 <stage zoom="0.8" name="mall" folder="stages/mall/" startCamPosY="450" startCamPosX="500">
 	<sprite name="bg" x="-1000" y="-500" sprite="bgWalls" scroll="0.2"/>
-	
+
 	<high-memory>
-		<sprite name="upperBoppers" x="-240" y="-90" sprite="upperBop" scroll="0.2" type="onbeat"/>
+		<sprite name="upperBoppers" x="-240" y="-90" sprite="upperBop" scroll="0.2" type="onbeat" beatInterval="1"/>
 	</high-memory>
 	<sprite name="bgEscalator" x="-1100" y="-600" sprite="bgEscalator" scroll="0.3" scale="0.9" updateHitbox="true"/>
 	<sprite name="tree" x="370" y="-250" sprite="christmasTree" scroll="0.4"/>
-	<sprite name="bottomBoppers" x="-300" y="140" sprite="bottomBop" scroll="0.9" type="onbeat" />
+	<sprite name="bottomBoppers" x="-300" y="140" sprite="bottomBop" scroll="0.9" type="onbeat" beatInterval="1"/>
 	<sprite name="fgSnow" x="-600" y="700" sprite="fgSnow"/>
-	
+
 	<high-memory>
-		<sprite name="santa" x="-840" y="150" sprite="santa" type="onbeat"/>
+		<sprite name="santa" x="-840" y="150" sprite="santa" type="onbeat" beatInterval="1"/>
 	</high-memory>
 
 

diff --git a/assets/data/stages/philly.hx b/assets/data/stages/philly.hx
@@ -90,7 +90,7 @@ function updateTrainPos():Void
 
 function trainReset():Void
 {
-	gf.playAnim('hairFall');
+	gf.playAnim('hairFall', true);
 	phillyTrain.x = FlxG.width + 200;
 	trainMoving = false;
 	// trainSound.stop();

diff --git a/assets/data/stages/school.xml b/assets/data/stages/school.xml
@@ -23,7 +23,7 @@
 			antialiasing="false" scale="6" scroll="0.85" updateHitbox="true" type="loop"/>
 	</high-memory>
 
-	<sprite name="bgGirls" x="-100" y="190" sprite="bgFreaks" scroll="0.9" scale="6" antialiasing="false" updateHitbox="true" type="onbeat">
+	<sprite name="bgGirls" x="-100" y="190" sprite="bgFreaks" scroll="0.9" scale="6" antialiasing="false" updateHitbox="true" type="onbeat" beatInterval="1">
 		<anim name="danceLeft" anim="BG girls group" indices="0,1,2,3,4,5,6,7,8,9,10,11,12,13" fps="24" loop="false"/>
 		<anim name="danceRight" anim="BG girls group" indices="15,16,17,18,19,20,21,22,23,24,25,26,27,28,29" fps="24" loop="false"/>
 	</sprite>