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
705 commits 3 branches 3 tags 3 GiB
Commit graph

290 commits

Author SHA1 Message Date
MtH 0f985267f2 week2 chart touchups 2021-03-23 23:53:16 +01: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
MtH f7869d61a4 bopeebo speeds n shit 2021-03-23 17:55:39 +01:00
George FunBook aa85510496 Merge branch 'master' into options 2021-03-22 23:05:46 -05:00
MtH 0718739801 week1 chart touchups 2021-03-23 02:41:09 +01:00
MtH 1b15a33c6a STRESS charts 2021-03-22 20:05:07 +01:00
MtH 03ecdf7b5e spookeez .ogg desync fix with no quality loss 2021-03-22 02:40:21 +01:00
Cameron Taylor cafc047da7 Merge branch 'shart' 2021-03-21 16:42:22 -04:00
Cameron Taylor e16b347606 stress bullshit in progress 2021-03-21 16:40:25 -04:00
Cameron Taylor 08ccaef628 color swap shit in progress 2021-03-21 14:45:46 -04:00
MtH 7c4bd7b584 guns easier 2021-03-21 16:06:57 +01:00
MtH af43771093 ugh EVEN EASIER 2021-03-21 14:55:48 +01:00
MtH fa09126a0b ugh easy redo 2021-03-20 23:34:50 +01:00
Cameron Taylor 7f32d00647 new note spritesheets 2021-03-20 00:48:17 -04:00
Cameron Taylor 20cd370df5 creds thingie and week6 imgage fixin 2021-03-19 14:34:00 -04: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 b9356fb543 Merge branch 'master' of https://github.com/ninjamuffin99/funkin 2021-03-18 19:01:08 -04:00
Cameron Taylor ad8b26cca0 Merge branch 'shart' 2021-03-18 16:29:35 -04:00
Cameron Taylor 3a84984a3f Merge branch 'nitpix' 2021-03-18 16:22:53 -04:00
MtH 184a8cd9cd monster tweaks 
now he sings at the start (by popular request)
camera shit
 2021-03-18 19:33:47 +01:00
Cameron Taylor 21337c608f TANKMAN GAMEOVER SHIT 2021-03-18 14:15:54 -04:00
MtH a9b9d146b8 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into shart 
also update hard chart with partial new ninja muffin pattern (pretty good pattern)
 2021-03-18 17:51:15 +01:00
MtH 47952c7dcd bf pixel die offset fix & manual sparrow fix 2021-03-18 14:04:28 +01:00
Cameron Taylor 78dafab62f bf holding gf 2021-03-17 05:20:25 -04:00
Cameron Taylor df5692b601 swag 2021-03-16 01:59:54 -04:00
Cameron Taylor db3a4cc483 tnakmen in progres lol 2021-03-16 01:51:23 -04: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 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 ca54b2a163 oops more bullshit 2021-03-13 13:37:59 -05:00
MtH f067b17fbc w7s2 ez-norm (muffinbase) 2021-03-13 18:00:36 +01:00
Cameron Taylor fc8aef32ce guns slight changes and modding desktop conditionals 2021-03-10 20:17:26 -05:00
MtH 383a3758e4 w7c2 first draft 2021-03-10 21:59:46 +01:00
Cameron Taylor f0b799410c intro whatev 2021-03-09 00:06:14 -05:00
Cameron Taylor 8e95e79c3b tankmen foreground in progress 2021-03-08 18:38:58 -05:00
Cameron Taylor 847ec80f07 assets, and switch statement so i dont get roasted 2021-03-07 01:59:22 -05:00
treacherousfiend 9056c77210 remove garbage data 
remove lots of null characters from the ends of almost every song, saves a surprising amount of file space, probably also makes IO slightly quicker?
also some other misc fixes to songs, like removing a new line from the start or end of a song
 2021-03-05 13:11:59 -07: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 958bc23c4c CHARTS FOR THE MOST PART 2021-03-02 19:01:20 -05:00
Cameron Taylor a211dc50e6 monster and shit 2021-03-02 04:30:25 -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 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 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
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
Cameron Taylor d50af76ffb Update introText.txt 2021-02-19 21:07:20 -05:00
George FunBook c95f24983f add prompt, finalize login UI 2021-02-18 13:58:16 -06:00
George FunBook 85cae9dbd2 Merge branch 'deferred_loading' into ng_login 2021-02-15 16:09:35 -06:00
George FunBook 9d70e5c098 move cancelMenu to preload library 2021-02-15 16:07:20 -06:00
George FunBook 9f0277da57 Merge branch 'deferred_loading' into ng_login 2021-02-15 15:59:36 -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 e79691b5d4 Gitaroo easter egg 2021-02-14 19:03:02 -05:00
Cameron Taylor 6107ecb997 icons and cleanin 2021-02-14 03:32:24 -05:00
George FunBook 534f195be6 move more assets to week libraries 2021-02-12 09:37:47 -06: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
Cameron Taylor 2dbd223f26 for my cousin mason 2021-02-05 22:35:33 -05: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 5943bfa342 thorns charts 2021-01-30 22:52:29 -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
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 ebb2638ba7 roses chart 2021-01-27 00:24:36 -05:00
Cameron Taylor 66c3d9a1cc roses ALIGNED 2021-01-26 18:57:40 -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 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 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 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