Commit Graph
582 Commits
Author SHA1 Message Date
Frakits 4ef946f74a Merge remote-tracking branch 'origin/main' 2025-08-01 20:33:15 +03:00
Frakits d7f1dc46a4 gfd 2025-08-01 20:33:07 +03:00
Ralty 19e5c2c85e Attempt to fix duplicating events 2025-08-01 18:17:49 +07:00
Ralty 581d61c0f9 Merge PR #2 2025-08-01 17:35:32 +07:00
Kolziak 85fbf9ffef returned the thing 2025-07-31 20:41:17 +02:00
Frakits 40eafeb7ab who the fuck choose Q and E istg 2025-07-29 20:18:50 +03:00
Ralty b1fa5775c4 Merge branch 'options-rewrite' 2025-07-29 19:04:48 +07:00
RaltyandGitHub 4ef1e7d835 Merge pull request #12 keybinds for camera movements
keybinds for camera movements
2025-07-28 19:13:51 +07:00
KolzeandGitHub d9bc14a517 fixed event icons not updating after changing the character 2025-07-27 23:12:52 +02:00
Kolziak 756026745b Revert "fixed event icons not updating after changing the character"
This reverts commit c936fa7f45.
2025-07-27 23:11:11 +02:00
KolzeandGitHub c936fa7f45 fixed event icons not updating after changing the character 2025-07-27 23:10:16 +02:00
Ralty a3a08d2f42 Merge branch 'main' into options-rewrite 2025-07-27 19:47:55 +07:00
KolzeandGitHub 0fa69561da Merge branch 'CodenameCrew:main' into patch-1 2025-07-27 14:15:56 +02:00
Ralty 51dc821bbb Fix Alphabet Strings, Charter flash color 2025-07-27 08:22:57 +07:00
Ralty b15e3bb5aa Options Rewrite WIP All Editor Menus Done 2025-07-27 08:12:11 +07:00
Chronic x3andGitHub 4b472e0322 Merge branch 'CodenameCrew:main' into main 2025-07-26 18:44:55 +01:00
Kolziak 8424e9c998 keybinds for cameras 2025-07-26 13:15:18 +02:00
Frakits 5e241b4ab8 this sucks 💔 2025-07-25 23:06:05 +03:00
Frakits 492668076c convert every single editor sfx path to flags 2025-07-25 22:57:16 +03:00
Frakits 93e23ebc69 I FIXED THIS SHIT!!!!!!!!!!!!!! 2025-07-25 20:00:10 +03:00
Chronic x3 fab4d1d788 Seperate pretty print options for the Chart, Character, and Stage editors.
The editors that save as xmls have pretty print enabled by default  btw
2025-07-25 17:38:20 +01:00
Frakits 84985b93d4 please check out all of these amazing sound effects of course 2025-07-25 18:35:16 +03:00
FuroandGitHub 4ed1fbd21f Update Charter.hx 2025-07-25 01:36:07 +02:00
Frakits ad8b6a9dad hi can someone test making events i can't use cne anymore 2025-07-24 21:19:40 +03:00
Ralty d39691a96e Merge branch 'main' into translations-system 2025-07-23 02:30:16 +07:00
Ralty 64114e9349 frakits help mee 2025-07-22 20:19:16 +07:00
Furo daa7550c35 Finished Charter & Options in Translation File 2025-07-21 19:06:25 +02:00
Furo 9bd8ad0ad7 Merge branch 'main' into translations-system 2025-07-21 12:58:53 +02:00
Ralty 9f43f96ef7 Fix Misplaced Variable?? 2025-07-20 18:06:05 +07:00
Ralty 1baca2e941 Merge branch 'raltyro-audio-rewrite'
# Conflicts:
#	source/funkin/backend/system/Conductor.hx
#	source/funkin/backend/system/modules/AudioSwitchFix.hx
#	source/funkin/editors/charter/Charter.hx
#	source/funkin/options/Options.hx
2025-07-20 00:36:31 +07:00
Ralty 31b2f5bcb9 Merge branch 'furo-charter-bookmarks' into new-editors-conductor
# Conflicts:
#	source/funkin/backend/utils/CoolUtil.hx
#	source/funkin/editors/charter/Charter.hx
2025-07-20 00:24:17 +07:00
Ralty 0b0b30239e oops 2025-07-19 19:19:25 +07:00
Ralty b1829aa4ad Merge branch 'new-conductor' into new-editors-conductor
# Conflicts:
#	source/funkin/editors/charter/Charter.hx
#	source/funkin/editors/charter/CharterBackdropGroup.hx
#	source/funkin/editors/charter/CharterEvent.hx
2025-07-19 19:17:27 +07:00
Ralty f95ac046d6 Whoops! 2025-07-19 01:38:58 +07:00
Ralty 52184f0470 Merge remote-tracking branch 'upstream/main' into new-editors-main
# Conflicts:
# commandline/commands/Compiler.hx
# source/funkin/backend/FunkinSprite.hx
# source/funkin/backend/MusicBeatState.hx
# source/funkin/backend/MusicBeatSubstate.hx
# source/funkin/backend/chart/Chart.hx
# source/funkin/backend/chart/EventsData.hx
# source/funkin/backend/scripting/GlobalScript.hx
# source/funkin/backend/system/Controls.hx
# source/funkin/backend/system/MainState.hx
# source/funkin/backend/utils/AudioAnalyzer.hx
# source/funkin/backend/utils/CoolUtil.hx
# source/funkin/editors/character/CharacterInfoScreen.hx
# source/funkin/editors/charter/Charter.hx
# source/funkin/editors/charter/CharterSelection.hx
# source/funkin/editors/charter/CharterStrumline.hx
# source/funkin/editors/charter/CharterStrumlineButton.hx
# source/funkin/editors/charter/SongCreationScreen.hx
# source/funkin/editors/ui/UIDropDown.hx
# source/funkin/editors/ui/UIFileExplorer.hx
# source/funkin/game/Note.hx
# source/funkin/game/PlayState.hx
# source/funkin/game/SplashGroup.hx
# source/funkin/game/Stage.hx
# source/funkin/game/Strum.hx
# source/funkin/menus/FreeplayState.hx
# source/funkin/options/Options.hx
# source/funkin/options/keybinds/KeybindsOptions.hx
2025-07-19 00:57:08 +07:00
Ralty c987a0cd19 Fix New-Conductor 2025-07-16 20:06:15 +07:00
Ralty e4be3bd427 Merge branch 'Time-Signature-Changes' into new-conductor
# Conflicts:
#	.gitignore
#	source/funkin/backend/FunkinSprite.hx
#	source/funkin/backend/chart/ChartData.hx
#	source/funkin/backend/chart/EventsData.hx
#	source/funkin/backend/system/Conductor.hx
#	source/funkin/backend/utils/CoolUtil.hx
#	source/funkin/editors/charter/Charter.hx
#	source/funkin/editors/charter/CharterEvent.hx
#	source/funkin/editors/charter/CharterEventScreen.hx
#	source/funkin/editors/charter/CharterMetaDataScreen.hx
#	source/funkin/editors/charter/SongCreationScreen.hx
#	source/funkin/game/PlayState.hx
2025-07-16 19:27:05 +07:00
Ralty e669eb32af Stable Reworked Audio
- Reworked Internal Audio to work with Streaming Vorbis Files (for now?)
- FlxSound.amplitude, FlxSound.amplitudeLeft, FlxSound.amplitudeRight, SoundChannel.leftPeak, SoundChannel.rightPeak now works. (Streamed Audio on this seems to be half-broken)
- Reworked AudioAnalyzer to work with all type of audios (hopefully) and work with Streamed Audio.
- Redo AudioSwitchFix to work in time instead of when switching states.

