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
3746 commits 30 branches 20 tags 6.8 GiB
Commit graph

3746 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eric f38f5a268b
Merge branch 'develop' into bugfix/fast-enter-options 2024-06-07 21:35:56 -04:00
gamerbross 1172949a04 Fix Options Menu not enabled in transIn 2024-06-07 21:31:53 -04:00
EliteMasterEric d19e9e62fa Merge branch 'richtrash21/freeplay-camera-optimization' into develop 2024-06-07 21:21:11 -04:00
EliteMasterEric 2e4b94d528 Fix additional merge conflicts 2024-06-07 21:20:04 -04:00
EliteMasterEric 4382b3e16e Merge branch 'develop' into richtrash21/freeplay-camera-optimization 2024-06-07 21:13:13 -04:00
Eric 195663638e
Merge pull request #2683 from Hundrec/patch-1 
Fix botplay sustain release bug
 2024-06-07 21:08:19 -04:00
Eric 9a8ba4183e
Merge branch 'develop' into patch-1 2024-06-07 21:08:09 -04:00
Eric aace5e2326
Merge pull request #2684 from gamerbross/bugfix/camfollow-pause-game 
[BUGFIX] Pause Camera Follow when pausing
 2024-06-07 20:56:01 -04:00
gamerbross cd485213db Pause Camera Follow when pausing 2024-06-08 02:26:17 +02:00
gamerbross ee6c4478a9 Use FlxG.camera instead of camGame 2024-06-08 02:02:54 +02:00
Hundrec 393355b512
Fix botplay sustain release bug 
Copied opponent's holdTimer code to the player's side
 2024-06-07 19:59:02 -04:00
EliteMasterEric d39f3dc1e8 Merge branch 'main' into develop 2024-06-07 19:54:30 -04:00
Cameron Taylor 7dfd682148
Merge pull request #2661 from Hundrec/patch-1 
README grammar fix
 2024-06-07 11:40:16 -04:00
Cameron Taylor 0242a6b64f
Merge pull request #2662 from An-enderman/patch-2 
Update COMPILING, adding one step
 2024-06-07 11:40:09 -04:00
Cameron Taylor 62091523d2
Merge branch 'main' into patch-2 2024-06-07 11:40:02 -04:00
Cameron Taylor 7e6bbe9bb6 Merge branch 'update-changelog' 2024-06-07 11:31:52 -04:00
Cameron Taylor 73984ea9d6 fix art submod 2024-06-07 11:28:35 -04:00
Cameron Taylor a7e33e73ab assets submod updated and gitmodules fix for public 2024-06-07 11:24:31 -04:00
Cameron Taylor 77b6025133 Merge branch 'rewrite/master' 2024-06-07 11:19:54 -04:00
An-enderman d4a524bbcb
Update COMPILING, adding one step 
I added the step that says to download Git, because the command "hmm install" requires Git to work.
 2024-06-07 16:40:37 +02:00
Hundrec 03cf3dcf99
README grammar fix 2024-06-07 03:29:58 -04:00
EliteMasterEric 3567e4e8e4 Writing down more changes as I remember them 2024-06-07 00:43:31 -04:00
EliteMasterEric 8700db1988 Make sure to credit all the community contributions properly. 2024-06-06 23:51:22 -04:00
EliteMasterEric 6665924dd9 We forgot to credit burgerballs! 2024-06-06 23:28:41 -04:00
Cameron Taylor e2fbeeb13e assets submod 2024-06-06 21:18:53 -04:00
Cameron Taylor b852811418
Merge pull request #561 from FunkinCrew/fix/grig-viz 
desktop vis testing
 2024-06-06 20:51:31 -04:00
Cameron Taylor 339f80e1f9
Merge branch 'rewrite/master' into fix/grig-viz 2024-06-06 20:51:10 -04:00
Cameron Taylor 7214e159e0 update grig 2024-06-06 20:50:53 -04:00
Cameron Taylor c54c10f562 lower fft res on desktop 2024-06-06 20:46:12 -04:00
Cameron Taylor c0594b8c73 Merge branch 'satin-panties-erect' into rewrite/master 2024-06-06 20:31:09 -04:00
EliteMasterEric 715e834753 Update changelog 2024-06-06 20:30:15 -04:00
Cameron Taylor 20b9b2eddd Merge branch 'satin-panties-erect' into rewrite/master 2024-06-06 20:29:18 -04:00
EliteMasterEric 7c638e0274 Add satin panties erect difficulty chart 2024-06-06 20:26:25 -04:00
Cameron Taylor 3c2a3a377e Merge branch 'feature/spazkid-chart-changes' into rewrite/master 2024-06-06 20:22:29 -04:00
Cameron Taylor e01e4d1e76 assets submod 2024-06-06 20:21:37 -04:00
Cameron Taylor 4f0e77c974 update hmm 2024-06-06 20:20:54 -04:00
Cameron Taylor fa270aa6ca Merge branch 'rewrite/master' into fix/grig-viz 2024-06-06 20:17:25 -04:00
Cameron Taylor e45e359de7 Merge branch 'mainmenu-remember-selection' into rewrite/master 2024-06-06 20:15:11 -04:00
Cameron Taylor 7ef14b24c7 Merge branch 'prshit' into rewrite/master 2024-06-06 20:13:36 -04:00
Cameron Taylor 3aa3007dbb Merge branch 'fix-url-open' into rewrite/master 2024-06-06 20:12:28 -04:00
Cameron Taylor 0bb22b60d9 update game version 2024-06-06 19:55:50 -04:00
Cameron Taylor cd6dc35958
Merge pull request #579 from FunkinCrew/burgerballs/scroll-speed-event 
[PUBLIC PR] Implement Scroll Speed song events into the Chart Editor
 2024-06-06 19:50:57 -04:00
Cameron Taylor 73c7bcf609
Merge branch 'rewrite/master' into burgerballs/scroll-speed-event 2024-06-06 19:49:47 -04:00
Cameron Taylor d0e5c7f12b
Merge pull request #585 from FunkinCrew/pursnake/character-scale 
[PUBLIC PR] Fix an issue with character scaling
 2024-06-06 19:49:35 -04:00
Cameron Taylor 02be65c383
Merge branch 'rewrite/master' into pursnake/character-scale 2024-06-06 19:47:48 -04:00
Cameron Taylor 8e6c43b81b
Merge pull request #605 from FunkinCrew/fabs-final-fixes 
Freeplay fixes, + some minor bug fixes
 2024-06-06 19:47:16 -04:00
Cameron Taylor 824b05256d Merge branch 'rewrite/master' into fabs-final-fixes 2024-06-06 19:46:50 -04:00
Cameron Taylor e4647e9e2d assets submod 2024-06-06 19:46:44 -04:00
Cameron Taylor bdcb420c04
Merge pull request #604 from FunkinCrew/holy-fuck-pixel-one 
Update num1-pixel.png to not suck
 2024-06-06 19:31:43 -04:00
EliteMasterEric 700b6e11b8 Update assets submodule 2024-06-06 19:05:05 -04:00