Skip to content

Commit

Permalink
Revert "3 wwqfd"
Browse files Browse the repository at this point in the history
This reverts commit 3af2ad5.
  • Loading branch information
Hackx2 committed Mar 27, 2024
1 parent 3af2ad5 commit eceeb41
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 8 deletions.
13 changes: 5 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

# This is a basic workflow to help you get started with Actions

name: Build
Expand All @@ -7,9 +6,9 @@ name: Build
on:
# Triggers the workflow on push or pull request events but only for the master branch
push:
branches: [ main, experimental ]
branches: [main, experimental]
pull_request:
branches: [ main, experimental ]
branches: [main, experimental]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
Expand Down Expand Up @@ -43,14 +42,12 @@ jobs:
- name: Create Version Tag
run: echo "${{github.run_id}}" > VERSION
- name: Compile
run: |
haxelib fixrepo
haxelib run lime build Project.xml linux --app-version="4.0.0-${{ github.run_id}}"
run: haxelib run lime build Project.xml linux --app-version="4.0.0-${{ github.run_id}}"
- name: Publish Artifact
uses: actions/[email protected]
with:
name: linuxBuild
path: 'export/release/linux/bin'
path: "export/release/linux/bin"
#---
buildWindows:
runs-on: windows-latest
Expand Down Expand Up @@ -108,4 +105,4 @@ jobs:
uses: actions/[email protected]
with:
name: macBuild
path: export/release/macos/bin
path: export/release/macos/bin
57 changes: 57 additions & 0 deletions Preloader.hx
Original file line number Diff line number Diff line change
@@ -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);
}
}

0 comments on commit eceeb41

Please sign in to comment.