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

452 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lotusotho
6552b2d132 Merge pull request #3 from ninjamuffin99/master 
merge changes 3
 2021-02-04 22:29:12 +01:00
regulad
1f8ac0d315 Update Issue Templates 
I had made some mistakes when I first submmited this PR as far as formatting and markdown goes.

Similar to #327.
 2021-02-03 10:51:52 -05:00
Cameron Taylor
7abd7c5c2e merge lol!! 2021-02-02 08:04:54 -05:00
Cameron Taylor
6301c7744f fix roses oopsies 2021-02-02 08:04:23 -05:00
Cameron Taylor
b8b5bb8888 RELEASE 2021-02-02 05:46:17 -05:00
Cameron Taylor
b0af2f6680 IM PISSED IM MAD BUT WE CLOSE 2021-02-02 04:54:36 -05:00
Cameron Taylor
518ee235d1 section shit 2021-02-02 04:13:28 -05:00
Cameron Taylor
cddb67d984 background girls 2021-02-02 03:24:34 -05:00
Cameron Taylor
60c4367896 lil dating sim things 2021-02-02 02:35:35 -05:00
Cameron Taylor
385097941c idk campaign menu shit 2021-02-02 02:20:14 -05:00
Cameron Taylor
c66eb94ccf THORNS AND EVIL MAN 2021-02-02 00:48:22 -05:00
Cameron Taylor
f306e603be aligned pixel arrows 2021-02-01 05:52:10 -05:00
Cameron Taylor
13ae7d65b6 FONT AND BULLSHIT 2021-02-01 01:50:30 -05:00
Cameron Taylor
5d0363ae96 call me senpai 2021-01-31 21:43:09 -05:00
Cameron Taylor
5ad361ecaa leaves lol! 2021-01-31 09:17:56 -05:00
Cameron Taylor
dac509b5a4 removed discord link lolol oops! 2021-01-30 23:54:28 -08:00
Cameron Taylor
224d8ea029 game over in progress 2021-01-30 07:16:51 -05:00
Cameron Taylor
c531aad3f6 senpai and roses on easy 2021-01-30 06:27:11 -05:00
Cameron Taylor
12f9cbe555 Merge branch 'master' of https://github.com/ninjamuffin99/ld47 2021-01-28 01:54:24 -05:00
Cameron Taylor
22b03ee420 bullshit 2021-01-28 01:54:21 -05:00
Cameron Taylor
85041ad157 Merge pull request #288 from PKPenguin321/controls-options 
Very rudimentary options UI for controls changes
 2021-01-28 01:51:58 -05:00
PKPenguin321
e8720332ec controls.txt and options UI 
very scuffed, OptionsMenu.hx is now mostly copied from FreeplayState.hx with no actual functionality
currently it reads lines off of controls.txt and displays them on Options menu which is now accessible from main menu
controls.txt has control functions prefixed with "set", IE "setUP", then the corresponding key on the following line IE "W"
 2021-01-27 00:58:58 -08:00
Cameron Taylor
908182e5c6 update readme for haxe discord shit lolol 2021-01-27 00:32:33 -05:00
Cameron Taylor
d10f3cda10 intro date shit 2021-01-25 15:56:42 -05:00
Cameron Taylor
c7c80c85fc SENPAI IN THE STREETS 2021-01-25 06:07:45 -05:00
Cameron Taylor
2233242f64 weedeewfwdsfadf 2021-01-25 05:04:31 -05:00
Cameron Taylor
9778793288 buncho dumbshti lol!!! 2021-01-25 04:18:44 -05:00
Cameron Taylor
19f77fec97 so much win 2021-01-24 22:42:51 -05:00
Cameron Taylor
23ddc9b2f4 Merge pull request #268 from regulad/issue-template 
Basic PR/Issue templates
 2021-01-23 16:49:07 -05:00
regulad
3dafb4f939 Forgot this! 2021-01-23 15:42:24 -05:00
regulad
623b2aa0cd Basic PR/Issue templates 
Closes #243
 2021-01-23 15:39:04 -05:00
Cameron Taylor
9a3e2a6243 Merge branch 'master' of https://github.com/ninjamuffin99/ld47 2021-01-22 01:50:40 -05:00
Cameron Taylor
0a0fa93d26 weed 2021-01-22 01:50:12 -05:00
Cameron Taylor
799ff5f78b Merge pull request #237 from Injourn/BFHoldNotes 
Fixed issue with bf-christmas and bf-car resetting animations too early
 2021-01-22 01:48:56 -05:00
Scott-GH
ac9eebe8ad Fixed issue with boyfriend resetting animating too early 2021-01-20 15:51:42 -08:00
Cameron Taylor
589378b6bc woops! 2021-01-20 07:19:48 -05:00
Cameron Taylor
3382e4e974 mod guide in progress 2021-01-20 06:53:20 -05:00
Cameron Taylor
f1d9c06882 menu fix maybe oops 2021-01-20 06:14:38 -05:00
Cameron Taylor
f30e6ae3a7 Merge branch 'master' of https://github.com/ninjamuffin99/ld47 2021-01-20 05:31:46 -05:00
Cameron Taylor
a92739402c CHRISTMAS UPDATE 2021-01-20 05:31:43 -05:00
Cameron Taylor
55b5f56624 scripted type beat 2021-01-20 04:11:55 -05:00
Cameron Taylor
44d8c8309f scripted thingie 2021-01-20 04:03:49 -05:00
Cameron Taylor
96fcaea0ba monster christmas 2021-01-20 01:38:39 -05:00
Cameron Taylor
0c892f4b32 santa lol 2021-01-19 23:29:18 -05:00
Cameron Taylor
7894b6e6f2 fix eggnog normal woops! 2021-01-19 22:58:07 -05:00
Cameron Taylor
d20573b76c more christmas stuff 2021-01-19 21:44:09 -05:00
Cameron Taylor
48b1cab705 charts and a bunch of christmas stuff 2021-01-19 21:09:47 -05:00
Cameron Taylor
be725e9b8a tweaking??? 2021-01-17 21:36:23 -05:00
Cameron Taylor
8e04a5657f double notes??? 2021-01-17 21:23:40 -05:00
Cameron Taylor
df2aa04b41 jump holds 2021-01-17 19:06:36 -05:00