gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fucks

Browse Source
This commit is contained in:
Yoshman29
2023-01-13 22:12:54 +01:00
parent ed7934b29e
commit e30c392ea9
6 changed files with 15998 additions and 4070 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/images/characters/gf/Animation.json
+15937 -4032
View File
File diff suppressed because it is too large Load Diff
assets/images/characters/gf/spritemap1.json
+45 -34
View File
@@ -1,46 +1,57 @@
{"ATLAS": {"SPRITES":[
{"SPRITE" : {"name": "0000","x":729,"y":358,"w":287,"h":360,"rotated": false}},
{"SPRITE" : {"name": "0001","x":420,"y":358,"w":309,"h":375,"rotated": false}},
{"SPRITE" : {"name": "0000","x":1603,"y":590,"w":287,"h":360,"rotated": false}},
{"SPRITE" : {"name": "0001","x":1294,"y":261,"w":309,"h":375,"rotated": false}},
{"SPRITE" : {"name": "0002","x":0,"y":0,"w":420,"h":359,"rotated": false}},
{"SPRITE" : {"name": "0003","x":420,"y":0,"w":406,"h":358,"rotated": false}},
{"SPRITE" : {"name": "0004","x":0,"y":359,"w":336,"h":165,"rotated": false}},
{"SPRITE" : {"name": "0005","x":934,"y":217,"w":90,"h":103,"rotated": false}},
{"SPRITE" : {"name": "0006","x":0,"y":524,"w":215,"h":242,"rotated": false}},
{"SPRITE" : {"name": "0007","x":729,"y":718,"w":213,"h":240,"rotated": false}},
{"SPRITE" : {"name": "0008","x":826,"y":0,"w":191,"h":120,"rotated": false}},
{"SPRITE" : {"name": "0009","x":565,"y":733,"w":90,"h":151,"rotated": false}},
{"SPRITE" : {"name": "0010","x":215,"y":733,"w":258,"h":124,"rotated": false}},
{"SPRITE" : {"name": "0011","x":372,"y":882,"w":122,"h":67,"rotated": false}},
{"SPRITE" : {"name": "0012","x":826,"y":217,"w":108,"h":126,"rotated": false}},
{"SPRITE" : {"name": "0013","x":215,"y":524,"w":103,"h":149,"rotated": false}},
{"SPRITE" : {"name": "0014","x":0,"y":766,"w":95,"h":130,"rotated": false}},
{"SPRITE" : {"name": "0015","x":1017,"y":0,"w":1,"h":4,"rotated": false}},
{"SPRITE" : {"name": "0016","x":942,"y":823,"w":67,"h":70,"rotated": false}},
{"SPRITE" : {"name": "0017","x":0,"y":924,"w":122,"h":62,"rotated": false}},
{"SPRITE" : {"name": "0018","x":336,"y":359,"w":64,"h":106,"rotated": false}},
{"SPRITE" : {"name": "0019","x":655,"y":733,"w":55,"h":112,"rotated": false}},
{"SPRITE" : {"name": "0020","x":274,"y":857,"w":98,"h":118,"rotated": false}},
{"SPRITE" : {"name": "0021","x":942,"y":718,"w":59,"h":105,"rotated": false}},
{"SPRITE" : {"name": "0022","x":318,"y":524,"w":87,"h":160,"rotated": false}},
{"SPRITE" : {"name": "0023","x":473,"y":733,"w":92,"h":149,"rotated": false}},
{"SPRITE" : {"name": "0024","x":215,"y":684,"w":104,"h":42,"rotated": false}},
{"SPRITE" : {"name": "0025","x":934,"y":340,"w":73,"h":18,"rotated": false}},
{"SPRITE" : {"name": "0026","x":336,"y":465,"w":72,"h":19,"rotated": false}},
{"SPRITE" : {"name": "0027","x":336,"y":484,"w":72,"h":18,"rotated": false}},
{"SPRITE" : {"name": "0028","x":934,"y":320,"w":73,"h":20,"rotated": false}},
{"SPRITE" : {"name": "0029","x":95,"y":857,"w":179,"h":67,"rotated": false}},
{"SPRITE" : {"name": "0030","x":95,"y":766,"w":118,"h":75,"rotated": false}},
{"SPRITE" : {"name": "0031","x":494,"y":884,"w":128,"h":61,"rotated": false}},
{"SPRITE" : {"name": "0032","x":122,"y":924,"w":124,"h":58,"rotated": false}},
{"SPRITE" : {"name": "0033","x":826,"y":120,"w":174,"h":97,"rotated": false}},
{"SPRITE" : {"name": "0034","x":826,"y":343,"w":82,"h":14,"rotated": false}}
{"SPRITE" : {"name": "0004","x":0,"y":627,"w":336,"h":165,"rotated": false}},
{"SPRITE" : {"name": "0005","x":1201,"y":501,"w":90,"h":103,"rotated": false}},
{"SPRITE" : {"name": "0006","x":1799,"y":0,"w":215,"h":242,"rotated": false}},
{"SPRITE" : {"name": "0007","x":1201,"y":636,"w":213,"h":240,"rotated": false}},
{"SPRITE" : {"name": "0008","x":594,"y":648,"w":191,"h":120,"rotated": false}},
{"SPRITE" : {"name": "0009","x":1890,"y":739,"w":90,"h":151,"rotated": false}},
{"SPRITE" : {"name": "0010","x":336,"y":648,"w":258,"h":124,"rotated": false}},
{"SPRITE" : {"name": "0011","x":221,"y":839,"w":122,"h":67,"rotated": false}},
{"SPRITE" : {"name": "0012","x":1414,"y":733,"w":108,"h":126,"rotated": false}},
{"SPRITE" : {"name": "0013","x":1890,"y":590,"w":103,"h":149,"rotated": false}},
{"SPRITE" : {"name": "0014","x":594,"y":768,"w":95,"h":130,"rotated": false}},
{"SPRITE" : {"name": "0015","x":2014,"y":0,"w":1,"h":4,"rotated": false}},
{"SPRITE" : {"name": "0016","x":826,"y":245,"w":468,"h":256,"rotated": false}},
{"SPRITE" : {"name": "0017","x":826,"y":0,"w":510,"h":245,"rotated": false}},
{"SPRITE" : {"name": "0018","x":1336,"y":0,"w":463,"h":261,"rotated": false}},
{"SPRITE" : {"name": "0019","x":0,"y":359,"w":418,"h":268,"rotated": false}},
{"SPRITE" : {"name": "0020","x":814,"y":501,"w":387,"h":271,"rotated": false}},
{"SPRITE" : {"name": "0021","x":420,"y":358,"w":394,"h":290,"rotated": false}},
{"SPRITE" : {"name": "0022","x":1603,"y":261,"w":352,"h":329,"rotated": false}},
{"SPRITE" : {"name": "0023","x":1522,"y":839,"w":67,"h":70,"rotated": false}},
{"SPRITE" : {"name": "0024","x":471,"y":839,"w":122,"h":62,"rotated": false}},
{"SPRITE" : {"name": "0025","x":1522,"y":733,"w":64,"h":106,"rotated": false}},
{"SPRITE" : {"name": "0026","x":1993,"y":551,"w":55,"h":112,"rotated": false}},
{"SPRITE" : {"name": "0027","x":689,"y":768,"w":98,"h":118,"rotated": false}},
{"SPRITE" : {"name": "0028","x":1980,"y":739,"w":59,"h":105,"rotated": false}},
{"SPRITE" : {"name": "0029","x":1955,"y":242,"w":87,"h":160,"rotated": false}},
{"SPRITE" : {"name": "0030","x":1955,"y":402,"w":92,"h":149,"rotated": false}},
{"SPRITE" : {"name": "0031","x":221,"y":792,"w":104,"h":42,"rotated": false}},
{"SPRITE" : {"name": "0032","x":1871,"y":242,"w":73,"h":18,"rotated": false}},
{"SPRITE" : {"name": "0033","x":1799,"y":242,"w":72,"h":19,"rotated": false}},
{"SPRITE" : {"name": "0034","x":336,"y":627,"w":72,"h":18,"rotated": false}},
{"SPRITE" : {"name": "0035","x":1201,"y":604,"w":73,"h":20,"rotated": false}},
{"SPRITE" : {"name": "0036","x":336,"y":772,"w":179,"h":67,"rotated": false}},
{"SPRITE" : {"name": "0037","x":0,"y":792,"w":118,"h":75,"rotated": false}},
{"SPRITE" : {"name": "0038","x":343,"y":839,"w":128,"h":61,"rotated": false}},
{"SPRITE" : {"name": "0039","x":787,"y":855,"w":124,"h":58,"rotated": false}},
{"SPRITE" : {"name": "0040","x":787,"y":772,"w":117,"h":83,"rotated": false}},
{"SPRITE" : {"name": "0041","x":904,"y":772,"w":117,"h":83,"rotated": false}},
{"SPRITE" : {"name": "0042","x":118,"y":792,"w":103,"h":83,"rotated": false}},
{"SPRITE" : {"name": "0043","x":1021,"y":772,"w":117,"h":83,"rotated": false}},
{"SPRITE" : {"name": "0044","x":1414,"y":636,"w":174,"h":97,"rotated": false}},
{"SPRITE" : {"name": "0045","x":911,"y":855,"w":82,"h":14,"rotated": false}}
]},
"meta": {
"app": "Adobe Animate",
"version": "21.0.1.37179",
"image": "spritemap1.png",
"format": "RGBA8888",
"size": {"w":1024,"h":986},
"size": {"w":2048,"h":950},
"resolution": "1"
}
}
assets/images/characters/gf/spritemap1.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 164 KiB

