Frakits
6b5885ca74
shit
2025-07-24 13:57:06 +03:00
Frakits
e8332c688f
readd the beta warning state as a template state (WarningState.hx)
2025-07-24 13:51:58 +03:00
Ralty
d39691a96e
Merge branch 'main' into translations-system
2025-07-23 02:30:16 +07:00
Ralty
64114e9349
frakits help mee
2025-07-22 20:19:16 +07:00
Ralty
400a399cb6
remove STRIPPED_COMPILE, other small small changes
2025-07-22 19:18:53 +07:00
Ralty
304bbe12fd
remove macro-fixer that is uhh made by yknoow
2025-07-21 23:08:01 +07:00
Furo
579bff7c44
Fix compiling
2025-07-21 16:16:36 +02:00
Furo
9bd8ad0ad7
Merge branch 'main' into translations-system
2025-07-21 12:58:53 +02:00
Ralty
3b06a3142e
Ooohh...
2025-07-20 00:56:18 +07:00
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
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
b64f4612b9
Merge branch 'main' into raltyro-audio-rewrite
...
# Conflicts:
# source/funkin/backend/utils/CoolUtil.hx
2025-07-19 23:36:06 +07:00
Ralty
f34c274326
IniUtil Section Supports, uh whatever
2025-07-19 22:51:27 +07:00
Ralty
102f80b4e3
here u go frakits
2025-07-19 20:18:42 +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
Frakits
274aa310c1
oh yeah and i nearly forgot
2025-07-19 14:44:13 +03:00
Frakits
6f8330f91b
h
2025-07-19 14:40:40 +03:00
Ralty
431928685d
Merge remote-tracking branch 'upstream/main' into new-editors-main
2025-07-19 01:41: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
Frakits
cca1c75c14
accidentally made the whole thing uncompilable oops
2025-07-18 13:04:23 +03:00
Frakits
e00b600650
SIIGHHH
2025-07-18 12:59:41 +03:00
Ralty
c987a0cd19
Fix New-Conductor
2025-07-16 20:06:15 +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
Ralty
1544d1464b
Fix AudioSwitchFix again
2025-07-15 18:27:01 +07:00
Ralty
bffb147cc2
Polish AudioAnalyzer & fix 8-bit detection
2025-07-15 01:23:52 +07:00
Ralty
a708c204e7
Little fix on AudioAnalyzer
2025-07-13 23:58:14 +07:00
Ralty
17ffdcd6ef
Fix AudioAnalyzer
2025-07-13 23:41:41 +07:00
Ralty
a3ae8a70d4
Allow AudioAnalyzer to have seperate outputs
2025-07-13 22:03:11 +07:00
Ralty
2ead99cdf4
Fix Mismatching Audio Streamed Buffer Size
2025-07-13 21:10:42 +07:00
Ralty
e669eb32af
Stable Reworked Audio
...
- Reworked Internal Audio to work with Streaming Vorbis Files (for now?)
- FlxSound.amplitude, FlxSound.amplitudeLeft, FlxSound.amplitudeRight, SoundChannel.leftPeak, SoundChannel.rightPeak now works. (Streamed Audio on this seems to be half-broken)
- Reworked AudioAnalyzer to work with all type of audios (hopefully) and work with Streamed Audio.
- Redo AudioSwitchFix to work in time instead of when switching states.
gosh, and all that i hope it doesnt break anything.
2025-07-13 19:56:26 +07:00
Ralty
3f19afd66d
EndTime, Offset in Ini's Music
2025-07-12 15:59:09 +07:00
Ralty
6834216878
Disable __updatePeaks & More work in audiosource
2025-07-12 00:24:25 +07:00
Ralty
80bc6506b9
Rewrite Internal Audio Source & Fix AudioSwitchFix
2025-07-11 10:59:26 +07:00
Ralty
6cb90a66c9
FlxSound & internal rewrite & Streamed Music
2025-07-10 15:37:35 +07:00
⍚~Nex
ce1ec6579f
why was this edited @YoshiCrafter29 ?? 😭
2025-07-07 01:57:24 +02:00
⍚~Nex
e6766cdcd7
dev mode implementation
2025-07-07 01:53:02 +02:00
Ralty
34b4de31fc
Should be done
2025-07-06 10:33:25 +07:00
⍚~Nex
1b0ad7d3a6
some more stuff SOMEONE HAVE TO TEST THESE 2 COMM
2025-07-06 04:44:46 +02:00
⍚~Nex
066dc7d57a
Merge remote-tracking branch 'public/main'
2025-07-06 04:40:21 +02:00
Ralty
5ee4ff2a10
can you please lock in
2025-07-05 19:07:57 +07:00
Ralty
bdfb1d31b4
Update Conductor.hx
2025-07-05 19:06:48 +07:00
Ralty
e2ff493bdf
Try to fix the characters dancing fast? 2
...
god damn it i got confused max with min sometime
2025-07-05 18:29:39 +07:00
Ralty
1a66b7109c
Merge remote-tracking branch 'upstream/main' into pr/397
2025-07-05 18:23:41 +07:00
Ralty
a5c208f4d3
Try to fix the characters dancing fast?
2025-07-05 18:20:21 +07:00
Ralty
2b533d62f5
dummyChange & lastBeatChange
2025-07-05 18:19:49 +07:00
b41602ff37
extend <solid> functionality in stages ( #633 )
...
* extend <solid> functionality in stages
adds support for scroll(x/y), zoomfactor, and alpha to solids made in a stage xml . because Why not
* better
---------
Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com >
2025-07-05 03:23:32 +02:00
9d1392399b
Add noExtension flag to getFolderContent for cleaner Paths usage ( #654 )
...
* yeah
* Revert "yeah"
This reverts commit 5ab6ab8c7dfurogaming9@gmail.com >
Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com >
2025-07-05 02:13:30 +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
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
Frakits