Merge pull request #342 from regulad/remove-checkboxes

Update Issue Templates

.editorconfig

@@ -1,7 +0,0 @@
-# top-most EditorConfig file
-root = true
-
-# Unix-style newlines with a newline ending every file
-[*]
-end_of_line = lf
-insert_final_newline = true

.gitattributes

@@ -1 +0,0 @@
-* text=auto eol=lf

.github/ISSUE_TEMPLATE/bug.md

@@ -1,50 +1,21 @@
 ---
 name: Bug Report
 about: Report a bug or critical performance issue
-title: 'Bug Report: [DESCRIBE YOUR BUG IN DETAIL HERE]'
+title: 'Bug Report: '
 labels: bug
 ---
+#### Please check for duplicates or similar issues, as well performing simple troubleshooting steps (such as clearing cookies, clearing AppData, trying another browser) before submitting an issue.
+### If you are playing the game in a browser, what site are you playing it from?
+[Newgrounds](https://www.newgrounds.com/portal/view/770371) or [Itch.io](https://ninja-muffin24.itch.io/funkin)? Specify below.
 
-<!-- FILL THIS ISSUE THING OUT AS MUCH AS POSSIBLE
-OR ELSE YOUR ISSUE WILL BE LESS LIKELY TO BE SOLVED!
+### If you are playing the game in a browser, what browser are you using?
+Chrome (or a Chromium based browser, i.e. Edge, Opera, etc.), Firefox, or Safari? Specify blow.
 
-Do not post about issues from other FNF mod engines!
-We cannot and probably won't solve those!
-You can hopefully go to their respective GitHub issues and report them there, thank you :)
+### If you are playing a downloaded version of the game, what operating system are you using?
+Windows (`x86`), Windows (`x86_64`), Linux, or macOS? Specify below.
 
-Please check for duplicates or similar issues, as well performing simple troubleshooting steps (such as clearing cookies, clearing AppData, trying another browser) before submitting an issue.
+## What version of the game are you using? Look in the bottom left corner of the main menu.
 
-From Joel On Software:
+## Have you identified any steps to reproduce the bug? If so, please describe them below. Use images if possible.
 
-"It’s pretty easy to remember the rule for a good bug report. Every good bug report needs exactly three things.
-
-1. Steps to reproduce,
-2. What you expected to see, and
-3. What you saw instead."
-
--->
-
-## Describe the bug
-<!-- A clear and concise description of what the bug is. -->
-
-## To Reproduce
-<!-- Describe in DETAIL how to reproduce the bug/issue you are running into. -->
-## Expected behavior
-<!-- A clear and concise description of what you expected to happen. -->
-
-## Screenshots/Video
-<!-- If applicable, add screenshots/video to help explain your problem.
-Remember to mark the area in the application thats impacted. -->
-
-## Desktop
- - OS:
- <!-- [e.g. Windows 10, 11, Mac, Linux Mint, Ubuntu, Arch (btw)] -->
- - Browser
- <!-- [e.g. chrome, safari, firefox, edge, operaGX] -->
- - Version:
- <!-- [e.g. 0.4.0, 0.3.3, this can be found in the bottom left corner of the main menu!] -->
-
-## Additional context
-<!-- Add any other context about the problem here. -->
-
-<!-- If you're game is FROZEN and you're playing a web version, press F12 to open up browser dev window, and go to console, and copy-paste whatever red error you're getting -->
+## Please describe your issue. Provide extensive detail and images if possible.

.github/ISSUE_TEMPLATE/question.md

@@ -0,0 +1,8 @@
+---
+name: Question
+about: Ask a general question
+title: 'Question: '
+labels: question
+---
+#### Please check for duplicates or similar issues before asking your question.
+## What is your question?

.github/actions/setup-haxe/action.yml

@@ -1,144 +0,0 @@
-name: setup-haxeshit
-description: "sets up haxe shit, using HMM!"
-
-inputs:
-  haxe:
-    description: 'Version of haxe to install'
-    required: true
-    default: '4.3.4'
-  hxcpp-cache:
-    description: 'Whether to use a shared hxcpp compile cache'
-    required: true
-    default: 'true'
-  hxcpp-cache-path:
-    description: 'Path to create hxcpp cache in'
-    required: true
-    default: ${{ runner.temp }}/hxcpp_cache
-  targets:
-    description: 'Targets we plan to compile to. Installs native dependencies needed.'
-    required: true
-  gh-token:
-    description: 'GitHub secret for private repos as dependencies'
-
-runs:
-  using: "composite"
-  steps:
-
-  - name: Setup timers
-    shell: bash
-    run: |
-      echo "TIMER_HAXE=$(date +%s)" >> "$GITHUB_ENV"
-
-  - name: Install Haxe
-    uses: funkincrew/ci-haxe@v3.1.0
-    with:
-      haxe-version: ${{ inputs.haxe }}
-
-  - name: Install native dependencies
-    if: ${{ runner.os == 'Linux' }}
-    shell: bash
-    run: |
-      ls -lah /usr/lib/x86_64-linux-gnu/
-      apt-get update
-      apt-get install -y \
-        g++ \
-        libx11-dev libxi-dev libxext-dev libxinerama-dev libxrandr-dev \
-        libgl-dev libgl1-mesa-dev \
-        libasound2-dev
-      ln -s /usr/lib/x86_64-linux-gnu/libffi.so.8 /usr/lib/x86_64-linux-gnu/libffi.so.6 || true
-  - name: Install linux-specific dependencies
-    if: ${{ runner.os == 'Linux' && contains(inputs.targets, 'linux') }}
-    shell: bash
-    run: |
-      apt-get install -y libvlc-dev libvlccore-dev
-
-  - name: Config haxelib
-    shell: bash
-    run: |
-      echo "TIMER_HAXELIB=$(date +%s)" >> "$GITHUB_ENV"
-      haxelib --debug --never install haxelib 4.1.0 --global
-      haxelib --debug --never deleterepo || true
-      haxelib --debug --never newrepo
-      echo "HAXEPATH=$(haxelib config)" >> "$GITHUB_ENV"
-      haxelib --debug --never git haxelib https://github.com/HaxeFoundation/haxelib.git master
-      haxelib --debug --global install hmm
-      echo "TIMER_DEPS=$(date +%s)" >> "$GITHUB_ENV"
-
-  - name: Restore cached dependencies
-    id: cache-hmm
-    uses: actions/cache@v4
-    with:
-      path: .haxelib
-      key: haxe-hmm-${{ runner.os }}-${{ hashFiles('**/hmm.json') }}
-
-  - if: ${{ steps.cache-hmm.outputs.cache-hit != 'true' }}
-    name: Prep git for dependency install
-    uses: gacts/run-and-post-run@v1
-    with:
-      run: git config --global 'url.https://x-access-token:${{ inputs.gh-token }}@github.com/.insteadOf' https://github.com/
-      post: git config --global --unset 'url.https://x-access-token:${{ inputs.gh-token }}@github.com/.insteadOf'
-
-  - if: ${{ steps.cache-hmm.outputs.cache-hit != 'true' }}
-    name: Install dependencies
-    shell: bash
-    run: |
-      haxelib --global run hmm install -q
-      echo "TIMER_DONE=$(date +%s)" >> "$GITHUB_ENV"
-
-  # by default use a shared hxcpp cache
-  - if: ${{ inputs.hxcpp-cache == 'true' }}
-    name: Restore hxcpp cache
-    uses: actions/cache@v4
-    with:
-      path: ${{ inputs.hxcpp-cache-path }}
-      key: haxe-hxcpp-${{ runner.os }}-${{ github.ref_name }}-${{ github.sha }}
-      restore-keys: haxe-hxcpp-${{ runner.os }}-${{ github.ref_name }}
-  # export env for it to reuse in builds
-  - if: ${{ inputs.hxcpp-cache == 'true' }}
-    name: Persist env for hxcpp cache
-    shell: bash
-    run: |
-      echo "HXCPP_COMPILE_CACHE=${{ inputs.hxcpp-cache-path }}" >> "$GITHUB_ENV"
-      echo 'HXCPP_CACHE_MB="4096"' >> "$GITHUB_ENV"
-
-  # if it's explicitly disabled, still cache export/ since that then contains the builds
-  - if: ${{ inputs.hxcpp-cache != 'true' }}
-    name: Restore export cache
-    uses: actions/cache@v4
-    with:
-      path: ${{ inputs.hxcpp-cache-path }}
-      key: haxe-export-${{ runner.os }}-${{ github.ref_name }}-${{ github.sha }}
-      restore-keys: haxe-export-${{ runner.os }}-${{ github.ref_name }}
-
-  - name: Print debug info
-    shell: bash
-    run: |
-      cat << EOF
-      runner:
-        kernel: $(uname -a)
-      haxe:
-        version: $(haxe -version)
-        which: $(which haxe)
-        haxepath: $HAXEPATH
-        took: $((TIMER_HAXELIB - TIMER_HAXE))s
-      haxelib:
-        version: $(haxelib version)
-        which: $(which haxelib)
-        local:
-          config: $(haxelib config)
-          path: $(haxelib path haxelib || true)
-        global
-          config: $(haxelib config --global)
-          path: $(haxelib path haxelib --global || true)
-        system
-          version: $(haxelib --system version)
-          local:
-            config: $(haxelib --system config)
-          global:
-            config: $(haxelib --system config --global)
-        took: $((TIMER_DEPS - TIMER_HAXELIB))s
-      deps:
-        took: $((TIMER_DONE - TIMER_DEPS))s
-      hxcpp_cache: |
-      $(haxelib run hxcpp cache list || true)
-      EOF

.github/actions/upload-itch/action.yml

