cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-09-04 12:48:04 +00:00
Code Issues Releases Wiki Activity
784 commits 30 branches 30 tags 4.1 GiB
Commit graph

574 commits

Author SHA1 Message Date
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
Cameron Taylor 254a34096a small shit characters dunno this shit weird lol 2021-02-23 23:14:18 -05:00
George FunBook 5a9b7d9fac start new Controls menu 2021-02-23 18:59:36 -06:00
George FunBook a6539a2769 add grid nav controls 2021-02-23 18:59:09 -06:00
George FunBook dcedd1facd cheats on debug only 2021-02-23 18:57:49 -06:00
George FunBook 903648f674 add AtlasText cuz Alpabet sux 2021-02-23 18:55:24 -06:00
George FunBook 4fc4ca2206 alphabet menu items + separate ngPrompt 2021-02-21 12:08:30 -06:00
George FunBook 64917acad7 move ngPrompt to new file 2021-02-19 22:10:16 -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
George FunBook c95f24983f add prompt, finalize login UI 2021-02-18 13:58:16 -06:00
Cameron Taylor 2278d22a5a mobile bullshit cookin in progress??? 2021-02-16 01:53:25 -05:00
Cameron Taylor a5c4c7ceb5 icon bullshit and somethin else gitaroo man 2021-02-16 00:21:11 -05:00
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
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