Ralty
1baca2e941
Merge branch 'raltyro-audio-rewrite'
...
# Conflicts:
# source/funkin/backend/system/Conductor.hx
# source/funkin/backend/system/modules/AudioSwitchFix.hx
# source/funkin/editors/charter/Charter.hx
# source/funkin/options/Options.hx
2025-07-20 00:36:31 +07:00
Ralty
b64f4612b9
Merge branch 'main' into raltyro-audio-rewrite
...
# Conflicts:
# source/funkin/backend/utils/CoolUtil.hx
2025-07-19 23:36:06 +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
f95ac046d6
Whoops!
2025-07-19 01:38:58 +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
Chronic x3 and GitHub
e02c93fab1
Update Options.hx
2025-07-15 13:53:31 +01:00
Ralty
96d60cfe8c
Streamed Vocals?
2025-07-12 02:34:55 +07:00
Ralty
5187f4a438
Register Endianness, stuff, add option to toggle
2025-07-12 02:27:12 +07:00
⍚~Nex
e6766cdcd7
dev mode implementation
2025-07-07 01:53:02 +02:00
⍚~Nex
066dc7d57a
Merge remote-tracking branch 'public/main'
2025-07-06 04:40:21 +02:00
6f7c3a4278
Options/Credits from multiple asset libraries + Fix options transition when exiting Controls ( #367 )
...
* load all options from all asset libraries
* add override for options
* removing overridedMods
* fixing the options transin not appearing
when exiting keybinds substate
* making it for credits too
---------
Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com >
2025-07-06 00:14:34 +02:00
Ralty
1a66b7109c
Merge remote-tracking branch 'upstream/main' into pr/397
2025-07-05 18:23:41 +07:00
1995c7ff93
[ENHANCEMENT] Add Volume Keys to Controls ( #518 )
...
* add ze volume keys B)
* e
* better
---------
Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com >
2025-07-05 03:44:42 +02:00
07ae6b643c
FINALLY fixed the issue with GlobalState blowing up when pressing F5. ( #666 )
...
* peak is happening
<r>RED<r>
* oops
* oops x2
forgot I left a trace when loading up global.hx from `Assets` lol
* **State / SubState reloading broken rn but pushing changes to see if anyone can fix**
* Human... I remember you
<r>disabling reloading substates cuz it broke...<r>
* <y>forgor to edit assets global.hx<y>
* lemme see
* kk
* opa
---------
Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com >
2025-07-05 01:46:42 +02:00
Ralty
241b87ad58
Change event params a bit and fix cam zooming
2025-06-30 10:49:38 +07: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
lunarcleint
bad9d83367
rainbow waveforms i think
2025-03-26 12:16:32 -07:00
Ne_Eo
531f8b7882
HTML5 stuff
2025-03-16 03:52:18 +01:00
⍚~Nex
6c836eae71
resize fixes + starting global and local events
...
will continue later
2025-03-08 19:04:19 +01: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
lunarcleint
52872cd837
some stuffs >:D
2025-02-25 15:26:32 -07:00
lunarcleint
1d745f3519
testing webhook >:D
2025-02-18 13:13:59 -07:00
Furo and GitHub
d802c429e1
TreeMenu Fix Constructor Arguments and Fallback "main"
2025-01-25 15:50:00 +01:00
Ne_Eo
5f51df0f3f
Merge branch 'main' into new-editors
2025-01-22 22:25:21 +01:00
Ne_Eo
108b385e6c
Merge remote-tracking branch 'upstream/main'
2025-01-17 15:23:44 +01:00
Ne_Eo
1facc82073
Fix credits menu bg not being able to be animated
2025-01-10 16:22:32 +01:00
Ne_Eo
fdf53b3d4f
Merge branch 'main' into new-editors
2025-01-09 20:05:06 +01:00
⍚~Nex
5ab8a02a10
Merge remote-tracking branch 'public/main'
2025-01-03 19:18:18 +01:00
300f38d290
[ENHANCEMENT] Prevent accidental selecting when tabbing back in ( #513 )
...
* prevent accidental selecting
* made something better
---------
Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com >
2025-01-02 15:56:33 +01:00
lunarcleint
736e225ad5
Resizable Editors option
2024-12-29 15:26:29 -07:00
Ne_Eo
2abc45a9e4
Store only necessary data for GitHub credits
2024-12-19 22:23:38 +01:00
Ne_Eo
aec73ab2b6
Added some more documentation
2024-12-16 04:37:18 +01:00
Ne_Eo
d6dc3ea232
Fix typos
2024-12-10 04:35:32 +01:00
Ne_Eo
85b50c7cce
Bug Fixes + Cleanup
2024-11-30 00:44:52 +01:00
TheZoroForce240
ba129a9c8c
custom controls stuff
2024-08-29 19:48:22 +01:00
Ne_Eo
879531a397
Optimization
2024-07-31 20:31:42 +02:00
lunarcleint
fcd86c7364
change default to false+cleabn
2024-07-22 23:12:57 -07:00
lunarcleint
b3ed23e4a4
clear offsets + option to drag
2024-07-21 22:46:12 -07:00
lunarcleint
dfe37ffaaf
Better debug character stuff
2024-07-19 01:40:45 -07:00
Ne_Eo
b2774445d8
Merge branch 'main' into new-editors
2024-07-18 22:01:45 +02:00
lunarcleint
c5eab636ba
debug stuff
2024-07-18 12:29:47 -07:00
⍚~Nex
e7ddb10c64
Merge remote-tracking branch 'master/main'
2024-06-09 01:27:43 +02:00
syrup and GitHub
bf0a6a9bbe
FPS Counter offset fix for Options/Credits menu ( #307 )
...
* pixel note splashes
* tyy!!
* pixel secret notesplashes
* the fix itself lol
2024-06-07 13:32:05 +02:00
NeeEoo
d17ea72c74
Organize Imports and remove unused Imports
2024-04-11 14:23:02 +02:00
⍚~Nex
5eb0801c22
optimized EVEN MORE the cne credits menu
...
fully asynced and looks better :D
2024-03-24 21:00:12 +01:00
NeeEoo
07e639b943
Merge branch 'main' into new-big-chungus
2024-03-24 04:35:17 +01:00
Ralty