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
Ralty
7003a98c9d
Update Charter.hx
2025-07-05 14:17:50 +07:00
⍚~Nex
e13486dec0
WHAT THE FUCK IS THIS
...
I DIDNT NOTICE😭
2025-07-05 02:15:35 +02:00
7a39947b7f
a little charter bugfixs and dont show strumlines locks if there no strumline in the chart ( #664 )
...
* dbssdbihsadibjsdainbi
* g
* a little charter fixs
* Update README.md
* ihateyou GitHub
* there
---------
Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com >
2025-07-05 02:04:10 +02: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
a6fcb3d237
Merge branch 'main' into pr/397
2025-06-06 20:39:24 +02:00
Ne_Eo
e9e36edfde
Backdrop Rotation & Zoom + FlxPoint Reflectable
...
FlxBackdrop now has .rotation and .zoom allowing you to rotate and zoom
You can now also use the entire FlxPoint api from hscript
2025-05-13 16:28:39 +02:00
Yoshman29
6480465d51
Failed to add attributes??
2025-05-11 11:26:40 +02:00
TheZoroForce240
2b087dc96e
floating point fixes (hopefully)
2025-05-05 17:53:43 +01:00
Ne_Eo
a7415783bc
Merge branch 'main' into pr/397
2025-05-05 15:38:45 +02: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
⍚~Nex
226c7f84a6
more progress + psych/legacy importer
2025-04-05 03:38:36 +02:00
⍚~Nex
cfe209067c
updated vslice structures + using the class funcs
2025-04-04 23:28:49 +02:00
Ne_Eo
d96aff2556
Huge bug fixed
2025-04-04 22:57:09 +02:00
⍚~Nex
d91e36e294
conditional saving parameter for events
2025-04-03 01:25:05 +02:00
⍚~Nex
1c6ec00d23
vslice bpm changes
2025-04-01 14:28:20 +02:00
⍚~Nex
0f09306a44
normal vslice SUPPORT
2025-04-01 01:36:23 +02:00
Furo
d67f537cdf
added vslice fnfc format (psych import soon)
2025-03-29 16:43:22 +01:00
Ne_Eo
531f8b7882
HTML5 stuff
2025-03-16 03:52:18 +01:00
Ne_Eo
68f3a64466
Allow setting the positions for events
2025-03-08 19:14:24 +01:00
Frakits
fa889dcb6e
zzz
2025-03-04 16:48:46 +02:00
Ne_Eo
3851ede84d
Merge remote-tracking branch 'upstream/main'
2025-02-28 16:38:04 +01:00
⍚~Nex
2227231264
Merge branch 'main' into pr/397
2025-02-25 19:38:41 +01:00
NyxieFemboy
3250cdb436
I think this should be everything?
2025-02-18 13:37:49 -05:00
TheZoroForce240
0f0d116fb2
more event icon stuff
2025-02-02 12:29:42 +00:00
TheZoroForce240
cb4a95678c
Negative and decimal support for event numbers (and some other changes)
2025-02-02 09:48:11 +00:00
TheZoroForce240
3e13bf50c6
Continuous bpm change event, lots of other reworks and fixes
2025-02-01 21:13:46 +00:00
TheZoroForce240 and GitHub
d0254eec44
fix infinite loop that could happen when deleting a strumline ( #535 )
2025-01-26 22:02:44 +01:00
Frakits
accc197407
properly working
2025-01-26 10:57:48 +02:00
Frakits
0102cbbdb6
broke selection
2025-01-25 16:38:17 +02:00
Ne_Eo
cbbb598f52
Added some more flags
2025-01-24 01:51:25 +01:00
SevDoesStuff and GitHub
ec2cae9f81
character editor Icon color wheel fix ( #496 )
...
* character Icon color wheel fix
* better method lol (thank you lunar)
2025-01-20 13:17:42 -05:00
Ne_Eo
18ea916f1a
Change how editor icons work
2025-01-17 15:23:32 +01:00
TheZoroForce240 and GitHub
2f6207b11b
fixing beat and measure lines with time sig changes ( #2 )
2025-01-11 14:16:46 -05:00
Ne_Eo
0e47728d0f
Merge branch 'main' into pr/397
2025-01-10 16:33:08 +01:00
Ne_Eo
a20020bc3c
Merge remote-tracking branch 'upstream/main'
2024-12-16 03:13:23 +01:00
ItsLJcool and GitHub
c4abac4ba1
Fixed pasting, and added copying in UITextBox ( #486 )
...
KeyModifier somehow returned an int outside of the KeyModifier's range 😭
Apparently there is a boolean that just checks for you called `ctrlKey`.........
2024-12-11 11:26:58 +02:00
NyxieFemboy
0040d93950
Fixes to Negative note sustain lengths in the charter
2024-12-10 19:13:28 -05:00
Ne_Eo
d6dc3ea232
Fix typos
2024-12-10 04:35:32 +01:00
⍚~Nex
eada3105a4
psych 1.0 format + some charts improvements
...
Fixes #448
2024-11-30 02:15:35 +01:00
Ne_Eo
85b50c7cce
Bug Fixes + Cleanup
2024-11-30 00:44:52 +01:00
Ne_Eo
cd0f06f448
Merge remote-tracking branch 'upstream/main'
2024-11-29 22:02:37 +01:00
Ne_Eo
90a8c2711c
Change URL on Wiki + Added some flags
2024-11-29 21:44:03 +01:00
Furo and GitHub
85617b7b4e
Hide UI Debug State in release mode ( #462 )
2024-11-29 15:27:24 +01:00