gabry/Funkin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,408 Commits 1 Branch 38 Tags
83bb3bb5074ecb5f50ee21979711efcda9d8017d
Commit Graph
5408 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Hyper_andCameron Taylor 83bb3bb507 feat: Show current beat and step next to song position 2025-04-22 19:02:09 -04:00
KadeandCameron Taylor 642b2142ca Merge pull request #999 from FunkinCrew/kolo/chart-event-crash-fix 
[PUBLIC PR] Fix a crash when messing with events in the chart editor
 2025-04-22 19:00:24 -04:00
KadeandCameron Taylor 0c6b730647 Merge pull request #998 from FunkinCrew/kolo/cap-score-display 
[PUBLIC PR] Cap Score Displays to their biggest possible values
 2025-04-22 19:00:24 -04:00
KoloandCameron Taylor 83c367e23b another bugfix yeah 
i hate dropdowns i hate dropdowns i hate dropdowns
 2025-04-22 19:00:24 -04:00
KadeandCameron Taylor fe7bf3dd55 Merge pull request #994 from FunkinCrew/cyn0x8/fileutil-sandbox 
[PUBLIC PR] Sandboxing for FileUtil (prevent deleting important game files etc)
 2025-04-22 19:00:24 -04:00
KadeandCameron Taylor 273d950899 Merge branch 'rewrite/master' into kolo/cap-score-display 2025-04-22 19:00:24 -04:00
KoloandCameron Taylor 9e61481cfe Merge branch 'develop' of https://github.com/FunkinCrew/Funkin into chart-events-fix 2025-04-22 19:00:24 -04:00
SuperandCameron Taylor e572c7c2fb Remove FlxG.fixedTimeStep from PlayState 
It's in TitleState now
 2025-04-22 19:00:24 -04:00
cyn0x8andCameron Taylor 95ade2a08b FileUtil overhaul + sandboxing 2025-04-22 19:00:24 -04:00
KoloandCameron Taylor 51324e9c28 mmyes 2025-04-22 19:00:24 -04:00
AbnormalandCameron Taylor e6e3a30c0c docs: Add missing documentation to the remaining functions in Module 2025-04-22 19:00:24 -04:00
SuperandCameron Taylor 2b7254fbd2 Add FlxG.fixedTimestep change to initState 2025-04-22 19:00:24 -04:00
HundrecandCameron Taylor d54df57b95 Two more Chart Editor entries in Changelog 2025-04-22 19:00:24 -04:00
Cameron Taylor b295e31266 Merge branch 'rewrite/master' into public-changes 2025-04-22 19:00:24 -04:00
HundrecandCameron Taylor 695c708cb0 Add a few fixes and changes from 0.6.0 2025-04-22 19:00:24 -04:00
EliteMasterEricandCameron Taylor 4a7f56a7ad Merge remote-tracking branch 'public/develop' into develop 2025-04-22 19:00:24 -04:00
HundrecandCameron Taylor 030abed207 Oops, one more lil space 2025-04-22 19:00:24 -04:00
HundrecandCameron Taylor 0d8cfaf104 Remove 0.6.0 Changelog entries that weren't implemented + polish 2025-04-22 19:00:24 -04:00
EliteMasterEricandCameron Taylor caf708fe4a Merge remote-tracking branch 'public/main' into develop 2025-04-22 18:41:41 -04:00
HundrecandCameron Taylor e7cf5fbbdc Grammatical fix in style-guide.md 2025-04-22 18:41:41 -04:00
HundrecandCameron Taylor ccaa3d1070 Consistent hyphens in CODESTYLE.md 2025-04-22 18:41:41 -04:00
HundrecCameron TaylorAbnormal
 		4b883d4339 Restore Contributing Guide to latest version 
Merge conflicts yay

Co-Authored-By: Abnormal <86753001+AbnormalPoof@users.noreply.github.com>
 2025-04-22 18:41:41 -04:00
sector-aandEric b40b4b0369 Fix Animation Editor Crash 
Fix poor code formatting

This is unnecessary now
 2025-04-22 15:53:53 -04:00
