Skip to content

Charter/Editor additions and fixes #793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 11 commits into
base: main
Choose a base branch
from
Draft

Charter/Editor additions and fixes #793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5a1fc57
camera highlights again
TheZoroForce240 Aug 15, 2025
5325145
Merge remote-tracking branch 'upstream/main' into charterstuffs
TheZoroForce240 Oct 6, 2025
5ac0c8b
option to mute all hitsounds
TheZoroForce240 Oct 6, 2025
b4af2da
context menus inside context menus and wip sliders in context menu
TheZoroForce240 Oct 7, 2025
e25d706
wip volume slider stuff
TheZoroForce240 Oct 12, 2025
fffc404
strumline preview fix with resizable editors
TheZoroForce240 Oct 14, 2025
d17de87
more slider stuff
TheZoroForce240 Oct 14, 2025
a672239
editor sfx option should now actually work for everything
TheZoroForce240 Oct 15, 2025
27a0291
fixed strumline vocals volume, fixed note type option keybinds and mo…
TheZoroForce240 Oct 15, 2025
15afdf4
fix for saving difficulty specific meta json
TheZoroForce240 Oct 15, 2025
e58e9ef
some extra misc changes
TheZoroForce240 Oct 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified assets/images/editors/ui/context-icons.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 8 additions & 3 deletions assets/languages/en/Editors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@
<str id="resetZoom">Reset Zoom</str>
<str id="showSectionsSeparator">Show Sections Separator</str>
<str id="showBeatsSeparator">Show Beats Separator</str>
<str id="showCameraHighlights">Show Camera Highlights</str>
<str id="rainbowWaveforms">Rainbow Waveforms</str>
<str id="lowDetailWaveforms">Low Detail Waveforms</str>
<str id="scrollLeft">Scroll Left</str>
Expand All @@ -236,8 +237,9 @@
<str id="goEnd">Go forward to the end</str> <!-- used to be "Go to the end" -->
<str id="addOpponentCamera">Add camera on Opponent</str>
<str id="addPlayerCamera">Add camera on Player</str>
<str id="muteInst">Mute instrumental</str>
<str id="muteVoices">Mute voices</str>
<str id="inst">Instrumental</str>
<str id="voices">Voices</str>
<str id="hitsounds">Hitsounds</str>
</group>

<group name="BookmarkMenu" prefix="bookmarks.">
Expand All @@ -250,6 +252,7 @@
<str id="editBookmarkListTitle">Bookmark List</str>
<str id="editBookmarksTitle">Edit Bookmarks</str>
<str id="newBookmarkName">New Bookmark</str>
<str id="bookmarkList">Bookmark List</str>
</group>

<str id="topBar.note">Note</str>
Expand All @@ -258,6 +261,7 @@
<str id="subtractSustainLength">Subtract sustain length</str>
<str id="selectAll">Select all</str>
<str id="selectMeasure">Select measure</str>
<str id="noteTypesList">Note Types List</str>
<str id="editNoteTypesList">Edit Note Types List</str>
</group>
<str id="topBar.snap">Snap</str>
Expand Down Expand Up @@ -308,8 +312,9 @@
<group name="StrumlineOptions" prefix="strumLine.">
<str id="button-name">Options ↓</str>

<str id="waveforms">Waveforms</str>
<str id="hitsounds">Hitsounds</str>
<str id="muteVocals">Mute Vocals</str>
<str id="vocals">Vocals</str>
<str id="edit">Edit</str>
<str id="delete">Delete</str>

