Skip to content

Commit 0d41146

Browse files
rodney528rodney528
authored
The Great Organization (#1)
* IT COMPILES * it complie again * actions should work now
1 parent 0f6d819 commit 0d41146

65 files changed

Lines changed: 477 additions & 2227 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/debug.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,12 @@ jobs:
4141
haxelib install hmm
4242
haxelib run hmm install
4343
44+
- name: Building HXCPP
45+
run: |
46+
cd ./.haxelib/hxcpp/git/tools/hxcpp
47+
haxe compile.hxml
48+
cd ../../../../../
49+
4450
- name: Compile Engine
4551
run: haxelib run lime build windows -debug
4652

@@ -115,6 +121,12 @@ jobs:
115121
# haxelib install hmm
116122
# haxelib run hmm install
117123

124+
# - name: Building HXCPP
125+
# run: |
126+
# cd ./.haxelib/hxcpp/git/tools/hxcpp
127+
# haxe compile.hxml
128+
# cd ../../../../../
129+
118130
# - name: Building the game
119131
# run: haxelib run lime build mac -debug
120132

@@ -192,6 +204,12 @@ jobs:
192204
# haxelib install hmm
193205
# haxelib run hmm install
194206

207+
# - name: Building HXCPP
208+
# run: |
209+
# cd ./.haxelib/hxcpp/git/tools/hxcpp
210+
# haxe compile.hxml
211+
# cd ../../../../../
212+
195213
# - name: Building the game
196214
# run: haxelib run lime build linux -debug
197215

‎.github/workflows/test.yml‎

Lines changed: 36 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,29 @@ jobs:
3232
key: windows-build-cache
3333
path: |
3434
.haxelib/
35-
export/build/windows/haxe/
36-
export/build/windows/obj/
35+
export/release/windows/haxe/
36+
export/release/windows/obj/
3737
restore-keys: windows-build-cache
3838

3939
- name: Install Libraries
4040
run: |
4141
haxelib install hmm
4242
haxelib run hmm install
4343
44+
- name: Building HXCPP
45+
run: |
46+
cd ./.haxelib/hxcpp/git/tools/hxcpp
47+
haxe compile.hxml
48+
cd ../../../../../
49+
4450
- name: Compile Engine
45-
run: haxelib run lime build windows -final
51+
run: haxelib run lime build windows
4652

4753
- name: Upload Artifact
4854
uses: actions/upload-artifact@main
4955
with:
5056
name: Kitty Windows Build
51-
path: export/build/windows/bin
57+
path: export/release/windows/bin
5258
overwrite: true
5359
include-hidden-files: true
5460
if-no-files-found: error
@@ -80,8 +86,8 @@ jobs:
8086
key: windows-build-cache
8187
path: |
8288
.haxelib/
83-
export/build/windows/haxe/
84-
export/build/windows/obj/
89+
export/release/windows/haxe/
90+
export/release/windows/obj/
8591
restore-keys: windows-build-cache
8692

8793
# mac:
@@ -106,23 +112,29 @@ jobs:
106112
# key: mac-build-cache
107113
# path: |
108114
# .haxelib/
109-
# export/build/mac/haxe/
110-
# export/build/mac/obj/
115+
# export/release/mac/haxe/
116+
# export/release/mac/obj/
111117
# restore-keys: mac-build-cache
112118

113119
# - name: Install Libraries
114120
# run: |
115121
# haxelib install hmm
116122
# haxelib run hmm install
117123

124+
# - name: Building HXCPP
125+
# run: |
126+
# cd ./.haxelib/hxcpp/git/tools/hxcpp
127+
# haxe compile.hxml
128+
# cd ../../../../../
129+
118130
# - name: Building the game
119-
# run: haxelib run lime build mac -final
131+
# run: haxelib run lime build mac
120132

121133
# - name: Upload Artifact
122134
# uses: actions/upload-artifact@main
123135
# with:
124136
# name: Kitty Mac Build
125-
# path: export/build/macos/bin
137+
# path: export/release/macos/bin
126138
# overwrite: true
127139
# include-hidden-files: true
128140
# if-no-files-found: error
@@ -154,8 +166,8 @@ jobs:
154166
# key: mac-build-cache
155167
# path: |
156168
# .haxelib/
157-
# export/build/mac/haxe/
158-
# export/build/mac/obj/
169+
# export/release/mac/haxe/
170+
# export/release/mac/obj/
159171
# restore-keys: mac-build-cache
160172

161173
# linux:
@@ -180,8 +192,8 @@ jobs:
180192
# key: linux-build-cache
181193
# path: |
182194
# .haxelib/
183-
# export/build/linux/haxe/
184-
# export/build/linux/obj/
195+
# export/release/linux/haxe/
196+
# export/release/linux/obj/
185197
# restore-keys: linux-build-cache
186198

187199
# - name: Installing Dependencies
@@ -192,14 +204,20 @@ jobs:
192204
# haxelib install hmm
193205
# haxelib run hmm install
194206

207+
# - name: Building HXCPP
208+
# run: |
209+
# cd ./.haxelib/hxcpp/git/tools/hxcpp
210+
# haxe compile.hxml
211+
# cd ../../../../../
212+
195213
# - name: Building the game
196-
# run: haxelib run lime build linux -final
214+
# run: haxelib run lime build linux
197215

198216
# - name: Upload Artifact
199217
# uses: actions/upload-artifact@main
200218
# with:
201219
# name: Kitty Linux Build
202-
# path: export/build/linux/bin
220+
# path: export/release/linux/bin
203221
# overwrite: true
204222
# include-hidden-files: true
205223
# if-no-files-found: error
@@ -230,6 +248,6 @@ jobs:
230248
# key: linux-build-cache
231249
# path: |
232250
# .haxelib/
233-
# export/build/linux/haxe/
234-
# export/build/linux/obj/
251+
# export/release/linux/haxe/
252+
# export/release/linux/obj/
235253
# restore-keys: linux-build-cache

‎source/BackgroundDancer.hx‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎source/ButtonRemapSubstate.hx‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎source/ControlsSubState.hx‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎source/GameDimensions.hx‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎source/GameOverState.hx‎

Lines changed: 0 additions & 82 deletions
This file was deleted.

‎source/Main.hx‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,25 @@
11
package;
22

3-
import openfl.display.BlendMode;
4-
import openfl.text.TextFormat;
5-
import openfl.display.Application;
63
import flixel.util.FlxColor;
7-
import flixel.FlxG;
84
import flixel.FlxGame;
95
import flixel.FlxState;
10-
import openfl.Assets;
116
import openfl.Lib;
127
import openfl.display.FPS;
138
import openfl.display.Sprite;
149
import openfl.events.Event;
10+
import kitty.scripting.HScript;
1511

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

26-
public static var watermarks:Bool = true; // Whether to put Kade Engine liteartly anywhere
22+
public static var watermarks:Bool = true; // Whether to put Kade Engine literally anywhere
2723

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

@@ -86,7 +82,7 @@ class Main extends Sprite
8682

8783
game = new FlxGame(gameWidth, gameHeight, initialState, framerate, framerate, skipSplash, startFullscreen);
8884
addChild(game);
89-
85+
9086
#if !mobile
9187
fpsCounter = new FPS(10, 3, 0xFFFFFF);
9288
addChild(fpsCounter);

0 commit comments

Comments
 (0)