cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-09-20 17:18:55 +00:00
Code Issues Releases Wiki Activity
2927 commits 3 branches 3 tags 3 GiB
Commit graph

2927 commits

This branch
This branch
All branches
Author SHA1 Message Date
Cameron Taylor e03998fd86 Merge pull request #439 from FunkinCrew/bugfix/week-6-blueball-camera 
Fix camera in game over screen on Week 6
 2024-03-30 03:25:08 -04:00
Cameron Taylor 52c5f81e26 Merge branch 'rewrite/master' into bugfix/week-6-blueball-camera 2024-03-30 03:24:46 -04:00
Cameron Taylor 3637e3594b assets submod 2024-03-30 03:24:30 -04:00
Cameron Taylor 065ef8895b Merge pull request #448 from FunkinCrew/bugfix/spooky-lightning-crash 
Fix polymod error on Spookeez
 2024-03-30 03:07:03 -04:00
Cameron Taylor 846df8de6f assets submod 2024-03-30 03:06:39 -04:00
EliteMasterEric f19507bd95 Add a bunch of erect songs 2024-03-29 23:00:42 -04:00
Cameron Taylor 32ed26ffa6 stereo preloader in progress 2024-03-29 17:54:20 -04:00
EliteMasterEric 5be47e6619 Fix limo ride too 2024-03-29 10:34:59 -04:00
EliteMasterEric f50c1ce86f Update assets submodule 2024-03-29 10:17:16 -04:00
Cameron Taylor 1803742af8 Merge pull request #447 from FunkinCrew/cancel-merge-2 
lol ref
 2024-03-29 02:14:46 -04:00
Cameron Taylor 2d2aa271dd Merge pull request #446 from FunkinCrew/cancel-merge-2 
better branch
 2024-03-29 02:14:39 -04:00
Cameron Taylor 826b6737e5 Merge pull request #445 from FunkinCrew/cancel-merge-2 
sender branch name
 2024-03-29 02:14:31 -04:00
Cameron Taylor 10db02a19b Merge pull request #444 from FunkinCrew/cancel-merged-actions 
remove push lol
 2024-03-29 02:14:11 -04:00
Cameron Taylor d7a4fa7601 Merge pull request #443 from FunkinCrew/cancel-merged-actions 
Cancel runs of merged and "outdated" branches
 2024-03-29 02:13:50 -04:00
Cameron Taylor e949900bec Merge pull request #434 from FunkinCrew/bugfix/combo-fixes 
Bugfix/combo fixes

cancel builds if there's a new one queued

get list of current runs on current-branch

push test

comment out if merge

wrap in string

actions permissions

log

more log

cancel runs test

write permission

uncomment pr merge check

remove push lol

sender branch name

better branch

lol ref
 2024-03-29 02:13:46 -04:00
Cameron Taylor f6857d3aa1 Merge pull request #434 from FunkinCrew/bugfix/combo-fixes 
Bugfix/combo fixes

cancel builds if there's a new one queued

get list of current runs on current-branch

push test

comment out if merge

wrap in string

actions permissions

log

more log

cancel runs test

write permission

uncomment pr merge check

remove push lol

sender branch name

better branch
 2024-03-29 02:13:43 -04:00
Cameron Taylor 1a1f40e31b Merge pull request #434 from FunkinCrew/bugfix/combo-fixes 
Bugfix/combo fixes

cancel builds if there's a new one queued

get list of current runs on current-branch

push test

comment out if merge

wrap in string

actions permissions

log

more log

cancel runs test

write permission

uncomment pr merge check

remove push lol

sender branch name
 2024-03-29 02:13:40 -04:00
Cameron Taylor be69a10b86 Merge pull request #434 from FunkinCrew/bugfix/combo-fixes 
Bugfix/combo fixes

cancel builds if there's a new one queued

get list of current runs on current-branch

push test

comment out if merge

wrap in string

actions permissions

log

more log

cancel runs test

write permission

uncomment pr merge check

remove push lol
 2024-03-29 02:13:34 -04:00
Cameron Taylor 93a270fba5 Merge pull request #434 from FunkinCrew/bugfix/combo-fixes 
Bugfix/combo fixes

cancel builds if there's a new one queued

get list of current runs on current-branch

push test

comment out if merge

wrap in string

actions permissions

log

more log

cancel runs test

write permission

uncomment pr merge check
 2024-03-29 02:13:06 -04:00
