cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-01 04:14:47 +00:00
Code Issues Releases Wiki Activity
603 commits 3 branches 3 tags 3 GiB
Commit graph

460 commits

Author SHA1 Message Date
George FunBook 1eae204b37 oices path 2021-02-15 15:49:13 -06:00
George FunBook 145e32c5f8 Merge branch 'master' into deferred_loading 2021-02-15 15:30:29 -06:00
George FunBook 994d46a6d0 wtf am i doing 2021-02-15 11:43:51 -06:00
Cameron Taylor f00b1d110c icons and changelog and newgrounds 2021-02-14 19:45:18 -05:00
Cameron Taylor a3ac7a852f 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 e79691b5d4 Gitaroo easter egg 2021-02-14 19:03:02 -05:00
Cameron Taylor 6ea3c2ebc1 Merge branch 'master' of https://github.com/ninjamuffin99/ld47 2021-02-14 03:32:29 -05:00
Cameron Taylor 6107ecb997 icons and cleanin 2021-02-14 03:32:24 -05:00
MtH 83fa11ca1e better sustain notes & organizing 2021-02-13 23:39:31 +01:00
M&M ab0d0c8d5c Merge branch 'master' into resyncvocals 2021-02-12 23:21:51 -08:00
George FunBook 605d222174 Merge branch 'master' into deferred_loading 2021-02-12 09:46:22 -06:00
Cameron Taylor 39651dea36 more seamless storymode transitions 2021-02-12 01:20:20 -05:00
Cameron Taylor 3cae655bbd Merge pull request #402 from TheDrawingCoder-Gamer/patch-1 
Use haxe switch case 'or'
 2021-02-11 22:14:24 -05:00
