cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-05 06:14:36 +00:00
Code Issues Releases Wiki Activity
1794 commits 3 branches 3 tags 3 GiB
Commit graph

1794 commits

This branch
This branch
All branches
Author SHA1 Message Date
EliteMasterEric 7c653a9e9b Merge branch 'rewrite/master' into rewrite/feature/chart-editor-wasd 2023-10-06 22:54:12 -04:00
Cameron Taylor dd17e04051 Merge pull request #174 from FunkinCrew/rewrite/fix-ci-builds-pt-i 
fix ci builds in rewrite branch
 2023-10-06 20:30:44 -04:00
EliteMasterEric 4a4708fe23 That is the fastest I have ever fixed a bug holy shit. 2023-10-06 11:42:39 -04:00
Hazel 2e97bb2d7b attempt i. at caching haxe installs 2023-10-06 15:52:28 +01:00
EliteMasterEric 6e37b81b67 Update assets/ 2023-10-06 01:21:45 -04:00
Cameron Taylor e0d6a9a188 Merge pull request #170 from FunkinCrew/feature/chart-editor-theme 
Add chart editor theme music
 2023-10-06 00:53:27 -04:00
Cameron Taylor f6dec84387 Merge pull request #168 from FunkinCrew/rewrite/bugfix/crash-handler 
Fix crash handler without breaking HaxeUI
 2023-10-06 00:48:52 -04:00
Hazel af65b83ddd remove --quiet so i can see errors (woah) 2023-10-05 15:55:23 +01:00
Hazel 1e72c3d600 64fast is not worth it 2023-10-05 15:54:13 +01:00
Hazel 66e9bf8716 64fast 2023-10-05 15:41:37 +01:00
Hazel 6d7df09437 missed a checkout for unit tests 2023-10-05 15:34:01 +01:00
Hazel 572dfb2656 apt update 2023-10-05 14:57:02 +01:00
Hazel 50b579ed4f attempt using PAT for submodule checkout 2023-10-05 14:48:54 +01:00
EliteMasterEric b6752531bf Add chart editor theme 2023-09-29 22:29:32 -04:00
EliteMasterEric 6c99f7161d Working Input Style, note snapping in menu, W/S to scroll 2023-09-29 21:49:07 -04:00
EliteMasterEric 92162bfdad Fix crash handler without breaking HaxeUI 2023-09-28 16:49:01 -04:00
EliteMasterEric 2fcb906edf Fixed volume sliders, Load Instrumental button, and fixed hitsounds. 2023-09-26 17:46:07 -04:00
EliteMasterEric be4fd74d40 Resolve metadata loading issues. 2023-09-25 23:24:18 -04:00
EliteMasterEric 42bb50882d "Add Variation" button, SongMetadata format changes, bug fixes, resolve metadata loading issues. 2023-09-25 23:24:07 -04:00
EliteMasterEric 62c62cb53e Update json2object to fork 2023-09-25 21:18:56 -04:00
EliteMasterEric ed6bc553ed Implemented art and assets as submodules. 2023-09-25 20:12:38 -04:00
Cameron Taylor 480b34cf6b Merge pull request #159 from FunkinCrew/feature/chart-editor-performance-revamp 
Chart Editor: Peformance Revamp
 2023-09-20 21:24:48 -04:00
EliteMasterEric dc728133d1 Merge remote-tracking branch 'origin/master' into feature/chart-editor-performance-revamp 2023-09-20 19:41:17 -04:00
Cameron Taylor cbbdba031d Merge pull request #150 from FunkinCrew/bugfix-squash/song-data-parser-rework 
Chart Editor: Song Data Parser Rework
 2023-09-19 19:54:28 -04:00
Cameron Taylor 26501e59dd Merge pull request #152 from FunkinCrew/feature/chart-note-snapping-ui 
Improved UI for note snapping (and notif on difficulty change)
 2023-09-19 19:30:37 -04:00
