gabry/Funkin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,766 Commits 1 Branch 38 Tags
cd2bbcb43bf471ed6b6c0ed16daa3feedf44d9fd
Commit Graph
3766 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Cameron Taylor cd2bbcb43b Merge branch 'ninjamuffin99/funk-292' into rewrite/master 2024-06-10 12:05:08 -04:00
Cameron Taylor b7d25bf04f Merge branch 'escape-quit' into rewrite/master 2024-06-10 12:04:30 -04:00
Cameron Taylor 5dcd3eb946 Merge branch 'heart-capsule-pos' into rewrite/master 2024-06-10 12:04:09 -04:00
Cameron Taylor b811aeec80 fix for pico explo 2024-06-09 16:15:33 -04:00
Cameron Taylor 55edb9ea14 pressing escape on title screen exits game 2024-06-09 15:38:22 -04:00
Cameron Taylor d974f12c72 Merge branch 'develop' into rewrite/master 2024-06-09 15:30:14 -04:00
Cameron Taylor f2d5a80bd1 completes funk-305 2024-06-09 15:06:45 -04:00
Cameron TaylorandGitHub eb979a8625 Merge pull request #2701 from zacksgamerz/develop 
Fixed that one mistake in .github/ISSUE_TEMPLATE/bug.md
 2024-06-09 12:21:45 -04:00
zacksgamerzandGitHub bc80e39a85 you're to your 2024-06-08 19:07:22 +07:00
Cameron Taylor 45b43108d1 lower fft amount on desktop 2024-06-07 22:36:25 -04:00
EricandGitHub 9a78060329 Merge pull request #2451 from nebulazorua/abstract-optionname 
abstract enum pagename
 2024-06-07 22:02:18 -04:00
EricandGitHub 4169116129 Merge branch 'develop' into abstract-optionname 2024-06-07 21:44:28 -04:00
EricandGitHub 5bd9ff8c21 Merge pull request #2551 from gamerbross/bugfix/fast-enter-options 
[BUGFIX] Options Menu not enabled in transIn
 2024-06-07 21:36:21 -04:00
EricandGitHub f38f5a268b Merge branch 'develop' into bugfix/fast-enter-options 2024-06-07 21:35:56 -04:00
gamerbrossandEliteMasterEric 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
EricandGitHub 195663638e Merge pull request #2683 from Hundrec/patch-1 
Fix botplay sustain release bug
 2024-06-07 21:08:19 -04:00
EricandGitHub 9a8ba4183e Merge branch 'develop' into patch-1 2024-06-07 21:08:09 -04:00
EricandGitHub 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
HundrecandGitHub 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 7b90a3cee3 lil changelog in progres 2024-06-07 14:36:14 -04:00
Cameron TaylorandGitHub 1d6315fe0e Merge pull request #610 from FunkinCrew/2hot-freeplay 
regexp for numbers
 2024-06-07 14:33:56 -04:00
Cameron Taylor 34c91dae76 dadbattle hard/erect fix 2024-06-07 14:24:57 -04:00
Cameron Taylor a0adbc72b3 regexp for numbers 2024-06-07 13:04:45 -04:00
Cameron TaylorandGitHub 7dfd682148 Merge pull request #2661 from Hundrec/patch-1 
README grammar fix
 2024-06-07 11:40:16 -04:00
Cameron TaylorandGitHub 0242a6b64f Merge pull request #2662 from An-enderman/patch-2 
Update COMPILING, adding one step
 2024-06-07 11:40:09 -04:00
Cameron TaylorandGitHub 62091523d2 Merge branch 'main' into patch-2 2024-06-07 11:40:02 -04:00
Cameron Taylor 6fd030cb30 Merge branch 'patch-1' into rewrite/master 2024-06-07 11:38:57 -04:00
Cameron Taylor 1e63998c74 Merge branch 'patch-2' into rewrite/master 2024-06-07 11:37:37 -04:00
Cameron Taylor 7e6bbe9bb6 Merge branch 'update-changelog'
Create and publish Docker image / build-and-push-image (push) Canceled after 0s
Details
Build and Upload nightly game builds / build-game-on-host (macos) (push) Canceled after 0s
Details
Build and Upload nightly game builds / build-game-on-host (windows) (push) Canceled after 0s
Details
Build and Upload nightly game builds / build-game-in-container (html5) (push) Canceled after 0s
Details
Build and Upload nightly game builds / build-game-in-container (linux) (push) Canceled after 0s
Details
v0.4.0 		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-endermanandGitHub 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
HundrecandGitHub 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 TaylorandGitHub b852811418 Merge pull request #561 from FunkinCrew/fix/grig-viz 
desktop vis testing
 2024-06-06 20:51:31 -04:00
Cameron TaylorandGitHub 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