Skip to content

Commit 131ee94

Browse files
committed
Merge remote-tracking branch 'upstream/main' into modcharting-features
2 parents 291fda2 + 8ba4199 commit 131ee94

81 files changed

Lines changed: 702 additions & 311 deletions

File tree

Some content is hidden

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

.github/ISSUE_TEMPLATE/bug.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,18 @@
22
name: Bug Report
33
about: Report a bug or critical performance issue
44
title: 'Bug Report: [DESCRIBE YOUR BUG IN DETAIL HERE]'
5-
labels: bug
5+
labels: ''
6+
assignees: ''
7+
68
---
79

810
[weed]: <> (MAKE SURE THAT THE ISSUE IS AS COMPLETE AS POSSIBLE. ISSUES THAT HAVE BARELY ANY INFORMATION OR IS ONLY MADE FOR TROLLING WILL BE INSTANTLY CLOSED.)
911
[weed]: <> (MAKE SURE TO ADD YOUR TARGET OR IT'LL BE IGNORED!)
1012

13+
### What version of the engine are you using?
14+
[weed]: <> (IF YOU COMPILED THE ENGINE PLEASE PROVIDE A COMMIT HASH THAT WE CAN BASE OFF OF)
15+
Version:
16+
1117
### Which target are you using?
1218
[weed]: <> (CHANGE [ ] TO [x] IN FRONT OF YOUR TARGET!)
1319

@@ -17,4 +23,4 @@ labels: bug
1723

1824
### Explain your issue
1925
##### Please check first if your issue haven't already been reported yet.
20-
[weed]: <> (MAKE SURE TO ADD A SCREENSHOT OF THE CRASH HANDLER, IF AVAILABLE, AND STEPS TO REPRODUCE THE BUG!)
26+
[weed]: <> (MAKE SURE TO ADD A SCREENSHOT OF THE CRASH HANDLER, IF AVAILABLE, AND STEPS TO REPRODUCE THE BUG!)

.github/ISSUE_TEMPLATE/compiling.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
---
22
name: Compiling help
3-
about: If you need help compiling the game, and you're running into issues. (Look through the 'compiling help' label in case it's been solved!)
3+
about: If you need help compiling the game, and you're running into issues. (Look
4+
through the 'compiling help' label in case it's been solved!)
45
title: 'Compiling help: [BRIEF DESCRIPTION / ERROR MESSAGE OUTPUT]'
5-
labels: compiling help
6+
labels: ''
7+
assignees: ''
8+
69
---
710

811
[weed]: <> (MAKE SURE THAT THE ISSUE IS AS COMPLETE AS POSSIBLE. ISSUES THAT HAVE BARELY ANY INFORMATION OR IS ONLY MADE FOR TROLLING WILL BE INSTANTLY CLOSED.)

.github/ISSUE_TEMPLATE/enhancement.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22
name: Enhancement
33
about: Suggest a new feature
44
title: 'Enhancement: '
5-
labels: enhancement
5+
labels: ''
6+
assignees: ''
7+
68
---
9+
710
#### Please check for duplicates or similar issues before creating this issue.
811
## What is your suggestion, and why should it be implemented?

.github/workflows/macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
uses: actions/upload-artifact@v4
3939
with:
4040
name: Codename Engine (Executable Only)
41-
path: export/release/macos/bin/CodenameEngine
41+
path: export/release/macos/bin/CodenameEngine.app/Contents/MacOS/CodenameEngine
4242
- name: Uploading artifact (entire build)
4343
uses: actions/upload-artifact@v4
4444
with:

.vscode/settings.json

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,37 @@
66
"*.hscript": "haxe",
77
"*.hsc": "haxe",
88
"*.hxs": "haxe"
9-
}
9+
},
10+
"lime.targetConfigurations": [
11+
{
12+
"label": "Windows (Test Build)",
13+
"target": "windows",
14+
"args": ["-DTEST_BUILD"]
15+
},
16+
{
17+
"label": "Linux (Test Build)",
18+
"target": "linux",
19+
"args": ["-DTEST_BUILD"]
20+
},
21+
{
22+
"label": "MacOS (Test Build)",
23+
"target": "macos",
24+
"args": ["-DTEST_BUILD"]
25+
},
26+
{
27+
"label": "Windows / Debug (Test Build)",
28+
"target": "windows",
29+
"args": ["-debug", "-DTEST_BUILD"]
30+
},
31+
{
32+
"label": "Linux / Debug (Test Build)",
33+
"target": "linux",
34+
"args": ["-debug", "-DTEST_BUILD"]
35+
},
36+
{
37+
"label": "MacOS / Debug (Test Build)",
38+
"target": "macos",
39+
"args": ["-debug", "-DTEST_BUILD"]
40+
},
41+
]
1042
}

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ Codename Engine is a new Friday Night Funkin' Engine aimed at simplifying moddin
1818

1919
## How to download
2020

21-
Latest builds for the engine can be found in the [Actions](https://github.com/YoshiCrafter29/CodenameEngine/actions) tab.<br>
21+
Latest builds for the engine can be found in the [Actions](https://github.com/CodenameCrew/CodenameEngine/actions) tab.<br>
2222
In the future (when the engine won't be a WIP anymore) we're gonna also publish the engine on platforms like Gamebanana; stay tuned!
2323

24-
If you don't have a github account please go onto https://fnf-cne-devs.github.io/ and click the download button for the respective operating system.
24+
If you don't have a github account please go onto https://codename-engine.com/ and click the download button for the respective operating system.
2525

2626
<details>
2727
<summary><h2>How to build</h2></summary>
200 KB
Binary file not shown.

art/flashFiles/TitleEnter.fla

6.69 KB
Binary file not shown.
-6.03 MB
Binary file not shown.

assets/data/editors/layouts/stage/characterEditScreen.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<stepper name="alphaStepper" label="${translate('alpha')}" value="char.alpha / 0.75" x="col(0)" y="curY" precision="2" step="0.01" width="100" />
5252
<stepper name="angleStepper" label="${translate('angle')}" value="char.angle" x="last.x + last.bWidth + XOFFSET - 20" y="curY" precision="2" step="0.01" width="100" />
5353

54-
<stepper name="zoomFactorStepper" label="${translate('zoomFactor')" value="char.zoomFactor" x="col(1)" y="curY" precision="2" step="0.01" width="100" />
54+
<stepper name="zoomFactorStepper" label="${translate('zoomFactor')}" value="char.zoomFactor" x="col(1)" y="curY" precision="2" step="0.01" width="100" />
5555

5656
<section if="!StringTools.startsWith(char.name, 'NO_DELETE_')">
5757
<textbox name="charName" label="${translate('positionName')}" value="char.name" x="col(2)" y="curY" width="100"/>

0 commit comments

Comments
 (0)