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

Merge branch 'main' of https://github.com/FNF-CNE-Devs/CodenameEngine-Dev

Browse Source
This commit is contained in:
lunarcleint
2023-09-26 16:45:02 -07:00
parent 74f430154a b245b8476a
commit 68f755dbe7
4 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/editors/character/CharacterEditor.hx
+2 -2
View File
@@ -11,7 +11,7 @@ import flixel.input.keyboard.FlxKey;
import funkin.game.Character;
class CharacterEditor extends UIState {
var __character:String;
static var __character:String;
public var character:Character;
public var ghosts:CharacterGhostsHandler;
@@ -45,7 +45,7 @@ class CharacterEditor extends UIState {
public function new(character:String) {
super();
__character = character;
if (character != null) __character = character;
}
public override function create() {
source/funkin/editors/charter/Charter.hx
+9 -7
View File
@@ -20,9 +20,9 @@ import funkin.editors.ui.UIState;
import openfl.net.FileReference;
class Charter extends UIState {
var __song:String;
var __diff:String;
var __reload:Bool;
static var __song:String;
static var __diff:String;
static var __reload:Bool;
var chart(get, null):ChartData;
private function get_chart()
@@ -86,9 +86,11 @@ class Charter extends UIState {
public function new(song:String, diff:String, reload:Bool = true) {
super();
__song = song;
__diff = diff;
__reload = reload;
if (song != null) {
__song = song;
__diff = diff;
__reload = reload;
}
}
public override function create() {
@@ -230,7 +232,7 @@ class Charter extends UIState {
onSelect: _note_selectall
},
{
label: "Select maeasure",
label: "Select measure",
keybind: [CONTROL, SHIFT, A],
onSelect: _note_selectmeasure
},
source/funkin/game/NoteGroup.hx
+8 -3
View File
@@ -8,6 +8,11 @@ class NoteGroup extends FlxTypedGroup<Note> {
var i:Int = 0;
var __currentlyLooping:Bool = false;
/**
* How many ms it should show a note before it should be hit
**/
public var limit:Float = 1500;
/**
* Preallocates the members array with nulls, but if theres anything in the array already it clears it
**/
@@ -36,7 +41,7 @@ class NoteGroup extends FlxTypedGroup<Note> {
if (__loopSprite == null || !__loopSprite.exists || !__loopSprite.active) {
continue;
}
if (__loopSprite.strumTime - Conductor.songPosition > 1500)
if (__loopSprite.strumTime - Conductor.songPosition > limit)
break;
__loopSprite.update(elapsed);
}
@@ -55,7 +60,7 @@ class NoteGroup extends FlxTypedGroup<Note> {
__loopSprite = members[i--];
if (__loopSprite == null || !__loopSprite.exists || !__loopSprite.visible)
continue;
if (__loopSprite.strumTime - Conductor.songPosition > 1500) break;
if (__loopSprite.strumTime - Conductor.songPosition > limit) break;
__loopSprite.draw();
}
__currentlyLooping = oldCur;
@@ -74,7 +79,7 @@ class NoteGroup extends FlxTypedGroup<Note> {
__loopSprite = members[i--];
if (__loopSprite == null || !__loopSprite.exists)
continue;
if (__loopSprite.strumTime - Conductor.songPosition > 1500) break;
if (__loopSprite.strumTime - Conductor.songPosition > limit) break;
noteFunc(__loopSprite);
}
__currentlyLooping = oldCur;
source/funkin/game/PlayState.hx
+2 -2
View File
@@ -565,8 +565,8 @@ class PlayState extends MusicBeatState
for(folder in scriptsFolders) {
for(file in Paths.getFolderContent(folder, true, fromMods ? MODS : BOTH)) {
if (folder == 'data/charts/')
Logs.trace('data/charts/ is deprecrated and will be removed in the future. Please move script $file.hx to songs/', WARNING, DARKYELLOW);
Logs.trace('data/charts/ is deprecrated and will be removed in the future. Please move script $file to songs/', WARNING, DARKYELLOW);
addScript(file);
}
}