cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-10-31 20:04:32 +00:00
Code Issues Releases Wiki Activity
784 commits 3 branches 3 tags 3 GiB
Commit graph

574 commits

Author SHA1 Message Date
MtH 393ab7733d clip rotated sus 2021-03-31 14:43:37 +02:00
Cameron Taylor 4518cbfbbc pico note sort 2021-03-30 21:25:41 -07:00
Cameron Taylor 82d0490f16 lil options cleaning 2021-03-30 21:01:18 -07:00
Cameron Taylor 96e6226c04 FPS counter toggle 2021-03-30 20:51:17 -07:00
MtH 242443810c susnote clip for downscroll still looks like shit tho 2021-03-31 03:02:12 +02:00
Cameron Taylor b6e8cc93b8 basically down scroll 2021-03-30 15:10:15 -07:00
MtH 377feed549 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-31 00:02:59 +02:00
MtH 82fba0eb8b have notes show up properly on scroll speeds below 1 2021-03-31 00:02:09 +02:00
Cameron Taylor 5b2412cf6f tankman/picospeaker better syncs 2021-03-30 13:58:05 -07:00
MtH 32e2f3ddf2 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-30 21:04:21 +02:00
MtH 554dfbf60b tighten main menu security to prevent weird crashes during transitions 2021-03-30 20:52:24 +02:00
Cameron Taylor cb8c5ca7b7 moved animate bullshit into CoolUtil and gave up 2021-03-30 11:15:34 -07:00
MtH 4c301801c5 skip to end of dialogue if not finished 2021-03-30 18:59:14 +02:00
MtH 1bd5cbf472 fixed bugs where game would crash if pressing R during cutscene or state transition 2021-03-30 18:43:07 +02:00
MtH d136168a5a resolve merge conflict with ActualMandM/pause 2021-03-30 16:47:50 +02:00
MtH bbe6b739fe Merge branch 'scoreoutline' of https://github.com/ActualMandM/Funkin into nitpix 2021-03-30 16:39:10 +02:00
MtH c00a8dc75a offset txts for all chars, move all chars to shared 2021-03-30 15:45:57 +02:00
MtH 81ce710db6 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-30 14:06:56 +02:00
MtH 04ad093ef0 week score lerp fix INSPIRED BY PR #447 BY @jvc2 
https://github.com/ninjamuffin99/Funkin/pull/447
 2021-03-30 14:06:03 +02:00
Cameron Taylor 2c03f4f507 Merge pull request #668 from VoltrexMaster/patch-2 
feat(extra): Remove extra imports
 2021-03-29 21:23:51 -07:00
George FunBook 38cc859bb4 fix errors on mac 2021-03-29 23:05:21 -05:00
Cameron Taylor 0f997c84af spritemap atlas bullshit? 2021-03-29 18:06:35 -07:00
Cameron Taylor 593e70e4e0 Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret 2021-03-29 18:00:37 -07:00
Cameron Taylor 519c187fd9 potential adobe animate texture atlas bullshit WIP 2021-03-29 18:00:30 -07:00
Cameron Taylor 23e6f9b972 Merge pull request #640 from VoltrexMaster/patch-1 
feat(performance): Use switch statement
 2021-03-29 13:45:54 -07:00
Cameron Taylor 217521860e Merge pull request #500 from ActualMandM/she_cheers 
girlfriend cheering in tutorial
 2021-03-29 13:43:41 -07:00
Cameron Taylor 482fd33f23 Merge pull request #1 from ninjamuffin99/sans_discord 
allow run without discord stuff
 2021-03-29 13:43:10 -07:00
Cameron Taylor 526f91fe5f pico in progress 2021-03-29 10:24:49 -07:00
MtH f067ebd8e9 resync by BOTH voices and inst 
also remove unnecessary includes in chartingstate
 2021-03-29 17:01:49 +02:00
Voltrex da91d35ebc Fix indentation 
2 -> 7 tabs.
 2021-03-29 18:17:41 +04:30
Voltrex 59ba23c46e feat(extra): Remove extra imports 
Remove 2 extra imports, `IOErrorEvent` was imported already.
 2021-03-29 04:16:32 +04:30
MtH 6ccf1940cd pixel countdown 2021-03-28 23:36:14 +02:00
MtH 8ae8aaec51 FIX NOTE HITS 
fixes weird note misses when multiple notes are hittable
also fixes notes on HUD appearing pressed when the button is released during game pause/window unfocus
 2021-03-28 23:29:44 +02:00
