1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-09-16 15:09:20 +00:00
Commit graph

346 commits

Author SHA1 Message Date
PKPenguin321 177280bd5b 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 3b2adb1a14
Merge pull request #268 from regulad/issue-template
Basic PR/Issue templates
2021-01-23 16:49:07 -05:00
regulad da60be0729
Forgot this! 2021-01-23 15:42:24 -05:00
regulad 5cc17b376c Basic PR/Issue templates
Closes #243
2021-01-23 15:39:04 -05:00
Cameron Taylor 34b7fc8b62 Merge branch 'master' of https://github.com/ninjamuffin99/ld47 2021-01-22 01:50:40 -05:00
Cameron Taylor 62968c5ec2 weed 2021-01-22 01:50:12 -05:00
Cameron Taylor 12b738b2ed
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 5673f0a863 Fixed issue with boyfriend resetting animating too early 2021-01-20 15:51:42 -08:00
Cameron Taylor e0394d51e0 woops! 2021-01-20 07:19:48 -05:00
Cameron Taylor 3bef48d16c mod guide in progress 2021-01-20 06:53:20 -05:00
Cameron Taylor aec9518f75 menu fix maybe oops 2021-01-20 06:14:38 -05:00
Cameron Taylor a8bea88494 Merge branch 'master' of https://github.com/ninjamuffin99/ld47 2021-01-20 05:31:46 -05:00
Cameron Taylor 50a7d25304 CHRISTMAS UPDATE 2021-01-20 05:31:43 -05:00
Cameron Taylor 11414df109 scripted type beat 2021-01-20 04:11:55 -05:00
Cameron Taylor 4342b9bcce scripted thingie 2021-01-20 04:03:49 -05:00
Cameron Taylor 671dced392 monster christmas 2021-01-20 01:38:39 -05:00
Cameron Taylor 69434ab7e5 santa lol 2021-01-19 23:29:18 -05:00
Cameron Taylor 5f119e092b fix eggnog normal woops! 2021-01-19 22:58:07 -05:00
Cameron Taylor 95caf7ee63 more christmas stuff 2021-01-19 21:44:09 -05:00
Cameron Taylor d2509f0a22 charts and a bunch of christmas stuff 2021-01-19 21:09:47 -05:00
Cameron Taylor 88d4b5fd3d tweaking??? 2021-01-17 21:36:23 -05:00
Cameron Taylor 03db78d975 double notes??? 2021-01-17 21:23:40 -05:00
Cameron Taylor 2d940b73b8 jump holds 2021-01-17 19:06:36 -05:00
Cameron Taylor 4192fe2beb LOTS OF SHIT 2021-01-17 04:16:02 -05:00
Cameron Taylor 0b3bf9df84 cool heads 2021-01-16 23:15:29 -05:00
Cameron Taylor 990745b5a1 dope shit in progress 2021-01-16 17:21:06 -05:00
Cameron Taylor fa787181fb fix placement of bf 2021-01-16 15:20:57 -05:00
Cameron Taylor da68144984 CHARTS LOL 2021-01-16 15:14:56 -05:00
Cameron Taylor 21c8dc3f13
Merge pull request #195 from regulad/patch-1
Small README change
2021-01-15 17:55:48 -05:00
regulad 324a8f72b8
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 73fc03f948 Merge branch 'master' of https://github.com/ninjamuffin99/ld47 2021-01-14 23:39:49 -05:00
Cameron Taylor 3fffb94661 cool changelog lol! 2021-01-14 23:39:43 -05:00
Cameron Taylor 88a8918143
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 b92c4ea413
Merge pull request #161 from WaviestBalloon/master
Updated README.md with better punctuation/grammar
2021-01-14 23:37:02 -05:00
Cameron Taylor b85855d8ef HAIR AND MOD SUPPORT SHIT IN PROGRESS 2021-01-14 23:33:12 -05:00
Cameron Taylor 447f638001 swappable characters debug 2021-01-13 22:38:31 -05:00
Cameron Taylor 63ac06bc9c
Merge pull request #176 from lotusotho/deletetransitions
Delete FlxTransitionableState
2021-01-12 23:10:18 -05:00
Waviest 69ac784e95
Update README.md
Co-authored-by: M&M <goldtextwitch@outlook.com>
2021-01-11 16:28:34 +00:00
Lotusotho 5aaa4b8aa5
Delete FlxTransitionableState 2021-01-10 17:03:46 +01:00
Cameron Taylor d96e28e64e
Merge pull request #169 from Geokureli/pico_fixes
fix pico asset paths
2021-01-08 23:09:46 -05:00
George FunBook 6358720119 fix pico asset paths 2021-01-08 14:01:59 -06:00
Cameron Taylor ae38ebc18a more keybind shit 2021-01-07 20:38:32 -05:00
Cameron Taylor 7400d200ca charting editor improvements 2021-01-06 23:02:23 -05:00
Cameron Taylor 1674ba6b46 chart editor type beat 2021-01-06 22:38:17 -05:00
Waviest 7709c57c4f
Update README.md 2021-01-07 01:16:57 +00:00
Waviest 73c7e1d99a
Update README.md 2021-01-07 00:57:59 +00:00
Cameron Taylor b432b39ff5
Merge pull request #138 from pahaze/master
Add enemies' dying faces
2021-01-05 21:08:14 -08:00
pahaze 6bd7f36e03 Update to latest master commit 2021-01-05 07:53:42 -05:00
Gede Hari 44e9882a38 Move version check screen to TitleState 2021-01-05 16:29:32 +08:00
Cameron Taylor c2332b5d42 Merge branch 'master' of https://github.com/ninjamuffin99/ld47 2021-01-04 19:12:38 -05:00