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
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
34b4de31fc
Should be done
2025-07-06 10:33:25 +07:00
Ralty
e2ff493bdf
Try to fix the characters dancing fast? 2
...
god damn it i got confused max with min sometime
2025-07-05 18:29:39 +07:00
Ralty
a5c208f4d3
Try to fix the characters dancing fast?
2025-07-05 18:20:21 +07:00
Ne_Eo
f17d8bf072
Merge remote-tracking branch 'upstream/main'
2025-05-02 02:45:57 +02:00
⍚~Nex
2a700b61c9
FunkinSprite's copyFrom working for FlxSprite too
2025-04-20 21:17:13 +02:00
⍚~Nex
39aadbe8a0
finished global/local events + HUGE SAVES FIX
...
HOW DID WE NEVER NOTICE??
anyways im really happy on how everything came out :D
more than a fix it also ended up like a rewrite!
2025-03-09 06:11:36 +01:00
Ne_Eo and lunarcleint
224b35c070
WIP bounds for flxanimate
...
Co-Authored-By: lunarcleint <88809950+lunarcleint@users.noreply.github.com >
2025-03-06 02:22:04 +01:00
Ne_Eo
fdf53b3d4f
Merge branch 'main' into new-editors
2025-01-09 20:05:06 +01:00
Ne_Eo
d6dc3ea232
Fix typos
2024-12-10 04:35:32 +01:00
Ne_Eo
012c8f76fc
Merge remote-tracking branch 'upstream/main'
2024-12-09 22:52:29 +01:00
⍚~Nex
f6deda2c84
addAnim for FunkinSprite + better names
...
so u dont have to manually add based if atlas or sparrow or else
this behaves as both addByPrefix and addByIndices and like the xml animations
2024-12-08 21:35:39 +01:00
⍚~Nex
eada3105a4
psych 1.0 format + some charts improvements
...
Fixes #448
2024-11-30 02:15:35 +01:00
Ne_Eo
204a151170
Merge branch 'main' into new-editors
2024-11-15 18:50:48 +01:00
⍚~Nex
77b7eebed1
better events and funkinSave categorization
2024-11-15 17:52:19 +01:00
⍚~Nex
4c94bb61a7
Merge branch 'main' into base-fnf-port-remake
2024-10-21 17:50:30 +02:00
Ne_Eo
5801ed0840
Merge branch 'main' into new-editors
2024-10-18 03:02:13 +02:00
Ne_Eo
9d47085992
Merge remote-tracking branch 'upstream/main'
2024-10-07 00:26:43 +02:00
Ne_Eo
2c52720244
Added getAnim and isAnimAtEnd
2024-10-07 00:10:43 +02:00
Ne_Eo
615206769c
Small change :3
2024-09-15 10:29:13 +02:00
Ne_Eo
17ce1f147c
Merge branch 'main' into new-editors
2024-09-14 23:49:06 +02:00
⍚~Nex
bc3e1f1c8c
Merge branch 'main' into base-fnf-port-remake
2024-09-14 16:19:13 +02:00
⍚~Nex
cecdd05322
Merge remote-tracking branch 'public/main'
2024-09-14 16:03:38 +02:00
⍚~Nex
dd4e8962d8
better default forced
...
FINALLY i had the best idea to fix this shit
2024-09-10 22:59:45 +02:00
Ne_Eo
6985590a5d
Merge remote-tracking branch 'upstream/main'
2024-09-10 00:05:18 +02:00
⍚~Nex
ae5fc555a8
"forced" anim attribute finally working
...
big changes here maybe
2024-09-08 16:30:27 +02:00
Ne_Eo
54b63b87dd
Merge branch 'main' into new-editors
2024-09-03 01:23:08 +02:00
⍚~Nex
32849cfd46
Merge branch 'main' into base-fnf-port-remake
2024-09-01 03:51:58 +02:00
Ne_Eo
d11282eef3
Merge remote-tracking branch 'upstream/main'
2024-09-01 02:40:31 +02:00
⍚~Nex
8e81d17fb0
continuinggg (very cool improvements)
...
asynced video loadings, classes rewrites, bugfixes and a lot more
2024-08-31 04:37:00 +02:00
Ne_Eo
3e5dc6f79f
Fix bug with looping with atlases
2024-08-28 12:06:47 +02:00
⍚~Nex
49db1a089a
hell, here we are again
2024-08-27 17:46:44 +02:00
Ne_Eo
759e03a1d4
Merge branch 'main' into new-editors
2024-08-27 03:50:31 +02:00
Ne_Eo
c9761f9aed
Merge remote-tracking branch 'upstream/main'
2024-08-27 03:48:18 +02:00
⍚~Nex
76c9146194
-loop prevention in character editor or others
2024-08-27 02:38:40 +02:00
24a65a4a8a
added "-loop" stuff ( #278 )
...
* added "-loop" stuff
* added loop anims to the chars
* added to mom and dad for their funny eye glow
* explanation
* Update da.xml
* slightly optimized and a lil better
* oops
this would have actually caused issues since the it would have take the reversed value from the animation before -loop
---------
Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com >
2024-08-27 02:27:37 +02:00
Ne_Eo
efbcce4612
Merge branch 'main' into new-editors
2024-08-20 21:17:04 +02:00
Ne_Eo
92450785f5
Pass shaderEnabled and colorTransform to atlases
2024-08-20 21:11:46 +02:00
NeeEoo
b537ca2b95
Added preview + cleaner dropdown xml
2024-04-14 17:38:00 +02:00
NeeEoo
9e9e4cd2b8
Added Focus and Toggles
2024-04-13 22:34:57 +02:00
Dirk-Dinkum and Ne_Eo
5f50b80df7
UIWindow collapsing fix
...
Co-Authored-By: Ne_Eo <NeeEoo@users.noreply.github.com >
2024-04-13 21:55:44 +02:00
Dirk-Dinkum and Ne_Eo
3daeb97362
fixed upside down tankmens
...
Co-Authored-By: Ne_Eo <NeeEoo@users.noreply.github.com >
2024-04-13 20:55:26 +02:00
Dirk-Dinkum and Ne_Eo
bded41e10f
fixed zoomfactor
...
Co-Authored-By: Ne_Eo <NeeEoo@users.noreply.github.com >
2024-04-13 20:30:33 +02:00
Dirk-Dinkum
82604c455e
MatrixUtil math fix
2024-04-13 19:33:53 +02:00
NeeEoo
f3bb4e2f50
Fixed macro issue
2024-04-12 02:36:46 +02:00
NeeEoo
d17ea72c74
Organize Imports and remove unused Imports
2024-04-11 14:23:02 +02:00
NeeEoo
8174fef53d
Small Optimizations
2024-04-05 21:21:19 +02:00
Rodney, An Imaginative Person and GitHub
fb485701b4
it would be so awesome, it would be so cool ( #267 )
2024-03-31 13:19:13 +02:00
Ralty