1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-03-27 12:29:39 +00:00
Commit graph

986 commits

Author SHA1 Message Date
Cameron Taylor db89e199c4 Merge pull request #455 from FunkinCrew/bugfix/results-screen-cleanup
Bunch of results screen fixes
2024-04-01 22:07:43 -04:00
Cameron Taylor 7fb4b47e2a Merge branch 'rewrite/master' into feature/credits 2024-04-01 22:06:58 -04:00
EliteMasterEric 67e096e443 Bunch of results screen fixes 2024-04-01 21:59:53 -04:00
EliteMasterEric 1df4a354cb Freeplay menu now filters to supported songs when you change difficulty 2024-04-01 18:34:26 -04:00
Cameron Taylor 32ed26ffa6 stereo preloader in progress 2024-03-29 17:54:20 -04:00
EliteMasterEric 7c04630bb7 Fix a bug where duplicate notes would get placed at the beginning 2024-03-29 00:49:02 -04:00
EliteMasterEric ddb41c9ef7 Increase AFK timer, and add SFX over it 2024-03-28 23:13:47 -04:00
EliteMasterEric 342782c3d3 Fix issue with pink screen when moving from PlayState->Freeplay->Main Menu 2024-03-28 22:33:50 -04:00
EliteMasterEric 443a501e4e Merge branch 'rewrite/master' into feature/freeplay-ost-text 2024-03-28 20:33:17 -04:00
EliteMasterEric 571c6d5960 Merge branch 'rewrite/master' into feature/credits 2024-03-28 20:29:15 -04:00
Eric 5fa559dfb1 Merge branch 'rewrite/master' into bugfix/buncha-2hot-fixes 2024-03-28 20:26:45 -04:00
EliteMasterEric 35f99b49a4 Merge branch 'rewrite/master' into input-offsets 2024-03-28 20:23:31 -04:00
EliteMasterEric 6a131555f8 Merge branch 'rewrite/master' into feature/chart-editor-gamepad-support 2024-03-28 20:15:32 -04:00
Cameron Taylor 86c91d1e82 Merge pull request #436 from FunkinCrew/feature/touch-here-to-play
New Funkin' Preloader, and Touch Here To Play
2024-03-28 07:15:53 -04:00
EliteMasterEric 8a9eee3aa3 Rework Funkin Preloader and added "Touch to Play" graphic 2024-03-28 04:34:43 -04:00
EliteMasterEric 6ab6458e2a Merge remote-tracking branch 'origin/rewrite/master' into feature/credits 2024-03-28 03:00:45 -04:00
EliteMasterEric 3a86b47292 Fix issue where main menu music wouldn't play after credits. 2024-03-28 02:57:51 -04:00
EliteMasterEric 5311b043ac Rework credits data structure. 2024-03-28 02:57:22 -04:00
EliteMasterEric b13c6563df Fix issues with Freeplay OST text and add animations. 2024-03-28 01:46:50 -04:00
EliteMasterEric 201e018f25 Merge remote-tracking branch 'origin/rewrite/master' into bugfix/buncha-2hot-fixes 2024-03-28 00:03:09 -04:00
EliteMasterEric 893822532e Fix an issue causing the Kickstarter video to not play 2024-03-28 00:01:42 -04:00
Cameron Taylor 0f80f1c8a6 Merge pull request #417 from FunkinCrew/bugfix/freeplay-afk-fixes
Bugfix/freeplay afk fixes
2024-03-27 21:08:08 -04:00
Cameron Taylor 3181795985 remove trace() calls from ages ago while im here 2024-03-27 20:58:58 -04:00
EliteMasterEric 463e946b17 Merge remote-tracking branch 'origin/rewrite/master' into bugfix/buncha-2hot-fixes 2024-03-27 01:40:22 -04:00
EliteMasterEric 4209c5156e Readd a missing sound in the story menu 2024-03-27 01:02:11 -04:00
Eric 88c973f1ae Merge branch 'rewrite/master' into bugfix/freeplay-afk-fixes 2024-03-26 19:35:10 -04:00
EliteMasterEric 1e888658f7 First implementation of credits state. 2024-03-26 12:33:54 -04:00
EliteMasterEric 90f861628d Fix an HTML5 build issue. 2024-03-25 21:09:02 -04:00
Cameron Taylor ccfb9ca65b Merge branch 'rewrite/master' into feature/high-erect 2024-03-25 16:02:09 -04:00
Cameron Taylor fe6cb8c5a9 Merge pull request #413 from FunkinCrew/bugfix/funkin-sound-overhaul
Funkin Sound overhaul
2024-03-25 15:59:02 -04:00
EliteMasterEric 51d36ea25e Work in progress on fixing Boyfriend's spook/tv animations 2024-03-24 04:53:05 -04:00
EliteMasterEric 24b03e4f6b Replace calls to FlxG.sound.playMusic with ones that set the BPM. 2024-03-23 23:38:07 -04:00
EliteMasterEric a8486a47df Fix a bug where the album disappears never to return 2024-03-23 18:22:15 -04:00
EliteMasterEric 6407770ed6 Rework every class to use FunkinSound. 2024-03-23 17:50:48 -04:00
EliteMasterEric dc638a1303 Fix a bunch of merge bugs. 2024-03-23 15:34:37 -04:00
EliteMasterEric 831d6aae71 Merge remote-tracking branch 'origin/rewrite/master' into input-offsets 2024-03-23 14:38:50 -04:00
Cameron Taylor 01e83d4713 the funkin crew presents 2024-03-22 20:21:09 -07:00
Cameron Taylor a695fb2b39 Merge branch 'rewrite/master' into formatting-fixes 2024-03-22 19:00:29 -07:00
EliteMasterEric aea9213eea Make sure the BPM label gets updated properly 2024-03-22 03:04:33 -04:00
EliteMasterEric 4524b66170 Only show easy/normal/hard in story mode for now 2024-03-22 02:47:43 -04:00
Cameron Taylor f7acee94cd Merge branch 'rewrite/master' into feature/freeplay-album-art 2024-03-21 23:37:20 -07:00
Cameron Taylor 80c938af4f fix for the album roll to come in only once bf hand hits 2024-03-21 23:34:03 -07:00
Cameron Taylor 433d4968da change to elasticOut 2024-03-21 23:32:07 -07:00
Eric fe2e272abb Merge branch 'rewrite/master' into title-music-vol-fix 2024-03-22 00:17:03 -04:00
EliteMasterEric 2b91c0f926 Merge remote-tracking branch 'origin/rewrite/master' into feature/focusCameraTweening 2024-03-22 00:06:55 -04:00
EliteMasterEric 5e0de6d1ce Fix some issues with events unintentionally sharing data after being edited via the toolbox. 2024-03-21 23:57:26 -04:00
Eric 662688023a Merge branch 'rewrite/master' into title-music-vol-fix 2024-03-21 22:57:18 -04:00
EliteMasterEric 1f81e92827 Scrapped the weird FlxAltasSprite stuff and just used a tween. Also fixed some bugs with story menu 2024-03-21 00:38:52 -04:00
EliteMasterEric 3975d34b70 Fix scoring lerp issue on story menu. 2024-03-20 23:06:32 -04:00
EliteMasterEric 36a9c29720 Work in progress on custom album art for freeplay 2024-03-20 14:37:24 -04:00
EliteMasterEric 3a35be916b A bunch of checkstyle fixes 2024-03-16 22:20:22 -04:00
EliteMasterEric d56c33cd17 Fix a dozen tiny issues with 2hot's audio and visuals (and some script crashes!). 2024-03-16 00:55:57 -04:00
EliteMasterEric e4eb543fa7 Fix a bug where title music starts blaringly loud. 2024-03-15 21:53:07 -04:00
Cameron Taylor d68ea0eb46 lil polish 2024-03-14 19:40:07 -07:00
Cameron Taylor 82383018f6 funkin soundtray 2024-03-14 19:27:07 -07:00
Jenny Crowe 42506909f7 Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into feature/focusCameraTweening 2024-03-14 15:24:51 -07:00
Cameron Taylor 3aada18a59 title screen volume fix 2024-03-14 04:03:33 -07:00
Cameron Taylor c4550ca773 Merge branch 'rewrite/master' into bugfix/github-force-debug 2024-03-14 03:09:05 -07:00
Cameron Taylor e0eb00d01a Merge branch 'rewrite/master' into feature/pico-flicker 2024-03-13 21:51:58 -07:00
Cameron Taylor 1211dbb6e8 Merge branch 'rewrite/master' into feature/chart-editor-song-scripts 2024-03-13 21:26:50 -07:00
Cameron Taylor c8b74ccce2 Merge branch 'rewrite/master' into feature/debugger-popup-fixes 2024-03-13 18:54:24 -07:00
Cameron Taylor b9ab38e0b9 timertools -> timerutil fix 2024-03-13 18:47:15 -07:00
Cameron Taylor 1a224423f9 Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into bugfix/precache-library-assets 2024-03-13 18:41:45 -07:00
EliteMasterEric d22cb1a96f Fix some issues resulting in release builds breaking! 2024-03-13 17:38:00 -04:00
EliteMasterEric a13dc6e585 Remove deprecated imports. 2024-03-13 12:07:06 -04:00
EliteMasterEric 66085ff867 Song scripts can now be (optionally) enabled in the Chart Editor playtest 2024-03-12 21:34:50 -04:00
EliteMasterEric 09e52e47ae Commit an unsaved file 2024-03-12 18:01:09 -04:00
EliteMasterEric bbaf8dfb3e Debugger popup fixes 2024-03-12 17:57:52 -04:00
EliteMasterEric be8f5699b5 2hot stutter actually fixed! 2024-03-11 23:42:32 -04:00
Jenny Crowe 6b8fb7dc77 Standardized camera zoom tweening to match camera follow tweening. Implemented methods to cancel tweens in necessary places. Start of pausing tweens when pausing the game (WIP). (CHANGES NOT TESTED EXPECT SOMETHING TO BREAK) 2024-03-10 16:35:41 -07:00
Jenny Crowe f9291d6458 Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into feature/focusCameraTweening 2024-03-10 14:51:24 -07:00
Cameron Taylor 25cb73316c Merge branch 'rewrite/master' into bugfix/html5-array-clone 2024-03-10 13:46:49 -04:00
Cameron Taylor 528b01d739 assets submod 2024-03-10 13:34:40 -04:00
EliteMasterEric 09029718aa Fix an issue where story menu characters bop too fast 2024-03-08 21:33:06 -05:00
EliteMasterEric a7b531e57f Fix swapped entries in Blazin' dropdown. 2024-03-08 15:07:10 -05:00
EliteMasterEric f671cc8569 Remove DynamicAccessTools entirely. 2024-03-06 14:13:48 -05:00
EliteMasterEric 2fa1d18dce Fix build 2024-03-06 12:29:54 -05:00
Cameron Taylor 1fe554e24e Merge pull request #371 from FunkinCrew/bugfix/FPIQ-286
Remove DynamicTools; fix pause menu on HTML5
2024-03-06 02:30:39 -05:00
Cameron Taylor 60223b3f12 Merge pull request #369 from FunkinCrew/bugfix/offset-toolbox-floats
offset toolbox floats fix
2024-03-06 02:23:16 -05:00
Mike Welsh a516e9199f Remove DynamicTools; fix pause menu on HTML5
Calls intended for `ArrayTools.clone` were being routed to
`DynamicTools.clone` due to the order of `using` statements in
`imports.hx`. This caused the pause menu to break due to arrays
becoming fubar (missing length property).

