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

2549 commits

Author SHA1 Message Date
EliteMasterEric 091f8eb724 Merge branch 'rewrite/master' into feature/freeplay-pico-character 2024-02-09 23:13:40 -05:00
Cameron Taylor a50f27fe96 weekend 1 camera zoom 2024-02-09 23:03:09 -05:00
Cameron Taylor f321c91078 Merge pull request #310 from FunkinCrew/feature/chart-editor-freeplay-preview
Chart Editor: Freeplay Preview Toolbox
2024-02-09 15:40:42 -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 fa2aebdc52 Use the correct assets submodule commit. 2024-02-07 19:37:19 -05:00
EliteMasterEric 2d4ca436ec Update Polymod to drastically improve efficiency of openfl.utils.Assets.list() 2024-02-07 18:46:09 -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 401c200070 Merge pull request #304 from FunkinCrew/feature/chart-editor-offset-toolbox
Chart Editor: Offsets Toolbox
2024-02-05 13:21:26 -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 bfd11ae097 Merge pull request #303 from FunkinCrew/bugfix/copy-prompt-fixes
Copy command fixes
2024-02-05 13:05:22 -05:00
Cameron Taylor 201e109d64 Merge branch 'rewrite/master' into bugfix/copy-prompt-fixes 2024-02-05 13:03:32 -05:00
Cameron Taylor 6e2786ef52 Merge pull request #302 from FunkinCrew/feature/units
Added units field to event properties
2024-02-05 13:03:01 -05:00
Cameron Taylor 30cb53d8c2 haxeui-core update 2024-02-05 13:02:23 -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 334d267ffc Merge pull request #306 from FunkinCrew/bugfix/metadata-crashfix
Metadata toolbox crash fix
2024-02-02 23:20:30 -05:00
EliteMasterEric 8e2c30720d Merge remote-tracking branch 'origin/rewrite/master' into bugfix/copy-prompt-fixes 2024-02-02 22:51:44 -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 65280c144c Merge branch 'feature/chart-editor-offset-toolbox' of https://github.com/FunkinCrew/Funkin-secret into feature/chart-editor-offset-toolbox 2024-02-02 22:28:47 -05:00
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