MtH 333cd2711b Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-28 18:10:40 +02:00
Cameron Taylor f1325d31e5 checkbox thingie hehe 2021-03-27 20:01:53 -07:00
Cameron Taylor 5408781804 reverted the ng thingies 2021-03-27 16:11:14 -07:00
Cameron Taylor 9e236c91ac checkbox fix in progress 2021-03-26 21:33:16 -04:00
Cameron Taylor 2717c6f0c7 no camera zoom shit 2021-03-26 21:28:04 -04:00
Cameron Taylor 7516134f5d no flashing menu 2021-03-26 21:22:07 -04:00
Cameron Taylor 113730e85c preference toggling 2021-03-26 20:09:04 -04:00
Cameron Taylor d6821142ea cutscene bullshit 2021-03-26 05:09:42 -04:00
Cameron Taylor 4247f82694 cool note thingies 2021-03-26 03:51:39 -04:00
Cameron Taylor 7cb1954718 lerp tweaks and shit more 2021-03-24 23:39:19 -04:00
Cameron Taylor 399da03591 camera movement lerp fix for high framerates 2021-03-24 22:41:41 -04:00
Cameron Taylor 6f2302cbbc mod menu thingie 2021-03-24 19:19:08 -04:00
Cameron Taylor 6fed4b5f16 outline bullshit in progress 2021-03-24 18:41:54 -04:00
Cameron Taylor 6c2101fa6f converting shit to new options menu 2021-03-24 16:44:58 -04:00
Voltrex efbb29ad28 feat(performance): Use switch statement 
Use a `switch` statement instead of a huge `if .. else if` chains.
 2021-03-24 18:43:17 +04:30
Cameron Taylor a7a15cc6b9 lol fixed dumbass shader thinge oops 2021-03-23 21:33:17 -04:00
George FunBook 2da29bc5fb Merge branch 'master' into sans_discord 2021-03-23 18:07:02 -05:00
Cameron Taylor 699a77201b Merge pull request #2 from ninjamuffin99/options 
Options
 2021-03-23 18:48:03 -04:00
Cameron Taylor 03cc7d9099 outline shader in progress 2021-03-23 18:43:08 -04:00
George FunBook 15e52a4be0 fix remove defaultCamera refs 2021-03-23 17:30:58 -05:00
George FunBook cd46e2ef4d fix back bug 2021-03-23 17:28:05 -05:00
George FunBook aa85510496 Merge branch 'master' into options 2021-03-22 23:05:46 -05:00
George FunBook 03f735bd33 fix camera 2021-03-22 22:41:37 -05:00
George FunBook 125f7cc957 fix type 2021-03-22 22:41:27 -05:00
George FunBook b184ac96f9 fix AtlasText bug 2021-03-22 21:39:50 -05:00
George FunBook c87079fff5 finalize options menu 2021-03-22 21:39:35 -05:00
George FunBook bdb8042b83 allow run without discord stuff 2021-03-22 09:09:46 -05:00
George FunBook 1949a66d89 more ui work 2021-03-22 08:40:32 -05:00
George FunBook 3572cd9c47 more work on controls menu 2021-03-22 07:48:52 -05:00
MtH bb663f7c19 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-22 01:55:17 +01:00
Cameron Taylor 9d988a021f note color bullshit and also disabled 'stuns'?? 2021-03-21 16:29:47 -04:00
Cameron Taylor 08ccaef628 color swap shit in progress 2021-03-21 14:45:46 -04:00
Cameron Taylor 00cf2e5c6d shader bullshit 2021-03-20 15:20:00 -04:00
Cameron Taylor 3661a8cd8c SHADERRRR 2021-03-20 14:55:29 -04:00
MtH 2c295911cc DECIMAL BPM support for da charters out there, 
also changes to HealthIcon to better work in ChartingState
 2021-03-20 17:33:29 +01:00
MtH 930b565bc8 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-20 12:56:53 +01:00
Cameron Taylor 9aa59d679e shader dumbshit in progress IGNORE FOR NOW! 2021-03-20 04:33:44 -04:00
Cameron Taylor ba69b6f3be arrows stuff 2021-03-20 01:03:42 -04:00
Cameron Taylor 7f32d00647 new note spritesheets 2021-03-20 00:48:17 -04:00
MtH ed324cd9c6 hair blowing idle loop for week4 2021-03-19 19:02:42 +01: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 7ee1a735b4 pixel icon bullshits 2021-03-19 00:03:29 -04: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 00395d9d39 Merge pull request #496 from Jakkzero/master 
Discord RPC (custom status)
 2021-03-18 19:08:55 -04:00
Cameron Taylor ad8b26cca0 Merge branch 'shart' 2021-03-18 16:29:35 -04:00
Cameron Taylor 155c334586 fixed compiler conditional thingie 2021-03-18 16:26:39 -04:00
Cameron Taylor 7f4218eabe Merge branch 'shart' of https://github.com/ninjamuffin99/funkin-secret into shart 2021-03-18 16:24:58 -04:00
Cameron Taylor 3a84984a3f Merge branch 'nitpix' 2021-03-18 16:22:53 -04:00
Cameron Taylor 21337c608f TANKMAN GAMEOVER SHIT 2021-03-18 14:15:54 -04:00
MtH 47952c7dcd bf pixel die offset fix & manual sparrow fix 2021-03-18 14:04:28 +01:00
MtH 4ef634ec2c title tweaks: 
fix crash when spamming enter,
force logo bump,
compensate for missed beats with intro text (ex. when window being dragged)
 2021-03-18 12:49:37 +01: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