MtH 9d8211186b entirely phase out totalBeats/totalSteps in favor of the more reliable curStep/curBeat 2021-02-12 03:19:43 +01:00
MtH d115ef59a8 totalSteps & totalBeats synced with bpm changes 2021-02-12 01:58:11 +01:00
MtH 56053710ef 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 2b83d4014b BPM map, trim off useless song stuff, adjust MILF cam zoom 2021-02-11 23:06:26 +01:00
Bulby 2e5b11ea25 Use haxe switch case 'or' 2021-02-11 14:54:16 -05:00
George FunBook 99548212a7 Merge branch 'master' into deferred_loading 2021-02-11 13:18:50 -06:00
George FunBook 187069783a remove TitleState.soundExt 2021-02-11 13:14:16 -06:00
George FunBook aa1e0648c9 fix preloaded versions 2021-02-11 13:14:02 -06:00
MtH d033665899 Merge branch 'master' of https://github.com/ninjamuffin99/Funkin 2021-02-11 11:09:23 +01:00
George FunBook 7d8e753a12 move files to weeks and load songs individually 2021-02-10 14:18:14 -06:00
George FunBook 33a89712f8 move songs to song folder and create libraries for each week 2021-02-09 12:07:05 -06:00
George FunBook 9005386825 move files to libraries 2021-02-08 20:43:17 -06:00
George FunBook 84b64efa39 add Paths asset name helper 2021-02-08 15:34:48 -06:00
M&M d80002ec51 Resync by music instead of vocals 2021-02-08 09:48:58 -08:00
MtH a1102a3842 tweak changeBPM functionality 2021-02-08 04:07:56 +01:00
M&M fe3ece4a61 Pause menu goes back to the mode you came from 2021-02-07 17:31:21 -08:00
Jan200101 47ed4f3c89 check if newgroups api key actually exists before creating core 2021-02-05 13:14:28 +01:00
Lotusotho 9c0197cfc0 Deleted bool I created before 2021-02-04 22:40:02 +01:00
Lotusotho cf7a4825ca Fixed bug at the start of the dialogue 2021-02-04 22:36:01 +01:00
M&M 0006134a55 Add outline to score text 2021-02-02 23:44:35 -08:00
Cameron Taylor 469704b291 fix roses oopsies 2021-02-02 08:04:23 -05:00
Cameron Taylor 9f3a5e3497 RELEASE 2021-02-02 05:46:17 -05:00
Cameron Taylor 33d28a096e IM PISSED IM MAD BUT WE CLOSE 2021-02-02 04:54:36 -05:00
Cameron Taylor 61241d1f2d section shit 2021-02-02 04:13:28 -05:00
Cameron Taylor a8268b2254 background girls 2021-02-02 03:24:34 -05:00
Cameron Taylor 0022bd1e14 lil dating sim things 2021-02-02 02:35:35 -05:00
Cameron Taylor a23cfa3274 idk campaign menu shit 2021-02-02 02:20:14 -05:00
Cameron Taylor 9e0a40f29a THORNS AND EVIL MAN 2021-02-02 00:48:22 -05:00
Cameron Taylor f3cfad693b aligned pixel arrows 2021-02-01 05:52:10 -05:00
Cameron Taylor 0084ee3a85 FONT AND BULLSHIT 2021-02-01 01:50:30 -05:00
Cameron Taylor 24bf212f4a call me senpai 2021-01-31 21:43:09 -05:00
Cameron Taylor 5c1a66b3ff leaves lol! 2021-01-31 09:17:56 -05:00
Cameron Taylor ea63cc63f2 game over in progress 2021-01-30 07:16:51 -05:00
Cameron Taylor 7a21fd2541 senpai and roses on easy 2021-01-30 06:27:11 -05:00
Cameron Taylor 5998f0c607 Merge branch 'master' of https://github.com/ninjamuffin99/ld47 2021-01-28 01:54:24 -05:00
Cameron Taylor 5bd018d2f0 bullshit 2021-01-28 01:54:21 -05:00
PKPenguin321 3b393aed30 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 56bba50a62 intro date shit 2021-01-25 15:56:42 -05:00
Cameron Taylor 7e9305616f SENPAI IN THE STREETS 2021-01-25 06:07:45 -05:00
Cameron Taylor 36e543b2c9 weedeewfwdsfadf 2021-01-25 05:04:31 -05:00
Cameron Taylor b9dfc5e61c buncho dumbshti lol!!! 2021-01-25 04:18:44 -05:00
Cameron Taylor 54a5eded18 so much win 2021-01-24 22:42:51 -05:00
Cameron Taylor fd0120aa2c weed 2021-01-22 01:50:12 -05:00
Cameron Taylor 2d60ff427e woops! 2021-01-20 07:19:48 -05:00
Cameron Taylor 1b303fbe9b mod guide in progress 2021-01-20 06:53:20 -05:00
Cameron Taylor 9d79793bee menu fix maybe oops 2021-01-20 06:14:38 -05:00
Cameron Taylor 9ee599761f CHRISTMAS UPDATE 2021-01-20 05:31:43 -05:00
Cameron Taylor 078cd7a417 scripted type beat 2021-01-20 04:11:55 -05:00
Cameron Taylor 6de5effb58 scripted thingie 2021-01-20 04:03:49 -05:00
Cameron Taylor bce6138410 monster christmas 2021-01-20 01:38:39 -05:00
Cameron Taylor 8c5f6191e6 santa lol 2021-01-19 23:29:18 -05:00
Cameron Taylor 79338c2415 fix eggnog normal woops! 2021-01-19 22:58:07 -05:00
Cameron Taylor 20397744b8 more christmas stuff 2021-01-19 21:44:09 -05:00
Cameron Taylor e61a30ddce charts and a bunch of christmas stuff 2021-01-19 21:09:47 -05:00
Cameron Taylor 2e0e2c57e1 tweaking??? 2021-01-17 21:36:23 -05:00
Cameron Taylor cb22536109 double notes??? 2021-01-17 21:23:40 -05:00
Cameron Taylor de0ccd03f3 jump holds 2021-01-17 19:06:36 -05:00
Cameron Taylor 1f9b115cfd LOTS OF SHIT 2021-01-17 04:16:02 -05:00
Cameron Taylor 3cf89a929b cool heads 2021-01-16 23:15:29 -05:00
Cameron Taylor 90528556ad dope shit in progress 2021-01-16 17:21:06 -05:00
Cameron Taylor 02021d15ff fix placement of bf 2021-01-16 15:20:57 -05:00
Cameron Taylor cc42385055 CHARTS LOL 2021-01-16 15:14:56 -05:00
Cameron Taylor 30379f2eef Merge branch 'master' of https://github.com/ninjamuffin99/ld47 2021-01-14 23:39:49 -05:00
Cameron Taylor c3169fe913 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 0afc7343d4 HAIR AND MOD SUPPORT SHIT IN PROGRESS 2021-01-14 23:33:12 -05:00
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