Skip to content

Commit 92659df

Browse files
corecathxcorecathx
committed
1.6 stuff!!
1 parent 5504608 commit 92659df

Some content is hidden

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

59 files changed

+6185
-1586
lines changed

‎.gitignore

+3-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
export/
22
.vscode/
3-
APIStuff.hx
4-
ldingbackuplalaldasf.txt
5-
fpstatebackup.txt
6-
CreateCharacterBETATEST.hx
7-
CHARACTERHX-CHARCODE
83
art/backupcodeshit/
9-
source/modding/StageEdit.hx
10-
docs/hscript.md
114
todo.txt
125
cdev-changelog.txt
136
build.hxml
147
vscode-project.hxml
15-
crash_handler/src
8+
hxformat.json
9+
crash_handler/src
10+
CHANGELOG.md

‎Modding.md

-21
This file was deleted.

‎Project.xml

+2-5
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<define name="NO_PRELOAD_ALL" unless="PRELOAD_ALL"/>
5050

5151
<!--CDEV Engine's define names-->
52-
<define name="ALLOW_MODS" if="desktop"/>
52+
<define name="ALLOW_MODS"/><!-- if="desktop"-->
5353
<define name="CRASH_HANDLER" if="desktop"/>
5454
<!--<define name="USE_VIDEOS"/>-->
5555

@@ -126,8 +126,6 @@
126126
<haxelib name="flixel-addons" />
127127
<haxelib name="hscript" />
128128

129-
130-
131129
<!--In case you want to use the ui package-->
132130
<haxelib name="flixel-ui" />
133131
<haxelib name="faxe" if='switch'/>
@@ -192,8 +190,7 @@
192190
<icon path="art/icon256.png" size='256'/>
193191
<icon path="art/icon512.png" size='512'/>
194192
<icon path="art/iconOG.png" />
195-
196-
<!-- <haxedef name="SKIP_TO_PLAYSTATE" if="debug" /> -->
193+
197194
<haxedef name="NG_LOGIN" if="newgrounds" />
198195

199196
</project>

‎assets/fonts/diffic.ttf

168 KB
Binary file not shown.

‎docs/assets/pmf.ttf

45.2 KB
Binary file not shown.

‎docs/assets/pmf2.ttf

168 KB
Binary file not shown.

‎docs/index.html

+8-77
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,25 @@
11
<!DOCTYPE html>
22
<html>
33
<!--what are you looking at?-->
4+
<!--i'm bad at making html and stuff, still learning tho!-->
45
<head>
56
<meta charset="UTF-8">
67
<title>CDEV Engine Docs</title>
78
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto">
8-
<style>
9-
.body {
10-
margin: 0px;
11-
background-color: black;
12-
}
13-
14-
.container {
15-
display: grid;
16-
grid-template-columns: 250px auto;
17-
}
18-
19-
.tab-content {
20-
display: none;
21-
font-family: 'Roboto', sans-serif;
22-
max-width: 80%;
23-
}
24-
25-
.active-tab {
26-
display: block;
27-
}
28-
29-
table {
30-
border-collapse: collapse;
31-
width: 100%;
32-
}
33-
34-
th,
35-
td {
36-
border: 1px solid rgb(139, 139, 139);
37-
padding: 8px;
38-
text-align: left;
39-
}
40-
41-
code {
42-
font-family: 'Monaco', 'Courier New', monospace;
43-
/* Ganti 'Monaco' dengan jenis font yang Anda inginkan jika tidak tersedia di komputer pengguna */
44-
}
45-
46-
#sidebar {
47-
background-color: #2a3350;
48-
padding: 20px;
49-
min-height: 100vh;
50-
overflow-y: auto;
51-
}
52-
53-
#sidebar ul {
54-
list-style-type: none;
55-
padding: 0;
56-
}
57-
58-
#sidebar ul li {
59-
margin-bottom: 10px;
60-
}
61-
62-
#sidebar ul li a {
63-
text-decoration: none;
64-
color: #a1a1a1;
65-
font-family: 'Roboto', sans-serif;
66-
display: block;
67-
}
68-
69-
#content {
70-
background-color: #161d33;
71-
color: #FFFFFF;
72-
padding: 20px;
73-
font-family: 'Roboto', sans-serif;
74-
}
75-
76-
#sidebar ul li a:hover {
77-
background-color: #2b4d80;
78-
}
79-
</style>
9+
<link rel="stylesheet" href="style.css">
8010
</head>
8111