Using `DynamicTools` is a little dangerous, so remove it in favor
of calling `Reflect.copy` directly.
2024-03-05 23:21:57 -08:00
FabsTheFabs 6bc1eb7278 typo oops 2024-03-06 05:06:57 +00:00
FabsTheFabs 607b5757fd added decimal point to waveform duration 2024-03-06 05:05:03 +00:00
Cameron Taylor 1ebfeb3a89 Merge branch 'rewrite/master' of https://github.com/FunkinCrew/funkin-secret into feature/script-event-note-incoming 2024-03-05 23:57:53 -05:00
EliteMasterEric 1b1834e98b Implement a botplay checkbox in the chart editor 2024-03-05 22:27:07 -05:00
EliteMasterEric 059e1c0e13 Implement onNoteIncoming script event. 2024-03-05 21:48:04 -05:00
Eric e76a94b682 Merge branch 'rewrite/master' into bugfix/2hot-explosion-polymod 2024-03-05 14:11:54 -05:00
EliteMasterEric 9212ea9c90 Script fixes for 2hot explosions breaking Polymod 2024-03-05 02:29:44 -05:00
EliteMasterEric ae5f48c29c Fix issues with story mode colors breaking 2024-03-05 00:22:29 -05:00
Jenny Crowe 132eda6715 Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into feature/focusCameraTweening 2024-03-04 20:57:54 -07:00
Jenny Crowe d9cf097e46 Fixed bools and associated checkboxes not updating properly. 2024-03-04 20:57:21 -07:00
Cameron Taylor fa72fa44b1 tallies for story mode 2024-03-04 21:18:40 -05:00
Cameron Taylor ae7d8b9046 Merge branch 'rewrite/master' into feature/blazin-animation-work 2024-03-04 18:11:11 -05:00
EliteMasterEric 73cf6b9fd2 Rewrite save data to fix scripted story levels. Add a "pre-transition death delay" 2024-03-04 16:37:42 -05:00
Hazel 0a19c7a8cb fix(ci), feat(ci), refactor: i don't need sleep, i need answers (#357)
* hx the codec

