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

53 commits

Author SHA1 Message Date
George FunBook 70409443d1 fix errors on mac 2021-03-29 23:05:21 -05:00
Cameron Taylor c0cfbc3380 Merge pull request #1 from ninjamuffin99/sans_discord
allow run without discord stuff
2021-03-29 13:43:10 -07:00
Cameron Taylor 105c05f2e2 no flashing menu 2021-03-26 21:22:07 -04:00
George FunBook c5888e44ed Merge branch 'master' into sans_discord 2021-03-23 18:07:02 -05:00
George FunBook 3476796cc6 Merge branch 'master' into options 2021-03-22 23:05:46 -05:00
George FunBook e6a5064845 fix camera 2021-03-22 22:41:37 -05:00
George FunBook 8a515b63f5 allow run without discord stuff 2021-03-22 09:09:46 -05:00
George FunBook 34cb7f9982 more ui work 2021-03-22 08:40:32 -05:00
Cameron Taylor 619f7c8a22 Merge branch 'master' of https://github.com/ninjamuffin99/funkin 2021-03-18 19:12:39 -04:00
George FunBook 43b0d5ac78 add options menu 2021-03-13 20:11:56 -06:00
MtH 367cb8b1cc make main menu bg not go offscreen when selecting options, add offsets for menu items 2021-03-13 22:31:49 +01:00
WorstAquaPlayer 5e7bbc3b66 Exiting through the pause menu updates RPC 2021-02-27 21:34:49 -03:00
Cameron Taylor 10ecc85baf options menu in progress 2021-02-24 18:32:51 -05:00
George FunBook 5b6862d6cf start new Controls menu 2021-02-23 18:59:36 -06:00
George FunBook aef55f90c6 alphabet menu items + separate ngPrompt 2021-02-21 12:08:30 -06:00
George FunBook 3936f739b2 move ngPrompt to new file 2021-02-19 22:10:16 -06:00
George FunBook e6b9ec2100 finalize prompts and uix 2021-02-19 20:11:33 -06:00
George FunBook 80e7539deb add prompt, finalize login UI 2021-02-18 13:58:16 -06:00
George FunBook d3a873037d flicker on accept 2021-02-15 16:04:08 -06:00
George FunBook 99f6ad9d50 wtf am i doing 2021-02-15 11:43:51 -06:00
George FunBook fb3ed180e1 Merge branch 'master' into deferred_loading 2021-02-12 09:46:22 -06:00
Cameron Taylor b3ec450352 more seamless storymode transitions 2021-02-12 01:20:20 -05:00
George FunBook 07abc35f66 add Paths asset name helper 2021-02-08 15:34:48 -06:00
Cameron Taylor 385097941c idk campaign menu shit 2021-02-02 02:20:14 -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
Gede Hari 6c3f1df72f Move version check screen to TitleState 2021-01-05 16:29:32 +08:00
Cameron Taylor 7b2c930808 MOD SHIT IN PROGRESS 2021-01-04 18:56:30 -05:00
Cameron Taylor 57520a407d oops no options lolol 2020-12-27 05:42:06 -05:00
Cameron Taylor 84eca4325c charts and shit fixied 2020-12-25 18:24:20 -05:00
Cameron Taylor 18b87b391e dumb lol! 2020-12-25 03:40:01 -05:00
Cameron Taylor 649ce2bc9d outdated check 2020-12-25 00:17:21 -05:00
Cameron Taylor a7111abeb3 mom chart 2020-12-22 19:57:55 -05:00
Cameron Taylor aedac402cf NGio bootleg API bullshit 2020-12-15 22:00:22 -05:00
Cameron Taylor 2ff2d57540 new shit babyu 2020-12-13 02:45:36 -05:00
Gede Hari 68a15dc8f7 Fixed song starting early when paused during countdown
also tweaked something in main menu
2020-12-10 13:04:36 +08:00
Gede Hari d4848da042 Freeplay song not continuing fade in when exiting freeplay menu 2020-12-10 08:58:46 +08:00
Gede Hari 394e8c663b Fixes MainMenu not playing music after playing/exiting level 2020-12-10 08:47:28 +08:00
Cameron Taylor ef3fa33717 Merge branch 'master' into master 2020-11-25 00:22:22 -08:00
Brandon d6243b794e 11/24/2020 2020-11-24 22:53:48 -05:00
Cameron Taylor 7d975293b2 fixed quotation mark lol 2020-11-22 12:52:09 -08:00
Cameron Taylor 6f79dd445a fixed URL thing for linux 2020-11-22 12:39:32 -08:00
Brandon 77c9422088 haha , also highscore.hx breaks switch 2020-11-07 15:52:21 -05:00
Brandon 7dc874d622 caught up to cam 2020-11-06 21:17:27 -05:00
Cameron Taylor 48c482440c clarified changelog 2020-11-06 03:17:40 -08:00
Cameron Taylor 35eee013d5 balanced normal, and usin newgrounds haxelib 2020-11-06 01:57:00 -08:00
Brandon bbeca8e4fe i'll debug tomorrow 2020-11-03 04:12:13 -05:00
Brandon 81db7718d2 ng release and blank controls 2020-11-01 14:16:22 -05:00
Cameron Taylor 97ba544409 scores in progress 2020-11-01 01:55:02 -08:00
Brandon 1866069af2 latest halloween 2020-10-31 21:11:14 -04:00
Cameron Taylor 9596610408 sounds and polish shit 2020-10-31 12:53:58 -07:00