Cameron Taylor f6bcd8bf05 Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret into feature/chart-note-snapping-ui 2023-09-19 19:25:42 -04:00
Cameron Taylor 72f9cfdf76 Merge pull request #154 from FunkinCrew/feature/ghost-hold-notes 
Chart Editor - Ghost Hold Notes
 2023-09-19 19:20:51 -04:00
Cameron Taylor a2e43b8e4e Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret into feature/ghost-hold-notes 2023-09-19 19:16:02 -04:00
EliteMasterEric 86c105aff8 Merge remote-tracking branch 'origin/master' into bugfix-squash/song-data-parser-rework 2023-09-18 21:58:22 -04:00
EliteMasterEric 29c22a422f Fixed a JSON parser issue causing event data to be parsed wrong! 2023-09-18 20:14:43 -04:00
EliteMasterEric 06269e95fd Fix to crash in freeplay (swapped two args oops!) 2023-09-18 20:02:17 -04:00
Cameron Taylor c0a65f9081 Merge pull request #141 from FunkinCrew/bugfix/chart-editor-null-safety 
Apply @:nullSafety to chart editor classes.
 2023-09-18 19:37:13 -04:00
EliteMasterEric b56768d9b5 Fix an issue where the game would try and fail to load metadata for a newly created song in the Chart Editor. 2023-09-18 17:59:55 -04:00
EliteMasterEric 0d84559606 HTML5 should build now 2023-09-18 17:19:31 -04:00
EliteMasterEric 09b03efeea Merge branch 'master' into bugfix/chart-editor-null-safety 2023-09-18 16:52:47 -04:00
Cameron Taylor ca31dc0f3c Merge pull request #149 from FunkinCrew/bugfix-squashed/macos-file-browse 
Chart Editor: MacOS File Browse Fix
 2023-09-18 15:49:08 -04:00
Cameron Taylor 35239909d0 woops fix conditional 2023-09-18 15:48:40 -04:00
Cameron Taylor 446dc30277 Merge branch 'master' into bugfix-squashed/macos-file-browse 2023-09-18 15:40:52 -04:00
EliteMasterEric 8dd07d2763 I discovered a new profiling tool and stayed up until 5 AM optimizing shit. 2023-09-13 14:51:12 -04:00
Cameron Taylor 5d7efcd6b9 Merge pull request #142 from FunkinCrew/bugfix/chart-editor-playbar-buttons 
Fixed a bug where the playbar buttons wouldn't work
 2023-09-13 00:09:37 -04:00
Cameron Taylor fc3d2a17b6 Merge pull request #143 from FunkinCrew/feature/chart-editor-snap 
Chart Editor: Configure Snapping (+ important bug fix!)
 2023-09-12 23:56:05 -04:00
EliteMasterEric b42e4ceb67 Fix cursor modes on toolboxes. 2023-09-12 23:37:07 -04:00
EliteMasterEric 257fa2da6a Remove old Notifbar code 2023-09-12 23:31:38 -04:00
Cameron Taylor 2b3f99547a Merge pull request #144 from FunkinCrew/feature/chart-editor-beat-lines 
Darkened beat dividers on chart grid.
 2023-09-12 22:41:46 -04:00
Cameron Taylor eae1723d87 Merge pull request #148 from FunkinCrew/feature/chart-editor-file-keybinds 
Chart Editor: Added missing File menu keybinds
 2023-09-12 22:37:50 -04:00
Cameron Taylor ff34771ca3 Merge branch 'master' into feature/chart-editor-file-keybinds 2023-09-12 22:37:37 -04:00
Cameron Taylor e02dee2601 fixed N -> O typo? 2023-09-12 22:34:49 -04:00
Cameron Taylor b4042dba8c Merge pull request #155 from FunkinCrew/bugfix/story-menu-background 
Bugfixes: Story Menu Visuals
 2023-09-12 22:29:39 -04:00
Cameron Taylor 9c4f43b6bf Merge pull request #157 from FunkinCrew/feature/improved-cursor 
Chart Editor: Improved Cursor
 2023-09-12 22:24:36 -04:00
EliteMasterEric a02058b260 Merge branch 'feature/improved-cursor' into develop 2023-09-12 19:52:08 -04:00