George FunBook 7ce5bb40da add input groups 2021-03-16 10:20:40 -05:00
George FunBook 65e7add217 add rebind key prompt 2021-03-16 09:56:08 -05: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
Cameron Taylor 767059114c offsets for bf and gf 2021-03-13 23:02:14 -05: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
MtH e96205dfad make main menu bg not go offscreen when selecting options, add offsets for menu items 2021-03-13 22:31:49 +01:00
MtH 32452c4180 portraits before box to fix thorns intro layering issue 2021-03-13 20:06:03 +01:00
MtH 1933f65c2d finger fadeout oops 2021-03-13 19:48:49 +01:00
MtH ed7002226d freeplay monster icon 2021-03-13 19:43:11 +01:00
MtH 2226ab7939 week6 dialogue finger 2021-03-13 19:40:54 +01:00
Cameron Taylor ca54b2a163 oops more bullshit 2021-03-13 13:37:59 -05:00
Cameron Taylor fc8aef32ce guns slight changes and modding desktop conditionals 2021-03-10 20:17:26 -05:00
Cameron Taylor 5848160819 conditionals for HTML5 2021-03-10 17:01:57 -05:00
Cameron Taylor 61ab98c879 mod menu prototyping 2021-03-10 00:27:57 -05:00
Cameron Taylor 141c01c8b8 Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret 2021-03-09 23:33:38 -05:00
Cameron Taylor 0e44032eda file and folder detection 2021-03-09 19:41:03 -05:00
MtH f1421e2ff6 gf sad offset TINY FIX 2021-03-09 12:29:00 +01: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 9f9996154a video stuff in progress 2021-03-04 19:36:56 -05:00
Cameron Taylor 4d27422c40 charts an shit and death counter 2021-03-04 14:30:35 -05:00
Cameron Taylor 451e7f7d7a stuff for week 7 2021-03-04 03:00:48 -05:00
Cameron Taylor a211dc50e6 monster and shit 2021-03-02 04:30:25 -05:00
Cameron Taylor 1a6b2e51a7 freeplay stuff in progress 2021-03-02 00:46:28 -05:00
Cameron Taylor 2ca75724cd freeplay icon polish, and pause title touchups 2021-03-01 23:58:19 -05:00
Cameron Taylor e26b5f4cda pause screen polish shit 2021-03-01 23:00:02 -05:00
Cameron Taylor a6a3db6aa4 easier storymode menu adding onto 2021-03-01 22:56:12 -05:00
Cameron Taylor 0d3e116d88 freeplay menu polish thingie 2021-03-01 22:56:12 -05:00
Cameron Taylor 1a9ae4ba0a song icon formatting 2021-03-01 22:56:12 -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 d0698ea7b4 Exiting through the pause menu updates RPC 2021-02-27 21:34:49 -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
WorstAquaPlayer 7dfaa19e1d Added changePresence arguments 2021-02-27 16:58:07 -03:00
Jakkzero 67bd8c1bae Update FreeplayState.hx 2021-02-27 02:28:01 +00:00
M&M 43521f3926 girlfriend finally cheers 2021-02-26 15:45:06 -08:00
Jakkzero 6355cf2681 put the thread import in the right place 2021-02-26 13:25:55 +00:00
Jakkzero 292d311fff forgot to comment out debug trace 2021-02-26 13:23:03 +00:00
Jakkzero fdecd95cca fixed endless discord updates 
I'm an idiot and had no idea what I was doing with haxe.Timer.delay() so I'm using Sys.sleep() and it seems to work fine.
 2021-02-26 12:52:40 +00:00
Jakkzero 90277aaa67 Adding updated source files 2021-02-26 12:27:32 +00:00
Cameron Taylor eff2a19257 week metadata bullshit for free[;ay 2021-02-24 20:52:59 -05:00
Cameron Taylor 000a01664d freeplay fixin shit 2021-02-24 20:22:37 -05:00
Cameron Taylor e94c7a1fae bopeebo note thing 2021-02-24 19:06:41 -05:00
Cameron Taylor b37f6a7614 options menu in progress 2021-02-24 18:32:51 -05: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 29d3d15741 bullshit lol 2021-02-23 23:32:53 -05:00
Cameron Taylor 78241f9a67 Merge branch 'master' of https://github.com/ninjamuffin99/ld47 2021-02-23 23:31:15 -05:00