gosh, and all that i hope it doesnt break anything.
2025-07-13 19:56:26 +07:00
Ralty 5187f4a438 Register Endianness, stuff, add option to toggle 2025-07-12 02:27:12 +07:00
⍚~Nex 066dc7d57a Merge remote-tracking branch 'public/main' 2025-07-06 04:40:21 +02:00
Ralty 1a66b7109c Merge remote-tracking branch 'upstream/main' into pr/397 2025-07-05 18:23:41 +07:00
Ralty 7003a98c9d Update Charter.hx 2025-07-05 14:17:50 +07:00
⍚~Nex e13486dec0 WHAT THE FUCK IS THIS
I DIDNT NOTICE😭
2025-07-05 02:15:35 +02:00
7a39947b7f a little charter bugfixs and dont show strumlines locks if there no strumline in the chart (#664)
* dbssdbihsadibjsdainbi

* g

* a little charter fixs

* Update README.md

* ihateyou GitHub

* there

---------

Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
2025-07-05 02:04:10 +02:00
7a8f1f0ded Update FreeplayState.hx (#669)
* Update FreeplayState.hx

* should be good

* pretty print the color

---------

Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
2025-07-05 01:06:57 +02:00
Ralty 241b87ad58 Change event params a bit and fix cam zooming 2025-06-30 10:49:38 +07:00
KolziakandGitHub e39fe457ec fixed the game crashing 2025-06-16 13:47:52 +02:00
Furo a023c2408d Better Making and Bookmarks on the scrollbar :D
im reviving this shit 🔥
2025-06-11 17:23:43 +02:00
Yoshman29 6480465d51 Failed to add attributes?? 2025-05-11 11:26:40 +02:00
TheZoroForce240 2b087dc96e floating point fixes (hopefully) 2025-05-05 17:53:43 +01:00