Skip to content

Commit 2ce799a

Browse files
TechnikTilCrusherNotDripsilver984
committed
lotso rewriteo
this commit also contains a rewritten version of silver984's PR changes. Co-authored-by: CrusherNotDrip <[email protected]> Co-authored-by: SILVERSTAR <[email protected]> Signed-off-by: TechnikTil <[email protected]>
1 parent ba0b18a commit 2ce799a

File tree

113 files changed

+2410
-688
lines changed

Some content is hidden

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

113 files changed

+2410
-688
lines changed

‎.gitattributes‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
text=auto
1+
* text=auto eol=lf
2+
*.hxp linguist-language=Haxe
3+
.hxpkg linguist-language=JSON

‎.hxpkg‎

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,32 +19,19 @@
1919
"link": "https://github.com/TilNotDrip/flixel-addons",
2020
"branch": "technotdrip-engine"
2121
},
22-
{
23-
"name": "flxanimate",
24-
"link": "https://github.com/Dot-Stuff/flxanimate",
25-
"branch": "ef85c132044d897a04c5008da29674d88f83c4d6"
26-
},
27-
{
28-
"name": "hxcpp",
29-
"link": "https://github.com/HaxeFoundation/hxcpp",
30-
"branch": "86d4b1a07ddadf162a0c48487f1e1b17d7bbcd64"
31-
},
32-
{
33-
"name": "hxcpp-debug-server",
34-
"version": "1.2.4"
35-
},
36-
{
37-
"name": "hxp",
38-
"version": "1.3.0"
39-
},
4022
{
4123
"name": "extension-androidtools",
4224
"version": "2.1.1"
4325
},
4426
{
4527
"name": "flixel-controls",
46-
"link": "https://github.com/TechnikTil/FlxControls",
47-
"branch": "aca3217338ed7b30c9582f4295d886379273f072"
28+
"link": "https://github.com/Geokureli/FlxControls",
29+
"branch": "5fa97eab4ac29499a8f2a4abcd46f6f6cd1192b9"
30+
},
31+
{
32+
"name": "flxanimate",
33+
"link": "https://github.com/Dot-Stuff/flxanimate",
34+
"branch": "ef85c132044d897a04c5008da29674d88f83c4d6"
4835
},
4936
{
5037
"name": "format",
@@ -60,6 +47,11 @@
6047
"link": "https://gitlab.com/haxe-grig/grig.audio.git",
6148
"branch": "57f5d47f2533fd0c3dcd025a86cb86c0dfa0b6d2"
6249
},
50+
{
51+
"name": "hxcpp",
52+
"link": "https://github.com/HaxeFoundation/hxcpp",
53+
"branch": "86d4b1a07ddadf162a0c48487f1e1b17d7bbcd64"
54+
},
6355
{
6456
"name": "hscript",
6557
"version": "2.6.0"
@@ -68,6 +60,10 @@
6860
"name": "hxdiscord_rpc",
6961
"version": "1.3.0"
7062
},
63+
{
64+
"name": "hxp",
65+
"version": "1.3.0"
66+
},
7167
{
7268
"name": "thx.core",
7369
"version": "0.44.0"
@@ -78,4 +74,4 @@
7874
}
7975
]
8076
}
81-
]
77+
]

‎.vscode/extensions.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"recommendations": [
33
"openfl.lime-vscode-extension",
4+
"vshaxe.haxe-extension-pack",
45
"redhat.vscode-xml"
56
]
67
}

‎assets/gameplay/hud/funkin/healthBar.png‎

213 Bytes
Loading

‎assets/gameplay/hud/funkin/strumline/noteSplashes.png‎

87 KB
Loading