After

Width:  |  Height:  |  Size: 280 KiB

buildnumber.txt
+1 -1
View File
@@ -1 +1 @@
2044
2051
source/funkin/game/PlayState.hx
+6 -3
View File
@@ -815,10 +815,11 @@ class PlayState extends MusicBeatState
scripts.call("destroy");
super.destroy();
FlxDestroyUtil.destroy(scripts);
instance = null;
if (vocals != null) {
vocals.destroy();
@:privateAccess {
FlxG.sound.destroySound(inst);
FlxG.sound.destroySound(vocals);
}
instance = null;
}
public function generateNotes(songData:SwagSong) {
@@ -905,6 +906,8 @@ class PlayState extends MusicBeatState
vocals.loadEmbedded(Paths.voices(PlayState.SONG.song));
FlxG.sound.list.add(vocals);
inst.persist = vocals.persist = false;
notes = new NoteGroup();
add(notes);
source/funkin/system/FramerateField.hx
+9
View File
@@ -10,6 +10,8 @@ import openfl.system.System;
import openfl.display.Application;
import flixel.math.FlxMath;
import flixel.FlxG;
import openfl.display._internal.stats.Context3DStats;
import openfl.display._internal.stats.DrawCallContext;
class FramerateField extends TextField {
public var showFPS:Bool = true;
@@ -100,6 +102,13 @@ class FramerateField extends TextField {
text.push(Std.string(e));
}
}
#if (gl_stats && !disable_cffi && (!html5 || !canvas))
text.push('=== STATS ===');
text.push("totalDC: " + Context3DStats.totalDrawCalls());
text.push("stageDC: " + Context3DStats.contextDrawCalls(DrawCallContext.STAGE));
text.push("stage3DDC: " + Context3DStats.contextDrawCalls(DrawCallContext.STAGE3D));
#end
}
this.text = text.join("\n");
}