Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
17742f3
initial changes
inky03 Feb 4, 2025
8e97db1
note extra data, fix receptors on release
inky03 Feb 4, 2025
6c772cf
Merge branch 'main' into notepool
inky03 Feb 4, 2025
15d6164
Merge branch 'main' into notepool
inky03 Feb 4, 2025
303fa1b
internal changes
inky03 Feb 24, 2025
d534dd5
Merge branch 'main' into notepool
inky03 Feb 24, 2025
ab1f90e
Merge branch 'main' into notepool
inky03 Feb 24, 2025
acd3905
Merge branch 'main' into notepool
inky03 Feb 25, 2025
89f0afc
more big stuff
inky03 Mar 8, 2025
7fb273e
Merge branch 'main' into notepool
inky03 Mar 8, 2025
8c58644
update more assets
inky03 Mar 8, 2025
281718d
note generation improvements, etc
inky03 Mar 10, 2025
e589f05
Update Chart.hx
inky03 Mar 11, 2025
42c8594
additional fixes, strumlines on creation
inky03 Mar 11, 2025
96db8a5
optimizations and Other things
inky03 Mar 16, 2025
13fe26b
fix rating position, play anim special
inky03 Mar 17, 2025
98c2e0f
better stack detection,
inky03 Mar 18, 2025
7673555
i forgot to finish titling the last commit
inky03 Mar 18, 2025
616e1d7
Note.texture
inky03 Mar 19, 2025
a2a3259
FunkinSprite.anim overhaul, character hold +
inky03 Mar 20, 2025
3f36789
fix nene character script
inky03 Mar 20, 2025
72a973d
Strumline/Lane.character, PREPARE MULTIKEY
inky03 Mar 20, 2025
459c4be
SUPER WIP note styles
inky03 Mar 23, 2025
9f702f0
lmao
inky03 Mar 23, 2025
2e1d06c
abolish note cover, almost fully implement styles
inky03 Mar 26, 2025
42bd698
"recycled" alphabet
inky03 Mar 30, 2025
28cc01e
fixes and improvements, notestyle scripts
inky03 Apr 2, 2025
bcf0d6e
spritegroup improvement(kinda), etc
inky03 Apr 6, 2025
298b0aa
MORE big things
inky03 Apr 21, 2025
804a29b
experimental modchart sustains
inky03 May 9, 2025
5c95670
Change more renderer stuff
inky03 May 9, 2025
aef6e73
render rotated n zoomed triangles
inky03 May 9, 2025
c881f95
chart audio offset
inky03 May 9, 2025
d23c44e
update soundtray for flixel 6.1.0
inky03 May 9, 2025
33411ac
fix audio offset math
inky03 May 10, 2025
41a696a
fix some stupid garbage
inky03 May 10, 2025
63a3c3a
update character internal
inky03 May 11, 2025
644d0ee
you can now play the game without assets.
inky03 May 11, 2025
8a4421f
hl semi support again, more util funnies
inky03 May 12, 2025
4cc6870
Strumline.scaleTo and fix
inky03 May 12, 2025
2e0e1d9
copy tempo changes in playstate conductor
inky03 May 12, 2025
c61b71c
Update FunkinSprite.hx
inky03 May 24, 2025
aabfc65
nb flag
inky03 May 25, 2025
68e94e8
fix interp no value optional functions
inky03 May 25, 2025
1d9a151
update strip
inky03 May 25, 2025
10f7043
over overhaul notemodcjhart system and more
inky03 May 25, 2025
658cdb2
h
inky03 May 25, 2025
1de28ee
fix note release on looping animations
inky03 May 26, 2025
4e054b8
updated rating assets <3
inky03 May 26, 2025
0f4eeda
note vars that shouldnt be resett lol
inky03 May 27, 2025
9ab995b
Update TitleState.hx
inky03 May 27, 2025
7940f3d
add defines stuffs
inky03 May 30, 2025
df2712d
account for scale , angle for bar center
inky03 May 31, 2025
4e5dd52
do NOT roudn clipRect
inky03 May 31, 2025
94a874c
fix conductor event rollout
inky03 May 31, 2025
21fc028
stoppable gameover start
inky03 Jun 1, 2025
bd1dcf6
make stage a...ahem... FunkinGroup
inky03 Jun 1, 2025
dc624d2
camLocked
inky03 Jun 1, 2025
64c8c87
fix hit note rgb and rotated hold strip
inky03 Jun 1, 2025
ff95c82
lane specific notestyle animations
inky03 Jun 1, 2025
95c78b8
hold sprite offset
inky03 Jun 1, 2025
09bca41
remove spotlight bs
inky03 Jun 1, 2025
ba6dbb2
more note event vars
inky03 Jun 1, 2025
1fcb9c8
optional zindex on insert
inky03 Jun 1, 2025
07afbbe
Bar.overlayOnTop
inky03 Jun 1, 2025
dfa2022
fix bar bounds
inky03 Jun 1, 2025
ae4bb90
new healthbar clipping
inky03 Jun 1, 2025
8aa5121
freeplay state correct mod
inky03 Jun 1, 2025
2935ab4
relocate discord rpc
inky03 Jun 4, 2025
32576e9
Update Chart.hx
inky03 Jun 17, 2025
e18b698
fix broken tempo change copying
inky03 Jun 17, 2025
20aca1d
um.. a lot ? and FunkinText
inky03 Jul 19, 2025
9fbf61c
arrowpath
inky03 Jul 19, 2025
3d66186
Update Stage.hx
inky03 Jul 19, 2025
5c29d00
Update Stage.hx
inky03 Jul 19, 2025
deec36c
PAUSE MENU, (attempt) optimize hold rendering
inky03 Jul 20, 2025
f456b9d
more hold garbage
inky03 Jul 21, 2025
bb3a027
unify new ui stuff with options menu
inky03 Jul 21, 2025
2506fdb
rework score system
inky03 Jul 21, 2025
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
assets/images/gay porn/
mods/
dump/
export/
.vscode/
.DS_Store
Expand Down
2 changes: 1 addition & 1 deletion CREDITS.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ NOTE: THIS WILL BE MOVED TO THE CREDITS STATE WHEN IT'S FINISHED, including link
## SPECIAL THANKS
**funkin' crew** - made FRIDAY NIGHT FUNKIN'!! damn!! proprietary of most assets, borrowed parts of backend class implementations<br>
**psych engine** - formats support, discord rpc base, paths implementations, a lot of ideas generally<br>
**codename engine** - chart format support<br>
**codename engine** - chart format support, "play animation context"<br>
**sword** - some useful pointers<br>
**crowplexus** - some useful pointers (crash handler)<br>
**unholywanderer04** - obligatory unholywanderer04 mention<br>
Expand Down
3 changes: 1 addition & 2 deletions Project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,10 @@
<haxeflag name="--macro" value="addMetadata('@:build(funkin.macros.FunkinMacro.buildFlxBasic())', 'flixel.FlxBasic')" />
<haxeflag name="--macro" value="addMetadata('@:build(funkin.macros.HScriptMacro.buildInterp())', 'crowplexus.hscript.Interp')" />
<haxeflag name="--macro" value="include('flixel', true, ['flixel.addons.nape', 'flixel.addons.editors.spine', 'flixel.system.macros'])" if="ALLOW_SCRIPTS" />
<haxeflag name="--macro" value="include('sys', true, ['sys.db', 'sys.ssl', 'sys.net'])" if="ALLOW_SCRIPTS" />
<haxeflag name="--macro" value="include('haxe', true, ['haxe.atomic', 'haxe.macro'])" if="ALLOW_SCRIPTS" />
<haxeflag name="--macro" value="include('hxvlc', true)" if="hxvlc ALLOW_SCRIPTS" />
<haxeflag name="--macro" value="include('funkin', true)" if="ALLOW_SCRIPTS" />
<haxeflag name="--macro" value="include('sys', true)" if="ALLOW_SCRIPTS" />
<!-- dont include sys.db and sys.ssl? -->

