EliteMasterEric
13d6ba378e
Work in progress on fixing Week 6
2024-02-28 00:19:08 -05:00
Cameron Taylor
ddeac1db15
deubbershish...
2024-02-27 22:02:04 -05:00
EliteMasterEric
12a48b9b86
Work in progress on revamped, more extensible pause menu.
2024-02-26 23:18:56 -05:00
EliteMasterEric
90360de0d0
Working Blazin cutscene and fixed time travel
2024-02-26 19:03:04 -05:00
EliteMasterEric
66c91d8b3e
Sort the chart editor note kind dropdown.
2024-02-23 03:23:00 -05:00
EliteMasterEric
4168962fec
Revert "Fix FunkinSound not resuming after focus"
...
This reverts commit d6b3e2a9cf
2024-02-23 03:19:34 -05:00
EliteMasterEric
fb9fd57210
Improve json parsing error handling.
2024-02-23 03:16:51 -05:00
EliteMasterEric
e349b0bb49
New pre-caching techniques should reduce stuttering on Weekend 1.
2024-02-23 00:16:11 -05:00
EliteMasterEric
ddfb0c6a61
Working on more asset caching improvements.
2024-02-22 23:37:52 -05:00
EliteMasterEric
11bb69002b
Merge remote-tracking branch 'origin/rewrite/master' into feature/2hot-death-animation
2024-02-22 21:01:07 -05:00
EliteMasterEric
01ed1730f4
Fix some issues with cutscenes.
2024-02-22 20:56:41 -05:00
Eric
905d47c005
Merge branch 'rewrite/master' into anim-editor-stuffs
2024-02-22 19:07:31 -05:00
EliteMasterEric
572ecc8aa8
Merge remote-tracking branch 'origin/rewrite/master' into anim-editor-stuffs
2024-02-22 19:05:20 -05:00
Cameron Taylor
e9dc03f8f1
Merge branch 'rewrite/master' into feature/screenshot-sound
2024-02-22 19:04:07 -05:00
EliteMasterEric
539b688055
Exploration in expanding FunkinSprite for optimization
2024-02-22 18:55:24 -05:00
Cameron Taylor
201c81cfef
changed keybind to ctrl+shift+L
2024-02-22 18:51:18 -05:00
EliteMasterEric
5b486e5634
Merge remote-tracking branch 'origin/bugfix/audio-focus' into feature/2hot-death-animation
2024-02-22 12:59:34 -05:00
EliteMasterEric
818e80ed74
Add a screenshot sound provided by Isaac.
2024-02-22 03:15:06 -05:00
EliteMasterEric
0b49a88cdd
Move the crash keybind into a global plugin.
2024-02-22 01:47:35 -05:00
EliteMasterEric
744e2f95bd
Add additional memory utilities and logging.
2024-02-22 00:06:02 -05:00
EliteMasterEric
907d9150c0
Add additional memory utilities and logging.
2024-02-21 17:10:18 -05:00
EliteMasterEric
36c0c61946
Merge remote-tracking branch 'origin/rewrite/master' into feature/2hot-death-animation
2024-02-20 18:44:51 -05:00
EliteMasterEric
d888fb860d
Remove support for >100% audio since it didn't actually boost the gain.
2024-02-20 13:37:53 -05:00
Cameron Taylor
2cfeb2c94d
anim editor dropdown fix
2024-02-20 00:29:11 -05:00
Cameron Taylor
85b3441a03
tiny levelitems positioning
2024-02-19 21:40:52 -05:00
Jenny Crowe
7d7cf32f44
Chart editor grid now updates when changing the song BPM. HItsound volumes converted to two separate sliders.
2024-02-19 18:18:32 -07:00
EliteMasterEric
44623071cd
Redo event stuff for abot and game over audio logic
2024-02-18 03:02:36 -05:00
Eric
1c8fd7251c
Merge pull request #322 from FunkinCrew/storymode-nene-fix
...
hide storymode menu characters if they dont exist for the level
2024-02-17 19:26:05 -05:00
EliteMasterEric
12335fef9d
Merge remote-tracking branch 'origin/rewrite/master' into feature/2hot-death-animation
2024-02-17 15:18:23 -05:00
Cameron Taylor
0a83f2f1e8
Merge branch 'rewrite/master' into feature/chart-editor-note-kind
2024-02-17 05:26:58 -05:00
Cameron Taylor
01250852c5
simplified preloader
2024-02-17 04:45:12 -05:00
Cameron Taylor
2baac0e983
dont infinitely add new props, replace the old ones
2024-02-17 04:21:03 -05:00
Cameron Taylor
41cb3d93b2
nicer color tweens
2024-02-17 04:01:06 -05:00
Cameron Taylor
fc3b83367f
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/funkin-secret into storymode-nene-fix
2024-02-17 03:49:54 -05:00
Cameron Taylor
316fa72b19
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/funkin-secret into bugfix/loading-state
2024-02-17 03:44:16 -05:00
EliteMasterEric
16df3f0e9d
Move E to a final constant as Mike suggested.
2024-02-17 03:41:08 -05:00
EliteMasterEric
8a9a7f3b97
Additional chart editor fixes.
2024-02-17 02:13:11 -05:00
Mike Welsh
a523b82439
Fix songs failing to load on HTML5 target
...
Do a small refactor of `LoadingState` to fix loading songs on the
when `NO_PRELOAD_ALL` is defined.
This allows the HTML5 target to progress into song gameplay again.
2024-02-16 21:00:44 -08:00
EliteMasterEric
de8fe2e271
Merge branch 'feature/chart-editor-note-kind' into feature/2hot-death-animation
2024-02-16 22:46:06 -05:00
EliteMasterEric
1bc96afd6d
Move E to a final constant as Mike suggested.
2024-02-16 22:13:51 -05:00
EliteMasterEric
98e6d4091e
Revamp note kind handling in the chart editor.
2024-02-16 22:01:47 -05:00
Mike Welsh
ef96bd4358
Fix variable name in MathUtils.smoothLerp
2024-02-16 17:22:55 -08:00
Cameron Taylor
516c5e8596
Merge pull request #329 from FunkinCrew/feature/screenshots
...
Implemented a screenshot button.
2024-02-16 19:31:53 -05:00
Cameron Taylor
0b58a4f664
camera flash fix
2024-02-16 18:58:27 -05:00
Cameron Taylor
928f941c2f
Merge pull request #331 from FunkinCrew/bugfix/countdown-pause-music
...
Fix issue with incorrect music after pausing during countdown
2024-02-16 17:36:23 -05:00
Cameron Taylor
29e1c480fd
unwrap openFolder from #if sys
2024-02-16 16:35:57 -05:00
EliteMasterEric
e4cd694c15
ScreenshotPlugin now uses Player.controls. VolumePlugin is now outside MusicBeatState
2024-02-16 14:42:28 -05:00
EliteMasterEric
77ff261be1
Make functions non-inline so they work on HScript
2024-02-16 13:08:34 -05:00
Mike Welsh
e90c37ad75
Fix issue with incorrect music after pausing during countdown
...
Whenever you pause gameplay, the `PlayState` pauses the music.
But if you start a song from the main menu, pause during the 3,2,1
countdown, and then unpause, the main menu music will incorrectly
start playing again due to `FlxG.sound.music` still referencing it
before the gameplay song starts playing.
Only restart the music if it was actually playing to begin with by
storing the play state in `PlayState.openSubState` when we pause.
This hopefully avoids any other cases where the pause state gets
pushed while the music is stopped.
2024-02-16 04:54:27 -08:00
Cameron Taylor
94938313dd
click preview to open screenshots folder (and moved openFolder to FileUtil
2024-02-16 05:24:43 -05:00
Cameron Taylor
0036a334bc
display fancy preview as a sprite on top of FlxG.stage, to properly render over substates
2024-02-16 04:48:54 -05:00
Mike Welsh
d6b3e2a9cf
Fix FunkinSound not resuming after focus
...
`FunkingSound.onFocus` was checking `_shouldPlay` before resuming,
but this would always be false, causing the sound to not resume
when tabbing out and back into the game.
2024-02-16 00:08:33 -08:00
EliteMasterEric
e24c78ae16
Implemented a screenshot button. FancyPreview is broken.
2024-02-15 21:34:24 -05:00
EliteMasterEric
5ec0939263
Bunch of changes to NoteScriptEvent and death logic
2024-02-15 17:25:28 -05:00
EliteMasterEric
c896300b63
NoteData stringifies nicer now.
2024-02-15 17:23:43 -05:00
Eric
10f4ad704e
Additional mathematical utilities.
2024-02-15 14:17:44 -05:00
Mike Welsh
91ab1cb520
Remove hmm dependency to fix HTML5 target
...
Remove the `hmm` haxelib dependency from the build.
Linking to `hmm` caused `utest` to be transitively linked, which
eventually caused OpenFL to act strangely and instatiate the
application twice on the HTML5 target.
`hmm` was only used for `HaxelibVersions.getLibraryVersions` macro
call. Instead, manually parse the `hmm.json` ourselves to avoid
the dependency. This fixes the HTML5 target.
`hmm` is still used for package management, but no longer linked
in to the build itself.
2024-02-15 00:23:24 -08:00
EliteMasterEric
9209bac02c
Port improved AtlasSprite from char-select-rebase
2024-02-14 03:27:34 -05:00
Cameron Taylor
b96232787a
hide storymode menu characters if they dont exist for the level
2024-02-13 05:23:59 -05:00
Cameron Taylor
923f8f423e
swag truthers we are BACK
2024-02-13 03:32:20 -05:00
EliteMasterEric
bd4103fd11
Merge remote-tracking branch 'origin/rewrite/master' into feature/hashlink-hot-reload
2024-02-13 03:06:20 -05:00
EliteMasterEric
e37fc09e89
Hashlink actually working!
2024-02-13 03:03:11 -05:00
EliteMasterEric
fa4b896d9a
Merge branch 'rewrite/master' into feature/hashlink-hot-reload
2024-02-13 02:23:14 -05:00
EliteMasterEric
c4522fe177
Merge branch 'rewrite/master' into rewrite/weekend-1-gameplay-shaderdev
2024-02-13 02:17:06 -05:00
EliteMasterEric
f7da12acbc
Apparently the transition bug was TransitionableSubState's fault so kill it with fire.
2024-02-13 02:09:25 -05:00
EliteMasterEric
f0b5ef4491
Rest in peace, SwagCamera.
2024-02-13 01:38:11 -05:00
Cameron Taylor
681cfa0883
chart editor waveform fixes for single vocal audio files
2024-02-13 01:16:09 -05:00
Cameron Taylor
41e94f951e
Merge branch 'rewrite/master' of https://github.com/funkincrew/funkin-secret into feature/freeplay-pico-character
2024-02-13 00:48:26 -05:00
Cameron Taylor
8c54a62ed6
Merge branch 'rewrite/master' into feature/freeplay-pico-character
2024-02-13 00:41:03 -05:00
Cameron Taylor
6e0f577d54
debugger fixes
2024-02-13 00:29:46 -05:00
EliteMasterEric
0ff258ce75
Use stickers to transition from the Results state
2024-02-12 23:34:51 -05:00
EliteMasterEric
1b5b7f0ae2
Fix a bug where stickers were broken on story mode
2024-02-12 23:34:40 -05:00
EliteMasterEric
0494ddb506
Fix crash in chart editor minimal Playtest
2024-02-12 23:19:25 -05:00
Cameron Taylor
92f52b2c3f
flixel debugging on test builds
2024-02-12 23:15:18 -05:00
EliteMasterEric
86488a0964
Ensure the CrashHandler ALWAYS initializes first so we have stack traces.
2024-02-12 18:09:36 -05:00
EliteMasterEric
2d8e686b33
Attempt to fix StickerState bug
2024-02-12 16:50:40 -05:00
EliteMasterEric
ef28d34520
Sort PlayState imports
2024-02-12 16:50:29 -05:00
EliteMasterEric
60cde55950
Add scripted FunkinSprite
2024-02-12 16:50:18 -05:00
EliteMasterEric
f4d4d6a194
Fix deprecation issue with FlxTweenType.
2024-02-12 16:49:56 -05:00
EliteMasterEric
f14193e17b
Fix black screen on Grabbable Camera
2024-02-12 16:49:36 -05:00
EliteMasterEric
ce0860fc18
Error handling for frame buffer
2024-02-12 16:49:25 -05:00
EliteMasterEric
a0df87c6b2
Add state and substate to watch
2024-02-12 16:49:04 -05:00
Cameron Taylor
902eb3af91
Merge pull request #288 from FunkinCrew/ansi-trace
...
ansi
2024-02-10 13:45:18 -05:00
EliteMasterEric
d0b3842d44
Merge branch 'feature/freeplay-pico-character' into rewrite/weekend-1-gameplay-shaderdev
2024-02-10 02:38:23 -05:00
Cameron Taylor
66188fbd52
Merge branch 'rewrite/master' into feature/chart-editor-freeplay-difficulty
2024-02-10 02:32:23 -05:00
EliteMasterEric
eea8dde455
Merge branch 'rewrite/master' into rewrite/weekend-1-gameplay-shaderdev
2024-02-10 02:30:50 -05:00
Cameron Taylor
4bfab35b29
Merge branch 'rewrite/master' into feature/dialogue-data-refactor
2024-02-10 02:25:06 -05:00
EliteMasterEric
bb0b176469
Fix bug with building specifically for freeplay.
2024-02-10 00:51:02 -05:00
EliteMasterEric
3ede16be16
Fix issue where Freeplay could be silent sometimes
2024-02-10 00:50:07 -05:00
EliteMasterEric
091f8eb724
Merge branch 'rewrite/master' into feature/freeplay-pico-character
2024-02-09 23:13:40 -05:00
EliteMasterEric
4bf9f68658
Finalize freeplay preview toolbox
2024-02-09 14:58:57 -05:00
EliteMasterEric
4491465bf9
Implement difficulty rank into Metadata toolbox.
2024-02-08 19:22:28 -05:00
EliteMasterEric
2dd5f476b5
Fix a bug where alt instrumentals will load but not cache.
2024-02-08 02:21:12 -05:00
EliteMasterEric
31cd5b3414
Rework Conversation data parsing
2024-02-07 18:45:13 -05:00
EliteMasterEric
fa556dc1f2
Rewrite conversation JSON parsing code.
2024-02-07 09:21:44 -05:00
EliteMasterEric
82b63c02e1
Reworks to make Pico mode actually work.
2024-02-05 21:35:58 -05:00
EliteMasterEric
e5fb1de4ba
Fix a boatload of deprecation warnings and upgrade a few libraries.
2024-02-05 19:46:11 -05:00
EliteMasterEric
167976c8ba
Work in progress
2024-02-05 13:35:30 -05:00
Cameron Taylor
984c26c0e5
Merge branch 'rewrite/master' into feature/chart-editor-offset-toolbox
2024-02-05 13:06:25 -05:00
Cameron Taylor
201e109d64
Merge branch 'rewrite/master' into bugfix/copy-prompt-fixes
2024-02-05 13:03:32 -05:00
Cameron Taylor
cc8b2b2d20
Merge branch 'rewrite/master' into feature/units
2024-02-05 11:55:52 -05:00
EliteMasterEric
8be9c4f8ed
Fix web builds.
2024-02-02 23:26:02 -05:00
Eric
4d6ee03947
Merge branch 'rewrite/master' into ansi-trace
2024-02-02 22:39:06 -05:00
EliteMasterEric
387ff4e816
Replace multiple conditions with array.
2024-02-02 22:38:34 -05:00
EliteMasterEric
f6f9ad3985
Completed functionality for offset window.
2024-02-02 21:53:45 -05:00
Jenny Crowe
fe7ffecc0d
Chart editor: Tweaked FlxCamera management when entering and exiting playtest mode to fix UI-related crashes.
2024-02-01 13:52:50 -07:00
EliteMasterEric
f74604c48e
Feature changes to Offsets window
2024-01-30 21:50:25 -05:00
EliteMasterEric
0f5be08c41
Add mute and max volume options to FunkinSound.
2024-01-30 21:49:49 -05:00
EliteMasterEric
c23ddb5c5a
Fixes to the MeshRenderer
2024-01-30 21:49:34 -05:00
EliteMasterEric
f6e4bc863d
Work in progress on offsets toolbox (working dragging!)
2024-01-27 03:24:49 -05:00
EliteMasterEric
8085b20a67
Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-offset-toolbox
2024-01-27 00:56:13 -05:00
Jenny Crowe
7137c13382
Copy command now pulses events in selection even if no notes are in the selection. "Copied" prompt now includes events in the text.
2024-01-26 19:36:10 -07:00
Jenny Crowe
4743076314
Added % as a unit to not include a space for when displaying in the event tooltip
2024-01-26 19:01:05 -07:00
Jenny Crowe
bfb032dc7f
Added units to other song events.
2024-01-26 18:51:36 -07:00
Jenny Crowe
4f7c2cd511
Now using hbox to more easily append unit label
2024-01-26 18:30:41 -07:00
Jenny Crowe
8b19a7511c
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into feature/units
2024-01-26 18:20:04 -07:00
Cameron Taylor
ca739cee45
event.value -> event.value.toFloat() fix
2024-01-25 23:05:54 -05:00
Cameron Taylor
72fe05ddf5
Merge branch 'rewrite/master' into feature/audio-tab-upgrade
2024-01-25 22:52:31 -05:00
Cameron Taylor
a0b855c8bb
Merge pull request #300 from FunkinCrew/bugfix/vocal-offset-loading
...
Fixed bugs related to instrumental/vocal offsets not loading or being taken into account properly
2024-01-25 22:32:08 -05:00
EliteMasterEric
c9163986d5
Initial attempt at rendering the waveform inside the offsets toolbox.
2024-01-25 20:23:18 -05:00
EliteMasterEric
25aff02784
Added options for waveform amplitude and minimum size.
2024-01-25 19:10:33 -05:00
Jenny Crowe
e111e91a9c
Editor: Added ability to set units for event properties. Fixed bug where event icon tooltip wouldn't show an enum text value correctly.
2024-01-24 20:31:25 -07:00
EliteMasterEric
abebfd8300
Added a forceUpdate option, and improved efficiency of other setters.
2024-01-24 15:47:43 -05:00
EliteMasterEric
17bf3289b5
Fix for default constructor values.
2024-01-24 14:54:29 -05:00
EliteMasterEric
ba674b1f92
Added support for clipRects to WaveformSprite.
2024-01-24 14:35:50 -05:00
EliteMasterEric
a1cff6be50
Replace waveform renderer with the newer, more performant version.
2024-01-23 23:24:05 -05:00
EliteMasterEric
e8fa7f9c70
Performant audio waveforms generated directly from provided FlxSound elements.
2024-01-23 22:47:27 -05:00
Jenny Crowe
dfe4ff614c
Editor: Removed side sliders. Split vocal volume into two sliders. Removed vocal volume from the savefile.
2024-01-22 23:51:13 -07:00
EliteMasterEric
c3d2582252
Work in progress on new Waveform renderer
2024-01-20 14:07:48 -05:00
EliteMasterEric
608d9b6968
Add new Offsets window, work in progress
2024-01-20 14:07:31 -05:00
Jenny Crowe
a7e9f08e26
Editor now loads saved inst/vocal offset properly.
2024-01-19 21:24:18 -07:00
Jenny Crowe
9adfd0b6f1
Vocal offset is now properly taken into account when playing a song
2024-01-19 21:02:43 -07:00
EliteMasterEric
d215152aaf
Fix a bug where removing audio tracks wouldn't remove their visualizers.
2024-01-18 22:28:25 -05:00
Eric
ae907beab9
Merge branch 'rewrite/master' into ansi-trace
2024-01-18 10:01:18 -05:00
Cameron Taylor
969626c8f8
Merge pull request #296 from FunkinCrew/bugfix/play-pause-button
...
Stop audio playback when starting playtest, fixing the button icon.
2024-01-18 07:18:10 -05:00
Cameron Taylor
f13772da67
Merge branch 'rewrite/master' into bugfix/chart-editor-upload-vocals-rewrite
2024-01-18 07:13:57 -05:00
Cameron Taylor
fa00140d23
stringify moved to SongEventSchema
2024-01-18 04:25:15 -05:00
Cameron Taylor
210088a25d
Merge branch 'rewrite/master' into feature/chart-editor-event-tooltips
2024-01-18 04:25:04 -05:00
EliteMasterEric
3ef7a03094
Add "Remove Difficulty" button to the Difficulty toolbox.
2024-01-18 01:08:38 -05:00
Cameron Taylor
2fa5b1a9db
Merge branch 'rewrite/master' into bugfix/pico-death-anim-fix
2024-01-18 00:57:25 -05:00
Cameron Taylor
ab9b6d6c47
Merge pull request #292 from FunkinCrew/bugfix/chart-editor-selection-box
...
Fix a bug where the drag-to-select box in the chart editor is not visible
2024-01-18 00:40:05 -05:00
Cameron Taylor
ef11f89632
Merge branch 'rewrite/master' into feature/separate-character-vocal-volumes
2024-01-18 00:24:47 -05:00
EliteMasterEric
8c770e6c62
Stop audio playback when starting playtest, fixing the button icon.
2024-01-18 00:00:57 -05:00
EliteMasterEric
25fe2c0d39
Rewrite Upload Vocals dialog.
2024-01-17 23:53:23 -05:00
EliteMasterEric
26b7610663
Fix an error with playable Pico death
2024-01-17 23:14:28 -05:00
EliteMasterEric
a0c4499b03
Fix a bug where replaying a level makes a pink screen
2024-01-17 23:12:59 -05:00
EliteMasterEric
027c2843f4
This bug took me like 4-5 hours of staring at code to fix i am going crazy graaaa
2024-01-17 22:19:40 -05:00
Cameron Taylor
96d02261c5
Merge branch 'rewrite/master' into feature/stage-solids
2024-01-17 21:40:26 -05:00
Jenny Crowe
e44b028946
Added side sliders that alter the volume of vocals and hitsounds on player/opponent sides.
2024-01-17 16:24:03 -07:00
EliteMasterEric
80c7bcdfdf
Rewrite Stage data handling to use the Registry pattern, and add support for solid colors.
2024-01-16 17:08:25 -05:00