EliteMasterEric 9b7bfff817 Update assets submodule 2024-03-29 01:23:36 -04:00
EliteMasterEric 28462681b2 Fix bug where 100ms sustains wouldn't update their rendering. 2024-03-29 00:52:20 -04:00
EliteMasterEric 7c04630bb7 Fix a bug where duplicate notes would get placed at the beginning 2024-03-29 00:49:02 -04:00
Cameron Taylor 5ee550afb1 Merge pull request #434 from FunkinCrew/bugfix/combo-fixes 
Bugfix/combo fixes
 2024-03-29 00:46:38 -04:00
Cameron Taylor 0ce8ac3265 Merge pull request #438 from FunkinCrew/feature/weekend-1-graphic 
Update Story Menu Weekend 1 graphic
 2024-03-29 00:44:46 -04:00
EliteMasterEric ddb41c9ef7 Increase AFK timer, and add SFX over it 2024-03-28 23:13:47 -04:00
EliteMasterEric 342782c3d3 Fix issue with pink screen when moving from PlayState->Freeplay->Main Menu 2024-03-28 22:33:50 -04:00
EliteMasterEric aa7ff6fbc4 Update assets submodule 2024-03-28 21:40:47 -04:00
EliteMasterEric 8020624366 Fix a crash I found. 2024-03-28 21:40:16 -04:00
EliteMasterEric 1c9b087f2f Update assets submodule 2024-03-28 21:20:08 -04:00
EliteMasterEric 443a501e4e Merge branch 'rewrite/master' into feature/freeplay-ost-text 2024-03-28 20:33:17 -04:00
Eric 0eddea9bf8 Merge branch 'rewrite/master' into bugfix/combo-fixes 2024-03-28 20:32:34 -04:00
Eric 7e96b02248 Merge branch 'rewrite/master' into feature/new-audio 2024-03-28 20:31:10 -04:00
EliteMasterEric c7d67b46e0 Update art submodule 2024-03-28 20:29:32 -04:00
EliteMasterEric 571c6d5960 Merge branch 'rewrite/master' into feature/credits 2024-03-28 20:29:15 -04:00
Eric 5fa559dfb1 Merge branch 'rewrite/master' into bugfix/buncha-2hot-fixes 2024-03-28 20:26:45 -04:00
Cameron Taylor 86c91d1e82 Merge pull request #436 from FunkinCrew/feature/touch-here-to-play 
New Funkin' Preloader, and Touch Here To Play
 2024-03-28 07:15:53 -04:00
EliteMasterEric 8a9eee3aa3 Rework Funkin Preloader and added "Touch to Play" graphic 2024-03-28 04:34:43 -04:00
EliteMasterEric 4cd2a622a9 Update ART submodule! 2024-03-28 04:34:20 -04:00
EliteMasterEric 6ab6458e2a Merge remote-tracking branch 'origin/rewrite/master' into feature/credits 2024-03-28 03:00:45 -04:00
EliteMasterEric e5eca37dc0 Update assets submodule. 2024-03-28 02:58:46 -04:00
EliteMasterEric 3d14024fd8 Implement merch link. 2024-03-28 02:58:08 -04:00
EliteMasterEric 3a86b47292 Fix issue where main menu music wouldn't play after credits. 2024-03-28 02:57:51 -04:00
EliteMasterEric 5311b043ac Rework credits data structure. 2024-03-28 02:57:22 -04:00
EliteMasterEric b13c6563df Fix issues with Freeplay OST text and add animations. 2024-03-28 01:46:50 -04:00
EliteMasterEric 837fcee983 Fix a bug where 000 would display any time a Bad or Shit is hit (instead of just when a combo break is hit) 2024-03-28 00:19:57 -04:00
EliteMasterEric c1c2621e1d Fix bug where Bad and Shit didn't count at Notes Hit in the results screen. 2024-03-28 00:18:39 -04:00
EliteMasterEric 201e018f25 Merge remote-tracking branch 'origin/rewrite/master' into bugfix/buncha-2hot-fixes 2024-03-28 00:03:09 -04:00
EliteMasterEric 893822532e Fix an issue causing the Kickstarter video to not play 2024-03-28 00:01:42 -04:00
EliteMasterEric b771b46f1c Fix a build issue. 2024-03-28 00:01:18 -04:00
EliteMasterEric f267a72783 Merge remote-tracking branch 'origin/rewrite/master' into feature/new-audio 2024-03-27 23:00:34 -04:00