Commit Graph
2909 Commits
Author SHA1 Message Date
Ralty 102f80b4e3 here u go frakits 2025-07-19 20:18:42 +07:00
Ralty 0b0b30239e oops 2025-07-19 19:19:25 +07:00
Ralty 144780ea0e what 2025-07-19 19:18: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
Frakits 274aa310c1 oh yeah and i nearly forgot 2025-07-19 14:44:13 +03:00
Frakits ff5606badc Merge branch 'main' of https://github.com/FNF-CNE-Devs/CodenameEngine-Dev 2025-07-19 14:41:00 +03:00
Frakits 6f8330f91b h 2025-07-19 14:40:40 +03:00
RaltyandGitHub 00f3d128af Merge pull request #7 from chronicsilly/patch-2
Clean the xml more
2025-07-19 14:45:18 +07:00
Ralty ba525ac0e4 oh my god 2025-07-19 14:41:19 +07:00
RaltyandGitHub 5cc10b2656 Merge pull request #8 from chronicsilly/patch-3
prettyprint option on stage xmls
2025-07-19 14:34:20 +07:00
Ralty 8259266f44 Small fixes 2025-07-19 14:10:54 +07:00
Ralty 19c6b5a83c Merge branch 'new-editors-main' into new-editors 2025-07-19 09:36:32 +07:00
Ralty 431928685d Merge remote-tracking branch 'upstream/main' into new-editors-main 2025-07-19 01:41: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
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
Chronic x3andGitHub 5656ecdd93 prettyprint option on stage xmls 2025-07-17 15:41:51 +01: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
Chronic x3andGitHub e1883a6a09 Update CharacterEditor.hx 2025-07-15 17:32:46 +01:00
TheoDevandGitHub c4af35d9dd Merge pull request #6 from chronicsilly/patch-1
tgirl yuri
2025-07-15 06:00:37 -07:00
Chronic x3andGitHub e02c93fab1 Update Options.hx 2025-07-15 13:53:31 +01:00
Ralty 1544d1464b Fix AudioSwitchFix again 2025-07-15 18:27:01 +07:00
RaltyandGitHub a33f8a4e6d Streamed Music (Rewritten Internal Audio) PR Merge
- Reworked Internal Audio (FlxSound, NativeAudioSource, SoundChannel) to work with Streaming Vorbis Files (for now?)
  - FlxSound.amplitude now works. (This is implemented to avoid the lagspike on using the AudioAnalyzer on streamed audios as possible)
  - Implemented loopTime, and endTime into the internal instead of FlxSound for better looping (only for Streamed Audio)
  - Implemented Interpolation into time (only in FlxSound specifically, does not affect the actual internal audio classes)
  - Implemented variables such as offset, muted, pan, proximityPan, channels, stereo, loaded, streamed, onFinish (to seperate complete callback from looping callback), timeScaleBased (for pitch based in FlxG.timeScale)

- Reworked AudioAnalyzer to work much more faster with all type of audios (hopefully) and work with Streamed Audio. (NOTE: Using it on Streamed Audio is pretty expensive as it constantly seeking each calls, unless if the next time using it is the expected time decoder to seek to.)
- Redo AudioSwitchFix to work in time instead of when switching states.
- Improved the off-sync vocals detection
- Implemented LoopTime, EndTime, Offset into Ini's Music Assets
2025-07-15 01:41:10 +07:00
Ralty f2a5719c57 Whoops 2025-07-15 01:39:10 +07:00
Ralty bffb147cc2 Polish AudioAnalyzer & fix 8-bit detection 2025-07-15 01:23:52 +07:00
Ralty 7f3d976ac6 Fix FlxSound not completing correctly, & callbacks 2025-07-15 01:22:53 +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 89f862b42c Better Buffer Streamed Audio Management 2025-07-12 15:58:10 +07: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
Ralty 8b5314d66c quick fix 2025-07-12 00:46:31 +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 aa5cf639e8 Fix Resyncing 2025-07-10 16:16:55 +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
⍚~Nex 86157be887 some cutscene stuff 2025-07-06 17:50:15 +02:00
⍚~Nex a6c390f10e making health updating auto
more optimised than doing it each frame
2025-07-06 14:43:00 +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
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