1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-23 23:33:55 +00:00
Commit graph

384 commits

Author SHA1 Message Date
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
Cameron Taylor 331201bb2f LOTS OF SHIT 2021-01-17 04:16:02 -05:00
Cameron Taylor 88b52ab548 cool heads 2021-01-16 23:15:29 -05:00
Cameron Taylor a041da2012 dope shit in progress 2021-01-16 17:21:06 -05:00
Cameron Taylor b3aec93d45 fix placement of bf 2021-01-16 15:20:57 -05:00
Cameron Taylor a42e3b9dfc CHARTS LOL 2021-01-16 15:14:56 -05:00
Cameron Taylor fa62120930 Merge pull request #195 from regulad/patch-1
Small README change
2021-01-15 17:55:48 -05:00
regulad 86861b7287 Small README change
I had some troubles compiling and it seems some other people did too (#181, maybe more issues), so hopefully this will help just a little bit
2021-01-15 09:49:25 -05:00
Cameron Taylor 5e7ad47bb7 Merge branch 'master' of https://github.com/ninjamuffin99/ld47 2021-01-14 23:39:49 -05:00
Cameron Taylor 2b1fa0aa77 cool changelog lol! 2021-01-14 23:39:43 -05:00
Cameron Taylor 106e7accd6 Merge pull request #155 from gedehari/version-check-fix
Move version check screen to TitleState
2021-01-14 23:38:05 -05:00
Cameron Taylor bd97431ab1 Merge pull request #161 from WaviestBalloon/master
Updated README.md with better punctuation/grammar
2021-01-14 23:37:02 -05:00
Cameron Taylor d8159efb4b HAIR AND MOD SUPPORT SHIT IN PROGRESS 2021-01-14 23:33:12 -05:00
Cameron Taylor 8ad3bf1f44 swappable characters debug 2021-01-13 22:38:31 -05:00
Cameron Taylor aac0e84445 Merge pull request #176 from lotusotho/deletetransitions
Delete FlxTransitionableState
2021-01-12 23:10:18 -05:00
Waviest 937e546820 Update README.md
Co-authored-by: M&M <goldtextwitch@outlook.com>
2021-01-11 16:28:34 +00:00
Lotusotho bf4f828f56 Delete FlxTransitionableState 2021-01-10 17:03:46 +01:00
Cameron Taylor 1765d12c54 Merge pull request #169 from Geokureli/pico_fixes
fix pico asset paths
2021-01-08 23:09:46 -05:00
George FunBook 2063d00b5d fix pico asset paths 2021-01-08 14:01:59 -06:00