Commit Graph
66 Commits
Author SHA1 Message Date
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
Ne_Eo 531f8b7882 HTML5 stuff 2025-03-16 03:52:18 +01: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
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 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
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 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 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
⍚~Nex a8860604e8 mods dialogues fonts fix 2024-10-08 15:51:40 +02:00
⍚~Nex bc3e1f1c8c Merge branch 'main' into base-fnf-port-remake 2024-09-14 16:19:13 +02:00
Ne_Eo ec4515f4e2 Improved dropdown event, to also allow arrays 2024-09-11 11:04:03 +02:00
Ne_Eo fd451127c0 Merge remote-tracking branch 'upstream/main'
# Conflicts:
#	source/funkin/backend/system/framerate/CodenameBuildField.hx
2024-09-07 10:33:00 +02:00
FourLion4LandGitHub 16fa3046e2 CoolUtil openURL fix for Linux users (#378) 2024-09-06 12:48:32 +02:00
⍚~Nex 500cf98e0c editable static costants!
for scripts :D
2024-08-31 02:31:05 +02:00
Ne_Eo c9761f9aed Merge remote-tracking branch 'upstream/main' 2024-08-27 03:48:18 +02:00
Ne_Eo 1b55beffe9 Added number ranges for indices (1..6) 2024-08-27 02:17:35 +02:00
Ne_Eo 96e1ae4e8a Merge remote-tracking branch 'upstream/main' 2024-07-06 02:10:33 +02:00
⍚~Nex 6715e2b1cc even cooler stuff for file attributes 2024-06-18 04:54:59 +02:00
⍚~NexandNe_Eo a6c5b4d6e8 fixin some stuff about file attribs
Co-Authored-By: Ne_Eo <NeeEoo@users.noreply.github.com>
2024-06-18 00:04:26 +02:00
lunarcleint 2f917fd7c0 Fix Character isPlayer Bug / Better .xml saving 2024-06-12 03:12:50 -07:00
⍚~Nex e7ddb10c64 Merge remote-tracking branch 'master/main' 2024-06-09 01:27:43 +02:00
⍚~Nex 8d0a38419d resolved the attrib +h crash in a cool way B)
okay this was very funny to add
2024-06-07 17:45:04 +02:00
NeeEoo 59164cbb1d Cleanup 2024-04-12 12:38:36 +02:00
NeeEoo d17ea72c74 Organize Imports and remove unused Imports 2024-04-11 14:23:02 +02:00
NeeEoo c8ef7ef967 Cleanup 2024-04-09 13:33:55 +02:00
⍚~NexandNe_Eo b87e3f79f7 safeSaveFile for both strings and bytes
Co-Authored-By: Ne_Eo <NeeEoo@users.noreply.github.com>
2024-03-17 19:16:37 +01:00
⍚~NexandNe_Eo 69c9030b9c once again safer savings
Co-Authored-By: Ne_Eo <NeeEoo@users.noreply.github.com>
2024-03-17 18:24:44 +01:00
⍚~Nex 3de8fcc804 bugfix for loading deleted mods + safe saves 2024-03-17 18:00:18 +01:00
NeeEoo 4a34bb19d7 Cleanup 2024-03-05 17:54:34 +01:00