merge main into stable for v01.1c

.github/workflows/main.yml

@@ -1,14 +1,19 @@
 # This is a basic workflow to help you get started with Actions
 
 name: Build
-
+run-name: ${{ inputs.run_title || 'Standard Build Run' }}
 
 # Controls when the action will run.
 on:
   # Triggers the workflow on push or pull request events but only for the master branch
-
+  # push:
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
+    inputs:
+      run_title:
+        description: 'Custom title for this run'
+        required: false
+        default: 'Manual Build Run'
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -43,7 +48,7 @@ jobs:
       - name: Publish Artifact
         uses: actions/upload-artifact@v4.3.4
         with:
-          name: linuxBuild
+          name: linuxBuild_${{ github.sha }}
           path: 'export/release/linux/bin'
   buildWindows:
     runs-on: windows-latest
@@ -72,7 +77,7 @@ jobs:
       - name: Publish Artifact
         uses: actions/upload-artifact@v4.3.4
         with:
-          name: windowsBuild
+          name: windowsBuild_${{ github.sha }}
           path: export/release/windows/bin
   buildMac:
     runs-on: macos-15
@@ -100,5 +105,5 @@ jobs:
       - name: Publish Artifact
         uses: actions/upload-artifact@v4.3.4
         with:
-          name: macBuild
+          name: macBuild_${{ github.sha }}
           path: export/release/macos/bin

.github/workflows/prerelease.yaml