‎assets/gameplay/hud/funkin/strumline/noteSplashes.xml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<TextureAtlas imagePath="noteSplashes.png">
3+
<!-- Created with Adobe Animate version 23.0.10.176 -->
4+
<!-- http://www.adobe.com/products/animate.html -->
5+
<SubTexture name="note impact 1 blue0000" x="1737" y="792" width="189" height="270" frameX="-32" frameY="-12" frameWidth="260" frameHeight="298"/>
6+
<SubTexture name="note impact 1 blue0001" x="1830" y="260" width="213" height="265" frameX="-27" frameY="-22" frameWidth="260" frameHeight="298"/>
7+
<SubTexture name="note impact 1 blue0002" x="1045" y="1" width="252" height="291" frameX="-4" frameY="-6" frameWidth="260" frameHeight="298"/>
8+
<SubTexture name="note impact 1 blue0003" x="1" y="1" width="260" height="298"/>
9+
<SubTexture name="note impact 1 green0000" x="215" y="797" width="189" height="270" frameX="-32" frameY="-12" frameWidth="260" frameHeight="298"/>
10+
<SubTexture name="note impact 1 green0001" x="1830" y="526" width="213" height="265" frameX="-27" frameY="-22" frameWidth="260" frameHeight="298"/>
11+
<SubTexture name="note impact 1 green0002" x="1298" y="1" width="252" height="291" frameX="-4" frameY="-6" frameWidth="260" frameHeight="298"/>
12+
<SubTexture name="note impact 1 green0003" x="262" y="1" width="260" height="298"/>
13+
<SubTexture name="note impact 1 purple0000" x="405" y="798" width="189" height="270" frameX="-32" frameY="-12" frameWidth="260" frameHeight="298"/>
14+
<SubTexture name="note impact 1 purple0001" x="1523" y="551" width="213" height="265" frameX="-27" frameY="-22" frameWidth="260" frameHeight="298"/>
15+
<SubTexture name="note impact 1 purple0002" x="1551" y="1" width="252" height="291" frameX="-4" frameY="-6" frameWidth="260" frameHeight="298"/>
16+
<SubTexture name="note impact 1 purple0003" x="523" y="1" width="260" height="298"/>
17+
<SubTexture name="note impact 1 red0000" x="595" y="798" width="189" height="270" frameX="-32" frameY="-12" frameWidth="260" frameHeight="298"/>
18+
<SubTexture name="note impact 1 red0001" x="1" y="558" width="213" height="265" frameX="-27" frameY="-22" frameWidth="260" frameHeight="298"/>
19+
<SubTexture name="note impact 1 red0002" x="1045" y="293" width="252" height="291" frameX="-4" frameY="-6" frameWidth="260" frameHeight="298"/>
20+
<SubTexture name="note impact 1 red0003" x="784" y="1" width="260" height="298"/>
21+
<SubTexture name="note impact 2 blue0000" x="1119" y="585" width="169" height="201" frameX="-45" frameY="-41" frameWidth="274" frameHeight="267"/>
22+
<SubTexture name="note impact 2 blue0001" x="215" y="558" width="225" height="238" frameX="-20" frameY="-19" frameWidth="274" frameHeight="267"/>
23+
<SubTexture name="note impact 2 blue0002" x="1298" y="293" width="265" height="257" frameX="0" frameY="-10" frameWidth="274" frameHeight="267"/>
24+
<SubTexture name="note impact 2 blue0003" x="1804" y="1" width="224" height="258" frameX="-50" frameY="0" frameWidth="274" frameHeight="267"/>
25+
<SubTexture name="note impact 2 green0000" x="1119" y="787" width="169" height="201" frameX="-45" frameY="-41" frameWidth="274" frameHeight="267"/>
26+
<SubTexture name="note impact 2 green0001" x="441" y="559" width="225" height="238" frameX="-20" frameY="-19" frameWidth="274" frameHeight="267"/>
27+
<SubTexture name="note impact 2 green0002" x="1564" y="293" width="265" height="257" frameX="0" frameY="-10" frameWidth="274" frameHeight="267"/>
28+
<SubTexture name="note impact 2 green0003" x="533" y="300" width="224" height="258" frameX="-50" frameY="0" frameWidth="274" frameHeight="267"/>
29+
<SubTexture name="note impact 2 purple0000" x="1289" y="810" width="169" height="201" frameX="-45" frameY="-41" frameWidth="274" frameHeight="267"/>
30+
<SubTexture name="note impact 2 purple0001" x="667" y="559" width="225" height="238" frameX="-20" frameY="-19" frameWidth="274" frameHeight="267"/>
31+
<SubTexture name="note impact 2 purple0002" x="1" y="300" width="265" height="257" frameX="0" frameY="-10" frameWidth="274" frameHeight="267"/>
32+
<SubTexture name="note impact 2 purple0003" x="758" y="300" width="224" height="258" frameX="-50" frameY="0" frameWidth="274" frameHeight="267"/>
33+
<SubTexture name="note impact 2 red0000" x="1459" y="817" width="169" height="201" frameX="-45" frameY="-41" frameWidth="274" frameHeight="267"/>
34+
<SubTexture name="note impact 2 red0001" x="893" y="585" width="225" height="238" frameX="-20" frameY="-19" frameWidth="274" frameHeight="267"/>
35+
<SubTexture name="note impact 2 red0002" x="267" y="300" width="265" height="257" frameX="0" frameY="-10" frameWidth="274" frameHeight="267"/>
36+
<SubTexture name="note impact 2 red0003" x="1298" y="551" width="224" height="258" frameX="-50" frameY="0" frameWidth="274" frameHeight="267"/>
37+
</TextureAtlas>

