cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-15 11:22:55 +00:00
Code Issues Releases Wiki Activity
4564 commits 30 branches 20 tags 6.8 GiB
Commit graph

4564 commits

This branch
This branch
All branches
Author SHA1 Message Date
lemz 224d930ae6 Update PreferencesMenu.hx 2024-09-17 00:17:56 +02:00
Eric 3b9d400f57
Merge pull request #3328 from FunkinCrew/docs/troubleshooting-update 
[DOCS] Update to troubleshooting guide
 2024-09-16 18:17:25 -04:00
EliteMasterEric f8d0ddef34 Update troubleshooting guide 2024-09-16 18:17:07 -04:00
lemz 18edadb712 Merge branch 'fps-setting' of https://github.com/lemz1/Funkin into fps-setting 2024-09-17 00:16:33 +02:00
lemz 80fc0cd526 Update Preferences.hx 2024-09-17 00:16:27 +02:00
lemz e7674ec31c
Merge branch 'develop' into fps-setting 2024-09-17 00:13:49 +02:00
Eric 8efcd1eae1
Merge pull request #2584 from FunkinCrew/docs/compiling-guide 
[DOCS] Update compiling guide with more troubleshooting
 2024-09-16 18:12:55 -04:00
Eric 06485518db
Merge branch 'develop' into docs/compiling-guide 2024-09-16 18:12:49 -04:00
Eric 57523c9439
Merge pull request #3035 from 7oltan/character-path-fix 
FIXES CHARACTER PATH ONLY CHECKING IN SHARED
 2024-09-16 18:10:25 -04:00
Eric 42544ee757
Merge branch 'develop' into character-path-fix 2024-09-16 18:10:09 -04:00
Eric a5ac717677
Merge branch 'develop' into bugfix/freeplay-difficulty-stack-overflow 2024-09-16 18:03:47 -04:00
Eric ea2e6506c8
Merge pull request #2494 from cyn0x8/flash_fix 
consistent flashing
 2024-09-16 18:03:18 -04:00
Eric 1e8d3c715b
Merge branch 'develop' into flash_fix 2024-09-16 18:03:05 -04:00
Cameron Taylor a27c4ae24f pub modules art 2024-09-16 17:14:45 -04:00
Cameron Taylor 1f21e1114b pub modules 2024-09-16 17:12:11 -04:00
EliteMasterEric d59594ee45 Fix animations not looping on Char Select 2024-09-12 22:02:05 -04:00
Cameron Taylor d3d998d994 saru fixies 2024-09-12 21:57:48 -04:00
Cameron Taylor 247b86ea1d Merge branch 'bugfix/blazin-offsets' into rewrite/master 2024-09-12 21:53:54 -04:00
Cameron Taylor 80868ccbba assets submod 2024-09-12 21:53:38 -04:00
EliteMasterEric 0e225c9bae Update eggnog vocals again 2024-09-12 20:51:02 -04:00
EliteMasterEric c9d6c19420 Update fresh audio 2024-09-12 20:35:13 -04:00
EliteMasterEric c6bdd36959 Fix blazin offsets 2024-09-12 20:32:19 -04:00
Cameron Taylor cae7db6254 Merge branch 'vp9-cutscene' into rewrite/master 2024-09-12 20:26:05 -04:00
Cameron Taylor af31be5436 makeship linky 2024-09-12 20:14:48 -04:00
Cameron Taylor 172c90b1bd assets submod 2024-09-12 20:12:20 -04:00
Cameron Taylor a4cd2eb169 Merge branch 'pico-christmas-offsets' into rewrite/master 2024-09-12 20:05:42 -04:00
Cameron Taylor 0aa2ccd1cd assets submod 2024-09-12 20:05:14 -04:00
Cameron Taylor e2a51def65 Merge branch 'rewrite/master' into pico-cutscene-tweaks 2024-09-12 20:04:02 -04:00
Cameron Taylor 47f3c6f00a vid sizing 2024-09-12 19:56:04 -04:00
Cameron Taylor d826f2a7bc Merge branch 'rewrite/master' into char-unlock-tinkers 2024-09-12 19:55:35 -04:00
FabsTheFabs fdc5bc6b79 assets submod... 2024-09-13 00:37:47 +01:00
Cameron Taylor 3103768d91
Merge pull request #747 from FunkinCrew/charselect-fade-fix 
Fix transition out of character select
 2024-09-12 19:14:34 -04:00
Cameron Taylor 10dfc96cf4 Merge branch 'freeplay-charselect-hint' into rewrite/master 2024-09-12 19:11:42 -04:00
Cameron Taylor 2dc4e13b00 assets submod 2024-09-12 19:08:13 -04:00
CheemsAndFriends 1e9c6f0c4c Add Char Select stuff 2024-09-13 00:31:52 +02:00
FabsTheFabs f96532f104 assets submod 2024-09-12 22:47:58 +01:00
FabsTheFabs bc86f1f459 character select hint text 2024-09-12 22:44:40 +01:00
FabsTheFabs 5f60be6d75 allow controls to get dialouge name from control + ignore brackets 2024-09-12 22:44:22 +01:00
FabsTheFabs 703e899288 apply shader filter 2024-09-12 22:43:12 +01:00
CheemsAndFriends 34d1c568ea locked fixin 2024-09-12 23:22:20 +02:00
EliteMasterEric ae6f431b6a Update credits 2024-09-12 17:13:46 -04:00
EliteMasterEric a4bdeeaf5f Update polymod to fix a crash on missing imports 2024-09-12 17:13:40 -04:00
CheemsAndFriends 6dca858fd7 Introbizz 2024-09-12 23:13:30 +02:00
CheemsAndFriends 2a9814e030 port SAVE from develop 2024-09-12 22:58:31 +02:00
CheemsAndFriends f0ac09f949 Art master bizz 2024-09-12 22:53:11 +02:00
CheemsAndFriends 395de4ee95 Char select subs stuff 2024-09-12 22:53:01 +02:00
Cameron Taylor 89f4703977 Merge branch 'framerate-pref' into rewrite/master 2024-09-12 16:47:13 -04:00
Cameron Taylor dab41091af Merge branch 'update-final-charts' into rewrite/master 2024-09-12 16:45:28 -04:00
Cameron Taylor a4e977f60f assets submod 2024-09-12 16:45:20 -04:00
Cameron Taylor 1ee351c83d art submod 2024-09-12 16:42:57 -04:00