Skip to content

Commit 195198e

Browse files
committed
new update 1.6.2 :)))
1 parent e34bbd8 commit 195198e

Some content is hidden

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

81 files changed

+5809
-2667
lines changed

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ build.hxml
77
vscode-project.hxml
88
hxformat.json
99
crash_handler/src
10-
CHANGELOG.md
10+
CHANGELOG.md
11+
build-tools/

Project.xml

+9-4
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,19 @@
4848
<define name="PRELOAD_ALL" unless="web" />
4949
<define name="NO_PRELOAD_ALL" unless="PRELOAD_ALL"/>
5050

51+
<!--bruh-->
52+
<error value="lmao no mac support" if="mac"/>
53+
5154
<!--CDEV Engine's define names-->
5255
<define name="ALLOW_MODS"/><!-- if="desktop"-->
53-
<define name="CRASH_HANDLER" if="desktop"/>
56+
<define name="CRASH_HANDLER" if="windows || android"/>
5457
<define name="USE_VIDEOS" if="cpp"/>
55-
<haxelib name="DISCORD_RPC" if="cpp"/>
58+
<haxelib name="DISCORD_RPC" if="desktop"/>
5659

5760
<section if="USE_VIDEOS">
5861
<haxelib name="hxCodec"/>
5962
</section>
60-
63+
6164
<section if="PRELOAD_ALL">
6265
<library name="songs" preload="true" />
6366
<library name="shared" preload="true" />
@@ -83,7 +86,7 @@
8386
<library name="week6" preload="false" />
8487
<library name="week7" preload="false" />
8588
</section>
86-
89+
8790
<assets path="assets/songs" library="songs" exclude="*.ogg" if="web"/>
8891
<assets path="assets/songs" library="songs" exclude="*.mp3" unless="web"/>
8992
<assets path="assets/shared" library="shared" exclude="*.ogg" if="web"/>
@@ -118,6 +121,7 @@
118121
NOT USING A DIRECT THING TO THE ASSET!!!
119122
-->
120123
<assets path="assets/fonts" embed='true'/>
124+
121125
<!-- _______________________________ Libraries ______________________________ -->
122126

123127
<haxelib name="flixel" />
@@ -131,6 +135,7 @@
131135
<haxelib name="flixel-ui" />
132136
<haxelib name="faxe" if='switch'/>
133137
<haxelib name="polymod"/>
138+
<haxelib name="extension-androidtools" if="android"/>
134139
<!--<haxelib name="linc_luajit" if="ALLOW_LUA"/>-->
135140
<haxelib name="discord_rpc" if="desktop"/>
136141
<!--<haxelib name="linc_luajit" if="windows"/>-->

art/flashFiles/stupid looking ui.fla

5.69 KB
Binary file not shown.

assets/preload/data/texts/inGameText.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Friday Night Funkin'--The full ass game.
33
Press F11 to enable fullscreen mode!
44
If you find a bug in this engine, please report--the bug on my discord or my twitter (x) dm!
55
Funkin Forever.
6-
You're currently playing--CDEV-Engine v1.6.1h
6+
You're currently playing--CDEV Engine v1.6.2
77
Does anyone actually read this?
88
DARK MODE.--YES.
99
Rewritten Inputs!
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
--force enable your mod by entering the mod name here.
2+
--any line starting with '--' is a comment.
3+
--uncomment this line below to override the saved mod list for the player
4+
--OVERRIDE_MOD_LIST

assets/preload/images/core5570r.png

1.87 MB
Loading
-5.86 KB
Loading

assets/preload/sounds/volumeDown.ogg

6.84 KB
Binary file not shown.

assets/preload/sounds/volumeUp.ogg

6.03 KB
Binary file not shown.
224 KB
Loading

assets/shared/images/ui/add.png

2.13 KB
Loading

build.hxml

-6
This file was deleted.

docs/index.html

+5-1
Original file line numberDiff line numberDiff line change
@@ -604,17 +604,21 @@ <h2>ClassName</h2>
604604
tabs[i].classList.remove("active-tab");
605605
}
606606
document.getElementById(tabId).classList.add("active-tab");
607+
document.documentElement.scrollTop = 0;
607608
}
608609

610+
609611
document.addEventListener('DOMContentLoaded', (e) => {
610612
const links = document.querySelectorAll("#sidebar > ul > li > a")
611613
for (let i of links) {
612614
let target = i.href.split('#')[1]
613615
i.addEventListener('click', (e) => {
614-
showTab(target)
616+
e.preventDefault();
617+
showTab(target);
615618
})
616619
}
617620
})
621+
618622
</script>
619623
</body>
620624

docs/style.css

