Skip to content

Commit a03a558

Browse files
Merge remote-tracking branch 'origin/main' into develop
2 parents c470af4 + 3491d5a commit a03a558

34 files changed

+250
-1001
lines changed

.gitignore

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
# HaxeFlixel
22
.haxelib/
3-
dump/
43
export/
4+
temp/
55

66
# macOS
77
.DS_Store
8+
9+
# JavaScript
10+
node_modules/
11+
package.json
12+
package-lock.json
13+
.aider*

.prettierignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@
22
.haxelib/
33
dump/
44
export/
5+
dump/
6+
temp/

.prettierrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Configuration for JSON file formatting
2+
* Configuration for JSON file formatting.
33
*/
44
module.exports = {
55
// Line width before Prettier tries to add new lines

.vscode/settings.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"editor.insertSpaces": false,
2+
"editor.insertSpaces": true,
33
"editor.tabSize": 2,
44
"editor.detectIndentation": false,
55
"search.exclude": {
@@ -22,7 +22,7 @@
2222
"Haxe",
2323
"IBEAM",
2424
"keybinds",
25-
"NTSC",
25+
"Korben",
2626
"NUMPADEIGHT",
2727
"NUMPADFIVE",
2828
"NUMPADFOUR",

COMPILING.md

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ __**Please read and follow each step carefully in order for the game to compile
55

66
## Global Setup (Every Platform)
77

8-
These are the necessary steps required to compile the game on __***every***__ platform. If you're on either Windows, macOS, or Linux, then read the applicable sub section in section `Extra Steps (for Running and Configuring the Game on Other Platforms)` below.
8+
These are the necessary steps required to compile on the game on __***every***__ platform. If you're on either Windows, macOS, or Linux, then read the applicable sub section in section `Extra Steps (for Running and Configuring the Game on Other Platforms)` below.
99

10-
1. Download the [Haxe programming language](https://haxe.org/download/version/4.3.6).
10+
1. Download the [Haxe programming language](https://haxe.org/downloads/). TODO: test version 4.3.4 for compile version!
1111
- When you download the necessary installer, just use the default options and configurations.
1212

1313
2. Download the [Git version control software made by GitHub](https://www.git-scm.com).
1414
- Similar to when you installed Haxe, just simply use the default configurations when going through the installer.
1515

1616
3. Open your operating system's terminal (or Command Prompt, if you're a Windows user).
1717

18-
4. Run `cd path/of/your/clone/here`. This is where the game's code will be stored, with `path/of/your/clone/here` being the folder location.
18+
4. Run `cd path/of/your/clone/here`. This is where the game's code will be stored, with `path/of/your/clone/here` being the file location.
1919

2020
> [!TIP]
2121
> If you're on Windows, it's recommended for your clone's code to be placed in your Documents folder (or, if you have GitHub Desktop installed, in `Documents/GitHub`).
@@ -31,9 +31,6 @@ These are the necessary steps required to compile the game on __***every***__ pl
3131

3232
8. Run `hmm install` to start installing all of the game's dependencies. **This will take a bit, so be patient**.
3333

34-
> [!TIP]
35-
> If the libraries do not install correctly, then you can run the `.bat` file or `.sh` file (according to your system).
36-
3734
9. Run `haxelib run lime setup` to setup the lime command.
3835
- This will allow you to compile and run the game on many common platforms, such as every major desktop platform (Windows, macOS, Linux, etc.), both popular mobile systems (Android and iOS), and more.
3936

@@ -43,9 +40,6 @@ These are the necessary steps required to compile the game on __***every***__ pl
4340
> [!TIP]
4441
> You can replace `html5` with other platforms to compile it accordingly.
4542
46-
> [!IMPORTANT]
47-
> If ever, for some reason, the shaders make the screen become black, it is advised you clear your computer's `Temp/` directory. If the issue persists, then please take a look at the [contributing](CONTRIBUTING.md) file for info on how to report a bug.
48-
4943
## Extra Steps (for Running and Configuring the Game on Other Platforms)
5044

5145
### Windows

CONTRIBUTING.md

Lines changed: 34 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ When you write code, heres some simple things we ask of you:
88
## Issues
99

1010
If you wish to fix a bug, make an enhancement, or even wish to
11-
simply make a recommendation, then no worries! You can make an [issue](https://github.com/korithekoder/Starcore/issues)
11+
simply make a recommendation, then no worries! You can make an [issue](https://github.com/stringfromjava/Starcore/issues)
1212
or create a sub-issue and help someone with an issue that needs to be worked on!
1313

1414
> [!IMPORTANT]
@@ -23,34 +23,35 @@ However, sometimes they can be a hindrance as well.
2323

2424
If your comments have typos, aren't clear or concise, or just
2525
hard to understand in general, then they won't be any
26-
use. Even too many comments can make it difficult to understand your code.
26+
use. Even too many comments are unnecessary, since your code should be
27+
self documented and easily readable.
2728

2829
### Example of GOOD Comments (With Good Formatting)
2930

3031
```haxe
3132
/**
32-
* Get's the last key that was pressed on the current frame.
33+
* Gets the last key that was pressed on the current frame.
3334
*
3435
* @return The last key that was pressed. If no keys were pressed, then
35-
* `FlxKey.NONE` is returned instead.
36+
* `FlxKey.NONE` is returned instead.
3637
*/
3738
public static function getLastKeyPressed():FlxKey
3839
{
39-
for (key in 8...303) // Loop through all keys in FlxKey
40+
for (key in 8...303) // Loop through all keys in FlxKey
41+
{
42+
try
4043
{
41-
try
42-
{
43-
if (FlxG.keys.anyJustPressed([key]))
44-
{
45-
return key;
46-
}
47-
}
48-
catch (e:Exception)
49-
{
50-
// Skip and move on if it is not a valid key
51-
}
44+
if (FlxG.keys.anyJustPressed([key]))
45+
{
46+
return key;
47+
}
5248
}
53-
return FlxKey.NONE;
49+
catch (e:Exception)
50+
{
51+
// Skip and move on if it is not a valid key
52+
}
53+
}
54+
return FlxKey.NONE;
5455
}
5556
```
5657

@@ -66,44 +67,46 @@ public
6667
static
6768
function getLastpressed():FlxKey
6869
{
69-
// loop thouhg all keys (8-303)
70+
// loop thouhg all keys (8-303)
7071
for (key in 8...303) // loop through all keys
71-
{
72+
{
7273
// try to check if its pressed :p
73-
try{
74+
try{
7475
// check if its pressed
75-
if (FlxG.keys.anyJustPressed([key]))
76+
if (FlxG.keys.anyJustPressed([key]))
7677
{
77-
// return the pressed key
78-
return key;
78+
// return the pressed key
79+
return key;
7980
}
8081
}
81-
// catch the exception
82-
catch (e:Exception) {
83-
// just skip with non valid key xd
84-
}
82+
// catch the exception
83+
catch (e:Exception) {
84+
// just skip with non valid key xd
8585
}
86-
// return nnoe if no kyes are pressed
87-
return FlxKey.NONE;
86+
}
87+
// return nnoe if no kyes are pressed
88+
return FlxKey.NONE;
8889
}
8990
```
9091

9192
> [!TIP]
92-
> You can format a file on VS Code with `SHIFT` + `ALT` + `F` to match the code style standards, although just know that it won't fix typos or correct your grammar, thats all on you!
93+
> You can format a file on VS Code with `SHIFT` + `ALT` + `F` to match the code style standards, although just know that it won't fix typos or correct your grammar, that's all on you!
9394
9495
## Things You CANNOT Do
9596

9697
Excluding *collaborators*, there are some files that contributors simply cannot change or delete.
9798

9899
1. You are not allowed to change these files:
100+
- Any files in the [.github folder](.github/)
99101
- Any files in the [setup folder](setup/).
100-
- Any files in the [unused folder](unused/), that's for the collaborators!
102+
- Any files in the [unused folder](unused/).
101103
- `.gitattributes`
102104
- `.gitignore`
103105
- `.prettier.js`
104106
- `checkstyle.json`
105107
- `COMPILING.md`
106108
- `CONTRIBUTING.md`
109+
- `hmm.json`
107110
- `hxformat.json`
108111
- `LICENSE.md`
109112
- `project.hxp`

LICENSE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
As of right now, Starcore uses a license called the *Apache License*, meaning that you
44
can redistribute it and make money off of it (if you give credit of course).
55

6-
***NOTE: THIS LICENSE WILL MOST LIKELY CHANGE WHEN STARCORE BECOMES MORE COMPLEX!***
6+
***NOTE: THIS LICENSE WILL MOST LIKELY CHANGE WHEN STARCORE BECOMES A FULL GAME!***
77

88
## License
99

@@ -185,7 +185,7 @@ Apache License
185185
186186
END OF TERMS AND CONDITIONS
187187
188-
Copyright 2025 Kori Box
188+
Copyright 2025 Korben "String" Box
189189
190190
Licensed under the Apache License, Version 2.0 (the "License");
191191
you may not use this file except in compliance with the License.

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Due to how complex this game (will) be, it will be quite some time
33
before even a basic demo will come out.
44

55
When one *does* come out, ***WAY*** more info will be put in here and it
6-
will be released on [itch.io](https://itch.io) under my name (`@korithekoder`), so
6+
will be released on [itch.io](https://itch.io) under my name (`@stringfromjava`), so
77
when it does release, be sure to take a look!
88

99
# Contributing
@@ -12,7 +12,7 @@ If you would like to contribute to the game, then you can very gladly do so!
1212
We appreciate every contribution made by the people who would like to help make this game
1313
come to life. <3
1414

15-
For more info, please read the [contributing](CONTRIBUTING.md) file for more info.
15+
For more info, please read the [contributing](CONTRIBUTING.md) file.
1616

1717
# Development
1818

checkstyle.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@
555555
},
556556
{
557557
"props": {
558-
"format": "^\\s*(TODO|FIXME|HACK|XXX|BUG)"
558+
"format": "^\\s*(TODO|FIXME|HACK|XXX|BUG|NOTE)"
559559
},
560560
"type": "TODOComment"
561561
},

hmm.json

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
{
2+
"dependencies": [
3+
{
4+
"name": "lime",
5+
"type": "haxelib",
6+
"version": "8.2.2"
7+
},
8+
{
9+
"name": "openfl",
10+
"type": "haxelib",
11+
"version": "9.4.1"
12+
},
13+
{
14+
"name": "flixel",
15+
"type": "haxelib",
16+
"version": "6.1.0"
17+
},
18+
{
19+
"name": "flixel-addons",
20+
"type": "haxelib",
21+
"version": "3.3.2"
22+
},
23+
{
24+
"name": "flixel-tools",
25+
"type": "haxelib",
26+
"version": "1.5.1"
27+
},
28+
{
29+
"name": "hxcpp-debug-server",
30+
"type": "haxelib",
31+
"version": "1.2.4"
32+
},
33+
{
34+
"name": "hxdiscord_rpc",
35+
"type": "haxelib",
36+
"version": "1.3.0"
37+
},
38+
{
39+
"name": "hxcpp",
40+
"type": "haxelib",
41+
"version": "4.3.2"
42+
},
43+
{
44+
"name": "hxp",
45+
"type": "haxelib",
46+
"version": "1.3.0"
47+
},
48+
{
49+
"name": "flxsoundfilters",
50+
"type": "git",
51+
"dir": null,
52+
"ref": "a89bb537684111a6ff85737981f4b2d8ef4b4f68",
53+
"url": "https://github.com/TheZoroForce240/FlxSoundFilters"
54+
}
55+
]
56+
}

0 commit comments

Comments
 (0)