@@ -0,0 +1,159 @@
+name: Build [Publish Pre-Release]
+
+
+on:
+  workflow_dispatch:
+
+jobs:
+  buildLinux:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4.1.7
+
+      - name: Get short SHA
+        id: slug
+        run: echo "sha_short=$(echo ${{ github.sha }} | cut -c1-7)" >> $GITHUB_OUTPUT
+
+      - uses: krdlab/setup-haxe@master
+        with:
+          haxe-version: 4.3.4
+
+      - name: Install Haxelib
+        run: |
+          sudo apt-get install libvlc-dev
+          sudo apt-get install libvlccore-dev
+          haxelib setup ~/haxelib
+          haxelib install hxcpp > /dev/null --quiet
+          chmod +x ./setup/unix.sh
+          sh ./setup/unix.sh
+
+      - name: Skip SScript setup mode
+        run: echo 'oy9:showMacroty8:loopCosti25y10:includeAllfg' >> ~/settings.cocoa
+
+      - name: Create Version Tag
+        run: echo "${{github.run_id}}" > VERSION
+
+      - name: Compile
+        run: haxelib run lime build Project.xml linux --app-version="4.0.0-${{ github.run_id}}" -D officialBuild
+
+      - name: Zip Build
+        run: |
+          cd export/release/linux/bin
+          zip -r ../../../../linuxBuild-${{ steps.slug.outputs.sha_short }}.zip .
+
+      - name: Publish Artifact
+        uses: actions/upload-artifact@v4.3.4
+        with:
+          name: linuxBuild-${{ steps.slug.outputs.sha_short }}
+          path: linuxBuild-${{ steps.slug.outputs.sha_short }}.zip
+
+  buildWindows:
+    runs-on: windows-latest
+
+    steps:
+      - uses: actions/checkout@v4.1.7
+
+      - name: Get short SHA
+        id: slug
+        shell: bash
+        run: echo "sha_short=$(echo ${{ github.sha }} | cut -c1-7)" >> $GITHUB_OUTPUT
+
+      - uses: krdlab/setup-haxe@master
+        with:
+          haxe-version: 4.3.4
+
+      - name: Install Haxelib
+        run: |
+          haxelib setup C:/haxelib
+          haxelib install hxcpp > /dev/null --quiet
+          .\"setup/windows.bat"
+        shell: cmd
+
+      - name: Skip SScript setup mode
+        run: echo 'oy9:showMacroty8:loopCosti25y10:includeAllfg' >> %USERPROFILE%/settings.cocoa
+        shell: cmd
+
+      - name: Create Version Tag
+        run: echo "${{github.run_id}}" > VERSION
+
+      - name: Compile
+        run: haxelib run lime build windows --app-version="4.0.0-${{ github.run_id}}"  -D officialBuild
+
+      - name: Zip Build
+        run: Compress-Archive -Path export/release/windows/bin\* -DestinationPath windowsBuild-${{ steps.slug.outputs.sha_short }}.zip
+        shell: powershell
+
+      - name: Publish Artifact
+        uses: actions/upload-artifact@v4.3.4
+        with:
+          name: windowsBuild-${{ steps.slug.outputs.sha_short }}
+          path: windowsBuild-${{ steps.slug.outputs.sha_short }}.zip
+
+  buildMac:
+    runs-on: macos-15
+
+    steps:
+      - uses: actions/checkout@v4.1.7
+
+      - name: Get short SHA
+        id: slug
+        run: echo "sha_short=$(echo ${{ github.sha }} | cut -c1-7)" >> $GITHUB_OUTPUT
+
+      - uses: krdlab/setup-haxe@master
+        with:
+          haxe-version: 4.3.4
+
+      - name: Install Haxelib
+        run: |
+          haxelib setup ~/haxelib
+          haxelib install hxcpp > /dev/null --quiet
+          chmod +x ./setup/unix.sh
+          sh ./setup/unix.sh
+
+      - name: Skip SScript setup mode
+        run: echo 'oy9:showMacroty8:loopCosti25y10:includeAllfg' >> ~/settings.cocoa
+
+      - name: Create Version Tag
+        run: echo "${{github.run_id}}" > VERSION
+
+      - name: Compile
+        run: haxelib run lime build mac --app-version="4.0.0-${{ github.run_id}}"  -D officialBuild
+
+      - name: Zip Build
+        run: |
+          cd export/release/macos/bin
+          zip -r ../../../../macBuild-${{ steps.slug.outputs.sha_short }}.zip .
+
+      - name: Publish Artifact
+        uses: actions/upload-artifact@v4.3.4
+        with:
+          name: macBuild-${{ steps.slug.outputs.sha_short }}
+          path: macBuild-${{ steps.slug.outputs.sha_short }}.zip
+
+  createRelease:
+    needs: [buildLinux, buildWindows, buildMac]
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Get short SHA
+        id: slug
+        run: echo "sha_short=$(echo ${{ github.sha }} | cut -c1-7)" >> $GITHUB_OUTPUT
+
+      - name: Download Artifacts
+        uses: actions/download-artifact@v4
+        with:
+          pattern: '*Build-*'
+          merge-multiple: true
+
+      - name: Create Prerelease
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: build-${{ steps.slug.outputs.sha_short }}
+          name: Build Commit ${{ steps.slug.outputs.sha_short }}
+          prerelease: true
+          files: |
+            linuxBuild-${{ steps.slug.outputs.sha_short }}.zip
+            windowsBuild-${{ steps.slug.outputs.sha_short }}.zip
+            macBuild-${{ steps.slug.outputs.sha_short }}.zip

.gitignore

@@ -25,3 +25,5 @@ vs_Community.exe
 !.vscode/extensions.json
 art/build_html.bat
 art/build_html-debug.bat
+
+types.xml

Project.xml

@@ -2,7 +2,7 @@
 <project>
 	<!-- _________________________ Application Settings _________________________ -->
 
-	<app title="Friday Night Funkin': Brainy Engine+" file="BrainyEngine+" packageName="com.Brainy7890.BrainyEngine" package="com.Brainy7890.BrainyEngine" main="Main" version="0.2.8" company="Brainy7890" />
+	<app title="Friday Night Funkin': Brainy Engine+" file="BrainyEngine+" packageName="com.Brainy7890.BrainyEngine" package="com.Brainy7890.BrainyEngine" main="Main" version="0.1.1c" company="Brainy7890" />
 
 	<!--Switch Export with Unique ApplicationID and Icon-->
 	<set name="APP_ID" value="0x0100f6c013bbc000" />
