Skip to content

The Great Organization #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rodney528 merged 4 commits into from
Mar 29, 2026
Merged

The Great Organization #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a189218
IT COMPILES
rodney528 Mar 26, 2026
e4ff93b
Merge branch 'main' into the-great-organization
rodney528 Mar 29, 2026
2b561fd
it complie again
rodney528 Mar 29, 2026
ac0dd47
actions should work now
rodney528 Mar 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .github/workflows/debug.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@ jobs:
haxelib install hmm
haxelib run hmm install

- name: Building HXCPP
run: |
cd ./.haxelib/hxcpp/git/tools/hxcpp
haxe compile.hxml
cd ../../../../../

- name: Compile Engine
run: haxelib run lime build windows -debug

Expand Down Expand Up @@ -115,6 +121,12 @@ jobs:
# haxelib install hmm
# haxelib run hmm install

# - name: Building HXCPP
# run: |
# cd ./.haxelib/hxcpp/git/tools/hxcpp
# haxe compile.hxml
# cd ../../../../../

# - name: Building the game
# run: haxelib run lime build mac -debug

Expand Down Expand Up @@ -192,6 +204,12 @@ jobs:
# haxelib install hmm
# haxelib run hmm install

# - name: Building HXCPP
# run: |
# cd ./.haxelib/hxcpp/git/tools/hxcpp
# haxe compile.hxml
# cd ../../../../../

# - name: Building the game
# run: haxelib run lime build linux -debug

Expand Down
54 changes: 36 additions & 18 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,23 +32,29 @@ jobs:
key: windows-build-cache
path: |
.haxelib/
export/build/windows/haxe/
export/build/windows/obj/
export/release/windows/haxe/
export/release/windows/obj/
restore-keys: windows-build-cache

- name: Install Libraries
run: |
haxelib install hmm
haxelib run hmm install

- name: Building HXCPP
run: |
cd ./.haxelib/hxcpp/git/tools/hxcpp
haxe compile.hxml
cd ../../../../../

- name: Compile Engine
run: haxelib run lime build windows -final
run: haxelib run lime build windows

- name: Upload Artifact
uses: actions/upload-artifact@main
with:
name: Kitty Windows Build
path: export/build/windows/bin
path: export/release/windows/bin
overwrite: true
include-hidden-files: true
if-no-files-found: error
Expand Down Expand Up @@ -80,8 +86,8 @@ jobs:
key: windows-build-cache
path: |
.haxelib/
export/build/windows/haxe/
export/build/windows/obj/
export/release/windows/haxe/
export/release/windows/obj/
restore-keys: windows-build-cache

# mac:
Expand All @@ -106,23 +112,29 @@ jobs:
# key: mac-build-cache
# path: |
# .haxelib/
# export/build/mac/haxe/
# export/build/mac/obj/
# export/release/mac/haxe/
# export/release/mac/obj/
# restore-keys: mac-build-cache

# - name: Install Libraries
# run: |
# haxelib install hmm
# haxelib run hmm install

# - name: Building HXCPP
# run: |
# cd ./.haxelib/hxcpp/git/tools/hxcpp
# haxe compile.hxml
# cd ../../../../../

# - name: Building the game
# run: haxelib run lime build mac -final
# run: haxelib run lime build mac

# - name: Upload Artifact
# uses: actions/upload-artifact@main
# with:
# name: Kitty Mac Build
# path: export/build/macos/bin
# path: export/release/macos/bin
# overwrite: true
# include-hidden-files: true
# if-no-files-found: error
Expand Down Expand Up @@ -154,8 +166,8 @@ jobs:
# key: mac-build-cache
# path: |
# .haxelib/
# export/build/mac/haxe/
# export/build/mac/obj/
# export/release/mac/haxe/
# export/release/mac/obj/
# restore-keys: mac-build-cache

# linux:
Expand All @@ -180,8 +192,8 @@ jobs:
# key: linux-build-cache
# path: |
# .haxelib/
# export/build/linux/haxe/
# export/build/linux/obj/
# export/release/linux/haxe/
# export/release/linux/obj/
# restore-keys: linux-build-cache

# - name: Installing Dependencies
Expand All @@ -192,14 +204,20 @@ jobs:
# haxelib install hmm
# haxelib run hmm install

# - name: Building HXCPP
# run: |
# cd ./.haxelib/hxcpp/git/tools/hxcpp
# haxe compile.hxml
# cd ../../../../../

# - name: Building the game
# run: haxelib run lime build linux -final
# run: haxelib run lime build linux

# - name: Upload Artifact
# uses: actions/upload-artifact@main
# with:
# name: Kitty Linux Build
# path: export/build/linux/bin
# path: export/release/linux/bin
# overwrite: true
# include-hidden-files: true
# if-no-files-found: error
Expand Down Expand Up @@ -230,6 +248,6 @@ jobs:
# key: linux-build-cache
# path: |
# .haxelib/
# export/build/linux/haxe/
# export/build/linux/obj/
# export/release/linux/haxe/
# export/release/linux/obj/
# restore-keys: linux-build-cache
29 changes: 0 additions & 29 deletions source/BackgroundDancer.hx
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions source/ButtonRemapSubstate.hx
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions source/ControlsSubState.hx
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions source/GameDimensions.hx
View file
Open in desktop

This file was deleted.

82 changes: 0 additions & 82 deletions source/GameOverState.hx
View file
Open in desktop

This file was deleted.

12 changes: 4 additions & 8 deletions source/Main.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,25 @@
package;

import openfl.display.BlendMode;
import openfl.text.TextFormat;
import openfl.display.Application;
import flixel.util.FlxColor;
import flixel.FlxG;
import flixel.FlxGame;
import flixel.FlxState;
import openfl.Assets;
import openfl.Lib;
import openfl.display.FPS;
import openfl.display.Sprite;
import openfl.events.Event;
import kitty.scripting.HScript;

class Main extends Sprite
{
var gameWidth:Int = 1280; // Width of the game in pixels (might be less / more in actual pixels depending on your zoom).
var gameHeight:Int = 720; // Height of the game in pixels (might be less / more in actual pixels depending on your zoom).
var initialState:Class<FlxState> = TitleState; // The FlxState the game starts with.
var initialState:Class<FlxState> = kitty.states.menus.TitleState; // The FlxState the game starts with.
var zoom:Float = -1; // If -1, zoom is automatically calculated to fit the window dimensions.
var framerate:Int = 120; // How many frames per second the game should run at.
var skipSplash:Bool = true; // Whether to skip the flixel splash screen that appears in release mode.
var startFullscreen:Bool = false; // Whether to start the game in fullscreen on desktop targets

public static var watermarks:Bool = true; // Whether to put Kade Engine liteartly anywhere
public static var watermarks:Bool = true; // Whether to put Kade Engine literally anywhere

// You can pretty much ignore everything from here on - your code should go in your states.

Expand Down Expand Up @@ -86,7 +82,7 @@ class Main extends Sprite

game = new FlxGame(gameWidth, gameHeight, initialState, framerate, framerate, skipSplash, startFullscreen);
addChild(game);

#if !mobile
fpsCounter = new FPS(10, 3, 0xFFFFFF);
addChild(fpsCounter);
Expand Down
Loading
Loading