Skip to content

Commit

Permalink
1.5.3 (Current Stable Changes)
Browse files Browse the repository at this point in the history
- Redone senpais offsets and spirits to be correct

- Removed Greyscale shader (didn't work)

- Up to date with 1.0.1 psych engine.

- Moved all hud references to Hud.hx from PlayState

- Changed input listener into the strumLineGroup

- Revamped noteSplashes and the noteSplashEiditor by @LarryFrosty.

- Removed FNF-Modcharting-Tools (Sadge) and added instead FunkinModchart (testing currently, no adapter is available currently, only I have it)

- Fixed CustomCodeShaders from CodeNameEngine (using their own code lol)

- UI made by me and menus that are unfinished left here because why not. (aren't used but still)

- Allowing High DPI by @crowplexus

- HScript better logging and chart editor improvements by @inky03

-
  • Loading branch information
glowsoony committed Jan 21, 2025
1 parent a85e7fe commit 500a01f
Show file tree
Hide file tree
Showing 141 changed files with 9,759 additions and 11,665 deletions.
150 changes: 0 additions & 150 deletions CHANGELOG.md

This file was deleted.

14 changes: 10 additions & 4 deletions Project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xsi:schemaLocation="http://lime.openfl.org/project/1.0.4 http://lime.openfl.org/xsd/project-1.0.4.xsd">
<!-- _________________________ Application Settings _________________________ -->

<app title="Friday Night Funkin': Sick Coders Engine" file="SCE" packageName="com.SCTeam.SCEE" package="com.SCTeam.SCE" main="Main" version="1.5.2" company="SCTeam" />
<app title="Friday Night Funkin': Sick Coders Engine" file="SCE" packageName="com.SCTeam.SCEE" package="com.SCTeam.SCE" main="Main" version="1.5.3" company="SCTeam" />

<!--Switch Export with Unique ApplicationID and Icon-->
<set name="APP_ID" value="0x0100f6c013bbc000" />
Expand All @@ -25,7 +25,7 @@ xsi:schemaLocation="http://lime.openfl.org/project/1.0.4 http://lime.openfl.org/
<!-- ____________________________ Window Settings ___________________________ -->

<!--These window settings apply to all targets-->
<window width="1280" height="720" fps="60" background="#000000" hardware="true" vsync="false" />
<window width="1280" height="720" fps="60" background="#000000" hardware="true" vsync="false" allow-high-dpi="true" />

<!--HTML5-specific-->
<window if="html5" resizable="true" />
Expand Down Expand Up @@ -246,12 +246,10 @@ xsi:schemaLocation="http://lime.openfl.org/project/1.0.4 http://lime.openfl.org/
<haxelib name="hxtelemetry" if="telemetry"/>
<haxedef name="HXCPP_TELEMETRY" if="telemetry"/>

<haxelib name="fnf-modcharting-tools"/>
<haxelib name="hscript-improved" />
<haxelib name="markdown"/>

<!-- Defines the SCE's version of modcharting Tools. -->
<define name="SCEModchartingTools" if="TestingM"/>
<define name="HScriptImproved" if="hscript-improved"/>

<!-- Enables a terminal log prompt on debug builds -->
Expand All @@ -266,6 +264,13 @@ xsi:schemaLocation="http://lime.openfl.org/project/1.0.4 http://lime.openfl.org/
<haxelib name="FlxPartialSound"/>
<haxelib name="flxsoundfilters" />

<haxedef name="FM_ENGINE" value="SCE"/>
<haxedef name="FM_ENGINE_VERSION" value="1.5.3"/>

<haxelib name="funkin-modchart" />

<define name="FunkinModchart" if="funkin-modchart"/>

<!--Disable source traces for release builds-->
<haxeflag name="-D no-traces"/>

Expand All @@ -279,6 +284,7 @@ xsi:schemaLocation="http://lime.openfl.org/project/1.0.4 http://lime.openfl.org/
Ignore packages we can't include.
-->
<haxeflag name="--macro" value="include('flixel', true, [ 'flixel.addons.editors.spine.*', 'flixel.addons.nape.*', 'flixel.system.macros.*' ])" />
<haxeflag name="--macro" value="modchart.core.macros.Macro.includeFiles()" if="FunkinModchart"/>

<section if="COMPILE_ALL_CLASSES">
<haxeflag name="-dce" value="no" />
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -154,3 +154,7 @@ _____________________________________
* You can play on the opponent's side!
* You can turn off the sustains!
* You can do a show casing mode for gameplay, playing normaly, or even for videos!

---
- [Todo](docs/files/TODO.md)
---
6 changes: 0 additions & 6 deletions Todo.txt

This file was deleted.

10 changes: 5 additions & 5 deletions assets/base_game/shared/data/characters/senpai.json
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
{
"animations": [
{
"offsets": [1, 0],
"offsets": [0, 3],
"loop": false,
"anim": "idle",
"fps": 24,
"name": "Senpai Idle",
"indices": []
},
{
"offsets": [5, 37],
"offsets": [1, 11],
"loop": false,
"fps": 24,
"anim": "singUP",
"indices": [],
"name": "SENPAI UP NOTE"
},
{
"offsets": [0, 0],
"offsets": [1, 3],
"loop": false,
"fps": 24,
"anim": "singRIGHT",
"indices": [],
"name": "SENPAI RIGHT NOTE"
},
{
"offsets": [40, 0],
"offsets": [6, 4],
"loop": false,
"fps": 24,
"anim": "singLEFT",
"indices": [],
"name": "SENPAI LEFT NOTE"
},
{
"offsets": [14, 0],
"offsets": [4, 2],
"loop": false,
"fps": 24,
"anim": "singDOWN",
Expand Down
112 changes: 59 additions & 53 deletions assets/base_game/shared/data/characters/spirit.json
Original file line number Diff line number Diff line change
@@ -1,54 +1,60 @@
{
"animations": [
{
"offsets": [-218, -280],
"loop": false,
"anim": "idle",
"fps": 24,
"name": "idle spirit_",
"indices": []
},
{
"offsets": [-200, -280],
"loop": false,
"anim": "singLEFT",
"fps": 24,
"name": "left_",
"indices": []
},
{
"offsets": [170, 110],
"loop": false,
"anim": "singDOWN",
"fps": 24,
"name": "spirit down_",
"indices": []
},
{
"offsets": [-220, -280],
"loop": false,
"anim": "singRIGHT",
"fps": 24,
"name": "right_",
"indices": []
},
{
"offsets": [-220, -240],
"loop": false,
"anim": "singUP",
"fps": 24,
"name": "up_",
"indices": []
}
],
"no_antialiasing": true,
"image": "characters/spirit",
"AtlasType": "PackerAtlas",
"position": [-150, 100],
"healthicon": "spirit-pixel",
"flip_x": false,
"healthbar_colors": [255, 60, 110],
"camera_position": [0, 0],
"sing_duration": 4,
"scale": 6
}
"animations": [
{
"loop": false,
"offsets": [-50, -53],
"fps": 24,
"anim": "idle",
"indices": [],
"name": "idle spirit_"
},
{
"loop": false,
"offsets": [-35, -55],
"fps": 24,
"anim": "singLEFT",
"indices": [],
"name": "left_"
},
{
"loop": false,
"offsets": [20, 2],
"fps": 24,
"anim": "singDOWN",
"indices": [],
"name": "spirit down_"
},
{
"loop": false,
"offsets": [-59, -54],
"fps": 24,
"anim": "singRIGHT",
"indices": [],
"name": "right_"
},
{
"loop": false,
"offsets": [-49, -46],
"fps": 24,
"anim": "singUP",
"indices": [],
"name": "up_"
}
],
"vocals_file": "",
"no_antialiasing": true,
"image": "characters/spirit",
"position": [-150, 100],
"player_camera_position": [0, 0],
"graphicScale": 0,
"playerposition": [-150, 100],
"healthicon": "spirit-pixel",
"isPsychChar": false,
"flip_x": false,
"healthbar_colors": [255, 60, 110],
"camera_position": [0, 0],
"noteSkin": "pixelUI",
"sing_duration": 4,
"scale": 6,
"_editor_isPlayer": false
}
Loading

0 comments on commit 500a01f

Please sign in to comment.