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

360 commits

Author SHA1 Message Date
George FunBook cbc798edca flicker on accept 2021-02-15 16:04:08 -06:00
George FunBook 9f0277da57 Merge branch 'deferred_loading' into ng_login 2021-02-15 15:59:36 -06:00
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
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
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