cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-12 17:52:45 +00:00
Code Issues Releases Wiki Activity
883 commits 3 branches 3 tags 3 GiB
Commit graph

366 commits

Author SHA1 Message Date
Cameron Taylor 48411894e2 offsets and adjustemnts 2021-03-17 05:29:04 -04:00
Cameron Taylor d8f0297675 bf holding gf 2021-03-17 05:20:25 -04:00
Cameron Taylor eba2639638 tnakmen in progres lol 2021-03-16 01:51:23 -04:00
MtH 49d060d9f2 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-14 20:49:28 +01:00
MtH 1467335ac7 remove check if philly train sound playing 2021-03-14 20:48:02 +01:00
MtH c3710025e1 fix oppenent freezing when !mustHitSection and no notes, dance only on downbeat 2021-03-14 20:46:44 +01:00
George FunBook 9ffa28dd21 Merge branch 'master' into options 2021-03-13 22:41:29 -06:00
George FunBook 307150d3e2 fix camera 2021-03-13 21:41:12 -06:00
George FunBook 95f8d65972 Merge branch 'master' into ng_login 2021-03-13 20:24:57 -06:00
George FunBook 43b0d5ac78 add options menu 2021-03-13 20:11:56 -06:00
Cameron Taylor 15f7b5e2d2 offset bullshit and pico 2021-03-13 20:53:57 -05:00
Cameron Taylor d7aba46853 tankmen foreground in progress 2021-03-08 18:38:58 -05:00
Cameron Taylor 4fae6773c9 tank guy and quality of life shit 2021-03-07 15:34:21 -05:00
Cameron Taylor 7658fb245b assets, and switch statement so i dont get roasted 2021-03-07 01:59:22 -05:00
Cameron Taylor 0951b672e7 charts an shit and death counter 2021-03-04 14:30:35 -05:00
M&M 1506dc001a Merge branch 'master' into scoreoutline 2021-02-28 19:45:56 -08:00
WorstAquaPlayer 3dd24abf07 Added missing #if to RPC call 2021-02-28 18:50:06 -03:00
WorstAquaPlayer b1993259bf Changed RPC !html and added Debug Status 2021-02-27 21:06:30 -03:00
WorstAquaPlayer 34a5175ce5 Alt+Tab and Game Over updates RPC 2021-02-27 20:49:53 -03:00
WorstAquaPlayer dee03abd3f Pausing and unpausing updates RPC 2021-02-27 20:23:50 -03:00
WorstAquaPlayer 700acb86a1 Now shows P2 icon and time left when song starts 2021-02-27 18:59:18 -03:00
M&M c90b35011f girlfriend finally cheers 2021-02-26 15:45:06 -08:00
Jakkzero cb8aa3d175 Adding updated source files 2021-02-26 12:27:32 +00: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 d2062f41b6 small shit characters dunno this shit weird lol 2021-02-23 23:14:18 -05:00
George FunBook 38496ea74d cheats on debug only 2021-02-23 18:57:49 -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
Cameron Taylor a3ece662fe icon bullshit and somethin else gitaroo man 2021-02-16 00:21:11 -05:00
George FunBook 5b84e136fc Merge branch 'master' into deferred_loading 2021-02-15 15:30:29 -06: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 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 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
M&M 79e1925bf8 Add outline to score text 2021-02-02 23:44:35 -08: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 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 22b03ee420 bullshit 2021-01-28 01:54:21 -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 a92739402c CHRISTMAS UPDATE 2021-01-20 05:31:43 -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 a041da2012 dope shit in progress 2021-01-16 17:21:06 -05:00
Cameron Taylor 5e7ad47bb7 Merge branch 'master' of https://github.com/ninjamuffin99/ld47 2021-01-14 23:39:49 -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
pahaze a3d9baec0b Update to latest master commit 2021-01-05 07:53:42 -05:00
pahaze 1475fa10ab Add enemies' dying faces 2021-01-01 00:39:58 -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 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 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 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 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 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
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
Lotusotho 16caad1818 Fixed loop problem at the end of Boopeebo 2020-12-06 14:58:32 +01:00
Cameron Taylor 8c55962468 exploit fixin 2020-12-04 12:36:28 -05:00
Cameron Taylor 2aa92af923 high score manipulation 2020-12-04 12:32:35 -05:00
Cameron Taylor 869ad02b0d closes #13 and closes #10 2020-12-02 12:28:28 -05: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 36b0302ac4 cool pause music 2020-11-20 04:21:04 -08:00
Cameron Taylor acc1382023 score on song 2020-11-17 17:32:38 -08:00
Brandon e30ed8e6e5 update to master 11/11/20 2020-11-11 05:00:13 -05:00
Cameron Taylor ce2dc75839 some animation touchups 2020-11-10 19:09:48 -08:00
Brandon 68958963a3 did the meme on switch 2020-11-10 15:07:34 -05:00
Brandon 6c04bb8e23 caught up 11/10/20 2020-11-10 13:08:18 -05:00
Brandon aa787059e4 caught up to hard mode 2020-11-07 16:59:25 -05:00
Brandon 9de490f296 game works again, twin-stick is fun 2020-11-07 16:13:41 -05:00
Brandon 77c9422088 haha , also highscore.hx breaks switch 2020-11-07 15:52:21 -05:00
Brandon 99741f0a65 crash on story menu 2020-11-07 00:05:58 -05:00
Cameron Taylor 3979fab6b9 hard mode lol 2020-11-06 19:39:21 -08:00
Brandon 179492e9a1 uhhh 2020-11-06 21:24:03 -05:00
Brandon 7dc874d622 caught up to cam 2020-11-06 21:17:27 -05:00
Cameron Taylor 5ed65c5ee5 score shit 2020-11-06 13:51:11 -08:00
Cameron Taylor 4ba3cfbfdb hotfix for da week 2 unlock 2020-11-06 11:56:41 -08:00
Cameron Taylor c2b17d4e3e WEEK SCORE SHIT 2020-11-06 02:56:45 -08:00
Cameron Taylor 35eee013d5 balanced normal, and usin newgrounds haxelib 2020-11-06 01:57:00 -08:00
Brandon de56282aec added debugs and cheats and we usin fmod 2020-11-05 05:08:40 -05:00
Brandon 71f5d24586 tracing the sound.time issue 2020-11-05 01:51:31 -05:00
Cameron Taylor 87f67764a3 Merge branch 'master' into master 2020-11-02 15:37:55 -08:00
Brandon 3a121ec4f8 cleansed of NG 2020-11-02 15:31:28 -05:00
Brandon 07acc53888 ng release 2020-11-02 01:46:37 -05:00
Cameron Taylor ca29bf1a84 lightning shit 2020-11-01 15:20:13 -08: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
Cameron Taylor 0831aa257a more poliiiish 2020-10-31 22:29:49 -07:00
Cameron Taylor 4859d15057 POLIIIISH SHIIIIT 2020-10-31 21:34:17 -07:00
Cameron Taylor ae50142583 easy charts 2020-10-31 20:22:49 -07:00
Brandon 1866069af2 latest halloween 2020-10-31 21:11:14 -04:00
Cameron Taylor 06b5366535 difficulty UI 2020-10-31 16:53:26 -07:00
Cameron Taylor 261a4c8bc4 difficulty shit in progress 2020-10-31 16:23:19 -07:00
Cameron Taylor 74054b5ece polish polish polish polish 2020-10-31 03:07:22 -07:00
Cameron Taylor 4997cfddaf text shit cookin 2020-10-31 00:32:51 -07:00
Cameron Taylor 81496c4f5d ALMOST DIALOGUE 2020-10-30 23:30:35 -07:00
Cameron Taylor 0fcd92f6d9 intro messages 2020-10-30 21:25:23 -07:00
Cameron Taylor 5a0dee6f63 lil bullshit 2020-10-30 19:33:28 -07:00
Cameron Taylor c76268fa3f story mode type shit 2020-10-30 18:55:09 -07:00
Brandon 61f74e7427 caught up 10/30/ 2020-10-30 19:47:19 -04:00
Cameron Taylor 51be7b67f1 spookeez charted 2020-10-30 11:54:53 -07:00
Cameron Taylor d918d21f13 polish bits here and there 2020-10-29 23:52:26 -07:00
Cameron Taylor 4cbab4f531 BPM BULLSHIT 2020-10-29 20:06:52 -07:00
Cameron Taylor 805fb23ef0 south charted 2020-10-28 19:47:10 -07:00
Cameron Taylor 9b08561db8 fix note miss bullshit 2020-10-28 01:24:56 -07:00
Cameron Taylor c5094754a9 idk bullshit 2020-10-28 00:32:34 -07:00
Cameron Taylor 076870c9f6 cute animations in progress teehee 2020-10-28 00:03:32 -07:00
Cameron Taylor 6b076faaf7 LOSS SCREEN WIP 2020-10-27 03:35:23 -07:00
Cameron Taylor cdf7ea1eed COOLER INTRO SHIT 2020-10-27 01:31:21 -07:00
Cameron Taylor 02b751d8fb new line support for text also camera shit 2020-10-26 02:16:05 -07:00
Cameron Taylor e78a08d765 adding in cool text shit 2020-10-25 13:51:06 -07:00
Cameron Taylor 43682dd30d fix miss animations 2020-10-24 02:36:50 -07:00
Cameron Taylor dc6686e095 less note stutter 2020-10-24 02:19:13 -07:00
Cameron Taylor 99b51a3f03 psooky! 2020-10-23 16:12:38 -07:00
Cameron Taylor 4d7fc18fc4 FIXED up bullshit 2020-10-21 17:22:12 -07:00
Cameron Taylor cd329632c7 BULLSHIT CONTROLS 2020-10-21 16:33:43 -07:00
Cameron Taylor b9d93fff71 made sustain notes slightly nicer 2020-10-21 13:12:32 -07:00
Cameron Taylor 87d0b36070 re added sustain notes lol 2020-10-19 18:59:00 -07:00
Cameron Taylor c231999a10 fixed bullshit 2020-10-18 19:18:06 -07:00
Cameron Taylor 84f54eae67 cool new stuff lol 2020-10-18 17:59:53 -07:00
Cameron Taylor 912596111b fixed camera shit 2020-10-18 00:27:39 -07:00
Cameron Taylor 022eded8f9 ass kicking song 2020-10-17 18:47:59 -07:00
Cameron Taylor 03481344f5 CHARTING SYSTEM IN PROGRESS 2020-10-17 14:33:35 -07:00
Cameron Taylor e6741869e8 fixed issue with desync 2020-10-16 04:15:17 -07:00
Cameron Taylor 1e4dc55c42 rippin my hair out at programming right now 2020-10-16 04:03:10 -07:00
Cameron Taylor 6b7a134472 vocal shit fixed and bpm fixed 2020-10-14 01:30:54 -07:00
Cameron Taylor d2158bfe18 CLEANED JSON LOL 2020-10-13 22:02:36 -07:00
Cameron Taylor 6e9c3f6540 better prototyping bullshit 2020-10-13 19:12:31 -07:00
Cameron Taylor f5c8077fb2 got prototyping shit workin to an extent 2020-10-13 18:51:53 -07:00
Cameron Taylor dd623ed22f almost got good prototyping shit in 2020-10-13 18:44:07 -07:00
Cameron Taylor c106057ec4 fixed certain notes not appearing 2020-10-13 02:36:45 -07:00
Cameron Taylor cfe3c10964 almost making progress on note shit 2020-10-13 01:37:19 -07:00
Cameron Taylor 7b4826de33 CHARTING SHIT IN PROGRESS 2020-10-13 01:07:04 -07:00
Cameron Taylor 11c9c75c70 save data bullshit 2020-10-09 20:22:07 -07:00
Cameron Taylor 9ea345b620 redoing and replacing some of the music logic 2020-10-09 19:39:52 -07:00
Cameron Taylor 186b981847 simple pause screen 2020-10-09 14:24:20 -07:00
Cameron Taylor d02442f529 baby shit controller support 2020-10-09 00:29:00 -07:00
Cameron Taylor 132782b777 build script fixin 2020-10-08 17:54:47 -07:00
Cameron Taylor 001dccb50a fixed build scripts and shit 2020-10-06 20:59:48 -07:00
Cameron Taylor 9965320307 we out here windows build 2020-10-06 18:56:33 -07:00
Cameron Taylor 4eab1c34ed RELEAAASE 2020-10-05 15:29:59 -07:00
Cameron Taylor 0d6ef4b20f BACKGROUNDS 2020-10-05 13:55:48 -07:00
Cameron Taylor d2e89c5bdf HEALTH IN PROGRESS 2020-10-05 13:32:41 -07:00
Cameron Taylor 956f4fda06 ready set go bullshit 2020-10-05 11:33:56 -07:00
Cameron Taylor 96b068de55 bunch of polish bullshit 2020-10-05 11:24:51 -07:00
Cameron Taylor 44f9878706 grafiti scores 2020-10-05 07:03:38 -07:00
Cameron Taylor d1a10dc0b4 assets and gf and shit 2020-10-05 05:55:39 -07:00
Cameron Taylor 0815f32a97 gf base shit 2020-10-05 04:46:57 -07:00