* fix(ci,html5): use haxe.Timer instead of Sys.time

* refactor(compat): use haxe.Timer instead of Sys.time(), introduce TimerUtil to reduce code dupe

* fix: redundant types

* refactor(style): use TimerTools in place of haxe.Timer

* refactor: consistent timer code

* feat: build timings

* refactor(ci): cleanup ci configs

* sigh

* sigh, 2

* fix: haxelib deleterepo does not silently fail

* retrigger ci

* verbose output

* debug info after haxelib gti

* force haxelib git override

* more debug info

* force bash

* at least haxelib is consistent now

* fix the runners first, then do that

* update ci-haxe

* it is time?

* deleterepo may fail

* finishing touches
2024-03-02 23:49:27 -05:00
EliteMasterEric 761a3d53df Taunt improvements. 2024-03-02 23:23:52 -05:00
EliteMasterEric f7a3d43e54 Fixes to animation looping and holds 2024-03-02 22:46:13 -05:00
EliteMasterEric 684eb919b5 Make the playback rate option explicit so it doesn't break in the future. 2024-02-29 18:49:20 -05:00
Cameron Taylor e36629a41f Merge branch 'rewrite/master' into feature/new-pause-menu 2024-02-29 13:53:55 -05:00
EliteMasterEric 1d70ff95f9 Several chart editor fixes (more precise playback speed, live input mode loads properly from save) 2024-02-28 21:19:21 -05:00
EliteMasterEric 5d030b8a31 Merge remote-tracking branch 'origin/rewrite/master' into feature/new-pause-menu 2024-02-28 03:04:56 -05:00
EliteMasterEric cecddbc2ee Fixed issues with audio in Week 6 after skipping the cutscene. 2024-02-28 03:01:20 -05:00
EliteMasterEric 13d6ba378e Work in progress on fixing Week 6 2024-02-28 00:19:08 -05:00
EliteMasterEric 66c91d8b3e Sort the chart editor note kind dropdown. 2024-02-23 03:23:00 -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
EliteMasterEric 572ecc8aa8 Merge remote-tracking branch 'origin/rewrite/master' into anim-editor-stuffs 2024-02-22 19:05:20 -05:00
EliteMasterEric 539b688055 Exploration in expanding FunkinSprite for optimization 2024-02-22 18:55:24 -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
Cameron Taylor 63a49010ba positioning and average reset 2024-02-19 20:56:57 -05:00
Cameron Taylor 6e691c66c3 Merge branch 'rewrite/master' of https://github.com/FunkinCrew/funkin-secret into input-offsets 2024-02-19 20:33:36 -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 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 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 98e6d4091e Revamp note kind handling in the chart editor. 2024-02-16 22:01:47 -05:00
EliteMasterEric e4cd694c15 ScreenshotPlugin now uses Player.controls. VolumePlugin is now outside MusicBeatState 2024-02-16 14:42:28 -05: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 638c166663 optimization when opening from pause menu 2024-02-15 04:10:48 -05:00
Cameron Taylor 96d27c271a avg offset better calc 2024-02-14 08:29:38 -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 c3d03011cc Merge branch 'rewrite/master' into input-offsets 2024-02-13 03:34:41 -05:00
EliteMasterEric 2dbc0cda6e Fix a missing import. 2024-02-13 03:18:51 -05:00
EliteMasterEric c901763ad8 Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-gamepad-support 2024-02-13 03:12:57 -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
Cameron Taylor 6b80e292e5 Merge branch 'rewrite/master' into input-offsets 2024-02-13 03:02:33 -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
Cameron Taylor 58077b4505 more working audio offset in progress 2024-02-12 22:44:59 -05:00
Cameron Taylor e759f90147 audioVisualOffset numbers 2024-02-12 22:14:35 -05:00
Cameron Taylor 25766dbde9 decoupling some stuff from Conductor.instance 2024-02-12 21:41:16 -05:00
Cameron Taylor 43ec35f5fd derp .position -> .time fix 2024-02-12 21:00:40 -05:00
Cameron Taylor 0145d7ed2d input offset edits in progress 2024-02-12 20:06:43 -05:00
EliteMasterEric 2d8e686b33 Attempt to fix StickerState bug 2024-02-12 16:50:40 -05:00
EliteMasterEric f4d4d6a194 Fix deprecation issue with FlxTweenType. 2024-02-12 16:49:56 -05:00
Cameron Taylor d903edcb59 Merge branch 'rewrite/master' into input-offsets 2024-02-10 15:43:27 -05:00
Cameron Taylor aeddcee983 tweaks in progress 2024-02-10 15:42:29 -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 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 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 de1ddcbf4d Merge branch 'rewrite/master' into feature/chart-editor-gamepad-support 2024-02-02 23:15:48 -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
Cameron Taylor 3621f17bd0 maybe acurate? 2024-01-31 03:24:00 -05:00
Cameron Taylor 0f29f2f7a6 Merge branch 'rewrite/master' into input-offsets 2024-01-31 00:39:35 -05:00
EliteMasterEric f74604c48e Feature changes to Offsets window 2024-01-30 21:50:25 -05:00
Cameron Taylor c44e33c556 derp 2024-01-27 06:16:46 -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 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 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
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 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 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 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
Cameron Taylor 6564aba2c1 Merge pull request #286 from FunkinCrew/bugfix/story-menu-animations
Reuse LevelProps (this fixes animations when switching weeks)
2024-01-16 06:27:18 -05:00
Cameron Taylor 1dcd0debc7 conductor stuff 2024-01-16 05:37:06 -05:00
EliteMasterEric b4edcc4b3c Reuse LevelProps (this fixes animations when switching weeks) 2024-01-15 23:43:05 -05:00
Cameron Taylor 3b078ee42c Merge pull request #284 from FunkinCrew/bugfix/chart-editor-edit-context
Fix "Edit Event" menu item when right clicking chart events
2024-01-15 21:30:22 -05:00
EliteMasterEric 3366240eb5 Fix "Edit Event" menu item when right clicking chart events 2024-01-15 18:21:49 -05:00
EliteMasterEric 6f0f5ea610 Fix a crash when closing chart editor with no music playing 2024-01-15 15:33:28 -05:00
Cameron Taylor bf11071349 null check on daSong for difficultyStars 2024-01-14 08:48:50 -05:00
EliteMasterEric 3e8200ee9d Allow builds without hxCodec if using hashlink 2024-01-12 21:52:28 -05:00
Cameron Taylor 75dfed8229 -release fix 2024-01-12 19:50:13 -05:00
EliteMasterEric 9fe0c68256 Add theme music toggle and extend fade in 2024-01-12 18:29:02 -05:00
Cameron Taylor 99b7a8a75d Merge branch 'rewrite/master' into bugfix/chart-editor-positioning-fixes 2024-01-12 08:19:26 -05:00
Cameron Taylor e87c895131 Merge branch 'rewrite/master' into feature/chart-editor-drag-edit-holds 2024-01-12 08:13:30 -05:00
EliteMasterEric 25c10d205d Some positioning fixes 2024-01-12 06:35:41 -05:00
Cameron Taylor fad569519d Merge branch 'rewrite/master' into bugfix/freeplay-icon-offsets 2024-01-12 06:15:15 -05:00
EliteMasterEric 025fd326bd Click and drag on a sustain to edit it. 2024-01-12 06:13:34 -05:00
Cameron Taylor 2539b90ab8 Merge branch 'rewrite/master' into feature/chart-editor-selection-tweak 2024-01-12 04:43:17 -05:00
EliteMasterEric c05131e6a9 Additional freeplay cleanup 2024-01-11 00:52:42 -05:00
EliteMasterEric 462eece09a Use proper difficulty rating data, proper clear percentage 2024-01-11 00:30:00 -05:00
EliteMasterEric fc12f956f6 Fix alignment of character pixel icons in freeplay menu 2024-01-10 20:58:29 -05:00
EliteMasterEric 06964ce1e3 Fix HTML5 build issue 2024-01-10 20:58:06 -05:00
Cameron Taylor b11bf09687 save/load for inputOffsets 2024-01-09 19:57:33 -05:00
Cameron Taylor 5d0c1521d5 strumline refactor stuffy 2024-01-09 13:16:00 -05:00
EliteMasterEric c6b3499897 Finished up hold note placement on gamepad, implemented note preview playhead 2024-01-08 21:26:24 -05:00
Cameron Taylor e323f46569 conductor.instance fixes 2024-01-08 15:46:16 -05:00
Cameron Taylor 7058d9baa7 stuf in progres 2024-01-08 15:39:44 -05:00
Cameron Taylor d62042a99a skip transition into debug substate 2024-01-08 15:39:44 -05:00
EliteMasterEric 4804b9ae22 Work in progress for Chart Editor gamepad support (navigation implemented, note placement WIP) 2024-01-06 01:06:10 -05:00
Cameron Taylor ac902c19c5 beats per measure conductor instance fix 2024-01-05 20:38:46 -05:00
Cameron Taylor ff88c53f7c steps per measure instance conductor fix 2024-01-05 20:38:20 -05:00
Cameron Taylor 350ce19783 conductor instnace small fix lol! 2024-01-05 20:37:13 -05:00
Cameron Taylor 8f7c449194 Merge branch 'rewrite/master' into feature/chart-editor-measure-numbers 2024-01-05 20:35:15 -05:00
Cameron Taylor cc7577a333 fix conductor instance stuf on watchPlugin 2024-01-05 20:25:54 -05:00
Cameron Taylor 97ea4b0891 re-add debug_refreshModules? 2024-01-05 20:23:15 -05:00
Cameron Taylor da4e77bf44 Merge branch 'rewrite/master' into feature/chart-editor-context-menus 2024-01-05 20:11:38 -05:00
Cameron Taylor 1e07b6ae22 Merge branch 'rewrite/master' into bugfix/chart-editor-modifies-freeplay 2024-01-05 17:41:07 -05:00
Cameron Taylor 65aee1dd13 Merge branch 'rewrite/master' into bugfix/conductor-rewrite 2024-01-05 15:32:42 -05:00
EliteMasterEric a3123cd64c Measure numbers next to ticks and support for initial time signature. 2024-01-05 02:35:41 -05:00
EliteMasterEric 336810b628 Tooltips when hovering over chart events 2024-01-04 10:00:39 -05:00
EliteMasterEric 4a0a330eb4 Redo logic around note selection, add new buttons for selecting individual sides. 2024-01-04 08:20:34 -05:00
EliteMasterEric 4c353101ae Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-context-menus 2024-01-04 01:55:00 -05:00
EliteMasterEric edc6f85e21 Finish up event editing (selecting an existing event now shows its data in the event data toolbox) 2024-01-03 21:10:14 -05:00
EliteMasterEric 7684757dbb Merge remote-tracking branch 'origin/rewrite/master' into no-debugger 2024-01-03 19:54:41 -05:00
EliteMasterEric bbaa9aa4af Work in progress on context menus and song event editing. 2024-01-03 19:53:17 -05:00
EliteMasterEric a1002c4756 Merge remote-tracking branch 'origin/rewrite/master' into bugfix/conductor-rewrite 2024-01-02 14:14:26 -05:00
EliteMasterEric ddfecf2cfc Clean up difficulty label behavior 2024-01-02 14:07:07 -05:00
Cameron Taylor 11d21c1369 Merge branch 'rewrite/master' into bugfix/chart-editor-monday-fixes 2024-01-01 19:09:36 -05:00
Eric edd8bdc014 Merge branch 'rewrite/master' into bugfix/chart-editor-monday-fixes 2023-12-19 19:04:40 -05:00
EliteMasterEric 711253a202 Update HaxeUI to latest 2023-12-19 16:12:25 -05:00
EliteMasterEric 70b7de94aa Fix to Metadata toolbox causing crash when no GF :( 2023-12-19 01:28:13 -05:00
EliteMasterEric ad02bf2ee0 Fix to GameOverSubstate exiting to Freeplay instead of Chart Editor 2023-12-19 01:27:58 -05:00
EliteMasterEric bb0fb02813 Fix to launching directly into Chart Editor 2023-12-19 01:26:43 -05:00
EliteMasterEric 3e65e7ecc5 Fix for vocals not loading properly and not getting cleared properly. 2023-12-19 01:26:26 -05:00
EliteMasterEric 328bb7b938 Fixes to Erect/Nightmare only 2023-12-19 01:25:15 -05:00
Cameron Taylor 41ad47db52 Merge branch 'rewrite/master' into bugfix/selection-highlight 2023-12-19 01:18:49 -05:00
shr ab7ba485cb added GrabbableCamera 2023-12-18 20:15:40 -05:00
Cameron Taylor 4fc56a2280 small fix to backups folder not existing 2023-12-15 21:46:09 -05:00
EliteMasterEric 88ca58f9e2 Fixes for updated HaxeUI and Flixel. 2023-12-15 21:09:01 -05:00
Cameron Taylor e9ed7223b6 no debugger 2023-12-15 02:29:32 -05:00
Cameron Taylor 15f72adeed Merge branch 'rewrite/master' into bugfix/selection-highlight 2023-12-14 18:41:23 -05:00
EliteMasterEric ca489b5609 Rewrite the Conductor to be a singleton instance. 2023-12-14 16:56:20 -05:00
EliteMasterEric b3236e6134 Fix a bug where modifying a copied template song's BPM in the chart editor would modify BPM in Freeplay. 2023-12-14 00:47:04 -05:00
Cameron Taylor 4ea04a9a2e Merge branch 'icon-charswitcher' into rewrite/master 2023-12-13 23:11:51 -05:00
EliteMasterEric e2b0ed98dd Fix a bug where making one selection and then making a different one would leave the original highlighted 2023-12-13 23:11:19 -05:00
Cameron Taylor 0a47689eaa ease 2023-12-13 23:11:12 -05:00
EliteMasterEric aeb2cf24ad Fix a rebase issue 2023-12-13 22:42:09 -05:00
EliteMasterEric b740fbf028 Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-waveform 2023-12-13 22:36:08 -05:00
Cameron Taylor 4193cd4ee2 proper dialog fading 2023-12-13 18:24:55 -05:00
Cameron Taylor 028e90474c Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into icon-charswitcher 2023-12-13 17:26:46 -05:00
Cameron Taylor db76a0dd1d Merge pull request #244 from FunkinCrew/chart-edit-playtest
Enabling / Disabling "playtest" mode from chart editor
2023-12-13 17:19:02 -05:00
Cameron Taylor b09ed369e8 f 2023-12-13 09:20:15 -05:00
Cameron Taylor 6ca0e32391 Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into icon-charswitcher 2023-12-13 09:20:11 -05:00
Eric 34673c3f6c Merge branch 'rewrite/master' into mac-delete 2023-12-12 19:44:04 -05:00
EliteMasterEric 42d070922b Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-waveform 2023-12-12 19:34:58 -05:00
Eric f36cb84797 Merge pull request #242 from FunkinCrew/copy-flash
chart editor: copy notes polish
2023-12-12 19:29:17 -05:00
Eric a6e7fc6d2c Merge pull request #241 from FunkinCrew/copy-preview
note highlight preview
2023-12-12 19:29:06 -05:00
Eric 50d015c449 Merge branch 'rewrite/master' into chart-edit-playtest 2023-12-12 17:09:26 -05:00
EliteMasterEric 43038d0a06 Move the "Start at current time" checkbox 2023-12-12 17:07:28 -05:00
Eric 591de9bf6d Merge branch 'rewrite/master' into icon-charswitcher 2023-12-12 14:29:06 -05:00
EliteMasterEric 52f16ce457 Redo icon dialog and add support to metadata dialog. 2023-12-12 05:24:43 -05:00
Cameron Taylor b33f27f097 tiny lil polish and cleanin 2023-12-11 04:35:39 -05:00
Cameron Taylor 05f977f85f character selector 2023-12-11 03:38:44 -05:00
Cameron Taylor 9ffffe9c8a player char select 2023-12-11 02:40:58 -05:00
Cameron Taylor 181e3f85b8 switching opp 2023-12-11 02:26:37 -05:00
Cameron Taylor ac3f27edd4 icon char select in progres 2023-12-11 00:19:33 -05:00
EliteMasterEric e24c5877a9 Some quick fixes to get Mac to build. 2023-12-10 23:33:08 -05:00
Cameron Taylor c3fa793d97 adds !isCursorOverHaxeUI around 2023-12-10 04:10:57 -05:00
Cameron Taylor 3a70ca4e08 menubar selected fix 2023-12-10 03:49:24 -05:00
Cameron Taylor 8cec180353 practice mode in progress 2023-12-10 03:37:12 -05:00
Cameron Taylor 7876b07c37 mac delete key fix 2023-12-09 18:00:32 -05:00
Cameron Taylor 87c866f662 copy notifier polish 2023-12-08 22:55:14 -05:00
Cameron Taylor 6f141e5f52 copy text popup 2023-12-08 22:28:34 -05:00
Cameron Taylor 796e1fcbab note highlight preview 2023-12-08 20:21:55 -05:00
Cameron Taylor 1871b87630 Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into feature/chart-waveform 2023-12-08 19:28:16 -05:00
Cameron Taylor c99ac11d8a opponent vocal 2023-12-08 18:44:45 -05:00
Cameron Taylor 81432100b8 Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into feature/chart-waveform 2023-12-08 18:35:28 -05:00
EliteMasterEric 6060282f20 Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-offsets-part-2 2023-12-08 16:12:56 -05:00
EliteMasterEric 64cba7ca2d Okay offsets should be actually done now. 2023-12-08 16:12:36 -05:00
EliteMasterEric 7c6baea7d2 Rework to fix variant issues 2023-12-08 14:01:12 -05:00
Cameron Taylor 2858cbf56b mac file filter fix 2023-12-08 02:14:26 -05:00
Cameron Taylor 88409df992 Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into feature/chart-waveform 2023-12-08 01:34:26 -05:00
EliteMasterEric f3fa9a58d3 Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-offsets-part-2 2023-12-08 01:16:16 -05:00
EliteMasterEric 7f0caeb026 Work in progress on offsets in Chart Editor state. 2023-12-08 01:15:22 -05:00
Cameron Taylor 3652550b1a Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into feature/chart-editor-offsets-part-1 2023-12-07 18:14:10 -05:00
EliteMasterEric e23c1464f6 Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-offsets-part-1 2023-12-07 16:32:12 -05:00
Cameron Taylor cd0bd7ff55 assets 2023-12-07 14:41:53 -05:00
Cameron Taylor 554c7bb31d null + macro things? 2023-12-07 14:29:45 -05:00
EliteMasterEric 1abd587645 Rework offsets to be built into the FlxSound 2023-12-06 15:04:24 -05:00
EliteMasterEric 1716ffc57f Implement instrumental and vocal offsets into the PlayState. 2023-12-05 02:44:57 -05:00
Cameron Taylor a750cc1620 vis wips wips wips 2023-12-01 19:58:58 -05:00
EliteMasterEric a0ae30a7c1 Metronome slider and scroll anchor 2023-12-01 17:14:48 -05:00
EliteMasterEric 8ef380e0b2 Resolve merge issues 2023-11-29 16:53:08 -05:00
EliteMasterEric eebb2e874f Merge branch 'rewrite/master' into bugfix/chart-editor-notif-in-bg 2023-11-29 16:42:40 -05:00
Cameron Taylor df427c8ecb player vis in progress 2023-11-29 06:17:01 -05:00
Cameron Taylor eea614b4f5 samples stability 2023-11-29 05:49:59 -05:00
Cameron Taylor 73810a5059 Merge branch 'rewrite/master' of https://github.com/funkincrew/funkin-secret into feature/chart-waveform 2023-11-29 04:44:37 -05:00
Cameron Taylor 0899c60e8d Merge pull request #234 from FunkinCrew/polish/welcome-screen
more info on playbar
2023-11-29 04:25:11 -05:00
Cameron Taylor 87b1cabbac Merge branch 'rewrite/master' into bugfix/platform-fixes 2023-11-29 01:46:10 -05:00
Cameron Taylor ca9f42fedf waveform in progres 2023-11-29 01:43:59 -05:00
EliteMasterEric 99ed8b94d7 Target the current time change rather than the first one. 2023-11-28 21:44:09 -05:00
EliteMasterEric 90fc00f9bb Additional web fixes, Github CI should be happy now. 2023-11-28 21:19:07 -05:00
EliteMasterEric 9a2f235bed Platform-specific fixes for HTML5 and MacOS 2023-11-28 20:52:45 -05:00
EliteMasterEric ed10d2c5d0 Multiple chart editor bug fixes +tweaks 2023-11-28 20:36:59 -05:00
Cameron Taylor 21b79c0b83 bpm in playbar 2023-11-28 04:30:29 -05:00
Cameron Taylor d9d5744f1e difficulty playbar 2023-11-28 04:05:17 -05:00
Cameron Taylor aee8df4fcb default note snapps 2023-11-27 23:29:48 -05:00
Cameron Taylor e44559d056 last modified 2023-11-27 20:37:10 -05:00
Cameron Taylor 41384ddf0d playtesting fix 2023-11-25 03:50:22 -05:00
Cameron Taylor f3a38e0232 fixing the stop 2023-11-25 02:48:43 -05:00
Cameron Taylor 64a4512980 charting song polish + recents menu fix 2023-11-25 02:18:39 -05:00
EliteMasterEric 290c568cb5 Disable notification actions while playtest is open. 2023-11-24 16:11:53 -05:00
EliteMasterEric a2cee82779 Fixing up a rough Git merge 2023-11-24 00:58:12 -05:00
EliteMasterEric 4e1945b373 Merge remote-tracking branch 'origin/rewrite/master' into bugfix/chart-editor-macro-rework 2023-11-24 00:49:51 -05:00
EliteMasterEric 47f39b072a Convert chart editor to macro-based UIState 2023-11-24 00:42:07 -05:00
EliteMasterEric bab7d6cf53 Reworks to dialogs 2023-11-24 00:41:38 -05:00
Cameron Taylor 811640ef6a Merge branch 'rewrite/master' into feature/chart-editor-backup-popup 2023-11-23 20:08:13 -05:00
Cameron Taylor 645b9b579a don't close backup dialog if opening folder 2023-11-23 18:35:57 -05:00
Cameron Taylor ecdb89c3a6 Merge pull request #228 from FunkinCrew/polish/chart-intro-screen
Polish/chart intro screen
2023-11-22 20:45:35 -05:00