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
2843d8a3a3
Merge branch 'main' into new-editors-conductor
...
# Conflicts:
# source/funkin/backend/utils/CoolUtil.hx
# source/funkin/backend/utils/IniUtil.hx
# source/funkin/editors/character/CharacterEditor.hx
# source/funkin/editors/ui/UIWarningSubstate.hx
2025-07-19 23:51:52 +07:00
Ralty
f34c274326
IniUtil Section Supports, uh whatever
2025-07-19 22:51:27 +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
Frakits
6f8330f91b
h
2025-07-19 14:40:40 +03: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
⍚~Nex
ce1ec6579f
why was this edited @YoshiCrafter29 ?? 😭
2025-07-07 01:57:24 +02: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
b41602ff37
extend <solid> functionality in stages ( #633 )
...
* extend <solid> functionality in stages
adds support for scroll(x/y), zoomfactor, and alpha to solids made in a stage xml . because Why not
* better
---------
Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com >
2025-07-05 03:23:32 +02:00
Teejio and GitHub
1ca98b3013
Add LoopTime to CoolUtil.playMusic ini Files ( #673 )
...
* Update CoolUtil.hx
* Update CoolUtil.hx
* realized i like it in sec more than ms
2025-07-02 11:34:50 -04:00
Ralty
c53a276e99
Merge remote-tracking branch 'upstream/main' into pr/397
2025-06-30 22:34:03 +07:00
⍚~Nex
2a44c5ca1d
replacing the discord rpc
2025-06-15 19:08:28 +02:00
Ne_Eo
a6fcb3d237
Merge branch 'main' into pr/397
2025-06-06 20:39:24 +02:00
Furo and GitHub
0ee90abe98
Fix wmic ( #642 )
2025-06-04 16:21:28 +02:00
Ne_Eo
c6c870270f
Small HTML5 Fixes
2025-05-16 01:03:53 +02:00
Yoshman29
6480465d51
Failed to add attributes??
2025-05-11 11:26:40 +02:00
Ne_Eo
94296ffb44
Merge remote-tracking branch 'upstream/main'
2025-05-07 15:47:35 +02:00
Ne_Eo
a7415783bc
Merge branch 'main' into pr/397
2025-05-05 15:38:45 +02:00
Microkat and GitHub
98da050c17
add fps to loadAnimatedGraphic ( #626 )
...
* add fps to loadAnimatedGraphic
wow and it doesn't even break old mods :0
* you'll float too
hi georgie
2025-05-02 23:15:36 +02:00
Ne_Eo
13033b2675
Merge remote-tracking branch 'upstream/main'
2025-04-10 02:24:58 +02:00
⍚~Nex
4b145bf62e
A LOT OF NEW STUFF + more vslice events WIP
...
JUST GOTTA MAKE THE TWEEN ON THE CAMERA MOVEMENT FRUNCTION PROPERLY AND WE'RE GOOD
(and also make the charter not save not changed paramteres)
2025-04-02 01:50:00 +02:00
lunarcleint
4ab77a4eb6
getSizeString64
2025-03-26 14:37:24 -07:00
lunarcleint
664954e30f
icant spell
2025-03-26 14:25:39 -07:00
lunarcleint
0412203015
fix vram in system info
2025-03-26 14:23:22 -07:00
lunarcleint
37bfe39dfd
bleh :PPPPP
2025-03-18 01:43:10 -07:00
Ne_Eo
531f8b7882
HTML5 stuff
2025-03-16 03:52:18 +01:00
Ne_Eo
f6df0cb6e8
Some fixes
2025-03-16 02:31:08 +01:00
NyxieFemboy
20efd35eef
MathUtil
2025-03-13 18:42:39 -04:00
lunarcleint
954828753e
atlas dragging + hitboxes
2025-03-08 04:42:09 -07: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
lunarcleint and Ne_Eo
97707015d8
i hate you liveshare ft neo
...
Co-authored-by: Ne_Eo <NeeEoo@users.noreply.github.com >
2025-03-05 15:17:29 -07:00
lunarcleint
0970a63dd1
AUTOCOMPLETE FOR ANIMS!!!
2025-03-04 19:52:58 -07:00
Ne_Eo
047e2fc551
Fuck
2025-03-02 23:39:31 +01:00
Ne_Eo
503ff87ab3
Add property parsing and cloning property values
2025-03-02 23:36:25 +01:00
Ne_Eo
bcde8c8709
Small changes
2025-03-02 20:31:25 +01:00
lunarcleint
2d35c1983e
edit sprite (pls test i need alot, kinda buggy)
2025-02-26 23:52:54 -07:00
lunarcleint
ed841e50a3
fully move to draw util !!
2025-02-22 16:03:30 -07:00
lunarcleint
052952dd67
Merge branch 'new-editors' of https://github.com/FNF-CNE-Devs/CodenameEngine-Dev into new-editors
2025-02-18 13:14:02 -07:00
lunarcleint
1d745f3519
testing webhook >:D
2025-02-18 13:13:59 -07:00
Ne_Eo
023e7753b2
Merge branch 'main' into new-editors
2025-02-06 21:22:45 +01:00
Ne_Eo
28868d8652
Better logs helpers
2025-02-06 21:14:24 +01:00
Ne_Eo
bb42fdc583
Fixed bug with last commit + more bug fixes
2025-01-24 02:49:42 +01:00
Ne_Eo
cbbb598f52
Added some more flags
2025-01-24 01:51:25 +01:00
Ne_Eo
31cc6a4b37
Make UIImageExplorer allow atlases
2025-01-15 03:27:25 +01:00
lunarcleint
117c3a2dab
image uploader
2025-01-14 17:37:21 -07:00
Ne_Eo
0e47728d0f
Merge branch 'main' into pr/397
2025-01-10 16:33:08 +01:00
Ralty and NyxieFemboy
dca41cfbc2
Merge pull request #1 from Raltyro/Continuous-Tempo-Change
...
Continuous Tempo Change (Thank you Ralty, Im sorry Im still learning this stuff)
2025-01-10 02:40:43 -05:00
Ne_Eo
a94a1f43bf
Merge branch 'new-editors' into furo-charter-bookmarks
2025-01-09 20:31:08 +01:00
Ralty