Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-30 03:25:47 -05:00
Code Issues Projects Releases Packages Wiki Activity
3919 commits 30 branches 20 tags 3 GiB
Commit graph

3919 commits

This branch
This branch
All branches
Author SHA1 Message Date
Cameron Taylor
192f1113b4 merch link freeplay fix 2024-05-01 15:22:20 -04:00
Cameron Taylor
d155e89cbe pico gameover sound fix 2024-05-01 14:57:02 -04:00
EliteMasterEric
c69a737222 Merge remote-tracking branch 'origin/rewrite/master' into develop-0.3.1 2024-05-01 13:50:13 -04:00
EliteMasterEric
bbccdfe3fb Fix issue when git status returns empty string. 2024-05-01 13:40:46 -04:00
EliteMasterEric
73baabfa82 Detect if your local Git has been modified and display it. 2024-05-01 13:29:54 -04:00
EliteMasterEric
afdd28dbe2 Automatically mark -release builds as not prototype. 2024-05-01 12:56:13 -04:00
Cameron Taylor
5d7dab3e79 rain 2024-05-01 12:18:13 -04:00
EliteMasterEric
16c595b1ff Credits edit 2024-05-01 11:43:55 -04:00
EliteMasterEric
02cc41fc98 Catch a potential crash when retrieving the render method 2024-05-01 11:41:15 -04:00
EliteMasterEric
72c83e7eb0 Don't show an error dialog twice. 2024-05-01 11:40:51 -04:00
EliteMasterEric
776747c2d9 Git Commit macro now available in all builds. 2024-05-01 11:40:23 -04:00
EliteMasterEric
9ffbc8479c Fix for another reported crash 2024-04-30 23:59:25 -04:00
Cameron Taylor
bc7d804550 actual proper commit 2024-04-30 23:32:03 -04:00
EliteMasterEric
079b1f327a Fix two crashes thanks to a crash report 2024-04-30 23:24:43 -04:00
Cameron Taylor
f50f4d42bb Merge pull request #537 from FunkinCrew/peepo-cred 
peepo cred
 2024-04-30 23:21:12 -04:00
EliteMasterEric
109a3f50fb Always fetch git hash while building and always display git hash in the logs. 2024-04-30 22:42:58 -04:00
Cameron Taylor
dcb9e34a23 ravy special thanks 2024-04-30 22:35:00 -04:00
Cameron Taylor
454ed5244d peepo cred 2024-04-30 22:22:37 -04:00
Cameron Taylor
567a31eb78 less cussing cartoons 2024-04-30 21:10:07 -04:00
Cameron Taylor
8a8872680a save 2024-04-30 20:52:02 -04:00
EliteMasterEric
06ce5eb44b Potential save fix 2024-04-30 20:15:23 -04:00
Cameron Taylor
f5cbfbf631 more save fixes 2024-04-30 20:03:24 -04:00
Cameron Taylor
8ac59d80ec save file fixins in progress 2024-04-30 19:54:55 -04:00
Cameron Taylor
36ab5d441c save file nullcheck 2024-04-30 19:30:11 -04:00
Cameron Taylor
086e0e3ae4 Merge pull request #535 from FunkinCrew/attract-screen-final 
Attract screen final
 2024-04-30 19:21:18 -04:00
Cameron Taylor
8c02503932 Merge branch 'rewrite/master' into attract-screen-final 2024-04-30 19:20:51 -04:00
Cameron Taylor
d70540757a assets submod 2024-04-30 19:20:34 -04:00
Cameron Taylor
bf8fafda8f Merge pull request #536 from FunkinCrew/mp3-laughs 
i forgot the mp3s
 2024-04-30 19:19:35 -04:00
FabsTheFabs
62783f47a5 assets submod 2024-05-01 00:12:16 +01:00
EliteMasterEric
02dbfa8f8b IT'S HAPPENING 2024-04-30 19:01:56 -04:00
EliteMasterEric
9030b165df Final attract screen 2024-04-30 19:01:39 -04:00
Cameron Taylor
9049c995dc assets submod 2024-04-30 18:49:18 -04:00
Cameron Taylor
f1988a08fe Merge pull request #534 from FunkinCrew/phillystreets-final-tweaks 
final phillystreets tweaks + pico offsets
 2024-04-30 18:48:02 -04:00
Cameron Taylor
7a6df99479 timescale fix 2024-04-30 18:45:47 -04:00
FabsTheFabs
154231e30c assets submod 2024-04-30 23:17:46 +01:00
Cameron Taylor
ffe1c213f6 Merge pull request #532 from FunkinCrew/readd-erect-charts 
Erect charts got removed lol
 2024-04-30 16:30:45 -04:00
Cameron Taylor
7986dbe2a0 revert mainmenu persistentUpdate chagne 2024-04-30 16:30:22 -04:00
Cameron Taylor
db9ba26133 assets submod 2024-04-30 16:25:47 -04:00
Cameron Taylor
8a3735a484 assets submod 2024-04-30 16:18:29 -04:00
Cameron Taylor
7133aabcd6 Merge pull request #518 from FunkinCrew/blazin-rain 
blazin rain fx
 2024-04-30 16:17:08 -04:00
Cameron Taylor
3b28a74cfd art submod 2024-04-30 16:16:15 -04:00
EliteMasterEric
85a6b8bc5b Readd volume box sprite 2024-04-30 16:15:07 -04:00
EliteMasterEric
2e0f880908 Assets submod 2024-04-30 16:10:03 -04:00
Cameron Taylor
7afa5ef7ba assets submod 2024-04-30 15:57:27 -04:00
Cameron Taylor
e8721a0c9e assets submod 2024-04-30 15:25:22 -04:00
Cameron Taylor
ab74cc2d5a Merge branch 'rewrite/master' into blazin-rain 2024-04-30 15:25:03 -04:00
Cameron Taylor
0a64d42c09 assets submod 2024-04-30 15:24:46 -04:00
EliteMasterEric
eb8840ba76 Readd parallax 2024-04-30 15:11:31 -04:00
EliteMasterEric
a645b67921 Fix can events on easy and normal 2024-04-30 15:07:41 -04:00
EliteMasterEric
11c0249f42 Fix an issue with Freeplay sorting when leaving an Erect song. 2024-04-30 14:36:57 -04:00