<!-- ______________________________ Haxedefines _____________________________ -->

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ haxelib install moonchart
haxelib install hxdiscord_rpc
haxelib git funkin.vis https://github.com/FunkinCrew/funkVis
haxelib git grig.audio https://gitlab.com/haxe-grig/grig.audio.git
haxelib git flxanimate https://github.com/Dot-Stuff/flxanimate.git dev
haxelib git flxanimate https://github.com/Dot-Stuff/flxanimate.git 884606823b39b41ae460cd5f0ec1a07310654aa2
haxelib git hscript-iris https://github.com/pisayesiwsi/hscript-iris.git dev
```
(hscript-iris and flxanimate use indev versions)
Expand Down
4 changes: 2 additions & 2 deletions assets/data/stages/phillyBlazin.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"bf": {
"zIndex": 2000,
"scale": 1.75,
"position": [-237, 100],
"position": [1400, 1660],
"cameraOffsets": [-350, -100]
},
"gf": {
Expand All @@ -72,7 +72,7 @@
"dad": {
"zIndex": 3000,
"scale": 1.75,
"position": [-237, 150],
"position": [1480, 1660],
"cameraOffsets": [500, 200]
}
}
Expand Down
136 changes: 136 additions & 0 deletions assets/data/styles/notes/funkin-6k.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
{
"version": "1.0.0",
"name": "Funkin' (6 Key)",
"author": "PhantomArcade",
"data": {
"general": {
"laneSpacing": 140,
"directions": [ // <prefix> <direction name> <suffix> <variantSuffix>
{
"name": "left",
"sing": "singLEFT",
"colorSave": "funkin-left",
"keybindSave": "funkin-0-6k",
"defaultColors": ["#C24B99", "#FFFFFF", "#3C1F56"]
},
{
"name": "up",
"sing": "singUP",
"colorSave": "funkin-up",
"keybindSave": "funkin-1-6k",
"defaultColors": ["#12FA05", "#FFFFFF", "#0A4447"]
},
{
"name": "right",
"sing": "singRIGHT",
"colorSave": "funkin-right",
"keybindSave": "funkin-2-6k",
"defaultColors": ["#F9393F", "#FFFFFF", "#651038"]
},
{
"name": "left",
"sing": "singLEFT",
"colorSave": "funkin-left-alt",
"keybindSave": "funkin-3-6k",
"defaultColors": ["#FFFF00", "#FFFFFF", "#993300"]
},
{
"name": "down",
"sing": "singDOWN",
"colorSave": "funkin-down",
"keybindSave": "funkin-4-6k",
"defaultColors": ["#00FFFF", "#FFFFFF", "#1542B7"]
},
{
"name": "right",
"sing": "singRIGHT",
"colorSave": "funkin-right-alt",
"keybindSave": "funkin-5-6k",
"defaultColors": ["#0033FF", "#FFFFFF", "#000066"]
}
]
},
"notes": {
"assetPath": "gameplay/funkin/notes",
"animations": [ // these animations will be added to all notes!
{
"name": "hit",
"suffix": "note",
"looped": true
}
]
},
"receptors": {
"assetPath": "gameplay/funkin/notes",
"animations": [
{
"name": "static",
"suffix": "receptor",
"disableRGB": true,
"looped": true
},
{
"name": "confirm",
"suffix": "confirm"
},
{
"name": "press",
"suffix": "press"
}
]
},
"holds": {
"assetPath": "gameplay/funkin/notes",
"animations": [
{
"name": "hold",
"suffix": "hold piece",
"looped": true
},
{
"name": "tail",
"suffix": "hold tail",
"looped": true
}
]
},
"noteCovers": {
"assetPath": "gameplay/funkin/noteCovers",
"animations": [
{
"name": "start",
"prefix": "hold cover start",
"offsets": [10, -46]
},
{
"name": "loop",
"prefix": "hold cover loop",
"offsets": [10, -46]
}
{
"name": "spark",
"prefix": "hold cover spark",
"offsets": [10, -46]
}
]
},
"noteSplashes": {
"assetPath": "gameplay/funkin/noteSplashes",
"variants": 2,
"animations": [
{
"name": "splash-1",
"prefix": "notesplash",
"suffix": "1",
"frameRateRange": [22, 26]
},
{
"name": "splash-2",
"prefix": "notesplash",
"suffix": "2",
"frameRateRange": [22, 26]
}
]
}
}
}
157 changes: 157 additions & 0 deletions assets/data/styles/notes/funkin-9k.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
{
"version": "1.0.0",
"name": "Funkin' (9 Key)",
"author": "PhantomArcade",
"data": {
"general": {
"laneSpacing": 120,
"directions": [ // <prefix> <direction name> <suffix> <variantSuffix>
{
"name": "left",
"sing": "singLEFT",
"colorSave": "funkin-left",
"keybindSave": "funkin-0-9k",
"defaultColors": ["#C24B99", "#FFFFFF", "#3C1F56"]
},
{
"name": "down",
"sing": "singDOWN",
"colorSave": "funkin-down",
"keybindSave": "funkin-1-9k",
"defaultColors": ["#00FFFF", "#FFFFFF", "#1542B7"]
},
{
"name": "up",
"sing": "singUP",
"colorSave": "funkin-up",
"keybindSave": "funkin-2-9k",
"defaultColors": ["#12FA05", "#FFFFFF", "#0A4447"]
},
{
"name": "right",
"sing": "singRIGHT",
"colorSave": "funkin-right",
"keybindSave": "funkin-3-9k",
"defaultColors": ["#F9393F", "#FFFFFF", "#651038"]
},
{
"name": "up",
"sing": "singUP",
"colorSave": "funkin-diamond",
"keybindSave": "funkin-4-9k",
"defaultColors": ["#999999", "#FFFFFF", "#201E31"]
},
{
"name": "left",
"sing": "singLEFT",
"colorSave": "funkin-left-alt",
"keybindSave": "funkin-5-9k",
"defaultColors": ["#FFFF00", "#FFFFFF", "#993300"]
},
{
"name": "down",
"sing": "singDOWN",
"colorSave": "funkin-down-alt",
"keybindSave": "funkin-6-9k",
"defaultColors": ["#8B4AFF", "#FFFFFF", "#3B177D"]
},
{
"name": "up",
"sing": "singUP",
"colorSave": "funkin-up-alt",
"keybindSave": "funkin-7-9k",
"defaultColors": ["#FF0000", "#FFFFFF", "#660000"]
},
{
"name": "right",
"sing": "singRIGHT",
"colorSave": "funkin-right-alt",
"keybindSave": "funkin-8-9k",
"defaultColors": ["#0033FF", "#FFFFFF", "#000066"]
}
]
},
"notes": {
"assetPath": "gameplay/funkin/notes",
"animations": [ // these animations will be added to all notes!
{
"name": "hit",
"suffix": "note",
"looped": true
}
]
},
"receptors": {
"assetPath": "gameplay/funkin/notes",
"animations": [
{
"name": "static",
"suffix": "receptor",
"disableRGB": true,
"looped": true
},
{
"name": "confirm",
"suffix": "confirm"
},
{
"name": "press",
"suffix": "press"
}
]
},
"holds": {
"assetPath": "gameplay/funkin/notes",
"animations": [
{
"name": "hold",
"suffix": "hold piece",
"looped": true
},
{
"name": "tail",
"suffix": "hold tail",
"looped": true
}
]
},
"noteCovers": {
"assetPath": "gameplay/funkin/noteCovers",
"animations": [
{
"name": "start",
"prefix": "hold cover start",
"offsets": [10, -46]
},
{
"name": "loop",
"prefix": "hold cover loop",
"offsets": [10, -46]
}
{
"name": "spark",
"prefix": "hold cover spark",
"offsets": [10, -46]
}
]
},
"noteSplashes": {
"assetPath": "gameplay/funkin/noteSplashes",
"variants": 2,
"animations": [
{
"name": "splash-1",
"prefix": "notesplash",
"suffix": "1",
"frameRateRange": [22, 26]
},
{
"name": "splash-2",
"prefix": "notesplash",
"suffix": "2",
"frameRateRange": [22, 26]
}
]
}
}
}
Loading