gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
2,470 Commits 10 Branches 5 Tags
52184f0470187bd4963efd91ac14f4e0741cd9b8
Commit Graph
499 Commits
Author SHA1 Message Date
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
⍚~Nex 066dc7d57a Merge remote-tracking branch 'public/main' 2025-07-06 04:40:21 +02:00
⍚~Nex e13486dec0 WHAT THE FUCK IS THIS 
I DIDNT NOTICE😭
 2025-07-05 02:15:35 +02:00
TedyesGitHub⍚~Nex
 		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
Nebula S. NovaGitHub⍚~Nex
 		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
Yoshman29 6480465d51 Failed to add attributes?? 2025-05-11 11:26:40 +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
FuroGitHubNe_Eo⍚~Nex
 		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 2fbc2bd0a1 oops 2025-04-14 03:38:14 +02:00
⍚~Nex ab61c89dab making sure everything gets saved 
did i just see a fucking indiecross bf uploaded😭
 2025-04-14 03:30:12 +02:00
lunarcleint b1f9f3fb1a fix character editor bugs +clean up code 2025-04-08 18:23:16 -07: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
lunarcleint d2fb59ecd4 pmo </3 2025-03-26 15:12:28 -07:00
lunarcleint 4122f0a2c6 make easier to tell local and global events apart 2025-03-26 15:00:45 -07:00
lunarcleint bad9d83367 rainbow waveforms i think 2025-03-26 12:16:32 -07:00
lunarcleint 3e51453541 Merge remote-tracking branch 'origin/new-editors-events-window-replacement' into new-editors 2025-03-20 01:32:14 -07:00
lunarcleint 3084106223 make editing events less annoying 2025-03-19 22:59:55 -07:00
lunarcleint 196d14ae82 gdfgd 2025-03-18 00:41:20 -07:00
Ne_Eo 531f8b7882 HTML5 stuff 2025-03-16 03:52:18 +01:00
Ne_Eo ac69ff3d7b Merge branch 'main' into new-editors 2025-03-16 02:35:35 +01:00
lunarcleint 326f4e1fe3 add batched notes to this branch 2025-03-14 14:14:03 -07:00
lunarcleint e68f241504 fix jank 2025-03-13 15:19:42 -07:00
lunarcleint 6ae02ebd3e stuff and inc 2025-03-12 23:58:04 -07:00
lunarcleint 56913f88e0 kinda important.,., 2025-03-12 15:10:17 -07:00
lunarcleint d2487c699b less jankiness >:D 2025-03-11 16:03:44 -07:00
⍚~Nex 612fd84aaa more fixes + update song charts and events 
MF gotta wait for monster cuz bpm changes are broken as FUCK
i'll prob merge the bpm pr soon at this point
 2025-03-09 17:50:06 +01:00
Frakits 9ed4501d5f THIS COMMIT! 2025-03-09 16:50:01 +02:00
lunarcleint 1198a7d983 charter batching optimzatioin 2025-03-09 03:22:34 -07:00
lunarcleint 62d639655c local events better ui >:D 2025-03-09 02:02:10 -07:00
lunarcleint d15e100b53 fix crash on save 2025-03-08 22:49:10 -07: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
⍚~Nex 6c836eae71 resize fixes + starting global and local events 
will continue later
 2025-03-08 19:04:19 +01:00
lunarcleint 7c3aff085f a 2025-03-04 19:35:31 -07:00
Frakits fa889dcb6e zzz 2025-03-04 16:48:46 +02:00
Ne_Eo 69a17d5fef Merge branch 'main' into new-editors 2025-02-28 16:39:06 +01:00
Ne_Eo 3851ede84d Merge remote-tracking branch 'upstream/main' 2025-02-28 16:38:04 +01:00
Ne_Eo 023e7753b2 Merge branch 'main' into new-editors 2025-02-06 21:22:45 +01:00
TheZoroForce240andGitHub 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 7a10f1eddb Fix bug that happened when dragging notes 2025-01-22 22:30:57 +01:00
lunarcleint 117c3a2dab image uploader 2025-01-14 17:37:21 -07:00