Cameron TaylorandEric aa37745bbd assets submod (week 6 shader fixin) 2025-04-22 15:51:45 -04:00
EliteMasterEricandCameron Taylor df6ffca01f Update assets submodule (charting revert stuff) 2025-04-19 19:41:27 -04:00
EliteMasterEricandCameron Taylor 9dd8a257df Update assets submodule to include twenty-seven chart tweak commits 2025-04-19 19:38:18 -04:00
mint 2984ce4852 hotfix(ci): use our own runners again :) 2025-04-19 03:23:27 +02:00
mint 8fb35ac822 hotfix(ci): for now, disable fail-fast so we can get some windows builds 2025-04-19 03:17:47 +02:00
mint e8c42c281f hotfix: mac lime ndlls again? 2025-04-19 02:58:52 +02:00
mint 68892b92ab hotfix(ci): bump neko version to 2.4.1 2025-04-19 02:32:22 +02:00
Cameron Taylor 12ee60f776 Mac ndlls lime hmm bump 2025-04-18 20:18:39 -04:00
Cameron Taylor 945314d271 lime bump for windows fix 2025-04-18 19:41:53 -04:00
EliteMasterEricandCameron Taylor 93d4f30cad Make ScreenshotPlugin null-safe. 2025-04-18 19:40:39 -04:00
AbnormalandCameron Taylor dda91cf770 change requested by eric 2025-04-18 19:35:24 -04:00
AbnormalandCameron Taylor 6a1160feab chore: Enable null safety for 11 classes 2025-04-18 19:35:24 -04:00
kade-githubandEric b48b5ae1aa remember diff for generate song list 2025-04-18 17:33:31 -04:00
fabsandCameron Taylor 5bf8154e0b otis muzzle flashing (assets submod) 2025-04-17 19:59:59 -04:00
EliteMasterEricandCameron Taylor 6de51848fd Update assets submodule 2025-04-17 19:59:59 -04:00
Cameron Taylor ee906ae8c0 fix: make the sound tray volume be less loud (#990) 2025-04-17 19:59:59 -04:00
KadeCameron TaylorVioletSnowLeopardEliteMasterEric
 		7eebce432d [PUBLIC PR] Prevent softlock caused by removing all keybinds for a UI control (#988) 
* prevent removing last keybind for UI controls

* add popup to alert you cannot remove keybind

* ensure controls list is unique

* Use public submodule URLs (would be nice if this was automatic but oh well)

---------

Co-authored-by: VioletSnowLeopard <ngzeretzke@gmail.com>
Co-authored-by: EliteMasterEric <ericmyllyoja@gmail.com>
 2025-04-17 19:59:59 -04:00
EliteMasterEric 750779a3fb Disable the pop-in animation on the Random capsule for consistency. 2025-04-17 18:25:44 -04:00
kade-githubandEric 095bc9006d animation on all diffs 2025-04-17 18:25:44 -04:00
kade-githubandEric 09fdd0c91e going to erect with the erect takes you to the closest erect 2025-04-17 18:25:44 -04:00
kade-githubandEric be5d6227a7 erect nearest neighbor select 2025-04-17 18:25:44 -04:00
KoloandCameron Taylor 855deb5828 set enabled when prompt gone 2025-04-16 16:06:39 -04:00
EliteMasterEricandCameron Taylor 963e2ecd63 Edit RegistryMacro to automatically populate baseGameEntryIds list. 2025-04-15 20:25:18 -04:00
lemz1andCameron Taylor 14975212a9 macro 
registry macro

Merge branch 'lemz1/registry-entry-data' into lemz1/registry-macro-stufff
 2025-04-15 20:25:18 -04:00
Hyper_andCameron Taylor 3ad14bac32 fix: Double check if events are the same when doing indexOf 
This is basically copy-pasted from SongNoteDataArrayTools lol
 2025-04-15 19:47:39 -04:00
Cameron Taylor e672c0978f hmm lime bump 2025-04-14 23:35:43 -04:00
Cameron Taylor 0d5b7d4ed4 also conditional for WindowUtils.setVSyncMode() for mac 2025-04-14 23:27:34 -04:00