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

3807 commits

This branch
This branch
All branches
Author SHA1 Message Date
Cameron Taylor
9908f973cf someone pls tell me how to use two different git submodules 2024-06-12 15:27:56 -04:00
Cameron Taylor
ead37894cd Merge branch 'rewrite/master' 2024-06-12 15:26:40 -04:00
Cameron Taylor
cce2ab7fff update project.xml for 0.4.1 lol 2024-06-12 15:05:32 -04:00
Eric
48653ababd Update CHANGELOG.md 2024-06-12 15:01:27 -04:00
Eric
7ce0544b18 Update CHANGELOG.md 2024-06-12 14:54:41 -04:00
Cameron Taylor
f8ecddc5b3 added eric code to changelog 2024-06-12 14:54:41 -04:00
Cameron Taylor
1ebcae79fe changelog for 0.4.1 2024-06-12 14:54:41 -04:00
EliteMasterEric
47f885ae97 Charter credits for Eggnog Erect 2024-06-12 13:33:19 -04:00
Cameron Taylor
47d5c4d141
Merge pull request #619 from FunkinCrew/freeplay-dad-smoother 
freeplay bg nicer AA and proper sizing
 2024-06-11 16:16:13 -04:00
Cameron Taylor
c325fdaa1b
Merge pull request #618 from FunkinCrew/speaker-volume-desktop 
[funk-378] reactive speaker to gamevolume on desktop
 2024-06-11 16:16:02 -04:00
Cameron Taylor
b64af80eba
Merge pull request #608 from FunkinCrew/bugfix/instrumental-id 
Play song IDs based on the chart file's "instrumental" field, not the variation ID.
 2024-06-11 16:15:24 -04:00
Cameron Taylor
c05f053fe3 Merge branch 'rewrite/master' into bugfix/instrumental-id 2024-06-11 16:12:39 -04:00
Cameron Taylor
1e3ef61fc9 freeplay bg nicer AA and proper sizing 2024-06-11 15:57:45 -04:00
Cameron Taylor
37a15e0a0f reactive speaker to gamevolume on desktop 2024-06-11 12:13:10 -04:00
Cameron Taylor
817c216d06
Merge pull request #617 from FunkinCrew/bugfix/save-highest-rank 
[FUNK-387] Save high scores and high ranks separately.
 2024-06-11 12:04:38 -04:00
Cameron Taylor
381e0104e9
Merge pull request #616 from FunkinCrew/feature/freeplay-keybinds 
[FUNK-391] Rebindable controls for the Freeplay menu
 2024-06-11 11:49:24 -04:00
Cameron Taylor
5686bfcd6b ### Changed 
- Tweaked the chart for Lit Up some more to fix some offset notes.Merge branch 'bugfix/spaz-charts' into rewrite/master
 2024-06-11 11:27:57 -04:00
Cameron Taylor
93c0bd0b63 assets submod 2024-06-11 11:25:43 -04:00
EliteMasterEric
b30faad7d9 Save high scores and high ranks separately. 2024-06-11 00:40:43 -04:00
EliteMasterEric
c0a7e4f728 Readd camera events to Roses 2024-06-10 19:32:53 -04:00
Cameron Taylor
00021523bc lower volume on freeplay easter egg 2024-06-10 17:35:49 -04:00
Ikko Eltociear Ashimine
e8f8a0c181 chore: update MenuList.hx 
lenth -> length
 2024-06-10 16:45:22 -04:00
Cameron Taylor
13d49017ac removed compiling help and question templates 2024-06-10 16:45:22 -04:00
Cameron Taylor
f91f4b2ddb simplified the bug template to have less clutter 2024-06-10 16:45:22 -04:00
DM-kun
da61b72c48 crash fix 2024-06-10 16:21:41 -04:00
Cameron Taylor
f31ea8fb73 add sound for changing sorting 2024-06-10 16:13:32 -04:00
gamerbross
8f44d9606d Remove unnecessary scrollMenu sounds + adjust volume 2024-06-10 13:17:38 -04:00
Cameron Taylor
4691e3d249 Merge branch 'bugfix/chart-editor-event-toolbox-crash' into rewrite/master 2024-06-10 12:26:47 -04:00
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 Taylor
9a26837374
Merge pull request #2730 from eltociear/patch-2 
chore: update MenuList.hx
 2024-06-09 14:19:37 -04:00
Ikko Eltociear Ashimine
bdaadfbfdd
chore: update MenuList.hx 
lenth -> length
 2024-06-10 02:26:55 +09:00
Cameron Taylor
9f960f5c28 removed compiling help and question templates 2024-06-09 12:43:43 -04:00
Cameron Taylor
9455b6eadc simplified the bug template to have less clutter 2024-06-09 12:41:00 -04:00
Cameron Taylor
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
EliteMasterEric
839d6a0841 A couple chart fixes 2024-06-09 02:27:36 -04:00
EliteMasterEric
09aa8fbf52 Rebindable controls for the Freeplay menu 2024-06-09 02:22:03 -04:00
zacksgamerz
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
Eric
9a78060329
Merge pull request #2451 from nebulazorua/abstract-optionname 
abstract enum pagename
 2024-06-07 22:02:18 -04:00
Eric
4169116129
Merge branch 'develop' into abstract-optionname 2024-06-07 21:44:28 -04:00
Eric
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
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