1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-09 00:04:42 +00:00
Commit graph

2350 commits

Author SHA1 Message Date
Eric fecb4a5ad5 Merge branch 'rewrite/master' into feature/units 2024-02-02 22:06:49 -05:00
Eric fc7244459e Merge branch 'rewrite/master' into feature/chart-editor-offset-toolbox 2024-02-02 22:03:57 -05:00
EliteMasterEric 8cef0c48d8 Update flixel-addons and assets submodule. 2024-02-02 22:03:32 -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
Hazel d6bc8d88aa fix(ci): checkout, html5 (#305)
* fetch-depth=1

* switch to app tokens

* docs?

* docs!

* actions / doesnt check out

* mac attempt 1

* custom setup haxe action

* trigger ci run thanks github

* interesting

* meow

* use tags

* homebrew fixing maybe

* mymindishazel/actions-setup-haxe@vC.1.8

* automationgit pushgit pushgit push

* rosetta all the way?

* macos oopsy

* mac cache && move ci to org

* update checkout action to do post-checkout cleaning

* update haxe & cache actions to node 20

* retry action but with updated ci-checkout@v6

* cleanup: there's no scheduled runs

* actions/cache@v4 in setup-haxe

* update to haxe 4.3

* lack of libc?

* ubuntu 23.10 has glibc 2.38

---------

Co-authored-by: Eric <ericmyllyoja@gmail.com>
Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
2024-01-29 14:50:04 -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
Jenny Crowe 8573a725bd acacagh assets update 2024-01-26 18:19:35 -07:00
Cameron Taylor d039c20eef Merge pull request #301 from FunkinCrew/feature/audio-tab-upgrade
Audio tab additions
2024-01-25 23:06:21 -05: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 280f84d5d0 assets submod 2024-01-25 22:52:20 -05:00
Cameron Taylor 8cab5f0d31 Merge pull request #298 from FunkinCrew/bugfix/haxeui-no-pr-35
Switch branches for HaxeUI-Flixel
2024-01-25 22:47:04 -05:00
Cameron Taylor 90fc1b3962 haxeui hmm update to latest 2024-01-25 22:46:47 -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
Cameron Taylor e9f50145e2 Merge branch 'rewrite/master' into bugfix/haxeui-no-pr-35 2024-01-25 22:31:23 -05:00
Cameron Taylor a71744eb8b Merge pull request #299 from FunkinCrew/bugfix/layered-vis
Fix a bug where removing audio tracks wouldn't remove their visualizers.
2024-01-25 22:30:50 -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 6cde91fe96 New assets commit 2024-01-22 23:51:57 -07: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
EliteMasterEric 0f8af2ca50 Switch branches for HaxeUI-Flixel 2024-01-18 22:08:01 -05:00
Eric ae907beab9 Merge branch 'rewrite/master' into ansi-trace 2024-01-18 10:01:18 -05:00
Hazel 583eb81de5 fix(ci): checkout failures, feat(ci): mac builds
* fetch-depth=1

* switch to app tokens

* docs?

* docs!

* actions / doesnt check out

* mac attempt 1

* custom setup haxe action

* trigger ci run thanks github

* interesting

* meow

* use tags

* homebrew fixing maybe

* mymindishazel/actions-setup-haxe@vC.1.8

* automationgit pushgit pushgit push

* rosetta all the way?

* macos oopsy

* mac cache && move ci to org

---------

Co-authored-by: Eric <ericmyllyoja@gmail.com>
Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
2024-01-18 07:19:29 -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 5df16afd7c Merge pull request #295 from FunkinCrew/bugfix/chart-editor-upload-vocals-rewrite
Rewrite Upload Vocals dialog.
2024-01-18 07:17:49 -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 e8d7cf0fe2 assets submod 2024-01-18 07:13:46 -05:00
Cameron Taylor 8b5f7a701d Merge pull request #268 from FunkinCrew/feature/chart-editor-event-tooltips
Chart Editor: Tooltips when hovering over chart events
2024-01-18 04:26:03 -05:00
Cameron Taylor fa00140d23 stringify moved to SongEventSchema 2024-01-18 04:25:15 -05:00