8212
<body>
8313
<div class="container">
8414
<div id="sidebar">
85-
<h2 style="color: white; font-family: 'Roboto', sans-serif;">Basics</h2>
15+
<h2 class="titlestuffsD">DOCS PAGES</h2>
16+
<h2 class="titlestuffs">Basics</h2>
8617
<ul>
8718
<li><a href="#welcome" onclick="showTab('welcome'); return false;">Welcome</a></li>
8819
<li><a href="#new-mod" onclick="showTab('new-mod'); return false;">Making a new mod</a></li>
8920
</ul>
9021

91-
<h2 style="color: white; font-family: 'Roboto', sans-serif;">Modding Stuffs</h2>
22+
<h2 class="titlestuffs">Modding Stuffs</h2>
9223
<ul>
9324
<li><a href="#new-song" onclick="showTab('new-song'); return false;">Adding your song</a></li>
9425
<li><a href="#new-character" onclick="showTab('new-character'); return false;">Adding a new
@@ -97,13 +28,13 @@ <h2 style="color: white; font-family: 'Roboto', sans-serif;">Modding Stuffs</h2>
9728
<li><a href="#new-week" onclick="showTab('new-week'); return false;">Adding a new week</a></li>
9829
</ul>
9930

100-
<h2 style="color: white; font-family: 'Roboto', sans-serif;">HScript API</h2>
31+
<h2 class="titlestuffs">HScript API</h2>
10132
<ul>
10233
<li><a href="#script-ex" onclick="showTab('script-ex'); return false;">How scripting works here</a></li>
10334
<li><a href="#scripts-used" onclick="showTab('scripts-used'); return false;">Variables</a></li>
10435
</ul>
10536

106-
<h2 style="color: white; font-family: 'Roboto', sans-serif;">Example Scripts</h2>
37+
<h2 class="titlestuffs">Example Scripts</h2>
10738
<ul>
10839
<li><a href="#song-scripts" onclick="showTab('song-scripts'); return false;">Song Scripts</a></li>
10940
<li><a href="#stage-scripts" onclick="showTab('stage-scripts'); return false;">Stage Scripts</a></li>
@@ -278,7 +209,7 @@ <h2>Final Result</h2>
278209
<div class="tab-content" id="new-week">
279210
<h1>Making a new week</h1>
280211
<hr>
281-
<p>wip haha cool swaggy ass</p>
212+
<p>wip </p>
282213
</div>
283214

284215
<!--

‎docs/style.css

+97
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
@font-face {
2+
font-family: funkinFont;
3+
src: url(assets/pmf.ttf);
4+
}
5+
@font-face {
6+
font-family: funkinDiff;
7+
src: url(assets/pmf2.ttf);
8+
}
9+
10+
body {
11+
background-color: black;
12+
}
13+
body, html {
14+
margin: 0;
15+
padding: 0;
16+
}
17+
.container {
18+
display: grid;
19+
grid-template-columns: 300px auto;
20+
}
21+
22+
.tab-content {
23+
display: none;
24+
font-family: funkinFont;
25+
max-width: 85%;
26+
}
27+
28+
.active-tab {
29+
display: block;
30+
}
31+
32+
table {
33+
border-collapse: collapse;
34+
width: 100%;
35+
}
36+
37+
th,
38+
td {
39+
border: 1px solid rgb(139, 139, 139);
40+
padding: 8px;
41+
text-align: left;
42+
}
43+
44+
code {
45+
font-family: Consolas,"courier new";
46+
background-color: black;
47+
}
48+
49+
#sidebar {
50+
background-color: #111111;
51+
padding: 20px;
52+
min-height: 100vh;
53+
overflow-y: auto;
54+
}
55+
56+
#sidebar ul {
57+
list-style-type: none;
58+
padding: 0;
59+
}
60+
61+
#sidebar ul li {
62+
margin-bottom: 10px;
63+
}
64+
65+
#sidebar ul li a {
66+
text-decoration: none;
67+
color: #a1a1a1;
68+
font-family: funkinFont;
69+
display: block;
70+
letter-spacing: 0.5px;
71+
}
72+
73+
#content {
74+
background-color: #000000;
75+
color: #FFFFFF;
76+
padding: 20px;
77+
font-family: funkinFont;
78+
letter-spacing: 0.5px;
79+
line-height: 120%;
80+
}
81+
82+
#sidebar ul li a:hover {
83+
background-color: #353535;
84+
}
85+
86+
.titlestuffs{
87+
color: white;
88+
font-family: funkinDiff;
89+
font-size: 24px;
90+
letter-spacing: 2px;
91+
}
92+
93+
.titlestuffsD{
94+
color: white;
95+
font-family: funkinFont;
96+
font-size: 34px;
97+
}

