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

275 commits

Author SHA1 Message Date
MtH 930b565bc8 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-20 12:56:53 +01:00
Cameron Taylor ba69b6f3be arrows stuff 2021-03-20 01:03:42 -04:00
MtH 77128f523e quickAnimAdd() for all, fixes looping anims
dad, pico looping idle fixed, they now dance on beat instead
also adds animation.finish() after initial anims, so their anims on create don't get in the way of anims during countdown
commented-out idea for senpai idle, as it's currently 2 beats long but not properly on beat
2021-03-19 18:13:41 +01:00
Cameron Taylor 1af910c20e icon code redo for more modularity 2021-03-18 21:08:44 -04:00
Cameron Taylor fd7a46a90a small organization/cleanup of Discord things 2021-03-18 20:26:17 -04:00
Cameron Taylor 9d8cda5069 Merge branch 'master' of https://github.com/ninjamuffin99/funkin 2021-03-18 19:12:39 -04:00
Cameron Taylor 3a84984a3f Merge branch 'nitpix' 2021-03-18 16:22:53 -04:00
MtH d662291f79 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-17 19:15:18 +01:00
MtH 5842a59e34 make pause actually use the pause control 2021-03-17 19:15:00 +01:00
MtH 69e51cb635 mitigate countdown dancing issues (might still fuck up on higher bpm) 2021-03-17 18:33:26 +01:00
Cameron Taylor 6f28bbe0a9 offsets and adjustemnts 2021-03-17 05:29:04 -04:00
Cameron Taylor 78dafab62f bf holding gf 2021-03-17 05:20:25 -04:00
Cameron Taylor db3a4cc483 tnakmen in progres lol 2021-03-16 01:51:23 -04:00
MtH 98082b44cb Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-14 20:49:28 +01:00
MtH 305df1f6ad remove check if philly train sound playing 2021-03-14 20:48:02 +01:00
MtH ca2b62d8ea fix oppenent freezing when !mustHitSection and no notes, dance only on downbeat 2021-03-14 20:46:44 +01:00
George FunBook 878a118045 Merge branch 'master' into options 2021-03-13 22:41:29 -06:00
George FunBook 24bdea6a20 fix camera 2021-03-13 21:41:12 -06:00
George FunBook 430b6cbb7c Merge branch 'master' into ng_login 2021-03-13 20:24:57 -06:00
George FunBook b29a32e0c9 add options menu 2021-03-13 20:11:56 -06:00
Cameron Taylor 09792b745e offset bullshit and pico 2021-03-13 20:53:57 -05:00
Cameron Taylor 8e95e79c3b tankmen foreground in progress 2021-03-08 18:38:58 -05:00
Cameron Taylor d5e6985024 tank guy and quality of life shit 2021-03-07 15:34:21 -05:00
Cameron Taylor 847ec80f07 assets, and switch statement so i dont get roasted 2021-03-07 01:59:22 -05:00
Cameron Taylor 4d27422c40 charts an shit and death counter 2021-03-04 14:30:35 -05:00
M&M bdce46d067 Merge branch 'master' into scoreoutline 2021-02-28 19:45:56 -08:00
WorstAquaPlayer 9bb673be5c Added missing #if to RPC call 2021-02-28 18:50:06 -03:00
WorstAquaPlayer df7c18f64a Changed RPC !html and added Debug Status 2021-02-27 21:06:30 -03:00
WorstAquaPlayer f416f6c1f4 Alt+Tab and Game Over updates RPC 2021-02-27 20:49:53 -03:00
WorstAquaPlayer d7b91bb4cc Pausing and unpausing updates RPC 2021-02-27 20:23:50 -03:00
WorstAquaPlayer 3ec6713b68 Now shows P2 icon and time left when song starts 2021-02-27 18:59:18 -03:00
Jakkzero 90277aaa67 Adding updated source files 2021-02-26 12:27:32 +00:00
Cameron Taylor 9ac509c72b Merge pull request #384 from ActualMandM/resyncvocals
Resync by music instead of vocals
2021-02-24 01:42:00 -05:00
Cameron Taylor 972fdc3f50 Merge branch 'deferred_loading' of https://github.com/Geokureli/Funkin into Geokureli-deferred_loading 2021-02-23 23:34:08 -05:00
Cameron Taylor 254a34096a small shit characters dunno this shit weird lol 2021-02-23 23:14:18 -05:00
George FunBook dcedd1facd cheats on debug only 2021-02-23 18:57:49 -06:00
George FunBook 5c641abb45 finalize prompts and uix 2021-02-19 20:11:33 -06:00
MtH 2a4667d416 fix several issues caused by sustain notes no longer being removed after correctly hit 2021-02-20 01:31:52 +01:00
Cameron Taylor a5c4c7ceb5 icon bullshit and somethin else gitaroo man 2021-02-16 00:21:11 -05:00
George FunBook 145e32c5f8 Merge branch 'master' into deferred_loading 2021-02-15 15:30:29 -06: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 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 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 0006134a55 Add outline to score text 2021-02-02 23:44:35 -08: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 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 5bd018d2f0 bullshit 2021-01-28 01:54:21 -05: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 9ee599761f CHRISTMAS UPDATE 2021-01-20 05:31:43 -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 90528556ad dope shit in progress 2021-01-16 17:21:06 -05:00
Cameron Taylor 30379f2eef Merge branch 'master' of https://github.com/ninjamuffin99/ld47 2021-01-14 23:39:49 -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
pahaze 5082b857fd Update to latest master commit 2021-01-05 07:53:42 -05:00
pahaze 1ba1ecb6af Add enemies' dying faces 2021-01-01 00:39:58 -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 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 7d5817e49e poop 2020-12-21 16:23:22 -05:00