1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-01 04:14:47 +00:00
Commit graph

532 commits

Author SHA1 Message Date
Cameron Taylor 41254d2d92 swappable characters debug 2021-01-13 22:38:31 -05:00
Lotusotho 1420da25c0 Delete FlxTransitionableState 2021-01-10 17:03:46 +01:00
George FunBook 9f3b4120e3 fix pico asset paths 2021-01-08 14:01:59 -06:00
Cameron Taylor ee81c90f6b more keybind shit 2021-01-07 20:38:32 -05:00
Cameron Taylor a627354db9 charting editor improvements 2021-01-06 23:02:23 -05:00
Cameron Taylor 667e90af34 chart editor type beat 2021-01-06 22:38:17 -05:00
Cameron Taylor 2abc060e39 Merge pull request #138 from pahaze/master
Add enemies' dying faces
2021-01-05 21:08:14 -08:00
pahaze 5082b857fd Update to latest master commit 2021-01-05 07:53:42 -05:00
Gede Hari 031fed6f81 Move version check screen to TitleState 2021-01-05 16:29:32 +08:00
Cameron Taylor 7db278fdd6 MOD SHIT IN PROGRESS 2021-01-04 18:56:30 -05:00
pahaze 1ba1ecb6af Add enemies' dying faces 2021-01-01 00:39:58 -05:00
Scott-GH 359fb83fd7 Added a fix to music restarting when the song ends. 2020-12-29 23:22:02 -08:00
Cameron Taylor d691f15c47 week unlockin shit 2020-12-27 05:57:45 -05:00
Cameron Taylor 2946f9322f oops no options lolol 2020-12-27 05:42:06 -05:00
Cameron Taylor 95c2e8390f maybe ready to go??? 2020-12-27 05:37:04 -05:00
Cameron Taylor d643b2c6b9 bg dancers coded 2020-12-27 03:13:51 -05:00
Cameron Taylor 6ba417574f CHARTS 2020-12-26 21:46:22 -05:00
Cameron Taylor a0c74ae053 charts and shit fixied 2020-12-25 18:24:20 -05:00
Cameron Taylor 61326448af AUTOSAVE FOR NOTE EDITOR! 2020-12-25 04:09:14 -05:00
Cameron Taylor 3a60603ed4 dumb lol! 2020-12-25 03:40:01 -05:00
Cameron Taylor fac6bbc259 outdated check 2020-12-25 00:17:21 -05:00
Cameron Taylor 2201177f20 moved flash files 2020-12-24 18:24:11 -05:00
Cameron Taylor e0356c748b cool shit mommy gf 2020-12-22 20:55:03 -05:00
Cameron Taylor 0524953b18 mom chart 2020-12-22 19:57:55 -05:00
Cameron Taylor 838b84c4eb songs 2020-12-21 17:20:57 -05:00
Cameron Taylor 7d5817e49e poop 2020-12-21 16:23:22 -05:00
Cameron Taylor c1a7259074 fix crash 2020-12-17 15:03:33 -05:00
Cameron Taylor 195ddb2eb3 NGio bootleg API bullshit 2020-12-15 22:00:22 -05:00
Cameron Taylor cec5ffbf25 new shit babyu 2020-12-13 02:45:36 -05:00
Cameron Taylor e7cc77ed4d colol workflow?? 2020-12-13 01:42:48 -05:00
Cameron Taylor fe60d4644d Merge branch 'master' of https://github.com/ninjamuffin99/ld47 2020-12-13 01:10:22 -05:00
Cameron Taylor 663fc0f3de Merge pull request #48 from gedehari/master
Music issues throughout the game
2020-12-12 22:10:06 -08:00
Cameron Taylor ea23feabb9 lol idk lol 2020-12-13 01:08:21 -05:00
Cameron Taylor b87dcbba24 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 a33601d5f6 changelog shit 2020-12-11 17:22:22 -05:00
Cameron Taylor 451a2ebd0a tutorial patch 2020-12-11 08:49:06 -05:00
Cameron Taylor 18213c5cb0 changelog and update shit 2020-12-11 08:08:41 -05:00
Cameron Taylor abd7826851 philly charts and hair 2020-12-11 07:55:39 -05:00
Cameron Taylor 800513ca05 gf assets and offsets update 2020-12-11 06:45:00 -05:00
Cameron Taylor 8e66575fb6 week setup? 2020-12-11 04:15:24 -05:00
Cameron Taylor 8600846f79 charts and fixins 2020-12-11 00:57:42 -05:00
Cameron Taylor f8dd35fc3a train in progress 2020-12-10 18:23:53 -05:00
Gede Hari 914e3cefbb Fixed song still playing when paused right when song starts
This should be it.
2020-12-10 13:41:31 +08:00
Gede Hari ff2a107065 Fixed song starting early when paused during countdown
also tweaked something in main menu
2020-12-10 13:04:36 +08:00
Gede Hari 6f25fc8aa9 oopsie daisy this shouldn't be tracked
my bad
2020-12-10 13:02:23 +08:00
Gede Hari ecea8da1f6 Freeplay song not continuing fade in when exiting freeplay menu 2020-12-10 08:58:46 +08:00
Gede Hari bd865fb31e Fixes MainMenu not playing music after playing/exiting level 2020-12-10 08:47:28 +08:00
Cameron Taylor 4e9f76ef6e fixed pausing desync issue 2020-12-09 18:14:36 -05:00
Cameron Taylor 5db020d4c9 animation fixins 2020-12-09 17:46:47 -05:00
Cameron Taylor c7f2aa1175 offsets and animations 2020-12-09 17:36:31 -05:00
Cameron Taylor acf2620e7d pico charted 2020-12-09 13:53:46 -05:00
Lotusotho ff6c01c18d Fixed loop problem at the end of Boopeebo 2020-12-06 14:58:32 +01:00
Cameron Taylor a95d3bd3a8 ng login bullshit 2020-12-04 12:57:09 -05:00
Cameron Taylor 10665f6c0f more intro texts 2020-12-04 12:46:03 -05:00
Cameron Taylor 92a9bc9e6c lol fix semi colon 2020-12-04 12:38:12 -05:00
Cameron Taylor a742940657 exploit fixin 2020-12-04 12:36:28 -05:00
Cameron Taylor e3a4f11d1e high score manipulation 2020-12-04 12:32:35 -05:00
Cameron Taylor f8c21d195a closes #13 and closes #10 2020-12-02 12:28:28 -05:00
Lotusotho ee9d491644 Update StoryMenuState.hx 2020-12-01 12:53:30 +01:00
lotusotho 59e5de38bb Update StoryMenuState.hx 2020-11-26 20:14:35 +01:00
BuildTools eecc30346d fixed spamming issue with the buttons on the story menu 2020-11-26 19:43:45 +01:00
Cameron Taylor 2c49696c0b Merge branch 'master' into master 2020-11-25 00:22:22 -08:00
Brandon 662b67b8ef 11/24/2020 2020-11-24 22:53:48 -05:00
Cameron Taylor 4e3297c48f fixed quotation mark lol 2020-11-22 12:52:09 -08:00
Cameron Taylor ebeba455d3 fixed URL thing for linux 2020-11-22 12:39:32 -08:00
Cameron Taylor cb0ebfdbe1 MAYBE DOIN CHART SHIT? 2020-11-21 02:43:04 -08:00
Cameron Taylor a932141476 cool pause music 2020-11-20 04:21:04 -08:00
Cameron Taylor 3d0711f0e2 fix for #12 2020-11-17 18:31:59 -08:00
Cameron Taylor a67689ab76 restart on pause menu 2020-11-17 18:20:27 -08:00
Cameron Taylor f419163ccc pause menu in progress 2020-11-17 17:50:09 -08:00
Cameron Taylor f2f0bfb013 score on song 2020-11-17 17:32:38 -08:00
Cameron Taylor 9135c5c595 freeplay sounds 2020-11-17 16:22:29 -08:00
Brandon 1a209e8220 caught up 11/16/20 2020-11-16 15:29:18 -05:00
Cameron Taylor e6c87f8fc3 oop fix eheh 2020-11-13 18:51:03 -08:00
Cameron Taylor ddc3f16a53 WIP shit for nicer charting hehe 2020-11-13 18:49:20 -08:00
Cameron Taylor 1fceefaa29 moved the intro texts to a txt file 2020-11-13 14:37:58 -08:00
Brandon 557820c692 update to master 11/11/20 2020-11-11 05:00:13 -05:00
Cameron Taylor 0c31b2cd57 some animation touchups 2020-11-10 19:09:48 -08:00
Cameron Taylor 325166d4f5 south chart, and maybe note flicker? 2020-11-10 18:07:56 -08:00
Brandon 43375beae1 did the meme on switch 2020-11-10 15:07:34 -05:00
Brandon 7b89e2520a caught up 11/10/20 2020-11-10 13:08:18 -05:00
Brandon f1b73b052c added lucky, highscore fix?? 2020-11-10 12:52:49 -05:00
Brandon e22bbdb25c before i \**** up 2020-11-09 21:59:55 -05:00
Cameron Taylor 26c2b55af0 fixed freeplay score offset shit 2020-11-09 15:26:10 -08:00
Brandon a02620b7ff caught up to hard mode 2020-11-07 16:59:25 -05:00
Brandon f014b59d02 game works again, twin-stick is fun 2020-11-07 16:13:41 -05:00
Brandon d12e8610ed haha , also highscore.hx breaks switch 2020-11-07 15:52:21 -05:00
Brandon 7dc6cb6b5e new preloader
-added preloader aniamtion
-modified export bat,
-added right stick controls
-switch preorders tagline
2020-11-07 02:29:20 -05:00
Brandon cc8ce9487e crash on story menu 2020-11-07 00:05:58 -05:00
Cameron Taylor 9d9aa2d75f hard mode lol 2020-11-06 19:39:21 -08:00
Brandon 85dcbcc429 Update Highscore.hx 2020-11-06 21:59:51 -05:00
Brandon 657b933eff boo george 2020-11-06 21:34:04 -05:00
Brandon b96a427acc uhhh 2020-11-06 21:24:03 -05:00
Brandon 80abf73758 caught up to cam 2020-11-06 21:17:27 -05:00
Cameron Taylor 37931f01ca score shit 2020-11-06 13:51:11 -08:00
Cameron Taylor aac4932ff5 hotfix for da week 2 unlock 2020-11-06 11:56:41 -08:00
Cameron Taylor 6720e1d9c6 clarified changelog 2020-11-06 03:17:40 -08:00
Cameron Taylor fefad9471b WEEK SCORE SHIT 2020-11-06 02:56:45 -08:00
Cameron Taylor 0966adf06a difficulty selecting 2020-11-06 02:31:33 -08:00
Cameron Taylor 6ad175b0dd Seperated tutorials 2020-11-06 02:21:29 -08:00
Cameron Taylor 3163249ff0 balanced normal, and usin newgrounds haxelib 2020-11-06 01:57:00 -08:00
Brandon c867eac6b8 added debugs and cheats and we usin fmod 2020-11-05 05:08:40 -05:00
Brandon d56d975ae0 tracing the sound.time issue 2020-11-05 01:51:31 -05:00
Brandon 313eef0d6b i'll debug tomorrow 2020-11-03 04:12:13 -05:00
Cameron Taylor 34d578fa0c Merge branch 'master' into master 2020-11-02 15:37:55 -08:00
Cameron Taylor 732df7c208 we out here 2020-11-02 14:40:12 -08:00
Brandon 7c76512039 swap A and B for switch 2020-11-02 16:56:28 -05:00
Brandon 7f727d3cef cleansed of NG 2020-11-02 15:31:28 -05:00
Brandon b5cc1da7c2 controls fixed for 3.4.7 2020-11-02 15:04:25 -05:00
Brandon b1d44d51e0 george the janitor 2020-11-02 14:37:23 -05:00
Brandon 245ca2f573 ng release 2020-11-02 01:46:37 -05:00
Brandon 3e4298d243 me sad cause haxe 4.0.0 2020-11-02 01:38:01 -05:00
Brandon 00a4b532ed shot in the dark 4.0 stuff 2020-11-02 00:39:28 -05:00
Cameron Taylor 078a0432f3 lightning shit 2020-11-01 15:20:13 -08:00
Brandon e63dc749b8 ng release and blank controls 2020-11-01 14:16:22 -05:00
Cameron Taylor 088fc38331 scores in progress 2020-11-01 01:55:02 -08:00
Cameron Taylor e410550b19 RELEASE SHIIIT 2020-11-01 00:58:20 -07:00
Cameron Taylor 30509c9f34 release 2020-11-01 00:01:00 -07:00
Cameron Taylor df5ddd7885 more poliiiish 2020-10-31 22:29:49 -07:00
Cameron Taylor f0fafbaee8 almost releaaaase 2020-10-31 21:55:00 -07:00
Cameron Taylor 62abd32b97 POLIIIISH SHIIIIT 2020-10-31 21:34:17 -07:00
Cameron Taylor bc08fb2c3d newgrounds io shit incoming 2020-10-31 20:42:14 -07:00
Cameron Taylor 8dfc1c2bbd hard songs and unlockables 2020-10-31 20:31:31 -07:00
Cameron Taylor 83c46cadb0 easy charts 2020-10-31 20:22:49 -07:00
Brandon 3d0acca834 old school syntax 2020-10-31 21:44:10 -04:00
Brandon 4a901c1cb6 latest halloween 2020-10-31 21:11:14 -04:00
Brandon 774af58274 enum syntax 2020-10-31 21:05:59 -04:00
Cameron Taylor 9ea6981f22 difficulty UI 2020-10-31 16:53:26 -07:00
Cameron Taylor 047b9af8ec difficulty shit in progress 2020-10-31 16:23:19 -07:00
Cameron Taylor 68a170c03f sounds and polish shit 2020-10-31 12:53:58 -07:00
Cameron Taylor b13db513f0 polish polish polish polish 2020-10-31 03:07:22 -07:00
Cameron Taylor 6f002e3d1e text shit cookin 2020-10-31 00:32:51 -07:00
Cameron Taylor df85d4324a ALMOST DIALOGUE 2020-10-30 23:30:35 -07:00
Cameron Taylor 90325836a1 intro messages 2020-10-30 21:25:23 -07:00
Cameron Taylor f59c22a9ff lil bullshit 2020-10-30 19:33:28 -07:00
Cameron Taylor 5bd30ded11 story mode type shit 2020-10-30 18:55:09 -07:00
Cameron Taylor 8c532afae1 abstract shit for brandy 2020-10-30 17:09:33 -07:00
Brandon 07230fad46 caught up 10/30/ 2020-10-30 19:47:19 -04:00
Brandon fa5dd4b035 transparent 2020-10-30 19:39:13 -04:00
Cameron Taylor 962fbe69ec menu shit in progress 2020-10-30 15:21:34 -07:00
Cameron Taylor 8444102a9a cool menu movement 2020-10-30 14:55:20 -07:00
Cameron Taylor fcdd82dfdb UI and menu bullshit 2020-10-30 14:18:26 -07:00
Cameron Taylor d583d16628 spookeez charted 2020-10-30 11:54:53 -07:00
Cameron Taylor 78599b457b polish bits here and there 2020-10-29 23:52:26 -07:00
Cameron Taylor 0c1fd3013c BPM BULLSHIT 2020-10-29 20:06:52 -07:00
Cameron Taylor ed40720ca6 south charted 2020-10-28 19:47:10 -07:00
Cameron Taylor a51bb7179a lil bullshit in progress hehe 2020-10-28 02:26:33 -07:00
Cameron Taylor 842cb3dbe6 fix note miss bullshit 2020-10-28 01:24:56 -07:00
Cameron Taylor 632e265f68 idk bullshit 2020-10-28 00:32:34 -07:00
Cameron Taylor 8eedae1440 cute animations in progress teehee 2020-10-28 00:03:32 -07:00
Cameron Taylor 847d850f27 LOSS SCREEN WIP 2020-10-27 03:35:23 -07:00
Cameron Taylor 14378c3dac COOLER INTRO SHIT 2020-10-27 01:31:21 -07:00
Brandon f3be7f93e3 switch setup start [REAL] 2020-10-26 19:06:42 -04:00
Cameron Taylor 50f699c5ad new line support for text also camera shit 2020-10-26 02:16:05 -07:00
Cameron Taylor decf1864de website bullshit 2020-10-25 14:38:48 -07:00
Cameron Taylor a55b831c2e adding in cool text shit 2020-10-25 13:51:06 -07:00
Cameron Taylor 87286b68c0 fix miss animations 2020-10-24 02:36:50 -07:00
Cameron Taylor 6c7d5b3f1b less note stutter 2020-10-24 02:19:13 -07:00
Cameron Taylor fa46570337 psooky! 2020-10-23 16:12:38 -07:00
Cameron Taylor b595d62486 FIXED up bullshit 2020-10-21 17:22:12 -07:00
Cameron Taylor bea3ca7fd8 BULLSHIT CONTROLS 2020-10-21 16:33:43 -07:00
Cameron Taylor 539a5f8550 made sustain notes slightly nicer 2020-10-21 13:12:32 -07:00
Cameron Taylor aaaf633f58 recharted Fresh 2020-10-21 11:05:27 -07:00
Cameron Taylor 8ec6f229aa stinky mocked up intro 2020-10-20 23:23:39 -07:00
Cameron Taylor 354025211a re added sustain notes lol 2020-10-19 18:59:00 -07:00
Cameron Taylor 414060eeb3 controllable sustain 2020-10-18 21:01:09 -07:00
Cameron Taylor 81612e2167 almost got sustains working 2020-10-18 19:51:01 -07:00
Cameron Taylor 29496d7ab9 ported sustain data into game 2020-10-18 19:34:21 -07:00
Cameron Taylor e443b1916d fixed bullshit 2020-10-18 19:18:06 -07:00
Cameron Taylor 32c27dfb30 cool new stuff lol 2020-10-18 17:59:53 -07:00
Cameron Taylor 51b39de6d9 fixed camera shit 2020-10-18 00:27:39 -07:00
Cameron Taylor 0542088c6e ass kicking song 2020-10-17 18:47:59 -07:00
Cameron Taylor 188674b64c CHARTING SYSTEM IN PROGRESS 2020-10-17 14:33:35 -07:00
Cameron Taylor 33385ddd15 fixed issue with desync 2020-10-16 04:15:17 -07:00
Cameron Taylor 78ec82d953 rippin my hair out at programming right now 2020-10-16 04:03:10 -07:00
Cameron Taylor f3fb40dc5e getting section meta data all fixed up 2020-10-15 21:22:13 -07:00
Cameron Taylor cc94633395 vocal shit fixed and bpm fixed 2020-10-14 01:30:54 -07:00
Cameron Taylor b3acc17685 cleaning up shit 2020-10-14 01:18:19 -07:00
Cameron Taylor f31813c9db CLEANED JSON LOL 2020-10-13 22:02:36 -07:00
Cameron Taylor 38bb4848a5 more controls for charting 2020-10-13 21:05:55 -07:00
Cameron Taylor 7e1ccefeb5 better prototyping bullshit 2020-10-13 19:12:31 -07:00
Cameron Taylor 7cf19cd186 got prototyping shit workin to an extent 2020-10-13 18:51:53 -07:00
Cameron Taylor fc5e73a87a almost got good prototyping shit in 2020-10-13 18:44:07 -07:00
Cameron Taylor 96e618327f NOTE DELETING 2020-10-13 18:23:22 -07:00
Cameron Taylor 6eab783c23 smash chart lol 2020-10-13 03:15:21 -07:00
Cameron Taylor 3697177a41 fixed that bullshit 2020-10-13 03:02:03 -07:00
Cameron Taylor dc11504c25 so close to proper note reading... 2020-10-13 02:55:00 -07:00
Cameron Taylor 2673a04d27 fixed certain notes not appearing 2020-10-13 02:36:45 -07:00
Cameron Taylor 50ab1605a6 fixed strumline issue 2020-10-13 01:44:12 -07:00
Cameron Taylor f0d4ab3ffd almost making progress on note shit 2020-10-13 01:37:19 -07:00
Cameron Taylor 5ecd641b13 CHARTING SHIT IN PROGRESS 2020-10-13 01:07:04 -07:00
Cameron Taylor 405f362a73 WIP note placing shit 2020-10-12 22:18:50 -07:00
Cameron Taylor 8fc2d4de71 BOO REDO SHIT 2020-10-12 20:08:08 -07:00
Cameron Taylor 330aa69741 UI BULLSHIT WIP 2020-10-11 20:52:21 -07:00
Cameron Taylor 705f43c50a some more section type beat 2020-10-11 19:05:26 -07:00
Cameron Taylor aeb77a3c25 sections in progress 2020-10-11 17:24:34 -07:00
Cameron Taylor f417661668 charting tool WIP shit 2020-10-10 02:28:44 -07:00
Cameron Taylor eb47d38047 sequencer in progress 2020-10-09 21:22:26 -07:00
Cameron Taylor d528967efc level shit lol 2020-10-09 20:25:52 -07:00
Cameron Taylor 427ca3cb03 save data bullshit 2020-10-09 20:22:07 -07:00
Cameron Taylor 4d4a724d72 redoing and replacing some of the music logic 2020-10-09 19:39:52 -07:00
Cameron Taylor f168200b45 renamed Charting.hx file 2020-10-09 16:26:11 -07:00
Cameron Taylor 8bcdb7a8e8 simple pause screen 2020-10-09 14:24:20 -07:00
Cameron Taylor 65036334d2 baby shit controller support 2020-10-09 00:29:00 -07:00
Cameron Taylor 7d925ae0ec build script fixin 2020-10-08 17:54:47 -07:00
Cameron Taylor 0062631472 fixed build scripts and shit 2020-10-06 20:59:48 -07:00
Cameron Taylor 9c44e56b19 we out here windows build 2020-10-06 18:56:33 -07:00
Cameron Taylor 320a760d82 fixed bullshit 2020-10-06 18:56:14 -07:00
Cameron Taylor 567a7af392 RELEAAASE 2020-10-05 15:29:59 -07:00
Cameron Taylor 082abad735 BACKGROUNDS 2020-10-05 13:55:48 -07:00
Cameron Taylor b40f7c94b8 HEALTH IN PROGRESS 2020-10-05 13:32:41 -07:00
Cameron Taylor 4ab27ca8a6 ready set go bullshit 2020-10-05 11:33:56 -07:00
Cameron Taylor 9dfe5cfe42 bunch of polish bullshit 2020-10-05 11:24:51 -07:00
Cameron Taylor a380fa16e5 grafiti scores 2020-10-05 07:03:38 -07:00
Cameron Taylor d8513fc4a0 assets and gf and shit 2020-10-05 05:55:39 -07:00
Cameron Taylor 95415f5890 gf base shit 2020-10-05 04:46:57 -07:00
Cameron Taylor ce0fd00fba more performance shit 2020-10-05 03:53:10 -07:00
Cameron Taylor aa7cef2c25 RIP WEED LMAO 2020-10-05 03:25:14 -07:00
Cameron Taylor 3855c5ea9f perfornance and optimization 2020-10-05 02:48:30 -07:00
Cameron Taylor a75e543fb8 note missing 2020-10-05 00:49:53 -07:00
Cameron Taylor d5121a6e8e hold notes and temp bg 2020-10-04 22:13:12 -07:00
Cameron Taylor de57ab82f6 MISS NOTES 2020-10-04 20:29:35 -07:00
Cameron Taylor 851d5c241c fresh Song charted 2020-10-04 19:31:38 -07:00
Cameron Taylor 9e1ccaf083 dynamic camer, reformat chart, lvl2 2020-10-04 17:53:49 -07:00
Cameron Taylor de17188ae4 fixed the dad bullshit 2020-10-04 15:27:49 -07:00
Cameron Taylor dbbd0c2851 a boy and his offsets... 2020-10-04 14:44:52 -07:00
Cameron Taylor 89fa9a3121 offsets "generally" 2020-10-04 11:50:12 -07:00
Cameron Taylor 86aba3f004 notes in da house 2020-10-04 01:38:21 -07:00
Cameron Taylor 0839f21e71 DOPE SHIT ALL DAY LETS GOOOOO 2020-10-03 23:42:58 -07:00
Cameron Taylor 75a02413de scores and dope shit 2020-10-03 12:32:15 -07:00
Cameron Taylor 32001dad2e fixed holding notes 2020-10-03 10:36:39 -07:00
Cameron Taylor 303c9d14aa INIT COMMIT 2020-10-02 23:50:15 -07:00