‎example_mods/FNF Test Mod/data/charts/mod-test/script.hx

+6-6
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ function onStartSong() {
2424
function update(elapsed) {
2525
// This function will be executed on frame update.
2626
// 'elapsed' - Float - How many times does this Function called.
27-
PlayState.iconP1.angle = FlxMath.lerp(0,PlayState.iconP1.angle,FlxMath.bound(1-(elapsed*3),0,1));
28-
PlayState.iconP2.angle = FlxMath.lerp(0,PlayState.iconP2.angle,FlxMath.bound(1-(elapsed*3),0,1));
27+
PlayState.iconP1.angle = FlxMath.lerp(0,PlayState.iconP1.angle,FlxMath.bound(1-(elapsed*12),0,1));
28+
PlayState.iconP2.angle = FlxMath.lerp(0,PlayState.iconP2.angle,FlxMath.bound(1-(elapsed*12),0,1));
2929

3030
for (i in 0...PlayState.playerStrums.members.length){
31-
if (CDevConfig.downscroll){
31+
if (CDevConfig.saveData.downscroll){
3232
PlayState.playerStrums.members[i].y = FlxMath.lerp(FlxG.height - 160,PlayState.playerStrums.members[i].y, FlxMath.bound(1 - (elapsed * 6), 0 , 1));
3333
} else{
3434
PlayState.playerStrums.members[i].y = FlxMath.lerp(70,PlayState.playerStrums.members[i].y, FlxMath.bound(1 - (elapsed * 6), 0 , 1));
@@ -37,7 +37,7 @@ function update(elapsed) {
3737
}
3838

3939
for (i in 0...PlayState.p2Strums.members.length){
40-
if (CDevConfig.downscroll){
40+
if (CDevConfig.saveData.downscroll){
4141
PlayState.p2Strums.members[i].y = FlxMath.lerp(FlxG.height - 160,PlayState.p2Strums.members[i].y, FlxMath.bound(1 - (elapsed * 6), 0 , 1));
4242
} else{
4343
PlayState.p2Strums.members[i].y = FlxMath.lerp(70,PlayState.p2Strums.members[i].y, FlxMath.bound(1 - (elapsed * 6), 0 , 1));
@@ -51,7 +51,7 @@ function p1NoteHit(noteData,isSustain) {
5151
// 'isSustain' - Boolean - Is it a sustain note?
5252

5353
if (!isSustain){
54-
if (CDevConfig.downscroll){
54+
if (CDevConfig.saveData.downscroll){
5555
PlayState.playerStrums.members[noteData].y += 20;
5656
} else{
5757
PlayState.playerStrums.members[noteData].y -= 20;
@@ -72,7 +72,7 @@ function p2NoteHit(noteData,isSustain) {
7272
// 'isSustain' - Boolean - Is it a sustain note?
7373

7474
if (!isSustain){
75-
if (CDevConfig.downscroll){
75+
if (CDevConfig.saveData.downscroll){
7676
PlayState.p2Strums.members[noteData].y += 20;
7777
} else{
7878
PlayState.p2Strums.members[noteData].y -= 20;

‎example_mods/FNF Test Mod/images/checker.png

741 Bytes
Loading

‎example_mods/FNF Test Mod/images/gfDanceTitle.png

856 KB
Loading

‎example_mods/FNF Test Mod/images/gfDanceTitle.xml

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<TextureAtlas imagePath="gfDanceTitle.png">
3+
<!-- Created with Adobe Animate version 21.0.6.41649 -->
4+
<!-- http://www.adobe.com/products/animate.html -->
5+
<SubTexture name="GF Dancing Beat blue0000" x="0" y="0" width="699" height="634" frameX="-2" frameY="-14" frameWidth="703" frameHeight="648"/>
6+
<SubTexture name="GF Dancing Beat blue0001" x="754" y="0" width="703" height="634" frameX="0" frameY="-14" frameWidth="703" frameHeight="648"/>
7+
<SubTexture name="GF Dancing Beat blue0002" x="1512" y="0" width="703" height="632" frameX="0" frameY="-16" frameWidth="703" frameHeight="648"/>
8+
<SubTexture name="GF Dancing Beat blue0003" x="2270" y="0" width="699" height="632" frameX="-2" frameY="-16" frameWidth="703" frameHeight="648"/>
9+
<SubTexture name="GF Dancing Beat blue0004" x="3024" y="0" width="699" height="635" frameX="-2" frameY="-13" frameWidth="703" frameHeight="648"/>
10+
<SubTexture name="GF Dancing Beat blue0005" x="0" y="690" width="699" height="635" frameX="-2" frameY="-13" frameWidth="703" frameHeight="648"/>
11+
<SubTexture name="GF Dancing Beat blue0006" x="754" y="690" width="699" height="637" frameX="-2" frameY="-11" frameWidth="703" frameHeight="648"/>
12+
<SubTexture name="GF Dancing Beat blue0007" x="1508" y="690" width="699" height="648" frameX="-2" frameY="0" frameWidth="703" frameHeight="648"/>
13+
<SubTexture name="GF Dancing Beat blue0008" x="1508" y="690" width="699" height="648" frameX="-2" frameY="0" frameWidth="703" frameHeight="648"/>
14+
<SubTexture name="GF Dancing Beat blue0009" x="1508" y="690" width="699" height="648" frameX="-2" frameY="0" frameWidth="703" frameHeight="648"/>
15+
<SubTexture name="GF Dancing Beat blue0010" x="2262" y="690" width="699" height="648" frameX="-2" frameY="0" frameWidth="703" frameHeight="648"/>
16+
<SubTexture name="GF Dancing Beat blue0011" x="2262" y="690" width="699" height="648" frameX="-2" frameY="0" frameWidth="703" frameHeight="648"/>
17+
<SubTexture name="GF Dancing Beat blue0012" x="2262" y="690" width="699" height="648" frameX="-2" frameY="0" frameWidth="703" frameHeight="648"/>
18+
<SubTexture name="GF Dancing Beat blue0013" x="3016" y="690" width="699" height="648" frameX="-2" frameY="0" frameWidth="703" frameHeight="648"/>
19+
<SubTexture name="GF Dancing Beat blue0014" x="3016" y="690" width="699" height="648" frameX="-2" frameY="0" frameWidth="703" frameHeight="648"/>
20+
<SubTexture name="GF Dancing Beat blue0015" x="0" y="1393" width="699" height="636" frameX="-2" frameY="-12" frameWidth="703" frameHeight="648"/>
21+
<SubTexture name="GF Dancing Beat blue0016" x="754" y="1393" width="703" height="636" frameX="0" frameY="-12" frameWidth="703" frameHeight="648"/>
22+
<SubTexture name="GF Dancing Beat blue0017" x="1512" y="1393" width="703" height="636" frameX="0" frameY="-12" frameWidth="703" frameHeight="648"/>
23+
<SubTexture name="GF Dancing Beat blue0018" x="2270" y="1393" width="699" height="636" frameX="-2" frameY="-12" frameWidth="703" frameHeight="648"/>
24+
<SubTexture name="GF Dancing Beat blue0019" x="3024" y="1393" width="699" height="637" frameX="-2" frameY="-11" frameWidth="703" frameHeight="648"/>
25+
<SubTexture name="GF Dancing Beat blue0020" x="0" y="2085" width="699" height="637" frameX="-2" frameY="-11" frameWidth="703" frameHeight="648"/>
26+
<SubTexture name="GF Dancing Beat blue0021" x="754" y="2085" width="699" height="638" frameX="-2" frameY="-10" frameWidth="703" frameHeight="648"/>
27+
<SubTexture name="GF Dancing Beat blue0022" x="1508" y="2085" width="699" height="643" frameX="-2" frameY="-5" frameWidth="703" frameHeight="648"/>
28+
<SubTexture name="GF Dancing Beat blue0023" x="1508" y="2085" width="699" height="643" frameX="-2" frameY="-5" frameWidth="703" frameHeight="648"/>
29+
<SubTexture name="GF Dancing Beat blue0024" x="1508" y="2085" width="699" height="643" frameX="-2" frameY="-5" frameWidth="703" frameHeight="648"/>
30+
<SubTexture name="GF Dancing Beat blue0025" x="2262" y="2085" width="699" height="642" frameX="-2" frameY="-6" frameWidth="703" frameHeight="648"/>
31+
<SubTexture name="GF Dancing Beat blue0026" x="2262" y="2085" width="699" height="642" frameX="-2" frameY="-6" frameWidth="703" frameHeight="648"/>
32+
<SubTexture name="GF Dancing Beat blue0027" x="2262" y="2085" width="699" height="642" frameX="-2" frameY="-6" frameWidth="703" frameHeight="648"/>
33+
<SubTexture name="GF Dancing Beat blue0028" x="3016" y="2085" width="699" height="642" frameX="-2" frameY="-6" frameWidth="703" frameHeight="648"/>
34+
<SubTexture name="GF Dancing Beat blue0029" x="3016" y="2085" width="699" height="642" frameX="-2" frameY="-6" frameWidth="703" frameHeight="648"/>
35+
</TextureAtlas>

‎example_mods/FNF Test Mod/images/logoBumpin.png

831 KB
Loading

‎example_mods/FNF Test Mod/images/logoBumpin.xml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<TextureAtlas imagePath="logoBumpin.png">
3+
<!-- Created with Adobe Animate version 21.0.6.41649 -->
4+
<!-- http://www.adobe.com/products/animate.html -->
5+
<SubTexture name="logo bumpin0000" x="10" y="10" width="808" height="440" frameX="-19" frameY="-9" frameWidth="849" frameHeight="463"/>
6+
<SubTexture name="logo bumpin0001" x="833" y="10" width="849" height="463"/>
7+
<SubTexture name="logo bumpin0002" x="1697" y="10" width="839" height="458" frameX="-5" frameY="-2" frameWidth="849" frameHeight="463"/>
8+
<SubTexture name="logo bumpin0003" x="2551" y="10" width="832" height="453" frameX="-8" frameY="-4" frameWidth="849" frameHeight="463"/>
9+
<SubTexture name="logo bumpin0004" x="10" y="488" width="826" height="450" frameX="-11" frameY="-5" frameWidth="849" frameHeight="463"/>
10+
<SubTexture name="logo bumpin0005" x="851" y="488" width="822" height="448" frameX="-13" frameY="-6" frameWidth="849" frameHeight="463"/>
11+
<SubTexture name="logo bumpin0006" x="1688" y="488" width="820" height="447" frameX="-14" frameY="-6" frameWidth="849" frameHeight="463"/>
12+
<SubTexture name="logo bumpin0007" x="2523" y="488" width="819" height="446" frameX="-14" frameY="-7" frameWidth="849" frameHeight="463"/>
13+
<SubTexture name="logo bumpin0008" x="10" y="953" width="819" height="446" frameX="-14" frameY="-7" frameWidth="849" frameHeight="463"/>
14+
<SubTexture name="logo bumpin0009" x="844" y="953" width="819" height="446" frameX="-14" frameY="-7" frameWidth="849" frameHeight="463"/>
15+
<SubTexture name="logo bumpin0010" x="844" y="953" width="819" height="446" frameX="-14" frameY="-7" frameWidth="849" frameHeight="463"/>
16+
<SubTexture name="logo bumpin0011" x="844" y="953" width="819" height="446" frameX="-14" frameY="-7" frameWidth="849" frameHeight="463"/>
17+
<SubTexture name="logo bumpin0012" x="844" y="953" width="819" height="446" frameX="-14" frameY="-7" frameWidth="849" frameHeight="463"/>
18+
<SubTexture name="logo bumpin0013" x="844" y="953" width="819" height="446" frameX="-14" frameY="-7" frameWidth="849" frameHeight="463"/>
19+
<SubTexture name="logo bumpin0014" x="844" y="953" width="819" height="446" frameX="-14" frameY="-7" frameWidth="849" frameHeight="463"/>
20+
</TextureAtlas>

‎example_mods/FNF Test Mod/images/newgrounds_logo.png

56.4 KB
Loading

‎example_mods/FNF Test Mod/images/titleEnter.png

1.38 MB
Loading

0 commit comments

Comments
 (0)