1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-18 04:43:12 +00:00
Commit graph

417 commits

Author SHA1 Message Date
Lotusotho 9c0197cfc0 Deleted bool I created before 2021-02-04 22:40:02 +01:00
Lotusotho cf7a4825ca Fixed bug at the start of the dialogue 2021-02-04 22:36:01 +01:00
Lotusotho ac3f2f2319 Merge pull request #3 from ninjamuffin99/master
merge changes 3
2021-02-04 22:29:12 +01:00
regulad e6d1f97e0e 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 e9f2423357 merge lol!! 2021-02-02 08:04:54 -05:00
Cameron Taylor 469704b291 fix roses oopsies 2021-02-02 08:04:23 -05:00
Cameron Taylor 9f3a5e3497 RELEASE 2021-02-02 05:46:17 -05:00
Cameron Taylor 33d28a096e IM PISSED IM MAD BUT WE CLOSE 2021-02-02 04:54:36 -05:00
Cameron Taylor 61241d1f2d section shit 2021-02-02 04:13:28 -05:00
Cameron Taylor a8268b2254 background girls 2021-02-02 03:24:34 -05:00
Cameron Taylor 0022bd1e14 lil dating sim things 2021-02-02 02:35:35 -05:00
Cameron Taylor a23cfa3274 idk campaign menu shit 2021-02-02 02:20:14 -05:00
Cameron Taylor 9e0a40f29a THORNS AND EVIL MAN 2021-02-02 00:48:22 -05:00
Cameron Taylor f3cfad693b aligned pixel arrows 2021-02-01 05:52:10 -05:00
Cameron Taylor 0084ee3a85 FONT AND BULLSHIT 2021-02-01 01:50:30 -05:00
Cameron Taylor 24bf212f4a call me senpai 2021-01-31 21:43:09 -05:00
Cameron Taylor 5c1a66b3ff leaves lol! 2021-01-31 09:17:56 -05:00
Cameron Taylor 52a03fb4a6 removed discord link lolol oops! 2021-01-30 23:54:28 -08:00
Cameron Taylor 5943bfa342 thorns charts 2021-01-30 22:52:29 -05:00
Cameron Taylor ea63cc63f2 game over in progress 2021-01-30 07:16:51 -05:00
Cameron Taylor 7a21fd2541 senpai and roses on easy 2021-01-30 06:27:11 -05:00
Cameron Taylor 5998f0c607 Merge branch 'master' of https://github.com/ninjamuffin99/ld47 2021-01-28 01:54:24 -05:00
Cameron Taylor 5bd018d2f0 bullshit 2021-01-28 01:54:21 -05:00
Cameron Taylor 0563232e2e Merge pull request #288 from PKPenguin321/controls-options
Very rudimentary options UI for controls changes
2021-01-28 01:51:58 -05:00
PKPenguin321 3b393aed30 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 255a14de0a update readme for haxe discord shit lolol 2021-01-27 00:32:33 -05:00
Cameron Taylor ebb2638ba7 roses chart 2021-01-27 00:24:36 -05:00
Cameron Taylor 66c3d9a1cc roses ALIGNED 2021-01-26 18:57:40 -05:00
Cameron Taylor 56bba50a62 intro date shit 2021-01-25 15:56:42 -05:00
Cameron Taylor 7e9305616f SENPAI IN THE STREETS 2021-01-25 06:07:45 -05:00
Cameron Taylor 36e543b2c9 weedeewfwdsfadf 2021-01-25 05:04:31 -05:00
Cameron Taylor b9dfc5e61c buncho dumbshti lol!!! 2021-01-25 04:18:44 -05:00
Cameron Taylor 54a5eded18 so much win 2021-01-24 22:42:51 -05:00
Cameron Taylor d2cfa41e18 Merge pull request #268 from regulad/issue-template
Basic PR/Issue templates
2021-01-23 16:49:07 -05:00
regulad fe7c998742 Forgot this! 2021-01-23 15:42:24 -05:00
regulad 587d0e6839 Basic PR/Issue templates
Closes #243
2021-01-23 15:39:04 -05:00
Cameron Taylor cf103fbbff Merge branch 'master' of https://github.com/ninjamuffin99/ld47 2021-01-22 01:50:40 -05:00
Cameron Taylor fd0120aa2c weed 2021-01-22 01:50:12 -05:00
Cameron Taylor 31d2d80535 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 dc40d29166 Fixed issue with boyfriend resetting animating too early 2021-01-20 15:51:42 -08:00
Cameron Taylor 2d60ff427e woops! 2021-01-20 07:19:48 -05:00
Cameron Taylor 1b303fbe9b mod guide in progress 2021-01-20 06:53:20 -05:00
Cameron Taylor 9d79793bee menu fix maybe oops 2021-01-20 06:14:38 -05:00
Cameron Taylor 5f11dcce14 Merge branch 'master' of https://github.com/ninjamuffin99/ld47 2021-01-20 05:31:46 -05:00
Cameron Taylor 9ee599761f CHRISTMAS UPDATE 2021-01-20 05:31:43 -05:00
Cameron Taylor 078cd7a417 scripted type beat 2021-01-20 04:11:55 -05:00
Cameron Taylor 6de5effb58 scripted thingie 2021-01-20 04:03:49 -05:00
Cameron Taylor bce6138410 monster christmas 2021-01-20 01:38:39 -05:00
Cameron Taylor 8c5f6191e6 santa lol 2021-01-19 23:29:18 -05:00
Cameron Taylor 79338c2415 fix eggnog normal woops! 2021-01-19 22:58:07 -05:00