‎assets/gameplay/hud/funkin/strumline/noteStrumline.png‎

1.44 MB
Loading

‎assets/gameplay/hud/funkin/strumline/noteStrumline.xml‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<TextureAtlas imagePath="noteStrumline.png">
3+
<!-- Created with Adobe Animate version 23.0.10.176 -->
4+
<!-- http://www.adobe.com/products/animate.html -->
5+
<SubTexture name="arrow down0000" x="1883" y="1" width="157" height="154"/>
6+
<SubTexture name="arrow left0000" x="1875" y="311" width="154" height="157"/>
7+
<SubTexture name="arrow right0000" x="1856" y="469" width="154" height="157"/>
8+
<SubTexture name="arrow up0000" x="1883" y="156" width="157" height="154"/>
9+
<SubTexture name="down confirm0000" x="1411" y="232" width="231" height="228"/>
10+
<SubTexture name="down confirm0001" x="453" y="688" width="221" height="218" frameX="-5" frameY="-5" frameWidth="231" frameHeight="228"/>
11+
<SubTexture name="down confirm0002" x="228" y="237" width="228" height="225" frameX="-2" frameY="-1" frameWidth="231" frameHeight="228"/>
12+
<SubTexture name="down confirm0003" x="228" y="237" width="228" height="225" frameX="-2" frameY="-1" frameWidth="231" frameHeight="228"/>
13+
<SubTexture name="down confirm hold0000" x="1411" y="1" width="235" height="230"/>
14+
<SubTexture name="down confirm hold0001" x="1647" y="1" width="235" height="230"/>
15+
<SubTexture name="down confirm hold0002" x="675" y="691" width="220" height="217" frameX="-8" frameY="-7" frameWidth="235" frameHeight="230"/>
16+
<SubTexture name="down confirm hold0003" x="675" y="691" width="220" height="217" frameX="-8" frameY="-7" frameWidth="235" frameHeight="230"/>
17+
<SubTexture name="down confirm hold0004" x="453" y="464" width="226" height="223" frameX="-5" frameY="-4" frameWidth="235" frameHeight="230"/>
18+
<SubTexture name="down confirm hold0005" x="680" y="467" width="226" height="223" frameX="-5" frameY="-4" frameWidth="235" frameHeight="230"/>
19+
<SubTexture name="down press0000" x="896" y="908" width="142" height="140" frameX="-4" frameY="-2" frameWidth="149" frameHeight="146"/>
20+
<SubTexture name="down press0001" x="896" y="908" width="142" height="140" frameX="-4" frameY="-2" frameWidth="149" frameHeight="146"/>
21+
<SubTexture name="down press0002" x="1113" y="906" width="149" height="146"/>
22+
<SubTexture name="down press0003" x="1113" y="906" width="149" height="146"/>
23+
<SubTexture name="left confirm0000" x="947" y="236" width="228" height="231"/>
24+
<SubTexture name="left confirm0001" x="225" y="690" width="218" height="221" frameX="-5" frameY="-5" frameWidth="228" frameHeight="231"/>
25+
<SubTexture name="left confirm0002" x="686" y="238" width="225" height="228" frameX="-2" frameY="-1" frameWidth="228" frameHeight="231"/>
26+
<SubTexture name="left confirm0003" x="686" y="238" width="225" height="228" frameX="-2" frameY="-1" frameWidth="228" frameHeight="231"/>
27+
<SubTexture name="left confirm hold0000" x="947" y="1" width="231" height="234"/>
28+
<SubTexture name="left confirm hold0001" x="1179" y="1" width="231" height="234"/>
29+
<SubTexture name="left confirm hold0002" x="1" y="695" width="217" height="220" frameX="-8" frameY="-7" frameWidth="231" frameHeight="234"/>
30+
<SubTexture name="left confirm hold0003" x="1" y="695" width="217" height="220" frameX="-8" frameY="-7" frameWidth="231" frameHeight="234"/>
31+
<SubTexture name="left confirm hold0004" x="1631" y="461" width="224" height="226" frameX="-4" frameY="-4" frameWidth="231" frameHeight="234"/>
32+
<SubTexture name="left confirm hold0005" x="228" y="463" width="224" height="226" frameX="-4" frameY="-4" frameWidth="231" frameHeight="234"/>
33+
<SubTexture name="left press0000" x="591" y="909" width="140" height="142" frameX="-3" frameY="-3" frameWidth="146" frameHeight="149"/>
34+
<SubTexture name="left press0001" x="591" y="909" width="140" height="142" frameX="-3" frameY="-3" frameWidth="146" frameHeight="149"/>
35+
<SubTexture name="left press0002" x="444" y="907" width="146" height="149"/>
36+
<SubTexture name="left press0003" x="444" y="907" width="146" height="149"/>
37+
<SubTexture name="right confirm0000" x="1176" y="236" width="228" height="231"/>
38+
<SubTexture name="right confirm0001" x="1354" y="690" width="218" height="221" frameX="-5" frameY="-5" frameWidth="228" frameHeight="231"/>
39+
<SubTexture name="right confirm0002" x="1405" y="461" width="225" height="228" frameX="-2" frameY="-1" frameWidth="228" frameHeight="231"/>
40+
<SubTexture name="right confirm0003" x="1405" y="461" width="225" height="228" frameX="-2" frameY="-1" frameWidth="228" frameHeight="231"/>
41+
<SubTexture name="right confirm hold0000" x="1" y="468" width="223" height="226" frameX="-5" frameY="-6" frameWidth="233" frameHeight="236"/>
42+
<SubTexture name="right confirm hold0001" x="907" y="468" width="223" height="226" frameX="-5" frameY="-6" frameWidth="233" frameHeight="236"/>
43+
<SubTexture name="right confirm hold0002" x="1" y="237" width="226" height="230" frameX="-4" frameY="-3" frameWidth="233" frameHeight="236"/>
44+
<SubTexture name="right confirm hold0003" x="1" y="237" width="226" height="230" frameX="-4" frameY="-3" frameWidth="233" frameHeight="236"/>
45+
<SubTexture name="right confirm hold0004" x="479" y="1" width="233" height="236"/>
46+
<SubTexture name="right confirm hold0005" x="713" y="1" width="233" height="236"/>
47+
<SubTexture name="right press0000" x="732" y="909" width="138" height="141" frameX="-3" frameY="-7" frameWidth="148" frameHeight="151"/>
48+
<SubTexture name="right press0001" x="732" y="909" width="138" height="141" frameX="-3" frameY="-7" frameWidth="148" frameHeight="151"/>
49+
<SubTexture name="right press0002" x="1853" y="778" width="148" height="151"/>
50+
<SubTexture name="right press0003" x="1853" y="778" width="148" height="151"/>
51+
<SubTexture name="up confirm0000" x="1643" y="232" width="231" height="228"/>
52+
<SubTexture name="up confirm0001" x="1631" y="688" width="221" height="218" frameX="-5" frameY="-5" frameWidth="231" frameHeight="228"/>
53+
<SubTexture name="up confirm0002" x="457" y="238" width="228" height="225" frameX="-2" frameY="-1" frameWidth="231" frameHeight="228"/>
54+
<SubTexture name="up confirm0003" x="457" y="238" width="228" height="225" frameX="-2" frameY="-1" frameWidth="231" frameHeight="228"/>
55+
<SubTexture name="up confirm hold0000" x="1" y="1" width="238" height="235"/>
56+
<SubTexture name="up confirm hold0001" x="240" y="1" width="238" height="235"/>
57+
<SubTexture name="up confirm hold0002" x="896" y="695" width="216" height="212" frameX="-10" frameY="-11" frameWidth="238" frameHeight="235"/>
58+
<SubTexture name="up confirm hold0003" x="896" y="695" width="216" height="212" frameX="-10" frameY="-11" frameWidth="238" frameHeight="235"/>
59+
<SubTexture name="up confirm hold0004" x="1131" y="468" width="222" height="218" frameX="-7" frameY="-8" frameWidth="238" frameHeight="235"/>
60+
<SubTexture name="up confirm hold0005" x="1131" y="687" width="222" height="218" frameX="-7" frameY="-8" frameWidth="238" frameHeight="235"/>
61+
<SubTexture name="up press0000" x="1573" y="907" width="144" height="141" frameX="-5" frameY="-4" frameWidth="153" frameHeight="150"/>
62+
<SubTexture name="up press0001" x="1573" y="907" width="144" height="141" frameX="-5" frameY="-4" frameWidth="153" frameHeight="150"/>
63+
<SubTexture name="up press0002" x="1856" y="627" width="153" height="150"/>
64+
<SubTexture name="up press0003" x="1856" y="627" width="153" height="150"/>
65+
</TextureAtlas>

