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 |
|
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 |
|
 TeejioandGitHub
|
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 |
|
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 |
|
 MicrokatandGitHub
|
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
|
0412203015
|
fix vram in system info
|
2025-03-26 14:23:22 -07:00 |
|
Ne_Eo
|
531f8b7882
|
HTML5 stuff
|
2025-03-16 03:52:18 +01: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 |
|
lunarcleint
|
2d35c1983e
|
edit sprite (pls test i need alot, kinda buggy)
|
2025-02-26 23:52:54 -07:00 |
|
lunarcleint
|
1d745f3519
|
testing webhook >:D
|
2025-02-18 13:13:59 -07: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 |
|
 RaltyandNyxieFemboy
|
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 |
|
Ne_Eo
|
fdf53b3d4f
|
Merge branch 'main' into new-editors
|
2025-01-09 20:05:06 +01:00 |
|
Ne_Eo
|
a6c99754fd
|
Added some documentation
|
2024-12-16 03:53:42 +01:00 |
|
Ne_Eo
|
d6dc3ea232
|
Fix typos
|
2024-12-10 04:35:32 +01:00 |
|
Furo
|
66953e4609
|
I like the part when the bookmark said its color picker time and then started coloring all over the place
|
2024-11-28 18:03:19 +01:00 |
|
Ne_Eo
|
2236a156fb
|
Merge branch 'main' into pr/397
|
2024-11-22 03:33:08 +01:00 |
|
Ne_Eo
|
36bb272ab4
|
Made CoolUtil.playMusic volume into a float
|
2024-11-15 18:52:47 +01:00 |
|
Ne_Eo
|
204a151170
|
Merge branch 'main' into new-editors
|
2024-11-15 18:50:48 +01:00 |
|
Ne_Eo
|
17301f6951
|
Small changes
|
2024-11-15 14:46:44 +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 |
|
⍚~Nex
|
4a1bc2c147
|
Merge branch 'main' into base-fnf-port-remake
|
2024-11-03 21:39:23 +01:00 |
|
Ne_Eo
|
fd8b38930c
|
Merge remote-tracking branch 'upstream/main'
|
2024-11-03 20:01:10 +01:00 |
|
 crowplexusandGitHub
|
796d585f9c
|
fix xdg-open in NixOS (#426)
since `/usr/bin/xdg-open` isn't an actual path in NixOS, it's actually BETTER to just invoke `xdg-open` without the full path
|
2024-11-03 14:01:56 +01:00 |
|
Ralty
|
daf3179f79
|
Conductor Final Continuous Tempo & Time Sigs
|
2024-10-25 19:14:56 +07:00 |
|
Ralty
|
3d99cd1985
|
Continuous Tempo Change
|
2024-10-23 23:19:22 +07: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
|
9640c3e17e
|
Merge remote-tracking branch 'upstream/main'
|
2024-10-18 02:53:24 +02:00 |
|
Ne_Eo
|
2cde5bf8fc
|
Compiling fixes
|
2024-10-18 00:36:55 +02:00 |
|
TheZoroForce240
|
dcbf9d74ad
|
Merge branch 'new-editors' into zoro-charterstuffs
|
2024-10-14 22:06:43 +01:00 |
|
⍚~Nex
|
a8860604e8
|
mods dialogues fonts fix
|
2024-10-08 15:51:40 +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 |
|