1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-24 07:43:56 +00:00
Commit graph

321 commits

Author SHA1 Message Date
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
Cameron Taylor 3529fbd25f MAYBE DOIN CHART SHIT? 2020-11-21 02:43:04 -08:00
Cameron Taylor 36b0302ac4 cool pause music 2020-11-20 04:21:04 -08:00
Cameron Taylor a0d99945df fix for #12 2020-11-17 18:31:59 -08:00
Cameron Taylor 3a1a410fe2 restart on pause menu 2020-11-17 18:20:27 -08:00
Cameron Taylor 2462ae555e pause menu in progress 2020-11-17 17:50:09 -08:00
Cameron Taylor acc1382023 score on song 2020-11-17 17:32:38 -08:00
Cameron Taylor dcb69d2a61 freeplay sounds 2020-11-17 16:22:29 -08:00
Brandon ded18739e1 caught up 11/16/20 2020-11-16 15:29:18 -05:00
Cameron Taylor 176e00b117 oop fix eheh 2020-11-13 18:51:03 -08:00
Cameron Taylor c883f958b1 WIP shit for nicer charting hehe 2020-11-13 18:49:20 -08:00
Cameron Taylor 5ecacb5a70 moved the intro texts to a txt file 2020-11-13 14:37:58 -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
Cameron Taylor 33a92a0a87 south chart, and maybe note flicker? 2020-11-10 18:07:56 -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 11ba4ac690 added lucky, highscore fix?? 2020-11-10 12:52:49 -05:00
Brandon bc91e6d3b8 before i \**** up 2020-11-09 21:59:55 -05:00
Cameron Taylor aae3bf37e1 fixed freeplay score offset shit 2020-11-09 15:26:10 -08: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 e84bb65b1d new preloader
-added preloader aniamtion
-modified export bat,
-added right stick controls
-switch preorders tagline
2020-11-07 02:29:20 -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 4c0186f5fb Update Highscore.hx 2020-11-06 21:59:51 -05:00
Brandon 7062391e70 boo george 2020-11-06 21:34:04 -05: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 48c482440c clarified changelog 2020-11-06 03:17:40 -08:00
Cameron Taylor c2b17d4e3e WEEK SCORE SHIT 2020-11-06 02:56:45 -08:00
Cameron Taylor 4a715a86a0 difficulty selecting 2020-11-06 02:31:33 -08:00
Cameron Taylor 36361ff0a4 Seperated tutorials 2020-11-06 02:21:29 -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
Brandon bbeca8e4fe i'll debug tomorrow 2020-11-03 04:12:13 -05:00
Cameron Taylor 87f67764a3 Merge branch 'master' into master 2020-11-02 15:37:55 -08:00
Cameron Taylor bbba49139b we out here 2020-11-02 14:40:12 -08:00
Brandon c2f0253f4a swap A and B for switch 2020-11-02 16:56:28 -05:00
Brandon 3a121ec4f8 cleansed of NG 2020-11-02 15:31:28 -05:00
Brandon 0d1bd527e2 controls fixed for 3.4.7 2020-11-02 15:04:25 -05:00
Brandon 5ebe1654f2 george the janitor 2020-11-02 14:37:23 -05:00
Brandon 07acc53888 ng release 2020-11-02 01:46:37 -05:00
Brandon 0590fc59b6 me sad cause haxe 4.0.0 2020-11-02 01:38:01 -05:00
Brandon 88b08d3dc3 shot in the dark 4.0 stuff 2020-11-02 00:39:28 -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 cb11c78c26 RELEASE SHIIIT 2020-11-01 00:58:20 -07:00
Cameron Taylor 55d0d25c87 release 2020-11-01 00:01:00 -07:00
Cameron Taylor 0831aa257a more poliiiish 2020-10-31 22:29:49 -07:00
Cameron Taylor c3d2179395 almost releaaaase 2020-10-31 21:55:00 -07:00
Cameron Taylor 4859d15057 POLIIIISH SHIIIIT 2020-10-31 21:34:17 -07:00
Cameron Taylor 24b78d949e newgrounds io shit incoming 2020-10-31 20:42:14 -07:00
Cameron Taylor b94cd258c7 hard songs and unlockables 2020-10-31 20:31:31 -07:00
Cameron Taylor ae50142583 easy charts 2020-10-31 20:22:49 -07:00
Brandon e293c0c2a6 old school syntax 2020-10-31 21:44:10 -04:00
Brandon 1866069af2 latest halloween 2020-10-31 21:11:14 -04:00
Brandon 4d811189dd enum syntax 2020-10-31 21:05:59 -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 9596610408 sounds and polish shit 2020-10-31 12:53:58 -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
Cameron Taylor c36e13722e abstract shit for brandy 2020-10-30 17:09:33 -07:00
Brandon 61f74e7427 caught up 10/30/ 2020-10-30 19:47:19 -04:00
Brandon f388fa0b21 transparent 2020-10-30 19:39:13 -04:00
Cameron Taylor f964f69a40 menu shit in progress 2020-10-30 15:21:34 -07:00
Cameron Taylor c11564e065 cool menu movement 2020-10-30 14:55:20 -07:00
Cameron Taylor 9b53f111a2 UI and menu bullshit 2020-10-30 14:18:26 -07: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 70e1e40174 lil bullshit in progress hehe 2020-10-28 02:26:33 -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
Brandon 32df13aedf switch setup start [REAL] 2020-10-26 19:06:42 -04:00
Cameron Taylor 02b751d8fb new line support for text also camera shit 2020-10-26 02:16:05 -07:00
Cameron Taylor 8caaf2fcb1 website bullshit 2020-10-25 14:38:48 -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 7402784e05 recharted Fresh 2020-10-21 11:05:27 -07:00
Cameron Taylor f8dfa98d37 stinky mocked up intro 2020-10-20 23:23:39 -07:00
Cameron Taylor 87d0b36070 re added sustain notes lol 2020-10-19 18:59:00 -07:00
Cameron Taylor d158afdaf7 controllable sustain 2020-10-18 21:01:09 -07:00
Cameron Taylor 06ef3c8529 almost got sustains working 2020-10-18 19:51:01 -07:00
Cameron Taylor bc367a08dc ported sustain data into game 2020-10-18 19:34:21 -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 e2d77eeec7 getting section meta data all fixed up 2020-10-15 21:22:13 -07:00
Cameron Taylor 6b7a134472 vocal shit fixed and bpm fixed 2020-10-14 01:30:54 -07:00
Cameron Taylor 1ffa98bc7a cleaning up shit 2020-10-14 01:18:19 -07:00
Cameron Taylor d2158bfe18 CLEANED JSON LOL 2020-10-13 22:02:36 -07:00
Cameron Taylor f543c23ba9 more controls for charting 2020-10-13 21:05:55 -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 c5d07c745f NOTE DELETING 2020-10-13 18:23:22 -07:00
Cameron Taylor 40fa0f8b57 smash chart lol 2020-10-13 03:15:21 -07:00
Cameron Taylor e9357d6649 fixed that bullshit 2020-10-13 03:02:03 -07:00
Cameron Taylor 144a775582 so close to proper note reading... 2020-10-13 02:55:00 -07:00
Cameron Taylor c106057ec4 fixed certain notes not appearing 2020-10-13 02:36:45 -07:00
Cameron Taylor 9c25489733 fixed strumline issue 2020-10-13 01:44:12 -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 ebf663d2f9 WIP note placing shit 2020-10-12 22:18:50 -07:00
Cameron Taylor 5f87faacfb BOO REDO SHIT 2020-10-12 20:08:08 -07:00
Cameron Taylor 6568affb02 UI BULLSHIT WIP 2020-10-11 20:52:21 -07:00
Cameron Taylor 98fbaba39a some more section type beat 2020-10-11 19:05:26 -07:00
Cameron Taylor 6e72357f72 sections in progress 2020-10-11 17:24:34 -07:00
Cameron Taylor 3ea8df0557 charting tool WIP shit 2020-10-10 02:28:44 -07:00
Cameron Taylor 29615f24f7 sequencer in progress 2020-10-09 21:22:26 -07:00
Cameron Taylor daa41dafe1 level shit lol 2020-10-09 20:25:52 -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 01843e2c1e renamed Charting.hx file 2020-10-09 16:26:11 -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 6f7b3e67ef fixed bullshit 2020-10-06 18:56:14 -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
Cameron Taylor 8a37bf319d more performance shit 2020-10-05 03:53:10 -07:00
Cameron Taylor 14948480ad RIP WEED LMAO 2020-10-05 03:25:14 -07:00
Cameron Taylor 79c682e736 perfornance and optimization 2020-10-05 02:48:30 -07:00
Cameron Taylor 1fddcf69cb note missing 2020-10-05 00:49:53 -07:00
Cameron Taylor 3068e91ff7 hold notes and temp bg 2020-10-04 22:13:12 -07:00
Cameron Taylor b4bfdb1a69 MISS NOTES 2020-10-04 20:29:35 -07:00
Cameron Taylor 8845651c7d fresh Song charted 2020-10-04 19:31:38 -07:00
Cameron Taylor ce5235a9ac dynamic camer, reformat chart, lvl2 2020-10-04 17:53:49 -07:00
Cameron Taylor 411f3a802a fixed the dad bullshit 2020-10-04 15:27:49 -07:00
Cameron Taylor 0f59fd782d a boy and his offsets... 2020-10-04 14:44:52 -07:00
Cameron Taylor 5f939d3747 offsets "generally" 2020-10-04 11:50:12 -07:00
Cameron Taylor c4fdb3295a notes in da house 2020-10-04 01:38:21 -07:00
Cameron Taylor 13e3c92db9 DOPE SHIT ALL DAY LETS GOOOOO 2020-10-03 23:42:58 -07:00
Cameron Taylor 97921c7a9b scores and dope shit 2020-10-03 12:32:15 -07:00
Cameron Taylor 17a3ddf4ba fixed holding notes 2020-10-03 10:36:39 -07:00
Cameron Taylor 38802b333c INIT COMMIT 2020-10-02 23:50:15 -07:00