‎assets/gameplay/hud/funkin/strumline/notes.png‎

16.4 KB
Loading

‎assets/gameplay/hud/funkin/strumline/notes.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<TextureAtlas imagePath="notes.png">
3+
<!-- Created with Adobe Animate version 23.0.10.176 -->
4+
<!-- http://www.adobe.com/products/animate.html -->
5+
<SubTexture name="blue0000" x="1" y="1" width="157" height="154"/>
6+
<SubTexture name="blue hold end0000" x="1" y="311" width="50" height="64"/>
7+
<SubTexture name="blue hold piece0000" x="1" y="376" width="50" height="44"/>
8+
<SubTexture name="green0000" x="1" y="156" width="157" height="154"/>
9+
<SubTexture name="green hold end0000" x="52" y="311" width="50" height="64"/>
10+
<SubTexture name="green hold piece0000" x="52" y="376" width="50" height="44"/>
11+
<SubTexture name="purple0000" x="159" y="1" width="154" height="157"/>
12+
<SubTexture name="purple hold end0000" x="103" y="311" width="50" height="64"/>
13+
<SubTexture name="purple hold piece0000" x="103" y="376" width="50" height="44"/>
14+
<SubTexture name="red0000" x="159" y="159" width="154" height="157"/>
15+
<SubTexture name="red hold end0000" x="154" y="317" width="50" height="64"/>
16+
<SubTexture name="red hold piece0000" x="205" y="317" width="50" height="44"/>
17+
</TextureAtlas>

0 commit comments

Comments
 (0)