cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-03-22 09:59:25 +00:00
Code Issues Releases Wiki Activity
529 commits 31 branches 21 tags 3 GiB
Commit graph

432 commits

Author SHA1 Message Date
Jakkzero 580f41f09d fixed endless discord updates 
I'm an idiot and had no idea what I was doing with haxe.Timer.delay() so I'm using Sys.sleep() and it seems to work fine.
 2021-02-26 12:52:40 +00:00
Jakkzero cb8aa3d175 Adding updated source files 2021-02-26 12:27:32 +00:00
Cameron Taylor b1b3df25b5 week metadata bullshit for free[;ay 2021-02-24 20:52:59 -05:00
Cameron Taylor 3882de4ad8 freeplay fixin shit 2021-02-24 20:22:37 -05:00
Cameron Taylor 3e65da6d9d bopeebo note thing 2021-02-24 19:06:41 -05:00
Cameron Taylor 10ecc85baf options menu in progress 2021-02-24 18:32:51 -05:00
Cameron Taylor b62fbe935f Merge pull request #384 from ActualMandM/resyncvocals 
Resync by music instead of vocals
 2021-02-24 01:42:00 -05:00
Cameron Taylor ebcceb1f20 Merge branch 'deferred_loading' of https://github.com/Geokureli/Funkin into Geokureli-deferred_loading 2021-02-23 23:34:08 -05:00
Cameron Taylor a6deae4796 bullshit lol 2021-02-23 23:32:53 -05:00
Cameron Taylor 811cc1f3ae Merge branch 'master' of https://github.com/ninjamuffin99/ld47 2021-02-23 23:31:15 -05:00
Cameron Taylor d2062f41b6 small shit characters dunno this shit weird lol 2021-02-23 23:14:18 -05:00
George FunBook 5b6862d6cf start new Controls menu 2021-02-23 18:59:36 -06:00
George FunBook d3e17274a8 add grid nav controls 2021-02-23 18:59:09 -06:00
George FunBook 38496ea74d cheats on debug only 2021-02-23 18:57:49 -06:00
George FunBook d9371cc8eb add AtlasText cuz Alpabet sux 2021-02-23 18:55:24 -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
MtH b83bb877d0 fix several issues caused by sustain notes no longer being removed after correctly hit 2021-02-20 01:31:52 +01:00
George FunBook 80e7539deb add prompt, finalize login UI 2021-02-18 13:58:16 -06:00
Cameron Taylor 12f8c57484 mobile bullshit cookin in progress??? 2021-02-16 01:53:25 -05:00
Cameron Taylor a3ece662fe icon bullshit and somethin else gitaroo man 2021-02-16 00:21:11 -05:00
George FunBook d3a873037d flicker on accept 2021-02-15 16:04:08 -06:00
George FunBook d6f6cc3ca9 Merge branch 'deferred_loading' into ng_login 2021-02-15 15:59:36 -06:00
George FunBook 7df55291a5 oices path 2021-02-15 15:49:13 -06:00
George FunBook 5b84e136fc Merge branch 'master' into deferred_loading 2021-02-15 15:30:29 -06:00
George FunBook 99f6ad9d50 wtf am i doing 2021-02-15 11:43:51 -06:00
Cameron Taylor 86955d6670 icons and changelog and newgrounds 2021-02-14 19:45:18 -05:00
Cameron Taylor 5d96dc44e0 Merge pull request #357 from lotusotho/senpaidialoguebug-fix 
Fixed bug that makes the whole game crash at the start of week 6
 2021-02-14 19:44:41 -05:00
Cameron Taylor 3d8a3a8f98 Gitaroo easter egg 2021-02-14 19:03:02 -05:00
Cameron Taylor 9585ae42e7 Merge branch 'master' of https://github.com/ninjamuffin99/ld47 2021-02-14 03:32:29 -05:00
Cameron Taylor a41e14ecdf icons and cleanin 2021-02-14 03:32:24 -05:00
MtH 7a70182697 better sustain notes & organizing 2021-02-13 23:39:31 +01:00
M&M 93b0fe153d Merge branch 'master' into resyncvocals 2021-02-12 23:21:51 -08: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
Cameron Taylor a037a52a60 Merge pull request #402 from TheDrawingCoder-Gamer/patch-1 
Use haxe switch case 'or'
 2021-02-11 22:14:24 -05:00
MtH a8a3c96e7b entirely phase out totalBeats/totalSteps in favor of the more reliable curStep/curBeat 2021-02-12 03:19:43 +01:00
MtH f3462c2c99 totalSteps & totalBeats synced with bpm changes 2021-02-12 01:58:11 +01:00
MtH 674a08b381 actually huge overhaul OOPS lol. 
trims off unnecessary data, supports bpm changes proper and according to my proposed system, also just happens to fix other issues with the chart editor
 2021-02-11 23:13:50 +01:00
MtH 41efd4f3db BPM map, trim off useless song stuff, adjust MILF cam zoom 2021-02-11 23:06:26 +01:00
Bulby 260a024e5c Use haxe switch case 'or' 2021-02-11 14:54:16 -05:00
George FunBook 755e338c88 Merge branch 'master' into deferred_loading 2021-02-11 13:18:50 -06:00
George FunBook 8dd68b6360 remove TitleState.soundExt 2021-02-11 13:14:16 -06:00
George FunBook 246c87240e fix preloaded versions 2021-02-11 13:14:02 -06:00
MtH ad233110f7 Merge branch 'master' of https://github.com/ninjamuffin99/Funkin 2021-02-11 11:09:23 +01:00
George FunBook 225ee24fc3 move files to weeks and load songs individually 2021-02-10 14:18:14 -06:00
George FunBook baab5f9749 move songs to song folder and create libraries for each week 2021-02-09 12:07:05 -06:00
George FunBook b3ebc4365f move files to libraries 2021-02-08 20:43:17 -06:00
George FunBook 07abc35f66 add Paths asset name helper 2021-02-08 15:34:48 -06:00
M&M 646694bb79 Resync by music instead of vocals 2021-02-08 09:48:58 -08:00
MtH 8e251f5b4a tweak changeBPM functionality 2021-02-08 04:07:56 +01:00
Jan200101 d38323ab55 check if newgroups api key actually exists before creating core 2021-02-05 13:14:28 +01:00
Lotusotho 823acd7a60 Deleted bool I created before 2021-02-04 22:40:02 +01:00
Lotusotho 4e3a29943a Fixed bug at the start of the dialogue 2021-02-04 22:36:01 +01: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 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
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 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 0a0fa93d26 weed 2021-01-22 01:50:12 -05: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 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 5e7ad47bb7 Merge branch 'master' of https://github.com/ninjamuffin99/ld47 2021-01-14 23:39:49 -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 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
Lotusotho bf4f828f56 Delete FlxTransitionableState 2021-01-10 17:03:46 +01:00
George FunBook 2063d00b5d fix pico asset paths 2021-01-08 14:01:59 -06:00
Cameron Taylor 17b6015b2c more keybind shit 2021-01-07 20:38:32 -05:00
Cameron Taylor fe21dfe7e8 charting editor improvements 2021-01-06 23:02:23 -05:00
Cameron Taylor efbb088fb8 chart editor type beat 2021-01-06 22:38:17 -05:00
Cameron Taylor a7cea54ab0 Merge pull request #138 from pahaze/master 
Add enemies' dying faces
 2021-01-05 21:08:14 -08:00
pahaze a3d9baec0b Update to latest master commit 2021-01-05 07:53:42 -05: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
pahaze 1475fa10ab Add enemies' dying faces 2021-01-01 00:39:58 -05:00
Scott-GH 47c26e634e Added a fix to music restarting when the song ends. 2020-12-29 23:22:02 -08:00
Cameron Taylor b051b18cf2 week unlockin shit 2020-12-27 05:57:45 -05:00
Cameron Taylor 57520a407d oops no options lolol 2020-12-27 05:42:06 -05:00
Cameron Taylor b3ad4ab908 maybe ready to go??? 2020-12-27 05:37:04 -05:00
Cameron Taylor 05fcb4fb74 bg dancers coded 2020-12-27 03:13:51 -05:00
Cameron Taylor b07372aa8e CHARTS 2020-12-26 21:46:22 -05:00
Cameron Taylor 84eca4325c charts and shit fixied 2020-12-25 18:24:20 -05:00
Cameron Taylor ea1c0e3888 AUTOSAVE FOR NOTE EDITOR! 2020-12-25 04:09:14 -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 afac787076 moved flash files 2020-12-24 18:24:11 -05:00
Cameron Taylor 7f16f0341e cool shit mommy gf 2020-12-22 20:55:03 -05:00
Cameron Taylor a7111abeb3 mom chart 2020-12-22 19:57:55 -05:00
Cameron Taylor b889648968 songs 2020-12-21 17:20:57 -05:00
Cameron Taylor 33acea20bf poop 2020-12-21 16:23:22 -05:00
Cameron Taylor 656bb3bec3 fix crash 2020-12-17 15:03:33 -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
Cameron Taylor b5c77a060d colol workflow?? 2020-12-13 01:42:48 -05:00
Cameron Taylor d3ef83c25d Merge branch 'master' of https://github.com/ninjamuffin99/ld47 2020-12-13 01:10:22 -05:00
Cameron Taylor 2262128b11 Merge pull request #48 from gedehari/master 
Music issues throughout the game
 2020-12-12 22:10:06 -08:00
Cameron Taylor 1a897d2798 lol idk lol 2020-12-13 01:08:21 -05:00
Cameron Taylor d2a58cee19 Merge pull request #35 from lotusotho/boopeebohalting-fix 
Fixed loop problem at the end of Boopeebo because of the vocals
 2020-12-11 14:43:48 -08:00
Cameron Taylor 9738b1ac93 changelog shit 2020-12-11 17:22:22 -05:00
Cameron Taylor 88ada9d345 tutorial patch 2020-12-11 08:49:06 -05:00
Cameron Taylor edd4fc5b58 changelog and update shit 2020-12-11 08:08:41 -05:00
Cameron Taylor fefa5f8051 philly charts and hair 2020-12-11 07:55:39 -05:00
Cameron Taylor 930c9ccd1a gf assets and offsets update 2020-12-11 06:45:00 -05:00
Cameron Taylor 7874300986 week setup? 2020-12-11 04:15:24 -05:00
Cameron Taylor ceba27472c charts and fixins 2020-12-11 00:57:42 -05:00
Cameron Taylor 2cb855702b train in progress 2020-12-10 18:23:53 -05:00
Gede Hari bc0e366895 Fixed song still playing when paused right when song starts 
This should be it.
 2020-12-10 13:41:31 +08: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 8289358d61 oopsie daisy this shouldn't be tracked 
my bad
 2020-12-10 13:02:23 +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 024c760cc2 fixed pausing desync issue 2020-12-09 18:14:36 -05:00
Cameron Taylor 7144c81127 animation fixins 2020-12-09 17:46:47 -05:00
Cameron Taylor adae54bb9b offsets and animations 2020-12-09 17:36:31 -05:00