From ef5bd52612f3cdf2175acdb766fbb2df818f9ec7 Mon Sep 17 00:00:00 2001 From: Yoshman29 <81191621+YoshiCrafter29@users.noreply.github.com> Date: Wed, 11 Jan 2023 18:19:48 +0100 Subject: [PATCH] woopsie --- .github/workflows/linux.yml | 2 -- .github/workflows/macos.yml | 2 -- .github/workflows/windows.yml | 2 -- buildnumber.txt | 2 +- source/funkin/game/Character.hx | 2 +- source/funkin/game/PlayState.hx | 3 --- 6 files changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index b79d926f..c4332e35 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -1,7 +1,6 @@ name: Linux Build on: - pull_request: push: jobs: build: @@ -27,7 +26,6 @@ jobs: cache-build-linux - name: Installing/Updating libraries run: | - ls haxe -cp ./update -D analyzer-optimize -main Update --interp - name: Building the game run: | diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index c65254fc..3ece903a 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -1,7 +1,6 @@ name: Mac OS Build on: - pull_request: push: jobs: build: @@ -27,7 +26,6 @@ jobs: cache-build-mac - name: Installing/Updating libraries run: | - ls haxe -cp ./update -D analyzer-optimize -main Update --interp - name: Building the game run: | diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 55ff7dd1..c591639a 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -1,7 +1,6 @@ name: Windows Build on: - pull_request: push: jobs: build: @@ -27,7 +26,6 @@ jobs: cache-build-windows - name: Installing/Updating libraries run: | - ls haxe -cp ./update -D analyzer-optimize -main Update --interp - name: Building the game run: | diff --git a/buildnumber.txt b/buildnumber.txt index 6d0f5c2f..006b3ab0 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -2006 \ No newline at end of file +2008 \ No newline at end of file diff --git a/source/funkin/game/Character.hx b/source/funkin/game/Character.hx index bda815e6..2a939815 100644 --- a/source/funkin/game/Character.hx +++ b/source/funkin/game/Character.hx @@ -45,7 +45,7 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset public var isGF:Bool = false; public var curCharacter:String = 'bf'; - public var lastHit:Float = -5000; + public var lastHit:Float = Math.NEGATIVE_INFINITY; public var holdTime:Float = 4; public var playerOffsets:Bool = false; diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index 1b2d6f00..beb5c1a1 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -725,9 +725,6 @@ class PlayState extends MusicBeatState startTimer = new FlxTimer().start(Conductor.crochet / 1000, function(tmr:FlxTimer) { - for(char in [dad, gf, boyfriend]) - if (char != null) - char.dance(); countdown(swagCounter++); }, introLength); }