Furo
9bd8ad0ad7
Merge branch 'main' into translations-system
2025-07-21 12:58:53 +02: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
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
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
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
80ef390095
Merge branch 'main' into translations-system
2024-11-29 22:06:37 +01:00
Ne_Eo
cd0f06f448
Merge remote-tracking branch 'upstream/main'
2024-11-29 22:02:37 +01:00
NyxieFemboy and GitHub
4bf58aeda5
Fixing the split vocals not pausing issue in charter ( #456 )
2024-11-24 19:39:17 +01:00
Ne_Eo
5f16024b3e
Merge branch 'main' into translations-system
2024-11-15 18:13:04 +01:00
⍚~Nex and Ne_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
⍚~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
lunarcleint
2034e9cedb
rename MetaDataScreen to CharterMetaDataScreen (thank god)
2024-03-21 01:57:55 -07:00
Furo