Skip to content

Commit a6f3323

Browse files
committed
Merge branch 'alpha' into github/auto-labels
2 parents d6dd22b + b7f3e47 commit a6f3323

212 files changed

Lines changed: 206657 additions & 370 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.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
RECOVER_*.fla
33

44
.haxelib/
5+
.haxelsp/
56
.vs/
67
.vscode/
78

.hxpkg

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,25 @@
4141
"name": "extension-androidtools",
4242
"version": "2.1.1"
4343
},
44+
{
45+
"name": "flixel-controls",
46+
"link": "https://github.com/TechnikTil/FlxControls",
47+
"branch": "aca3217338ed7b30c9582f4295d886379273f072"
48+
},
4449
{
4550
"name": "format",
4651
"version": "3.5.0"
4752
},
53+
{
54+
"name": "funkin.vis",
55+
"link": "https://github.com/TechnikTil/funkVis",
56+
"branch": "8429461bfd269bc1f991e3af330db5d60c96c71c"
57+
},
58+
{
59+
"name": "grig.audio",
60+
"link": "https://gitlab.com/haxe-grig/grig.audio.git",
61+
"branch": "57f5d47f2533fd0c3dcd025a86cb86c0dfa0b6d2"
62+
},
4863
{
4964
"name": "hscript",
5065
"version": "2.6.0"
@@ -60,11 +75,6 @@
6075
{
6176
"name": "thx.semver",
6277
"version": "0.2.2"
63-
},
64-
{
65-
"name": "flixel-controls",
66-
"link": "https://github.com/TechnikTil/FlxControls",
67-
"branch": "aca3217338ed7b30c9582f4295d886379273f072"
6878
}
6979
]
7080
}

Project.hxp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ class Project extends HXProject
142142
addHaxelib('hxdiscord_rpc', '1.3.0', FUNKIN_DISCORD_RPC.isEnabled(this));
143143
addHaxelib('thx.core', '0.44.0');
144144
addHaxelib('thx.semver', '0.2.2');
145+
addHaxelib('funkin.vis', 'git');
146+
addHaxelib('grig.audio');
145147
}
146148

147149
public function setupHaxeDefines():Void

assets/gameplay/missnote1.ogg

10.2 KB
Binary file not shown.

assets/gameplay/missnote2.ogg

11.4 KB
Binary file not shown.

assets/gameplay/missnote3.ogg

12.6 KB
Binary file not shown.
1.5 MB
Binary file not shown.
1.31 MB
Binary file not shown.
1.28 MB
Binary file not shown.

0 commit comments

Comments
 (0)