Expand Down
10 changes: 7 additions & 3 deletions source/funkin/backend/chart/Chart.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,9 +278,13 @@ class Chart {
var filteredChart = filterChartForSaving(chart, saveSettings.saveMetaInChart, saveSettings.saveLocalEvents, saveSettings.saveGlobalEvents && saveSettings.seperateGlobalEvents != true);

#if sys
var songPath = saveSettings.songFolder == null ? 'songs/${chart.meta.name}' : saveSettings.songFolder, variantSuffix = variant != null && variant != "" ? '-$variant' : "";
var metaPath = 'meta$variantSuffix.json', prettyPrint = saveSettings.prettyPrint == true ? Flags.JSON_PRETTY_PRINT : null, temp:String;
if ((temp = Paths.assetsTree.getPath('assets/$songPath/$metaPath')) != null) {
var songPath = saveSettings.songFolder == null ? 'songs/${chart.meta.name}' : saveSettings.songFolder, variantSuffix = variant != null && variant != "" ? '-$variant' : "", difficultySuffix = difficulty != null && difficulty != "" ? '-$difficulty' : "";
var metaPath = 'meta$variantSuffix.json', altMetaPath = 'meta${variantSuffix}${difficultySuffix}.json', prettyPrint = saveSettings.prettyPrint == true ? Flags.JSON_PRETTY_PRINT : null, temp:String;
if ((temp = Paths.assetsTree.getPath('assets/$songPath/$altMetaPath')) != null) { //check for difficulty specific
songPath = temp.substr(0, temp.length - altMetaPath.length - 1);
metaPath = temp;
}
else if ((temp = Paths.assetsTree.getPath('assets/$songPath/$metaPath')) != null) {
songPath = temp.substr(0, temp.length - metaPath.length - 1);
metaPath = temp;
}
Expand Down
4 changes: 2 additions & 2 deletions source/funkin/editors/character/CharacterAnimButton.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,12 +449,12 @@ class CharacterAnimButton extends UIButton {

public function toggleGhost() {
if (valid && parent.ghosts.indexOf(anim) == -1) {
FlxG.sound.play(Paths.sound(Flags.DEFAULT_CHARACTER_GHOSTENABLE_SOUND));
UIState.playEditorSound(Flags.DEFAULT_CHARACTER_GHOSTENABLE_SOUND);
parent.ghosts.push(anim);
ghostIcon.animation.play("alive", true);
ghostIcon.color = 0xFFFFFFFF;
} else {
FlxG.sound.play(Paths.sound(Flags.DEFAULT_CHARACTER_GHOSTDISABLE_SOUND));
UIState.playEditorSound(Flags.DEFAULT_CHARACTER_GHOSTDISABLE_SOUND);
parent.ghosts.remove(anim);
ghostIcon.animation.play("dead", true);
ghostIcon.color = 0xFFADADAD;
Expand Down
2 changes: 1 addition & 1 deletion source/funkin/editors/character/CharacterAnimsWindow.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class CharacterAnimsWindow extends UIButtonList<CharacterAnimButton> {
displayAnimsFramesList.remove(name);

public function deleteAnimation(button:CharacterAnimButton, addToUndo:Bool = true) {
FlxG.sound.play(Paths.sound(Flags.DEFAULT_EDITOR_DELETE_SOUND));
UIState.playEditorSound(Flags.DEFAULT_EDITOR_DELETE_SOUND);
if (buttons.members.length <= 1) return;
if (character.getAnimName() == button.anim)
@:privateAccess CharacterEditor.instance._animation_down(null);
Expand Down
8 changes: 4 additions & 4 deletions source/funkin/editors/character/CharacterEditor.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ class CharacterEditor extends UIState {

function _file_save(_) {
#if sys
FlxG.sound.play(Paths.sound('editors/save'));
UIState.playEditorSound(Flags.DEFAULT_EDITOR_SAVE_SOUND);
CoolUtil.safeSaveFile(
'${Paths.getAssetsRoot()}/data/characters/${character.curCharacter}.xml',
buildCharacter()
Expand All @@ -465,7 +465,7 @@ class CharacterEditor extends UIState {
}

function _file_saveas(_) {
FlxG.sound.play(Paths.sound('editors/save'));
UIState.playEditorSound(Flags.DEFAULT_EDITOR_SAVE_SOUND);
openSubState(new SaveSubstate(buildCharacter(), {
defaultSaveFile: '${character.curCharacter}.xml'
}));
Expand Down Expand Up @@ -499,7 +499,7 @@ class CharacterEditor extends UIState {
}

function _undo(undo:CharacterEditorChange) {
FlxG.sound.play(Paths.sound(Flags.DEFAULT_EDITOR_UNDO_SOUND));
UIState.playEditorSound(Flags.DEFAULT_EDITOR_UNDO_SOUND);
switch (undo) {
case null: // do nothing
case CCharEditPosition(oldPos, newPos):
Expand Down Expand Up @@ -570,7 +570,7 @@ class CharacterEditor extends UIState {
}

function _redo(redo:CharacterEditorChange) {
FlxG.sound.play(Paths.sound(Flags.DEFAULT_EDITOR_REDO_SOUND));
UIState.playEditorSound(Flags.DEFAULT_EDITOR_REDO_SOUND);
switch (redo) {
case null: // do nothing
case CCharEditPosition(oldPos, newPos):
Expand Down
Loading