@@ -1,124 +0,0 @@
-name: upload-itch
-description: "installs Butler, and uploads to itch.io!"
-
-inputs:
-  butler-key:
-    description: "Butler API secret key"
-    required: true
-  itch-repo:
-    description: "Where to upload the game to"
-    required: true
-    default: "ninja-muffin24/funkin-secret"
-  build-dir:
-    description: "Directory of the game build"
-    required: false
-  target:
-    description: "Target (html5, windows, linux, macos)"
-    required: true
-
-runs:
-  using: "composite"
-  steps:
-
-  # RUNNER_OS = Windows | macOS | Linux
-  # TARGET_BUILD = windows | macos | linux
-  # TARGET_ITCH = win | macos | linux
-  # TARGET_BUTLER_DOWNLOAD = windows-amd64 | darwin-amd64 | linux-amd64
-  - name: Setup variables
-    shell: bash
-    run: |
-      TARGET_OS=${{ inputs.target }}
-      RUNNER=${RUNNER_OS@L}
-      TARGET=${TARGET_OS@L}
-      case "$TARGET" in
-        "windows")
-          TARGET_ITCH=win
-          ;;
-        *)
-          TARGET_ITCH=$TARGET
-          ;;
-      esac
-      case "$RUNNER" in
-        "macos")
-          OS_NODE=darwin
-          ;;
-        *)
-          OS_NODE=$RUNNER
-          ;;
-      esac
-      BUTLER_PATH=$RUNNER_TEMP/butler
-
-      echo BUILD_DIR="export/release/$TARGET/bin" >> "$GITHUB_ENV"
-      echo ITCH_TAG=${{ inputs.itch-repo }}:$TARGET_ITCH-$GITHUB_REF_NAME >> "$GITHUB_ENV"
-      echo OS_AND_ARCH=$OS_NODE-amd64 >> "$GITHUB_ENV"
-      echo BUTLER_API_KEY=${{ inputs.butler-key }} >> "$GITHUB_ENV"
-      echo BUTLER_INSTALL_PATH=$BUTLER_PATH >> "$GITHUB_ENV"
-      echo TIMER_BUTLER=$(date +%s) >> "$GITHUB_ENV"
-      echo TARGET_ITCH=$TARGET_ITCH >> "$GITHUB_ENV"
-
-      echo "$BUTLER_PATH" >> "$GITHUB_PATH"
-
-  - name: Get latest butler version
-    shell: bash
-    run: |
-      LATEST=$(curl -sfL https://broth.itch.ovh/butler/$OS_AND_ARCH/LATEST)
-      echo BUTLER_LATEST=$LATEST >> "$GITHUB_ENV"
-
-      command -v butler \
-        && echo BUTLER_CURRENT=$(butler -V 2>&1 | cut -d ',' -f 1) >> "$GITHUB_ENV" \
-        || echo BUTLER_CURRENT=none >> "$GITHUB_ENV"
-
-  - name: Try to get butler from cache
-    id: cache-butler
-    uses: actions/cache@v4
-    with:
-      path: ${{ env.BUTLER_INSTALL_PATH }}
-      key: butler-${{ runner.os }}-${{ env.BUTLER_LATEST }}
-
-  - if: steps.cache-butler.outputs.cache-hit == 'true'
-    name: Make sure butler is executable
-    shell: bash
-    run: |
-      chmod +x $BUTLER_INSTALL_PATH/butler
-
-  - if: steps.cache-butler.outputs.cache-hit != 'true'
-    name: Install butler
-    shell: bash
-    run: |
-      mkdir -p $BUTLER_INSTALL_PATH
-      cd $BUTLER_INSTALL_PATH
-
-      curl -L -o butler.zip https://broth.itch.ovh/butler/$OS_AND_ARCH/LATEST/archive/default
-      unzip butler.zip
-      chmod +x butler
-
-  - name: Upload game to itch.io
-    shell: bash
-    run: |
-      echo "TIMER_UPLOAD=$(date +%s)" >> "$GITHUB_ENV"
-      butler login
-      butler push $BUILD_DIR $ITCH_TAG
-      echo "TIMER_DONE=$(date +%s)" >> "$GITHUB_ENV"
-
-  - name: Print debug info
-    shell: bash
-    run: |
-      cat << EOF
-      butler:
-        version: $(
-          if [[ "$BUTLER_CURRENT" == "$BUTLER_LATEST" ]]
-          then
-            echo $BUTLER_CURRENT
-          else
-            echo $BUTLER_CURRENT -> $BUTLER_LATEST
-          fi
-        )
-        install:
-          took: $(($TIMER_UPLOAD-$TIMER_BUTLER))s
-        upload:
-          tag: $TARGET_ITCH/$GITHUB_REF_NAME
-          took: $(($TIMER_DONE-$TIMER_UPLOAD))s
-      EOF
-      cat << EOF >> "$GITHUB_STEP_SUMMARY"
-      ### open in launcher: [$TARGET_ITCH/$GITHUB_REF_NAME](https://run.funkin.me/$TARGET_ITCH/$GITHUB_REF_NAME)
-      EOF

.github/hooks/README.md

@@ -1,5 +0,0 @@
-# Git Hooks
-These work even on Windows because of Git Bash.
-
-## Setup
-`git config core.hooksPath .github/hooks`

.github/hooks/post-checkout

@@ -1,2 +0,0 @@
-#!/bin/sh
-git submodule update --init --recursive

.github/hooks/post-merge

@@ -1,2 +0,0 @@
-#!/bin/sh
-git submodule update --init --recursive

.github/hooks/pre-push

@@ -1,5 +0,0 @@
-#!/bin/sh
-if git diff --cached --submodule | grep -q "^+"; then
-  echo "WARNING: You have unpushed changes in submodules."
-  exit 1
-fi

.github/labeler.yml

@@ -1,12 +0,0 @@
-# Add Documentation tag to PR's changing markdown files, or anyhting in the docs folder
-Documentation:
-- changed-files:
-  - any-glob-to-any-file:
-  - any-glob-to-any-file:
-      - docs/*
-      - '**/*.md'
-
-# Adds Haxe tag to PR's changing haxe code files
-Haxe:
-- changed-files:
-  - any-glob-to-any-file: '**/*.hx'

.github/workflows/build-docker-image.yml

@@ -1,53 +0,0 @@
-name: Create and publish Docker image
-
-on:
-  workflow_dispatch:
-  push:
-    paths:
-    - '**/Dockerfile'
-    - '.github/workflows/build-docker-image.yml'
-
-jobs:
-  build-and-push-image:
-    runs-on: build-set
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-    - name: Get checkout token
-      uses: actions/create-github-app-token@v1
-      id: app_token
-      with:
-        app-id: ${{ vars.APP_ID }}
-        private-key: ${{ secrets.APP_PEM }}
-        owner: ${{ github.repository_owner }}
-
-    - name: Checkout repo
-      uses: funkincrew/ci-checkout@v6
-      with:
-        submodules: false
-        token: ${{ steps.app_token.outputs.token }}
-
-    - name: Log into GitHub Container Registry
-      uses: docker/login-action@v3.1.0
-      with:
-        registry: ghcr.io
-        username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Build and push Docker image
-      uses: docker/build-push-action@v5.3.0
-      with:
-        context: ./build
-        push: true
-        tags: |
-          ghcr.io/funkincrew/build-dependencies:latest
-          ghcr.io/funkincrew/build-dependencies:${{ github.sha }}
-        labels: |
-          org.opencontainers.image.description=precooked haxe build-dependencies
-          org.opencontainers.image.revision=${{ github.sha }}
-          org.opencontainers.image.source=https://github.com/${{ github.repository }}
-          org.opencontainers.image.title=${{ github.repository_owner }}/build-dependencies
-          org.opencontainers.image.url=https://github.com/${{ github.repository }}
-          org.opencontainers.image.version=${{ github.sha }}

.github/workflows/build-game.yml

@@ -1,129 +0,0 @@
-name: Build and Upload nightly game builds
-
-on:
-  workflow_dispatch:
-  push:
-    paths-ignore:
-    - '**/Dockerfile'
-    - '.github/workflows/build-docker-image.yml'
-
-jobs:
-
-  build-game-on-host:
-    strategy:
-      matrix:
-        include:
-        - target: windows
-        - target: macos
-    runs-on:
-    - ${{ matrix.target }}
-    defaults:
-      run:
-        shell: bash
-
-    steps:
-    - name: Make git happy
-      run: |
-        git config --global --replace-all safe.directory $GITHUB_WORKSPACE
-
-    - name: Get checkout token
-      uses: actions/create-github-app-token@v1
-      id: app_token
-      with:
-        app-id: ${{ vars.APP_ID }}
-        private-key: ${{ secrets.APP_PEM }}
-        owner: ${{ github.repository_owner }}
-
-    - name: Checkout repo
-      uses: funkincrew/ci-checkout@v6
-      with:
-        submodules: 'recursive'
-        token: ${{ steps.app_token.outputs.token }}
-        persist-credentials: false
-
-    - name: Setup build environment
-      uses: ./.github/actions/setup-haxe
-      with:
-        gh-token: ${{ steps.app_token.outputs.token }}
-
-    - name: Build game
-      if: ${{ matrix.target == 'windows' }}
-      run: |
-        haxelib run lime build windows -v -release -DGITHUB_BUILD
-      timeout-minutes: 120
-    - name: Build game
-      if: ${{ matrix.target != 'windows' }}
-      run: |
-        haxelib run lime build ${{ matrix.target }} -v -release --times -DGITHUB_BUILD
-      timeout-minutes: 120
-
-    - name: Upload build artifacts
-      uses: ./.github/actions/upload-itch
-      with:
-        butler-key: ${{ secrets.BUTLER_API_KEY}}
-        target: ${{ matrix.target }}
-
-  build-game-in-container:
-    runs-on: build-set
-    container: ghcr.io/funkincrew/build-dependencies:latest
-    strategy:
-      matrix:
-        include:
-        - target: linux
-        - target: html5
-    defaults:
-      run:
-        shell: bash
-
-    steps:
-    - name: Get checkout token
-      uses: actions/create-github-app-token@v1
-      id: app_token
-      with:
-        app-id: ${{ vars.APP_ID }}
-        private-key: ${{ secrets.APP_PEM }}
-        owner: ${{ github.repository_owner }}
-
-    - name: Checkout repo
-      uses: funkincrew/ci-checkout@v6
-      with:
-        submodules: 'recursive'
-        token: ${{ steps.app_token.outputs.token }}
-        persist-credentials: false
-
-    - name: Config haxelib
-      run: |
-        haxelib --never newrepo
-        echo "HAXEPATH=$(haxelib config)" >> "$GITHUB_ENV"
-
-    - name: Restore cached dependencies
-      id: cache-hmm
-      uses: actions/cache@v4
-      with:
-        path: .haxelib
-        key: haxe-hmm-${{ runner.os }}-${{ hashFiles('**/hmm.json') }}
-
-    - if: ${{ steps.cache-hmm.outputs.cache-hit != 'true' }}
-      name: Install dependencies
-      run: |
-        git config --global 'url.https://x-access-token:${{ steps.app_token.outputs.token }}@github.com/.insteadOf' https://github.com/
-        haxelib --global run hmm install -q
-
-    - if: ${{ matrix.target != 'html5' }}
-      name: Restore hxcpp cache
-      uses: actions/cache@v4
-      with:
-        path: /usr/share/hxcpp
-        key: haxe-hxcpp-${{ runner.os }}-${{ github.ref_name }}-${{ github.sha }}
-        restore-keys: haxe-hxcpp-${{ runner.os }}-${{ github.ref_name }}
-
-    - name: Build game
-      run: |
-        haxelib run lime build ${{ matrix.target }} -v -release --times -DGITHUB_BUILD
-      timeout-minutes: 120
-
-    - name: Upload build artifacts
-      uses: ./.github/actions/upload-itch
-      with:
-        butler-key: ${{ secrets.BUTLER_API_KEY}}
-        target: ${{ matrix.target }}

.github/workflows/cancel-merged-branches.yml

@@ -1,38 +0,0 @@
-name: Cancel queued workflows on PR merge
-
-on:
-  pull_request:
-    types:
-    - closed
-
-jobs:
-
-  cancel_stuff:
-    if: github.event.pull_request.merged == true
-    runs-on: build-set
-    permissions:
-      actions: write
-
-    steps:
-    - name: Cancel queued workflows for ${{ github.event.pull_request.head.ref }}
-      uses: actions/github-script@v7
-      with:
-        result-encoding: string
-        retries: 3
-        script: |
-          let branch_workflows = await github.rest.actions.listWorkflowRuns({
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            workflow_id: "build-shit.yml",
-            status: "queued",
-            branch: "${{ github.event.pull_request.head.ref }}"
-          });
-          let runs = branch_workflows.data.workflow_runs;
-          runs.forEach((run) => {
-            github.rest.actions.cancelWorkflowRun({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              run_id: run.id
-            });
-          });
-          console.log(runs);

.github/workflows/labeler.yml

@@ -1,14 +0,0 @@
-name: "Pull Request Labeler"
-on:
-- pull_request_target
-
-jobs:
-  labeler:
-    permissions:
-      contents: read
-      pull-requests: write
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/labeler@v5
-      with:
-        sync-labels: true

.github/workflows/superlinter.yml

@@ -0,0 +1,10 @@
+jobs:
+  build:
+    runs-on: [ubuntu-latest, macos-latest]
+    steps:
+      - uses: krdlab/setup-haxe@v1
+        with:
+          haxe-version: 4.0.5
+      - run: |
+          haxe -version
+          haxelib install hxnodejs

.gitignore

@@ -1,15 +1,3 @@
-.DS_STORE
-.haxelib/
-.vs/
-APIStuff.hx
-dump/
 export/
-RECOVER_*.fla
-shitAudio/
-.build_time
-.swp
-
-# Exclude JS stuff
-node_modules/
-package.json
-package-lock.json
+.vscode/
+APIStuff.hx

.gitmodules

@@ -1,6 +0,0 @@
-[submodule "assets"]
-	path = assets
-	url = https://github.com/FunkinCrew/funkin.assets
-[submodule "art"]
-	path = art
-	url = https://github.com/FunkinCrew/funkin.art

.prettierignore

@@ -1,13 +0,0 @@
-# Ignore artifacts
-export
-
-# Ignore all JSONS in the images folder (including FlxAnimate JSONs)
-assets/preload/images
-assets/shared/images
-assets/weekend1/images
-
-# Don't ignore data files
-# TODO: These don't work.
-!assets/preload/data/
-
-assets/exclude/data/credits.json

.prettierrc.js

@@ -1,21 +0,0 @@
-/**
- * Configuration for JSON file formatting.
- */
-module.exports = {
-  // Line width before Prettier tries to add new lines.
-  printWidth: 80,
-
-	// Indent with 2 spaces.
-	tabs: false,
-  useTabs: false,
-  tabWidth: 2,
-
-  // Use double quotes.
-  singleQuote: false,
-  quoteProps: "preserve",
-  parser: "json",
-
-  bracketSpacing: true, // Spacing between brackets in object literals.
-  trailingComma: "none", // No trailing commas.
-  semi: false, // No semicolons at ends of statements.
-};

.vscode/extensions.json

@@ -1,12 +0,0 @@
-{
-  "recommendations": [
-    "nadako.vshaxe", // Basic Haxe integration
-    "wiggin77.codedox", // Haxe documentation
-    "vshaxe.haxe-checkstyle", // Haxe code style and conventions
-    "vshaxe.hxcpp-debugger", // CPP debugging
-    "openfl.lime-vscode-extension", // Lime integration
-    "esbenp.prettier-vscode", // JSON formatting
-    "redhat.vscode-xml", // XML formatting
-    "ryanluker.vscode-coverage-gutters" // Highlight code coverage
-  ]
-}

.vscode/launch.json

@@ -1,41 +0,0 @@
-{
-  "version": "0.2.0",
-  "configurations": [
-    {
-      // Launch in native/CPP on Windows/OSX/Linux
-      "name": "Lime Build+Debug",
-      "type": "lime",
-      "request": "launch"
-    },
-    {
-      // Launch in native/CPP on Windows/OSX/Linux
-      "name": "Lime Debug (No Build)",
-      "type": "lime",
-      "request": "launch",
-      "preLaunchTask": null
-    },
-    {
-      // Launch in browser
-      "name": "HTML5 Debug",
-      "type": "chrome",
-      "request": "launch",
-      "url": "http://127.0.0.1:3001",
-      "sourceMaps": true,
-      "webRoot": "${workspaceFolder}",
-      "preLaunchTask": "debug: html"
-    },
-    {
-      // Performs a build for debugging macros
-      // Debugging is attached on the compilation rather than the game itself
-      "name": "Haxe Eval",
-      "type": "haxe-eval",
-      "request": "launch"
-    },
-    {
-      // Attaches the debugger to an already running game
-      "name": "HXCPP - Attach",
-      "type": "hxcpp",
-      "request": "attach"
-    }
-  ]
-}

.vscode/settings.json

@@ -1,252 +0,0 @@
-{
-  "[haxe]": {
-    // Automatically keep Haxe files formatted.
-    "editor.formatOnSave": true,
-    "editor.formatOnPaste": true,
-    "editor.codeActionsOnSave": {
-      "source.organizeImports": "never"
-    },
-    "editor.defaultFormatter": "nadako.vshaxe",
-    "editor.tabSize": 2
-  },
-
-  "[json]": {
-    // Automatically keep JSON files formatted.
-    "editor.formatOnSave": true,
-    "editor.formatOnPaste": true,
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-
-  "[jsonc]": {
-    // Automatically keep JSONC files formatted.
-    "editor.formatOnSave": true,
-    "editor.formatOnPaste": true,
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  "prettier.tabWidth": 2,
-
-  // XML formatting style configuration
-  "xml.format.enabled": true,
-  "xml.format.legacy": false,
-  "xml.format.emptyElements": "collapse",
-  "xml.preferences.quoteStyle": "double",
-  "xml.format.enforceQuoteStyle": "preferred",
-  "xml.format.preserveAttributeLineBreaks": false,
-  "xml.format.preservedNewlines": 0,
-  "xml.format.splitAttributes": false,
-  "xml.format.joinCDATALines": true,
-  "xml.format.preserveEmptyContent": false,
-  "xml.format.joinCommentLines": false,
-  "xml.format.joinContentLines": false,
-  "xml.format.spaceBeforeEmptyCloseTag": true,
-  "xml.format.xsiSchemaLocationSplit": "onPair",
-  "xml.format.splitAttributesIndentSize": 2,
-  "xml.format.closingBracketNewLine": false,
-  "xml.format.preserveSpace": [
-    "xsl:text",
-    "xsl:comment",
-    "xsl:processing-instruction",
-    "literallayout",
-    "programlisting",
-    "screen",
-    "synopsis",
-    "pre",
-    "xd:pre"
-  ],
-  "xml.format.maxLineWidth": 0,
-  "xml.format.grammarAwareFormatting": true,
-
-  // Generic file formatting style configuration
-  "files.insertFinalNewline": true,
-  "files.trimFinalNewlines": false,
-  "files.trimTrailingWhitespace": true,
-
-  // Automatically detect indentation.
-  "editor.detectIndentation": true,
-  "editor.insertSpaces": true,
-  "editor.tabSize": 2,
-
-  // Automatically enforce Linux style line endings.
-  "files.eol": "\n",
-
-  "haxe.displayPort": "auto",
-  "haxe.enableCompilationServer": false,
-  "haxe.enableServerView": true,
-  "haxe.displayServer": {
-    "arguments": ["-v"]
-  },
-  // Fix file associations for HScript.
-  "files.associations": {
-    "*.hxp": "haxe",
-    "*.hscript": "haxe",
-    "*.haxe": "haxe",
-    "*.hxs": "haxe",
-    "*.hxc": "haxe"
-  },
-  "projectManager.git.baseFolders": ["./"],
-
-  "haxecheckstyle.sourceFolders": ["src", "source"],
-  "haxecheckstyle.externalSourceRoots": [],
-  "haxecheckstyle.configurationFile": "checkstyle.json",
-  "haxecheckstyle.codeSimilarityBufferSize": 100,
-
-  "lime.targetConfigurations": [
-    {
-      "label": "Windows / Debug",
-      "target": "windows",
-      "args": ["-debug", "-DFORCE_DEBUG_VERSION"]
-    },
-    {
-      "label": "Linux / Debug",
-      "target": "linux",
-      "args": ["-debug", "-DFORCE_DEBUG_VERSION"]
-    },
-    {
-      "label": "HashLink / Debug",
-      "target": "hl",
-      "args": ["-debug"]
-    },
-    {
-      "label": "Windows / Debug (FlxAnimate Test)",
-      "target": "windows",
-      "args": ["-debug", "-DANIMATE", "-DFORCE_DEBUG_VERSION"]
-    },
-    {
-      "label": "HashLink / Debug (FlxAnimate Test)",
-      "target": "hl",
-      "args": ["-debug", "-DANIMATE"]
-    },
-    {
-      "label": "Windows / Debug (Straight to Freeplay)",
-      "target": "windows",
-      "args": ["-debug", "-DFREEPLAY", "-DFORCE_DEBUG_VERSION"]
-    },
-    {
-      "label": "HashLink / Debug (Straight to Freeplay)",
-      "target": "hl",
-      "args": ["-debug", "-DFREEPLAY"]
-    },
-    {
-      "label": "Windows / Debug (Straight to Play - Bopeebo Normal)",
-      "target": "windows",
-      "args": [
-        "-debug",
-        "-DSONG=bopeebo -DDIFFICULTY=normal",
-        "-DFORCE_DEBUG_VERSION"
-      ]
-    },
-    {
-      "label": "Windows / Debug (Straight to Play - 2hot)",
-      "target": "windows",
-      "args": ["-debug", "-DSONG=2hot", "-DFORCE_DEBUG_VERSION"]
-    },
-    {
-      "label": "HashLink / Debug (Straight to Play - Bopeebo Normal)",
-      "target": "hl",
-      "args": ["-debug", "-DSONG=bopeebo -DDIFFICULTY=normal"]
-    },
-    {
-      "label": "Windows / Debug (Conversation Test)",
-      "target": "windows",
-      "args": ["-debug", "-DDIALOGUE", "-DFORCE_DEBUG_VERSION"]
-    },
-    {
-      "label": "HashLink / Debug (Conversation Test)",
-      "target": "hl",
-      "args": ["-debug", "-DDIALOGUE"]
-    },
-    {
-      "label": "Windows / Debug (Results Screen Test)",
-      "target": "windows",
-      "args": ["-debug", "-DRESULTS"]
-    },
-    {
-      "label": "Windows / Debug (Straight to Chart Editor)",
-      "target": "windows",
-      "args": ["-debug", "-DCHARTING", "-DFORCE_DEBUG_VERSION"]
-    },
-    {
-      "label": "HashLink / Debug (Straight to Chart Editor)",
-      "target": "hl",
-      "args": ["-debug", "-DCHARTING"]
-    },
-    {
-      "label": "Windows / Debug (Straight to Animation Editor)",
-      "target": "windows",
-      "args": ["-debug", "-DANIMDEBUG", "-DFORCE_DEBUG_VERSION"]
-    },
-    {
-      "label": "Windows / Debug (Debug hxCodec)",
-      "target": "windows",
-      "args": ["-debug", "-DHXC_LIBVLC_LOGGING", "-DFORCE_DEBUG_VERSION"]
-    },
-    {
-      "label": "HashLink / Debug (Straight to Animation Editor)",
-      "target": "hl",
-      "args": ["-debug", "-DANIMDEBUG"]
-    },
-    {
-      "label": "Windows / Debug (Latency Test)",
-      "target": "windows",
-      "args": ["-debug", "-DLATENCY", "-DFORCE_DEBUG_VERSION"]
-    },
-    {
-      "label": "HashLink / Debug (Latency Test)",
-      "target": "hl",
-      "args": ["-debug", "-DLATENCY"]
-    },
-    {
-      "label": "Windows / Debug (Waveform Test)",
-      "target": "windows",
-      "args": ["-debug", "-DWAVEFORM", "-DFORCE_DEBUG_VERSION"]
-    },
-    {
-      "label": "Windows / Release",
-      "target": "windows",
-      "args": ["-release"]
-    },
-    {
-      "label": "Windows / Release (GitHub Actions)",
-      "target": "windows",
-      "args": ["-release", "-DGITHUB_BUILD"]
-    },
-    {
-      "label": "HashLink / Debug (Waveform Test)",
-      "target": "hl",
-      "args": ["-debug", "-DWAVEFORM"]
-    },
-    {
-      "label": "HTML5 / Debug",
-      "target": "html5",
-      "args": ["-debug", "-DFORCE_DEBUG_VERSION"]
-    },
-    {
-      "label": "HTML5 / Debug (Watch)",
-      "target": "html5",
-      "args": ["-debug", "-watch", "-DFORCE_DEBUG_VERSION"]
-    },
-    {
-      "label": "macOS / Debug",
-      "target": "mac",
-      "args": ["-debug", "-DFORCE_DEBUG_VERSION"]
-    },
-    {
-      "label": "macOS / Release",
-      "target": "mac",
-      "args": ["-release"]
-    },
-    {
-      "label": "macOS / Release (GitHub Actions)",
-      "target": "mac",
-      "args": ["-release", "-DGITHUB_BUILD"]
-    }
-  ],
-  "cmake.configureOnOpen": false,
-  "coverage-gutters.coverageFileNames": [
-    "lcov.info",
-    "cov.xml",
-    "coverage.xml",
-    "jacoco.xml",
-    "coverage.cobertura.xml"
-  ]
-}

.vscode/tasks.json

@@ -1,13 +0,0 @@
-{
-  "version": "2.0.0",
-  "tasks": [
-    {
-      "type": "lime",
-      "command": "test",
-      "group": {
-        "kind": "build",
-        "isDefault": true
-      }
-    }
-  ]
-}

CHANGELOG.md

@@ -4,224 +4,6 @@ All notable changes will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.4.1] - 2024-06-12
-### Added
-- Pressing ESCAPE on the title screen on desktop now exits the game, allowing you to exit the game while in fullscreen on desktop
-- Freeplay menu controls (favoriting and switching categories) are now rebindable from the Options menu, and now have default binds on controllers.
-### Changed
-- Highscores and ranks are now saved separately, which fixes the issue where people would overwrite their saves with higher scores,
-which would remove their rank if they had a lower one.
-- A-Bot speaker now reacts to the user's volume preference on desktop (thanks to [M7theguy for the issue report/suggestion](https://github.com/FunkinCrew/Funkin/issues/2744)!)
-- On Freeplay, heart icons are shifted to the right when you favorite a song that has no rank on it.
-- Only play `scrollMenu` sound effect when there's a real change on the freeplay menu ([thanks gamerbross for the PR!](https://github.com/FunkinCrew/Funkin/pull/2741))
-- Gave antialiasing to the edge of the dad graphic on Freeplay
-- Rearranged some controls in the controls menu
-- Made several chart revisions
-  - Re-enabled custom camera events in Roses (Erect/Nightmare)
-  - Tweaked the chart for Lit Up (Hard)
-  - Corrected the difficulty ratings for M.I.L.F. (Easy/Normal/Hard)
-### Fixed
-- Fixed an issue in the controls menu where some control binds would overlap their names
-- Fixed crash when attempting to exit the gameover screen when also attempting to retry the song ([thanks DMMaster636 for the PR!](https://github.com/FunkinCrew/Funkin/pull/2709))
-- Fix botplay sustain release bug ([thanks Hundrec!](Fix botplay sustain release bug #2683))
-- Fix for the camera not pausing during a gameplay pause ([thanks gamerbross!](https://github.com/FunkinCrew/Funkin/pull/2684))
-- Fixed issue where Pico's gameplay sprite would unintentionally appear on the gameover screen when dying on 2Hot from an explosion
-- Freeplay previews properly fade volume during the BF idle animation
-- Fixed bug where Dadbattle incorrectly appeared as Dadbattle Erect when returning to freeplay on Hard
-- Fixed 2Hot not appearing under the "#" category in Freeplay menu
-- Fixed a bug where the Chart Editor would crash when attempting to select an event with the Event toolbox open
-- Improved offsets for Pico and Tankman opponents so they don't slide around as much.
-- Fixed the black "temp" graphic on freeplay from being incorrectly sized / masked, now it's identical to the dad freeplay graphic
-
-## [0.4.0] - 2024-06-06
-### Added
-- 2 new Erect remixes, Eggnog and Satin Panties. Check them out from the Freeplay menu!
-- Major visual improvements to the Results screen, with additional animations and audio based on your performance.
-- Major visual improvements to the Freeplay screen, with song difficulty ratings and player rank displays.
-  - Freeplay now plays a preview of songs when you hover over them.
-- Added a Charter field to the chart format, to allow for crediting the creator of a level's chart.
-  - You can see who charted a song from the Pause menu.
-- Added a new Scroll Speed chart event to change the note speed mid-song (thanks burgerballs!)
-### Changed
-- Tweaked the charts for several songs:
-  - Tutorial (increased the note speed slightly)
-  - Spookeez
-  - Monster
-  - Winter Horrorland
-  - M.I.L.F.
-  - Senpai (increased the note speed)
-  - Roses
-  - Thorns (increased the note speed slightly)
-  - Ugh
-  - Stress
-  - Lit Up
-- Favorite songs marked in Freeplay are now stored between sessions.
-- The Freeplay easter eggs are now easier to see.
-- In the event that the game cannot load your save data, it will now perform a backup before clearing it, so that we can try to repair it in the future.
-- Custom note styles are now properly supported for songs; add new notestyles via JSON, then select it for use from the Chart Editor Metadata toolbox. (thanks Keoiki!)
-- Health icons now support a Winning frame without requiring a spritesheet, simply include a third frame in the icon file. (thanks gamerbross!)
-  - Remember that for more complex behaviors such as animations or transitions, you should use an XML file to define each frame.
-- Improved the Event Toolbox in the Chart Editor; dropdowns are now bigger, include search field, and display elements in alphabetical order rather than a random order.
-### Fixed
-- Fixed an issue where Nene's visualizer would not play on Desktop builds
-- Fixed a bug where the game would silently fail to load saves on HTML5
-- Fixed some bugs with the props on the Story Menu not bopping properly
-- Additional fixes to the Loading bar on HTML5 (thanks lemz1!)
-- Fixed several bugs with the TitleState, including missing music when returning from the Main Menu (thanks gamerbross!)
-- Fixed a camera bug in the Main Menu (thanks richTrash21!)
-- Fixed a bug where changing difficulties in Story mode wouldn't update the score (thanks sectorA!)
-- Fixed a crash in Freeplay caused by a level referencing an invalid song (thanks gamerbross!)
-- Fixed a bug where pressing the volume keys would stop the Toy commercial (thanks gamerbross!)
-- Fixed a bug where the Chart Editor Playtest would crash when losing (thanks gamerbross!)
-- Fixed a bug where hold notes would display improperly in the Chart Editor when downscroll was enabled for gameplay (thanks gamerbross!)
-- Fixed a bug where hold notes would be positioned wrong on downscroll (thanks MaybeMaru!)
-- Removed a large number of unused imports to optimize builds (thanks Ethan-makes-music!)
-- Improved debug logging for unscripted stages (thanks gamerbross!)
-- Made improvements to compiling documentation (thanks gedehari!)
-- Fixed a crash on Linux caused by an old version of hxCodec (thanks Noobz4Life!)
-- Optimized animation handling for characters (thanks richTrash21!)
-- Made improvements to compiling documentation (thanks gedehari!)
-- Fixed a bug where pressing the volume keys would stop the Toy commercial (thanks gamerbross!)
-- Fixed a bug where the Chart Editor Playtest would crash when losing (thanks gamerbross!)
-- Removed a large number of unused imports to optimize builds (thanks Ethan-makes-music!)
-- Fixed a bug where hold notes would be positioned wrong on downscroll (thanks MaybeMaru!)
-- Additional fixes to the Loading bar on HTML5 (thanks lemz1!)
-- Fixed a crash in Freeplay caused by a level referencing an invalid song (thanks gamerbross!)
-- Improved debug logging for unscripted stages (thanks gamerbross!)
-- Fixed a bug where changing difficulties in Story mode wouldn't update the score (thanks sectorA!)
-- Fixed an issue where the Chart Editor would use an incorrect instrumental on imported Legacy songs (thanks gamerbross!)
-- Fixed a camera bug in the Main Menu (thanks richTrash21!)
-- Fixed several bugs with the TitleState, including missing music when returning from the Main Menu (thanks gamerbross!)
-- Fixed a bug where opening the game from the command line would crash the preloader (thanks NotHyper474!)
-- Fixed a bug where hold notes would display improperly in the Chart Editor when downscroll was enabled for gameplay (thanks gamerbross!)
-- Fixed a bug where characters would sometimes use the wrong scale value (thanks PurSnake!)
-- Additional bug fixes and optimizations.
-
-## [0.3.3] - 2024-05-14
-### Changed
-- Cleaned up some code in `PlayAnimationSongEvent.hx` (thanks BurgerBalls!)
-### Fixed
-- Fixes to the Loading bar on HTML5 (thanks lemz1!)
-- Don't allow any more inputs when exiting freeplay (thanks gamerbros!)
-- Fixed using mouse wheel to scroll on freeplay (thanks JugieNoob!)
-- Fixed the reset's of the health icons, score, and notes when re-entering gameplay from gameover (thanks ImCodist!)
-- Fixed the chart editor character selector's hitbox width (thanks MadBear422!)
-- Fixed camera stutter once a wipe transition to the Main Menu completes (thanks ImCodist!)
-- Fixed an issue where hold note would be invisible for a single frame (thanks ImCodist!)
-- Fix tween accumulation on title screen when pressing Y multiple times (thanks TheGaloXx!)
-- Fix a crash when querying FlxG.state in the crash handler
-- Fix for a game over easter egg so you don't accidentally exit it when viewing
-- Fix an issue where the Freeplay menu never displays 100% clear
-- Fix an issue where Weekend 1 Pico attempted to retrieve a missing asset.
-- Fix an issue where duplicate keybinds would be stoed, potentially causing a crash
-- Chart debug key now properly returns you to the previous chart editor session if you were playtesting a chart (thanks nebulazorua!)
-- Fix a crash on Freeplay found on AMD graphics cards
-
-## [0.3.2] - 2024-05-03
-### Added
-- Added `,` and `.` keybinds to the Chart Editor. These place Focus Camera events at the playhead, for the opponent and player respectively.
-- Implemented a blacklist to prevent mods from calling system functions.
-  - Added a couple utility functions to call useful stuff that got blacklisted.
-- Added an `onSongLoad` script event which allows for mutation of notes and events.
-- Added the current loaded modlist to crash logs.
-- Added the `visible` attribute to Level JSON data.
-- Enabled ZIP file system support for Polymod (make sure the metadata is in the root of the ZIP).
-### Changed
-- Songs in the mod folders will display in Freeplay without any extra scripting.
-- Story levels in the mod folders will display in Story without any extra scripting.
-- All audio should sound better in HTML5, less muddy
-### Fixed
-- Fixed a typo in the credits folder (`Custcene` -> `Cutscene`)
-- Fixed an issue where health icon transition animations would loop and never finish properly.
-- Fixed an issue where video cutscenes flagged as mid-song would crash the game when they finish.
-- Fixed an issue where some substate lifecycle events were not being dispatched.
-- Fixed a crash when trying to load into the Animation Offsets menu with an invalid character.
-- Fixed an issue where the preloader would spam the logs when it was complete and waiting for user input.
-- Should definitely have the fix for freeplay where it stops taking control of the main menu below it
-- Changed the code for the story menu difficulties so that "normal" doesn't overlap the arrows after leaving Weekend 1
-### Removed
-- Removed some unused `.txt` files in the `assets/data` folder.
-
-## [0.3.1] - 2024-05-01
-### Changed
-- Ensure the Git commit hash always displays in the log files.
-- Added whether the local Git repo was modified to the log files.
-- Removed "PROTOTYPE" text on release builds only (it still shows on debug builds).
-- Added additional credits and special thanks.
-- Updated peepo in creds to peepo173
-### Fixed
-- Fix a crash when retrieving system specs while handing a crash.
-- Fix a crash triggered when pausing before the song started.
-- Fix a crash triggered when dying before the song started.
-- Fix a crash triggered when unloading certain graphics.
-- Pico game over confirm plays correctly
-- When exiting from a song into freeplay, main menu no longer takes inputs unintentionally (aka issues with merch links opening up when selecting songs)
-- Fix for arrow keys causing web browser page scroll
-
-## [0.3.0] - 2024-04-30
-### Added
-- New Story Level: Weekend 1, starting Pico, Darnell, and Nene.
-  - Beat the level in Story Mode to unlock the songs for Freeplay!
-- 12 new Erect remixes, featuring Kawai Sprite, Saruky, Kohta Takahashi, and Saster
-  - Unlocked instantly in Freeplay
-- New visually enhanced Freeplay menu.
-  - Sorting, favorites, and more.
-- New Results screen upon completing any song or story level.
-- New refactored Chart Editor prototype (accessible via `~` in the main menu or `7` in the Play State, rebindable). (VERY EARLY PROTOTYPE. EXPECT BUGS AND CRASHES)
-- Implemented a new scripting system using HScript (an interpreted language with Haxe-like syntax) for incredible flexibility.
-  - All character-specific, stage-specific, or song-specific behaviors have been moved to HScript.
-- New song events system allows for simple customization of camera behavior.
-  - Mods can implement custom song events via HScript, and new built-in song events will come in the future.
-- New credits menu to list all the dozens of people who contributed.
-### Changed
-- Completely refactored the game's input system for higher reliability and accuracy.
-- Reworked note rendering to massively reduce lag on larger charts.
-- Reworks to scoring and health gain.
-- Dedicated gamepad support with the ability to rebind buttons.
-- Improvements to video cutscenes and dialogue, allowing them to be easily skipped or restarted.
-- Updated Polymod by several major versions, allowing for fully dynamic asset replacement and support for scripted classes.
-- Completely refactored almost every part of the game's code for performance, stability, and extensibility.
-  - This is not the Ludem Dare game held together with sticks and glue you played three years ago.
-- Characters, stages, songs, story levels, and dialogue are now built from JSON data registries rather than being hardcoded.
-  - All of these also support attaching scripts for custom behavior, more documentation on this soon.
-  - You can forcibly reload the game's JSON data and scripts by pressing F5.
-- Fully refactored the game's chart file format for extensibility and readability.
-  - You can migrate old charts using the Import FNF Legacy option in the chart editor.
-- Various visual tweaks and improvements.
-### Fixed
-- 17 quadrillion bugs across hundreds of PRs.
-
-## [0.2.8] - 2021-04-18 (note, this one is iffy cuz we slacked wit it lol!)
-### Added
-- TANKMAN! 3 NEW SONGS BY KAWAISPRITE (UGH, GUNS, STRESS)! Charting help by MtH!
-- Monster added into week 2, FINALLY (Charting help by MtH and ChaoticGamer!)
-- Can now change song difficulty mid-game.
-- Shows some song info on pause screen.
-- Cute little icons onto freeplay menu
-- Offset files for easier modification of characters
-### Changed
-- ASSET LOADING OVERHAUL, WAY FASTER LOAD TIMES ON WEB!!! (THANKS TO GEOKURELI WOKE KING)
-- Made difficulty selector on freeplay menu more apparent
-### Fixed
-- That one random note on Bopeebo
-
-## [0.2.7.1] - 2021-02-14
-### Added
-- Easter eggs
-- readme's in desktop versions of the game
-### Changed
-- New icons, old one was placeholder since October woops!
-- Made the transitions between the story mode levels more seamless.
-- Offset of the Newgrounds logo on boot screen.
-- Made the changelog txt so it can be opened easier by normal people who don't have a markdown reader (most normal people);
-### Fixed
-- Fixed crashes on Week 6 story mode dialogue if spam too fast ([Thanks to Lotusotho for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/357))
-- Should show intro credits on desktop versions of the game more consistently
-- Layering on Week 4 songs with GF and the LIMO LOL HOW TF I MISS THIS
-- Chart's and chart editor now support changeBPM, GOD BLESS MTH FOR THIS ONE I BEEN STRUGGLIN WIT THAT SINCE OCTOBER LMAO ([GOD BLESS MTH](https://github.com/ninjamuffin99/Funkin/pull/382))
-- Fixed sustain note trails ALSO THANKS TO MTH U A REAL ONE ([MTH VERY POWERFUL](https://github.com/ninjamuffin99/Funkin/pull/415))
-- Antialiasing on the skyscraper lights
-
 ## [0.2.7] - 2021-02-02
 ### Added
 - PIXEL DAY UPDATE LOL 1 WEEK LATER
@@ -263,7 +45,7 @@ which would remove their rank if they had a lower one.
 - Clear section button to note editor
 - Swap button in note editor
 - a new boot text or two
-- automatic check for when you're on an old version of the game!
+- automatic check for when you're on an old version of the game! 
 ### Changed
 - Made Spookeez on Normal easier.
 - Mouse is now visible in note editor

CODESTYLE.md

@@ -1,32 +0,0 @@
-# Code Style Guide
-
-Code style is enforced using Visual Studio Code extensions.
-
-## .hx
-Formatting is handled by the `nadako.vshaxe` extension, which includes Haxe Formatter.
-Haxe Formatter automatically resolves issues such as intentation style and line breaks, and can be configured in `hxformat.json`.
-
-Code Quality is handled by the `vshaxe.haxe-checkstyle` extension, which includes Haxe Checkstyle.
-
-### Haxe Checkstyle Notes
-* Checks can be escalated to display as different serverities in the Problems window.
-  * Checks can be disabled by setting the severity to `IGNORE`.
-* `IndentationCharacter` checks what is used to indent, `Indentation` checks how deep the intentation is.
-* `CommentedOutCode` check is in place because old code should be retrieved via Git history.
-* TODO items: Enable these one-by-one and fix them to improve the overall code quality.
-  - Reconfigure `MethodLength`
-  - Reconfigure `CyclomaticComplexity`
-  - Re-enable `MagicNumber`
-  - Re-configure `NestedControlFlow`
-  - Re-configure `NestedIfDepth`
-  - Figure out something for `Trace`
-  - Fix bug and enable `DocCommentStyle`
-
-## .json
-Formatting is handled by the `esbenp.prettier-vscode` extension, which includes Prettier.
-Prettier automatically handles formatting of JSON files, and can be configured in `.prettierrc.js`.
-
-### Prettier Notes
-* Prettier will automatically attempt to place expressions on a single line if they fit, but will keep them multi-line if they are manually made multi-line.
-  * This means that long singleline objects are automatically expanded, and short multiline objects aren't automatically collapsed.
-  * You may want to use regex replacement to manually remove the first newline in short multi-line objects to convince Prettier to collapse them.

LICENSE

@@ -1,14 +1,3 @@
-# Friday Night Funkin'
-
-The Friday Night Funkin' source code is licensed under the Apache 2.0 license: (https://www.apache.org/licenses/LICENSE-2.0)
-
-Friday Night Funkin' Copyright 2020-2024 The Funkin' Crew Inc.
-All Rights Reserved. "Friday Night Funkin'" and the "Friday Night Funkin'" logo are trademarks of The Funkin' Crew Inc.
-
-You can view the `funkin-assets` license here: (https://github.com/FunkinCrew/funkin.assets/blob/main/LICENSE.md)
-
-## Apache 2.0 License
-
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -197,7 +186,7 @@ You can view the `funkin-assets` license here: (https://github.com/FunkinCrew/fu
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2020-2024 The Funkin' Crew Inc.
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

Preloader.hx

@@ -0,0 +1,57 @@
+package ;
+ 
+import flixel.system.FlxBasePreloader;
+import openfl.display.Sprite;
+import flash.display.Bitmap;
+import flash.display.BitmapData;
+import flash.display.BlendMode;
+import flash.display.Sprite;
+import flash.Lib;
+import flixel.FlxG;
+ 
+@:bitmap("art/preloaderArt.png") class LogoImage extends BitmapData { }
+ 
+class Preloader extends FlxBasePreloader
+{
+    public function new(MinDisplayTime:Float=3, ?AllowedURLs:Array<String>) 
+    {
+        super(MinDisplayTime, AllowedURLs);
+    }
+     
+    var logo:Sprite;
+     
+    override function create():Void 
+    {
+        this._width = Lib.current.stage.stageWidth;
+        this._height = Lib.current.stage.stageHeight;
+         
+        var ratio:Float = this._width / 2560; //This allows us to scale assets depending on the size of the screen.
+         
+        logo = new Sprite();
+        logo.addChild(new Bitmap(new LogoImage(0,0))); //Sets the graphic of the sprite to a Bitmap object, which uses our embedded BitmapData class.
+        logo.scaleX = logo.scaleY = ratio;
+        logo.x = ((this._width) / 2) - ((logo.width) / 2);
+        logo.y = (this._height / 2) - ((logo.height) / 2);
+        addChild(logo); //Adds the graphic to the NMEPreloader's buffer.
+         
+        super.create();
+    }
+     
+    override function update(Percent:Float):Void 
+    {
+        if(Percent < 69)
+        {
+            logo.scaleX += Percent / 1920;
+            logo.scaleY += Percent / 1920;
+            logo.x -= Percent * 0.6;
+            logo.y -= Percent / 2;
+        }else{
+            logo.scaleX = this._width / 1280;
+            logo.scaleY = this._width / 1280;
+            logo.x = ((this._width) / 2) - ((logo.width) / 2);
+            logo.y = (this._height / 2) - ((logo.height) / 2);
+        }
+        
+        super.update(Percent);
+    }
+}

Project.xml

@@ -1,269 +1,125 @@
 <?xml version="1.0" encoding="utf-8"?>
-<project xmlns="http://lime.openfl.org/project/1.0.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://lime.openfl.org/project/1.0.4 http://lime.openfl.org/xsd/project-1.0.4.xsd">
+<project>
 	<!-- _________________________ Application Settings _________________________ -->
-	<app title="Friday Night Funkin'" file="Funkin" packageName="com.funkin.fnf" package="com.funkin.fnf" main="Main" version="0.4.1" company="ninjamuffin99" />
+
+	<app title="Friday Night Funkin'" file="Funkin" packageName="com.ninjamuffin99.funkin" main="Main" version="0.2.7" company="ninjamuffin99" />
+
 	<!--Switch Export with Unique ApplicationID and Icon-->
 	<set name="APP_ID" value="0x0100f6c013bbc000" />
 
-	<!--
-		Define the OpenFL sprite which displays the preloader.
-		You can't replace the preloader's logic here, sadly, but you can extend it.
-		Basic preloading logic is done by `openfl.display.Preloader`.
-	-->
-	<app preloader="funkin.ui.transition.preload.FunkinPreloader" />
+	<!--The flixel preloader is not accurate in Chrome. You can use it regularly if you embed the swf into a html file
+		or you can set the actual size of your file manually at "FlxPreloaderBase-onUpdate-bytesTotal"-->
+	<!-- <app preloader="Preloader" resizable="true" /> -->
+	<app preloader="flixel.system.FlxPreloader" />
 
 	<!--Minimum without FLX_NO_GAMEPAD: 11.8, without FLX_NO_NATIVE_CURSOR: 11.2-->
 	<set name="SWF_VERSION" value="11.8" />
+
 	<!-- ____________________________ Window Settings ___________________________ -->
+
 	<!--These window settings apply to all targets-->
 	<window width="1280" height="720" fps="60" background="#000000" hardware="true" vsync="false" />
+
 	<!--HTML5-specific-->
 	<window if="html5" resizable="true" />
+
 	<!--Desktop-specific-->
-	<window if="desktop" orientation="landscape" fullscreen="false" resizable="true" vsync="false" />
+	<window if="desktop" orientation="landscape" fullscreen="false" resizable="true" vsync="false"/>
+
 	<!--Mobile-specific-->
-	<window if="mobile" orientation="landscape" fullscreen="true" width="0" height="0" resizable="false" />
+	<window if="mobile" orientation="landscape" fullscreen="true" width="0" height="0" />
+
+	<!--Switch-specific-->
+	<window if="switch" orientation="landscape" fullscreen="true" width="0" height="0" resizable="true" />
+
 	<!-- _____________________________ Path Settings ____________________________ -->
 
 	<set name="BUILD_DIR" value="export/debug" if="debug" />
 	<set name="BUILD_DIR" value="export/release" unless="debug" />
 	<set name="BUILD_DIR" value="export/32bit" if="32bit" />
-	<source path="source" />
-	<assets path="assets/preload" rename="assets" exclude="*.ogg|*.wav" if="web" />
-	<assets path="assets/preload" rename="assets" exclude="*.mp3|*.wav" unless="web" />
-	<define name="PRELOAD_ALL" unless="web" />
-	<define name="NO_PRELOAD_ALL" unless="PRELOAD_ALL" />
-	<section if="PRELOAD_ALL">
-		<library name="songs" preload="true" />
-		<library name="shared" preload="true" />
-		<library name="tutorial" preload="true" />
-		<library name="week1" preload="true" />
-		<library name="week2" preload="true" />
-		<library name="week3" preload="true" />
-		<library name="week4" preload="true" />
-		<library name="week5" preload="true" />
-		<library name="week6" preload="true" />
-		<library name="week7" preload="true" />
-		<library name="weekend1" preload="true" />
-		<library name="videos" preload="true" />
-	</section>
-	<section if="NO_PRELOAD_ALL">
-		<library name="songs" preload="false" />
-		<library name="shared" preload="false" />
-		<library name="tutorial" preload="false" />
-		<library name="week1" preload="false" />
-		<library name="week2" preload="false" />
-		<library name="week3" preload="false" />
-		<library name="week4" preload="false" />
-		<library name="week5" preload="false" />
-		<library name="week6" preload="false" />
-		<library name="week7" preload="false" />
-		<library name="weekend1" preload="false" />
-		<library name="videos" preload="false" />
-	</section>
-	<library name="art" preload="false" />
-	<assets path="assets/songs" library="songs" exclude="*.fla|*.ogg|*.wav" if="web" />
-	<assets path="assets/songs" library="songs" exclude="*.fla|*.mp3|*.wav" unless="web" />
-	<!-- Videos go in their own library because web never needs to preload them, they can just be streamed. -->
-	<assets path="assets/videos" library="videos" />
-	<assets path="assets/shared" library="shared" exclude="*.fla|*.ogg|*.wav" if="web" />
-	<assets path="assets/shared" library="shared" exclude="*.fla|*.mp3|*.wav" unless="web" />
-	<assets path="assets/tutorial" library="tutorial" exclude="*.fla|*.ogg|*.wav" if="web" />
-	<assets path="assets/tutorial" library="tutorial" exclude="*.fla|*.mp3|*.wav" unless="web" />
-	<assets path="assets/week1" library="week1" exclude="*.fla|*.ogg|*.wav" if="web" />
-	<assets path="assets/week1" library="week1" exclude="*.fla|*.mp3|*.wav" unless="web" />
-	<assets path="assets/week2" library="week2" exclude="*.fla|*.ogg|*.wav" if="web" />
-	<assets path="assets/week2" library="week2" exclude="*.fla|*.mp3|*.wav" unless="web" />
-	<assets path="assets/week3" library="week3" exclude="*.fla|*.ogg|*.wav" if="web" />
-	<assets path="assets/week3" library="week3" exclude="*.fla|*.mp3|*.wav" unless="web" />
-	<assets path="assets/week4" library="week4" exclude="*.fla|*.ogg|*.wav" if="web" />
-	<assets path="assets/week4" library="week4" exclude="*.fla|*.mp3|*.wav" unless="web" />
-	<assets path="assets/week5" library="week5" exclude="*.fla|*.ogg|*.wav" if="web" />
-	<assets path="assets/week5" library="week5" exclude="*.fla|*.mp3|*.wav" unless="web" />
-	<assets path="assets/week6" library="week6" exclude="*.fla|*.ogg|*.wav" if="web" />
-	<assets path="assets/week6" library="week6" exclude="*.fla|*.mp3|*.wav" unless="web" />
-	<assets path="assets/week7" library="week7" exclude="*.fla|*.ogg|*.wav" if="web" />
-	<assets path="assets/week7" library="week7" exclude="*.fla|*.mp3|*.wav" unless="web" />
-	<assets path="assets/weekend1" library="weekend1" exclude="*.fla|*.ogg|*.wav" if="web" />
-	<assets path="assets/weekend1" library="weekend1" exclude="*.fla|*.mp3|*.wav" unless="web" />
-	<!-- <assets path='example_mods' rename='mods' embed='false'/> -->
-	<!--
-		AUTOMATICALLY MOVING EXAMPLE MODS INTO THE BUILD CAUSES ISSUES
-		Currently, this line will add the mod files to the library manifest,
-		which causes issues if the mod is not enabled.
-		If we can exclude the `mods` folder from the manifest, we can re-enable this line.
-		<assets path='example_mods' rename='mods' embed='false' exclude="*.md" />
-	-->
-	<assets path="art/readme.txt" rename="do NOT readme.txt" library="art"/>
-	<assets path="CHANGELOG.md" rename="changelog.txt" library="art"/>
-	<!-- NOTE FOR FUTURE SELF SINCE FONTS ARE ALWAYS FUCKY
+
+	<classpath name="source" />
+
+	<assets path="assets/images" />
+	<assets path="assets/data" />
+	<assets path='example_mods' rename='mods' embed='false'/>
+	<!-- <template path='mods' /> -->
+	
+	<!-- <library name="noPreload" preload='false'/> -->
+	<!-- <library name="noPreload"/> -->
+	<assets path="assets/music" include="*.mp3" if="web"/>
+	<assets path="assets/music" include="*.ogg" unless="web"/>
+	<assets path="assets/sounds" include="*.mp3" if="web" />
+	<assets path="assets/sounds" include="*.ogg" unless="web" />
+
+	<assets path="CHANGELOG.md"/>
+
+	<!-- NOTE FOR FUTURE SELF SINCE FONTS ARE ALWAYS FUCKY 
 		TO FIX ONE OF THEM, I CONVERTED IT TO OTF. DUNNO IF YOU NEED TO
 		THEN UHHH I USED THE NAME OF THE FONT WITH SETFORMAT() ON THE TEXT!!!
 		NOT USING A DIRECT THING TO THE ASSET!!!
 	-->
-	<assets path="assets/fonts" embed="true" />
-
-	<!-- If compiled via github actions, show debug version number. -->
-	<define name="FORCE_DEBUG_VERSION" if="GITHUB_BUILD" />
-	<define name="NO_REDIRECT_ASSETS_FOLDER" if="GITHUB_BUILD" />
-	<define name="TOUCH_HERE_TO_PLAY" if="web" />
-
+	<assets path="assets/fonts" embed='true'/>
 	<!-- _______________________________ Libraries ______________________________ -->
-	<haxelib name="lime" /> <!-- Game engine backend -->
-	<haxelib name="openfl" /> <!-- Game engine backend -->
-	<haxelib name="flixel" /> <!-- Game engine -->
 
-	<haxedev set="webgl" />
+	<haxelib name="flixel" />
+	<haxedev set='webgl' />
 
-	<haxelib name="flixel-addons" /> <!-- Additional utilities for Flixel -->
-	<haxelib name="hscript" /> <!-- Scripting -->
-	<haxelib name="flixel-ui" /> <!-- UI framework (DEPRECATED) -->
-	<haxelib name="haxeui-core" /> <!-- UI framework -->
-	<haxelib name="haxeui-flixel" /> <!-- Integrate HaxeUI with Flixel -->
-	<haxelib name="flixel-text-input" /> <!-- Improved text field rendering for HaxeUI -->
-	<haxelib name="polymod" /> <!-- Modding framework -->
-	<haxelib name="flxanimate" /> <!-- Texture atlas rendering -->
-	<haxelib name="hxCodec" if="desktop" unless="hl" /> <!-- Video playback -->
-	<haxelib name="funkin.vis"/>
-	<haxelib name="grig.audio" />
+	<!--In case you want to use the addons package-->
+	<haxelib name="flixel-addons" />
+	<haxelib name="hscript" />
 
-	<haxelib name="FlxPartialSound" /> <!-- Loading partial sound data -->
+	<!--In case you want to use the ui package-->
+	<haxelib name="flixel-ui" />
+	<haxelib name="newgrounds"/>
+	<haxelib name="faxe" if='switch'/>
+	<haxelib name="polymod"/>
 
-	<haxelib name="json2object" /> <!-- JSON parsing -->
-	<haxelib name="thx.core" /> <!-- General utility library, "the lodash of Haxe" -->
-	<haxelib name="thx.semver" /> <!-- Version string handling -->
+	<!-- <haxelib name="markdown" /> -->
+	<!-- <haxelib name="HtmlParser" /> -->
 
-	<haxelib name="hxcpp-debug-server" if="desktop debug" /> <!-- VSCode debug support -->
+	<!--In case you want to use nape with flixel-->
+	<!--<haxelib name="nape-haxe4" />-->
+
+	<!-- ______________________________ Haxedefines _____________________________ -->
+
+	<!--Enable the Flixel core recording system-->
+	<!--<haxedef name="FLX_RECORD" />-->
+
+	<!--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" />
+
 	<!--Disable the Flixel core debugger. Automatically gets set whenever you compile in release mode!-->
-	<haxedef name="FLX_NO_DEBUG" unless="debug || FORCE_DEBUG_VERSION" />
+	<haxedef name="FLX_NO_DEBUG" unless="debug" />
+
 	<!--Enable this for Nape release builds for a serious peformance improvement-->
 	<haxedef name="NAPE_RELEASE_BUILD" unless="debug" />
 
-	<!--
-		Hide deprecation warnings until they're fixed.
-		TODO: REMOVE THIS!!!!
-		<haxeflag name="-w" value="-WDeprecated" />
-	-->
-
-	<!-- Haxe 4.3.0+: Enable pretty syntax errors and stuff. -->
-	<haxedef name="message.reporting" value="pretty" />
-
 	<!-- _________________________________ Custom _______________________________ -->
-	<!-- Disable trace() calls in release builds to bump up performance.
-		<haxeflag name="- -no-traces" unless="debug" />-->
-	<!-- HScript relies heavily on Reflection, which means we can't use DCE. -->
-	<haxeflag name="-dce no" />
-	<!-- Ensure all Funkin' classes are available at runtime. -->
-	<haxeflag name="--macro" value="include('funkin')" />
-	<!-- Ensure all UI components are available at runtime. -->
-	<haxeflag name="--macro" value="include('haxe.ui.backend.flixel.components')" />
-	<haxeflag name="--macro" value="include('haxe.ui.containers.dialogs')" />
-	<haxeflag name="--macro" value="include('haxe.ui.containers.menus')" />
-	<haxeflag name="--macro" value="include('haxe.ui.containers.properties')" />
-	<haxeflag name="--macro" value="include('haxe.ui.core')" />
-	<haxeflag name="--macro" value="include('haxe.ui.components')" />
-	<haxeflag name="--macro" value="include('haxe.ui.containers')" />
-	<!--
-		Ensure additional class packages are available at runtime (some only really used by scripts).
-		Ignore packages we can't include.
-	-->
-	<haxeflag name="--macro" value="include('flixel', true, [ 'flixel.addons.editors.spine.*', 'flixel.addons.nape.*', 'flixel.system.macros.*' ])" />
-	<!-- Necessary to provide stack traces for HScript. -->
-	<haxedef name="hscriptPos" />
-	<haxedef name="safeMode"/>
-	<haxedef name="HXCPP_CHECK_POINTER" />
-	<haxedef name="HXCPP_STACK_LINE" />
-	<haxedef name="HXCPP_STACK_TRACE" />
-	<!-- This macro allows addition of new functionality to existing Flixel. -->
-	<haxeflag name="--macro" value="addMetadata('@:build(funkin.util.macro.FlxMacro.buildFlxBasic())', 'flixel.FlxBasic')" />
+
 	<!--Place custom nodes like icons here (higher priority to override the HaxeFlixel icon)-->
-	<icon path="art/icon16.png" size="16" />
-	<icon path="art/icon32.png" size="32" />
-	<icon path="art/icon64.png" size="64" />
-	<icon path="art/iconOG.png" />
-	<haxedef name="CAN_OPEN_LINKS" unless="switch" />
-	<haxedef name="CAN_CHEAT" if="switch debug" />
-	<!-- I don't remember what this is for. -->
-	<haxedef name="haxeui_no_mouse_reset" />
-	<!-- Clicking outside a dialog should deselect the current focused component. -->
-	<haxedef name="haxeui_focus_out_on_click" />
-	<!-- Required to use haxe.ui.backend.flixel.UIState with build macros. -->
-	<haxedef name="haxeui_dont_impose_base_class" />
-	<haxedef name="HARDCODED_CREDITS" />
-
-	<!-- Skip the Intro -->
-	<section if="debug">
-		<!-- Starts the game at the specified week, at the first song -->
-		<!-- <haxedef name="week" value="1" if="debug"/> -->
-		<!-- Starts the game at the specified song -->
-		<!-- <haxedef name="song" value="bopeebo" if="debug"/> -->
-		<!-- Difficulty, only used for week or song, defaults to 1 -->
-		<!-- <haxedef name="dif" value="2" if="debug"/> -->
-	</section>
-	<section if="newgrounds">
-		<!-- Enables Ng.core.verbose -->
-		<!-- <haxedef name="NG_VERBOSE" /> -->
-		<!-- Enables a NG debug session, so medals don't permently unlock -->
-		<!-- <haxedef name="NG_DEBUG" /> -->
-		<!-- pretends that the saved session Id was expired, forcing the reconnect prompt -->
-		<!-- <haxedef name="NG_FORCE_EXPIRED_SESSION" if="debug" /> -->
-	</section>
-
-	<!-- Uncomment this to wipe your input settings. -->
-	<!-- <haxedef name="CLEAR_INPUT_SAVE"/> -->
-
-	<section if="debug" unless="NO_REDIRECT_ASSETS_FOLDER || html5 || GITHUB_BUILD">
-		<!--
-			Use the parent assets folder rather than the exported one
-			No more will we accidentally undo our changes!
-		-->
-		<haxedef name="REDIRECT_ASSETS_FOLDER" />
-	</section>
+	<icon path="art/icon.png" />
 
 
-	<section>
-		<!--
-			This flag enables the popup/crashlog error handler.
-			However, it also messes with breakpoints on some platforms.
-		-->
-		<haxedef name="openfl-enable-handle-error" />
-	</section>
-
-	<!-- Run a script before and after building. -->
-	<prebuild haxe="source/Prebuild.hx"/> -->
-	<postbuild haxe="source/Postbuild.hx"/> -->
-
-	<!-- Enable this on platforms which do not support dropping files onto the window. -->
-	<haxedef name="FILE_DROP_UNSUPPORTED" if="mac" />
-	<section unless="FILE_DROP_UNSUPPORTED">
-		<haxedef name="FILE_DROP_SUPPORTED" />
-	</section>
-
-	<!-- Enable this on platforms which do not support the edsior views. -->
-	<haxedef name="CHART_EDITOR_UNSUPPORTED" if="web" />
-	<haxedef name="CHART_EDITOR_SUPPORTED" unless="web"/>
-
-	<!-- Options for Polymod -->
-	<section if="polymod">
-		<!-- Turns on additional debug logging. -->
-		<haxedef name="POLYMOD_DEBUG" value="true" if="debug" />
-		<!-- The file extension to use for script files. -->
-		<haxedef name="POLYMOD_SCRIPT_EXT" value=".hscript" />
-		<!-- Which asset library to use for scripts. -->
-		<haxedef name="POLYMOD_SCRIPT_LIBRARY" value="scripts" />
-		<!-- The base path from which scripts should be accessed. -->
-		<haxedef name="POLYMOD_ROOT_PATH" value="scripts/" />
-		<!-- Determines the subdirectory of the mod folder used for file appending. -->
-		<haxedef name="POLYMOD_APPEND_FOLDER" value="_append" />
-		<!-- Determines the subdirectory of the mod folder used for file merges. -->
-		<haxedef name="POLYMOD_MERGE_FOLDER" value="_merge" />
-		<!-- Determines the file in the mod folder used for metadata. -->
-		<haxedef name="POLYMOD_MOD_METADATA_FILE" value="_polymod_meta.json" />
-		<!-- Determines the file in the mod folder used for the icon. -->
-		<haxedef name="POLYMOD_MOD_ICON_FILE" value="_polymod_icon.png" />
-	</section>
+	<!-- <haxedef name="SKIP_TO_PLAYSTATE" if="debug" /> -->
+	<haxedef name="NG_LOGIN" if="newgrounds" />
+	
 </project>

README.md

@@ -1,44 +1,92 @@
-# Friday Night Funkin' 
-
-Friday Night Funkin' is a rhythm game. Built using HaxeFlixel for Ludum Dare 47.
-
-This game was made with love to Newgrounds and its community. Extra love to Tom Fulp.
-
-- [Playable web demo on Newgrounds!](https://www.newgrounds.com/portal/view/770371)
-- [Demo download builds for Windows, Mac, and Linux from Itch.io!](https://ninja-muffin24.itch.io/funkin)
-
-# Getting Started
-
-**PLEASE USE THE LINKS ABOVE IF YOU JUST WANT TO PLAY THE GAME**
-
-To learn how to install the necessary dependencies and compile the game from source, please check out our [building the game](/docs/COMPILING.md) guide.
-
-# Contributing
-
-Please check out our [Contributor's guide](./CONTRIBUTORS.md) on how you can actively participate in the development of Friday Night Funkin'.
-
-# Credits and Special Thanks
-
-Full credits can be found in-game, or wherever the credits.json file is.
-
-## Programming
-- [ninjamuffin99](https://twitter.com/ninja_muffin99) - Lead Programmer
-- [EliteMasterEric](https://twitter.com/EliteMasterEric) - Programmer
-- [MtH](https://twitter.com/emmnyaa) - Charting and Additional Programming
-- [GeoKureli](https://twitter.com/Geokureli/) - Additional Programming
-- Our contributors on GitHub
-
-## Art / Animation / UI
-- [PhantomArcade3K](https://twitter.com/phantomarcade3k) - Artist and Animator
-- [Evilsk8r](https://twitter.com/evilsk8r) - Art
-- [Moawling](https://twitter.com/moawko) - Week 6 Pixel Art
-- [IvanAlmighty](https://twitter.com/IvanA1mighty) - Misc UI Design
-
-## Music
-- [Kawaisprite](https://twitter.com/kawaisprite) - Musician
-- [BassetFilms](https://twitter.com/Bassetfilms) - Music for "Monster", Additional Character Design
-
-## Special Thanks
-- [Tom Fulp](https://twitter.com/tomfulp) - For being a great guy and for Newgrounds
-- [JohnnyUtah](https://twitter.com/JohnnyUtahNG/) - Voice of Tankman
-- [L0Litsmonica](https://twitter.com/L0Litsmonica) - Voice of Mommy Mearest
+# Friday Night Funkin
+
+This is the repository for Friday Night Funkin, a game originally made for Ludum Dare 47 "Stuck In a Loop".
+
+Play the Ludum Dare prototype here: https://ninja-muffin24.itch.io/friday-night-funkin
+Play the Newgrounds one here: https://www.newgrounds.com/portal/view/770371
+Support the project on the itch.io page: https://ninja-muffin24.itch.io/funkin
+
+## Credits / shoutouts
+
+- [ninjamuffin99 (me!)](https://twitter.com/ninja_muffin99) - Programmer
+- [PhantomArcade3K](https://twitter.com/phantomarcade3k) and [Evilsk8r](https://twitter.com/evilsk8r) - Art
+- [Kawaisprite](https://twitter.com/kawaisprite) - Musician
+
+This game was made with love to Newgrounds and it's community. Extra love to Tom Fulp.
+
+## Build instructions
+
+THESE INSTRUCTIONS ARE FOR COMPILING THE GAME'S SOURCE CODE!!!
+
+IF YOU WANT TO JUST DOWNLOAD AND INSTALL AND PLAY THE GAME NORMALLY, GO TO ITCH.IO TO DOWNLOAD THE GAME FOR PC, MAC, AND LINUX!!
+
+https://ninja-muffin24.itch.io/friday-night-funkin
+
+IF YOU WANT TO COMPILE THE GAME YOURSELF, CONTINUE READING!!!
+
+### Installing shit
+
+First you need to install Haxe and HaxeFlixel. I'm too lazy to write and keep updated with that setup (which is pretty simple). 
+The link to that is on the [HaxeFlixel website](https://haxeflixel.com/documentation/getting-started/)
+
+Other installations you'd need is the additional libraries, a fully updated list will be in `Project.xml` in the project root, but here are the one's I'm using as of writing.
+
+```
+hscript
+flixel-ui
+newgrounds
+```
+
+So for each of those type `haxelib install [library]` so shit like `haxelib install newgrounds`
+
+You'll also need to install polymod. Do this with 
+
+```
+haxelib git polymod https://github.com/larsiusprime/polymod.git
+```
+
+### Ignored files
+
+I gitignore the API keys for the game, so that no one can nab them and post fake highscores on the leaderboards. But because of that the game
+doesn't compile without it.
+
+Just make a file in `/source` and call it `APIStuff.hx`, and copy paste this into it
+
+```haxe
+package;
+
+class APIStuff
+{
+	public static var API:String = "";
+	public static var EncKey:String = "";
+}
+
+```
+
+and you should be good to go there.
+
+### Compiling game
+
+Once you have all those installed, it's pretty easy to compile the game. You just need to run 'lime test html5 -debug' in the root of the project to build and run the HTML5 version. (command prompt navigation guide can be found here: [https://ninjamuffin99.newgrounds.com/news/post/1090480](https://ninjamuffin99.newgrounds.com/news/post/1090480))
+
+To run it from your desktop (Windows, Mac, Linux) it can be a bit more involved. For Linux, you only need to open a terminal in the project directory and run 'lime test linux -debug' and then run the executible file in export/release/linux/bin. For Windows, you need to install Visual Studio Community 2019. While installing VSC, don't click on any of the options to install workloads. Instead, go to the individual components tab and choose the following:
+* MSVC v142 - VS 2019 C++ x64/x86 build tools
+* Windows SDK (10.0.17763.0)
+* C++ Profiling tools
+* C++ CMake tools for windows
+* C++ ATL for v142 build tools (x86 & x64)
+* C++ MFC for v142 build tools (x86 & x64)
+* C++/CLI support for v142 build tools (14.21)
+* C++ Modules for v142 build tools (x64/x86)
+* Clang Compiler for Windows
+* Windows 10 SDK (10.0.17134.0)
+* Windows 10 SDK (10.0.16299.0)
+* MSVC v141 - VS 2017 C++ x64/x86 build tools
+* MSVC v140 - VS 2015 C++ build tools (v14.00)
+
+This will install about 22GB of crap, but once that is done you can open up a command line in the project's directory and run `lime test windows -debug`. Once that command finishes (it takes forever even on a higher end PC), you can run FNF from the .exe file under export\release\windows\bin
+As for Mac, 'lime test mac -debug' should work, if not the internet surely has a guide on how to compile Haxe stuff for Mac.
+
+### Additional guides
+
+- [Command line basics](https://ninjamuffin99.newgrounds.com/news/post/1090480)

art/build-Itch-HTML-RELEASE.bat

@@ -0,0 +1,11 @@
+@echo off
+color 0a
+cd ..
+@echo on
+echo BUILDING GAME
+lime build html5 -final
+echo UPLOADING TO ITCH
+butler push ./export/release/html5/bin ninja-muffin24/funkin:html5
+butler status ninja-muffin24/funkin:html5
+echo ITCH SHIT UPDATED LMAOOOOO
+pause

art/build-Itch-HTML.bat

@@ -0,0 +1,11 @@
+@echo off
+color 0a
+cd ..
+@echo on
+echo BUILDING GAME
+lime build html5 -debug
+echo UPLOADING TO ITCH
+butler push ./export/debug/html5/bin ninja-muffin24/funkin:html5
+butler status ninja-muffin24/funkin:html5
+echo ITCH SHIT UPDATED LMAOOOOO
+pause

art/build-Itch-WINDOWS-CLEAN.bat

@@ -0,0 +1,15 @@
+@echo off
+color 0a
+cd ..
+@echo on
+echo BUILDING GAME
+lime build windows -final -clean
+echo UPLOADING 64 BIT VERSION TO ITCH
+butler push ./export/release/windows/bin ninja-muffin24/funkin:windows-64bit
+lime build windows -final -32
+echo UPLOADING 32 BIT VERSION TO ITCH
+butler push ./export/release/windows/bin ninja-muffin24/funkin:windows-32bit
+butler status ninja-muffin24/funkin:windows-32bit
+butler status ninja-muffin24/funkin:windows-64bit
+echo ITCH SHIT UPDATED LMAOOOOO
+pause

art/build-Itch-WINDOWS-SECRET.bat

@@ -0,0 +1,11 @@
+@echo off
+color 0a
+cd ..
+@echo on
+echo BUILDING GAME
+lime build windows -debug
+echo UPLOADING 64 BIT VERSION TO ITCH
+butler push ./export/debug/windows/bin ninja-muffin24/funkin:windows-secretBeta
+butler status ninja-muffin24/funkin:windows-secretBeta
+echo ITCH SHIT UPDATED LMAOOOOO
+pause

art/build-Itch-WINDOWS.bat

@@ -0,0 +1,15 @@
+@echo off
+color 0a
+cd ..
+@echo on
+echo BUILDING GAME
+lime build windows -release
+echo UPLOADING 64 BIT VERSION TO ITCH
+butler push ./export/release/windows/bin ninja-muffin24/funkin:windows-64bit
+lime build windows -release -32
+echo UPLOADING 32 BIT VERSION TO ITCH
+butler push ./export/release/windows/bin ninja-muffin24/funkin:windows-32bit
+butler status ninja-muffin24/funkin:windows-32bit
+butler status ninja-muffin24/funkin:windows-64bit
+echo ITCH SHIT UPDATED LMAOOOOO
+pause

art/build-NG-HTML-RELEASE.bat

@@ -0,0 +1,12 @@
+@echo off
+color 0a
+cd ..
+@echo on
+echo BUILDING GAME
+lime build html5 -final -Dng
+echo ZIPPING
+cd export
+7z a -tzip -r swag release\html5\bin
+start .
+start https://www.newgrounds.com/projects/games/1528775
+pause

art/build-lime-SWITCH.bat

@@ -0,0 +1,27 @@
+@echo off
+cd ..
+@echo on
+echo REBUILDING LIME FOR EXPORT (VERBOSE)
+@echo off
+color 0b
+@echo on
+lime rebuild windows -clean -v
+@echo off
+color 0a
+@echo on
+lime rebuild switch -clean -v
+@echo off
+color 0e
+@echo on
+lime rebuild tools -clean -v
+echo HOPE AND PRAY...
+@echo off
+color 0a
+@echo on
+echo BUILDING GAME
+lime build switch -final -clean -v
+@echo off
+color 0b
+@echo on
+echo NSP FILE CREATED
+pause

assets/data/characterList.txt

@@ -0,0 +1,16 @@
+bf
+dad
+gf
+spooky
+pico
+mom
+mom-car
+bf-car
+parents-christmas
+monster-christmas
+bf-christmas
+gf-christmas
+monster
+bf-pixel
+senpai
+spirit

assets/data/controls.txt

@@ -0,0 +1,32 @@
+setUP
+W
+setUP (ALTERNATE)
+FlxKey.UP
+setDOWN
+S
+setDOWN (ALTERNATE)
+FlxKey.DOWN
+setLEFT
+A
+setLEFT (ALTERNATE)
+FlxKey.LEFT
+setRIGHT
+D
+setRIGHT (ALTERNATE)
+FlxKey.RIGHT
+setACCEPT
+Z
+setACCEPT (ALTERNATE)
+ENTER
+setBACK
+BACKSPACE
+setBACK (ALTERNATE)
+ESCAPE
+setPAUSE
+P
+setPAUSE (ALTERNATE)
+ENTER
+setRESET
+R
+setRESET (ALTERNATE)
+null