Commit Graph
46 Commits
Author SHA1 Message Date
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 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
⍚~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
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
Yoshman29 6480465d51 Failed to add attributes?? 2025-05-11 11:26:40 +02:00
Ne_Eo f17d8bf072 Merge remote-tracking branch 'upstream/main' 2025-05-02 02:45:57 +02:00
Furo 2f2bad2dc9 Icon Fixes 2025-04-21 20:24:36 +02:00
⍚~Nex 895fb5c981 fixed healthicons in editors 2025-04-21 03:41:08 +02:00
8c252bba81 Better Health Icons (#484)
* Better Health Icons

- Add Animated Icons Support
- Switch to Funkin Sprite
- Customizable Icon Bumps With HScript

* Moved icons

* Improve code and features for Health Icons V2

* Small fixes

* fix icons in editors

* Remove that not needed code

* Use better onFinish callback

* Animate Atlas icons

* Cleanup

* Small change

* sing anim nodes on icons and updateIconPos can be overitten on hscript

* remove sing nodes since its useless

* fix potential null function pointer

* remove that lines

* fixing compiling errors

* hawk tuah

* ORGANIZE THEM >:D

* mlem

imports are organized based on the func in vsc smh

* bruh

---------

Co-authored-by: Ne_Eo <NeeEoo@users.noreply.github.com>
Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
2025-04-21 00:27:41 +02:00
lunarcleint b1f9f3fb1a fix character editor bugs +clean up code 2025-04-08 18:23:16 -07:00
⍚~Nex 226c7f84a6 more progress + psych/legacy importer 2025-04-05 03:38:36 +02:00
⍚~Nex cfe209067c updated vslice structures + using the class funcs 2025-04-04 23:28:49 +02:00
⍚~Nex 1c6ec00d23 vslice bpm changes 2025-04-01 14:28:20 +02:00
⍚~Nex 0f09306a44 normal vslice SUPPORT 2025-04-01 01:36:23 +02:00
Furo d67f537cdf added vslice fnfc format (psych import soon) 2025-03-29 16:43:22 +01:00
lunarcleint 117c3a2dab image uploader 2025-01-14 17:37:21 -07:00
Ne_Eo fe0542a32c Merge branch 'main' into translations-system 2025-01-09 20:26:29 +01:00
Ne_Eo d6dc3ea232 Fix typos 2024-12-10 04:35:32 +01:00
Ne_Eo 5f16024b3e Merge branch 'main' into translations-system 2024-11-15 18:13:04 +01:00
⍚~NexandNe_Eo 596cb850cc What? Constants is evolving into Flags!
Co-Authored-By: Ne_Eo <NeeEoo@users.noreply.github.com>
2024-11-15 13:58:35 +01:00
Ne_Eo 8ce4c8ab25 Merge branch 'main' into translations-system 2024-09-22 15:21:17 +02:00
⍚~Nex bc3e1f1c8c Merge branch 'main' into base-fnf-port-remake 2024-09-14 16:19:13 +02:00
⍚~Nex aa22bd6e1d fixing stuff 2024-09-02 23:47:11 +02:00
⍚~Nex 500cf98e0c editable static costants!
for scripts :D
2024-08-31 02:31:05 +02:00
Ne_Eo d8d4c5907d Charter translatable 2024-08-17 01:26:10 +02:00
Frakits 30fbf0c1bc needsvoices is finally removed! 2024-04-23 20:23:36 +03:00
NeeEoo d17ea72c74 Organize Imports and remove unused Imports 2024-04-11 14:23:02 +02:00
NeeEoo 4a34bb19d7 Cleanup 2024-03-05 17:54:34 +01:00
Frakist bc30119934 to be polished 2024-01-31 21:44:16 +02:00
lunarcleint a033e92476 beatsPerMeasure 2023-11-19 15:00:31 -07:00
lunarcleint 9737070854 Charter drag fixed when pressing shift 2023-08-20 01:13:42 -07:00
lunarcleint 4bcba9e188 Ok it works 2023-08-19 11:53:57 -07:00
lunarcleint 0dfd021a46 hi 2023-08-15 18:05:01 -07:00
lunarcleint 7d993189ca ui sound player functional 2023-08-13 19:18:20 -07:00
lunarcleint 78b6787c1b Merge branch 'main' of https://github.com/FNF-CNE-Devs/CodenameEngine-Dev 2023-08-12 16:28:19 -07:00
lunarcleint 4e69ea9fc8 WIP audio shit 2023-08-12 16:28:14 -07:00
NeeEoo 4985ffbd86 Small fixes 2023-08-12 13:22:28 +02:00
lunarcleint 046fdff3b4 VERY VERY WIP CREATE SONG MENU 2023-08-11 22:10:09 -07:00