+5-3
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,15 @@ body, html {
2121

2222
.tab-content {
2323
display: none;
24-
font-family: "Ubuntu";
25-
max-width: 85%;
26-
font-size: 14px;
24+
height: 0%;
2725
}
2826

2927
.active-tab {
28+
height: 100%;
3029
display: block;
30+
font-family: "Ubuntu";
31+
max-width: 85%;
32+
font-size: 14px;
3133
}
3234

3335
table {

example_mods/Funkin Mod/credits.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
--Put your custom credits here
22
--Credits should be on this format: Name::Desc::Color::Link
33
--Credits title should be on this format: Name
4-
--"Color" should be on hex format (ex: 0xFF000000, rgba)
4+
--"Color" should be on hex format (ex: 0xFF000000, rgba)
5+
Funkin Mod
6+
core5570r::Composer of "game-test"::0xFF1090FF::https://youtube.com/c/@core5570r
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
function onStateLeaved(){
2+
// just remove the video when the player switched states
3+
if (public["cutscene_video"] != null){
4+
public["cutscene_video"].stop();
5+
public["cutscene_video"].dispose();
6+
}
7+
}

example_mods/Funkin Mod/data/charts/game-test/ha.hx example_mods/Funkin Mod/data/charts/game-test/SongScript.hx

+26-17
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
function create(){
22
PlayState.boyfriend.charCamPos = [230,-50];
33
PlayState.dad.charCamPos[0] += 200;
4-
CDevConfig.offset = 0; // say goodbye to your offset
54
trace("Loaded");
65
}
76

@@ -17,7 +16,7 @@ function postCreate(){
1716
//text.cameras = [PlayState.camHUD];
1817
text.scrollFactor.set();
1918
text.screenCenter();
20-
text.y += 250;
19+
text.y += 200;
2120
add(text);
2221
text.borderSize = 4;
2322
text.visible = false;
@@ -31,18 +30,7 @@ function onNoteMiss(a){
3130
}
3231
}
3332
function update(b){
34-
if (beat > 68 && beat < 100)
35-
{
36-
if (controls.LEFT_P || controls.DOWN_P){
37-
FlxG.sound.play(Paths.sound("kick"), 0.7);
38-
PlayState.boyfriend.playAnim((controls.LEFT_P ? "singLEFT" : "singDOWN"), true);
39-
}
4033

41-
if (controls.UP_P || controls.RIGHT_P){
42-
FlxG.sound.play(Paths.sound("snare"), 0.7);
43-
PlayState.boyfriend.playAnim((controls.UP_P ? "singUP" : "singRIGHT"), true);
44-
}
45-
}
4634
}
4735
function beatHit(b){
4836
beat = b;
@@ -53,26 +41,42 @@ function beatHit(b){
5341
}
5442
}
5543
if (b == 68 || b == 100){
56-
PlayState.camHUD.visible = !PlayState.camHUD.visible;
5744
text.visible = !text.visible;
58-
if (PlayState.camHUD.visible){
45+
if (b == 100){
46+
PlayState.camHUD.alpha = 1;
5947
PlayState.defaultCamZoom -= 0.2;
6048
}else{
49+
PlayState.camHUD.alpha = 0.7;
6150
PlayState.defaultCamZoom += 0.2;
6251
}
6352
}
6453

54+
if (b == 98){
55+
var i = 0;
56+
for (s in PlayState.playerStrums.members){
57+
FlxTween.tween(s, {y:(CDevConfig.saveData.downscroll ? FlxG.height - 160 : 70), alpha:1}, 1,{startDelay:0.12*i, ease:FlxEase.backInOut});
58+
i++;
59+
}
60+
}
61+
6562
if (beat == 68){
6663
missed=false;
67-
text.text = "Hidden mode! Follow the opponent's movement!";
64+
text.text = "Hidden mode! Follow the opponent's arrows!";
6865
text.screenCenter();
6966
text.y += 250;
67+
68+
var i = 0;
69+
for (s in PlayState.playerStrums.members){
70+
FlxTween.tween(s, {y:(CDevConfig.saveData.downscroll ? FlxG.height+100 : -100), alpha:0.0001}, 1,{startDelay:0.12*i, ease:FlxEase.backInOut});
71+
i++;
72+
}
7073
}
7174
if (beat == 84){
7275
missed=false;
73-
text.text = "Hidden mode! Follow the opponent's movement!";
76+
text.text = "Hidden mode! Follow the opponent's arrows!";
7477
text.screenCenter();
7578
text.y += 250;
79+
7680
}
7781

7882
if (beat == 83){
@@ -92,6 +96,11 @@ function beatHit(b){
9296
}
9397

9498
if (b == 172){
99+
var i = 0;
100+
for (s in PlayState.p2Strums.members){
101+
FlxTween.tween(s, {y:(CDevConfig.saveData.downscroll ? FlxG.height+100 : -100), alpha:0.0001}, 1,{startDelay:0.12*i, ease:FlxEase.backInOut});
102+
i++;
103+
}
95104
FlxTween.tween(PlayState.dad,{alpha:0}, (Conductor.crochet)/1000, {ease:FlxEase.circInOut});
96105
FlxTween.tween(PlayState.dad.scale,{x:0,y:0}, (Conductor.crochet)/1000, {ease:FlxEase.circInOut});
97106
FlxG.sound.play(Paths.sound("gone.ogg"), 0.6);

0 commit comments

Comments
 (0)