@@ -104,7 +104,7 @@
 		<assets path='example_mods' rename='mods' embed='false' if="mac"/>
 		<assets path='list.txt' rename='modsList.txt' />
 	</section>
-	<assets path='art/readme.txt' rename='do NOT readme.txt' />
+	<assets path='README.md'/>
 
 	<!-- OpenAL config -->
 	<section if="desktop">
@@ -137,28 +137,9 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
-	<!--Enable the Flixel core recording system-->
-	<!--<haxedef name="FLX_RECORD" />-->
+	<haxeflag name="-xml" />
+	<haxeflag name="types.xml" />
 
-	<!--Disable the right and middle mouse buttons-->
-	<!-- <haxedef name="FLX_NO_MOUSE_ADVANCED" /> -->
-
-	<!--Disable the native cursor API on Flash-->
-	<!--<haxedef name="FLX_NO_NATIVE_CURSOR" />-->
-
-	<!--Optimise inputs, be careful you will get null errors if you don't use conditionals in your game-->
-	<!-- <haxedef name="FLX_NO_MOUSE" if="mobile" /> -->
-	<!-- <haxedef name="FLX_NO_KEYBOARD" if="mobile" /> -->
-	<!-- <haxedef name="FLX_NO_TOUCH" if="desktop" /> -->
-	<!--<haxedef name="FLX_NO_GAMEPAD" />-->
-
-	<!--Disable the Flixel core sound tray-->
-	<!--<haxedef name="FLX_NO_SOUND_TRAY" />-->
-
-	<!--Disable the Flixel sound management code-->
-	<!--<haxedef name="FLX_NO_SOUND_SYSTEM" />-->
-
-	<!--Disable the Flixel core focus lost screen-->
 	<haxedef name="FLX_NO_FOCUS_LOST_SCREEN" />
 
 	<!-- Show debug traces for hxCodec -->
@@ -193,9 +174,12 @@
 	<!-- _________________________________ Custom _______________________________ -->
 
 	<assets path='art/icons/iconOG.png' rename='icon.png' if="linux || mac" />
-
-	<icon path="art/icons/icon16.png" size='16'/>
-	<icon path="art/icons/icon32.png" size='32'/>
-	<icon path="art/icons/icon64.png" size='64'/>
-	<icon path="art/icons/iconOG.png" />
+
+	<section if="USE_OLD_ICONS">	
+		<icon path="art/icons/old/icon16.png" size='16'/>
+		<icon path="art/icons/old/icon32.png" size='32'/>
+		<icon path="art/icons/old/icon64.png" size='64'/>
+		<icon path="art/icons/old/iconOG.png" />
+	</section>
+	<icon path="art/icons/iconOG.png" unless="USE_OLD_ICONS"/>
 </project>

README.md

@@ -1,7 +1,26 @@
 # Brainy Engine+
 
+<img src="/art/icons/iconOG.png" height=512>
+
 Basically my old Psych fork but better or something
 
+This engine is under active development and therefore might be very unstable! Report any bugs to the Issues tab please!
+
+## Repo information
+![GitHub commit activity](https://img.shields.io/github/commit-activity/t/Brainy0789/BrainyEnginePlus)
+![GitHub Release](https://img.shields.io/github/v/release/Brainy0789/BrainyEnginePlus)
+![GitHub repo size](https://img.shields.io/github/repo-size/Brainy0789/BrainyEnginePlus)
+
+
+
+
+### Branches
+- main - main development branch
+- stable - stable source versions. if your making a mod i recommend using one of these branches.
+
 ## Features
 
-Scriptable States!
+### Scriptable States!
+Use hscript to code your own states without building from source!
+
+Learn how to edit scriptable states [here](https://github.com/Brainy0789/BrainyEnginePlus/wiki/Custom-States#custom-states)