cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-14 02:42:55 +00:00
Code Issues Releases Wiki Activity
1014 commits 30 branches 20 tags 6.8 GiB
Commit graph

845 commits

Author SHA1 Message Date
George FunBook 696835c90b polymod compiler checks instead of cpp 2021-09-11 00:33:50 -05:00
George FunBook 20c32acda1 remove import 2021-09-11 00:32:44 -05:00
Cameron Taylor 2bd4a91e7e odds and ends 2021-09-10 10:07:55 -04:00
Cameron Taylor 3c03e06a39 shader tweeak 2021-09-08 20:09:30 -04:00
Cameron Taylor 713a3dd623 SHADER SHIT FOR EVIL SCHOOL LOL! 2021-09-08 20:01:55 -04:00
Cameron Taylor 144a526f1c lol stream stuff lol 2021-09-08 18:10:06 -04:00
Cameron Taylor 8e8b121663 Merge pull request #6 from ninjamuffin99/nitpix 
aight yolo merge
 2021-09-08 17:21:55 -04:00
MtH 908372d296 lil oopsies and random cleanup of old shit 2021-09-08 22:28:30 +02:00
MtH 187706c71c note hit, scoring windows & stricter sustain note holding 
this is some big impact shit so feel it out first
 2021-09-08 19:28:11 +02:00
Cameron Taylor c1f000644e pico player offset stuff 2021-09-08 12:40:51 -04:00
Cameron Taylor 40233679c7 DARNELL MOSTLY CHARTED 2021-09-08 11:53:20 -04:00
MtH 63341f0bc9 fix imports for stagebuild in init/title, also GPG test like cam? 2021-09-08 17:16:16 +02:00
Cameron Taylor b470fee1b0 GPG test / lil cleanup 2021-09-08 00:06:49 -04:00
MtH ba4793cef4 allow shared lib to be used without needing to have a level selected 2021-09-07 23:10:43 +02:00
MtH d0800fcd39 titlestate spring cleaning, move shit into new initstate 
this is a huge ass commit so cam pls dont merge until u thoroughly check it and know what changed and moved and whatever. got rid of a lot of ludum dare era commented out shit as well. feel free to ask for clarification or add shit back if it's better suited here
 2021-09-07 23:09:34 +02:00
MtH 1033754ad3 notesplash framerate & use finishCallback instead of checking every frame 2021-09-07 22:14:14 +02:00
Cameron Taylor 624cc4b3fa matrix group recycle fix 2021-09-06 15:44:11 -04:00
Cameron Taylor f94f1d1d98 FlxAnimate drawing optimizations 2021-09-06 15:30:19 -04:00
Cameron Taylor a5ed25fc31 darnell and other stuf in progress lol 2021-09-06 14:50:04 -04:00
Cameron Taylor 1480335bcb lil code comments for FlxAnimate and ParseAnimate 2021-09-02 19:00:01 -04:00
Cameron Taylor 49a5c30b90 chart editor save improvements 2021-09-02 18:51:08 -04:00
Cameron Taylor 237114c877 darnell in progress 2021-09-02 18:39:40 -04:00
Cameron Taylor 2705ae3e16 darnell looping and sustain note holding anim stuf 2021-09-02 17:32:50 -04:00
Cameron Taylor ab501cc533 no icon warning 2021-09-02 17:07:32 -04:00
Cameron Taylor 380241bc6a darnell character 2021-09-02 16:56:46 -04:00
Cameron Taylor d108f7c39d seperated / cleaned up? 2021-09-01 23:39:37 -04:00
Cameron Taylor fdd28336c1 LIP SYNC 2021-09-01 20:37:37 -04:00
Cameron Taylor 84c2185027 slowly fixing it up 2021-09-01 20:04:07 -04:00
Cameron Taylor 720b428bcf animate atlas overhaul stuff 2021-09-01 15:34:20 -04:00
Cameron Taylor fad3af327f no more body thingie 2021-08-29 15:56:46 -04:00
Cameron Taylor 9694defa8d volume save data finally fixed lol 2021-08-28 18:10:32 -04:00
Cameron Taylor 9a801b43ad removed unused imports in playstate 2021-08-28 13:22:31 -04:00
Cameron Taylor de052ddbee evilschool "ported" 2021-08-28 13:01:17 -04:00
Cameron Taylor 2747de79cb anim shit for stages 2021-08-28 12:41:15 -04:00
Cameron Taylor 7ef82bd1d3 stage stuff in progress, seeing whats needed 2021-08-27 21:56:23 -04:00
Cameron Taylor a032109efd stage loading rework 2021-08-27 18:08:01 -04:00
Cameron Taylor d1871761d9 blend lol 2021-08-27 13:55:18 -04:00
Cameron Taylor 5baae3ad58 overlay wit sunset background 2021-08-27 13:16:31 -04:00
Cameron Taylor f6729592bf multiply shader in progres 2021-08-27 02:42:23 -04:00
Cameron Taylor 0308de6110 haxedef for android 2021-08-25 20:11:31 -04:00
Cameron Taylor c21961c156 swipe length default stuff 2021-08-25 20:03:58 -04:00
Cameron Taylor 5579d92f21 fix swipe on left side of screen thingie 2021-08-25 13:21:55 -04:00
Cameron Taylor 84a2b980a5 multi touch / swipe (very buggy) 2021-08-25 13:18:45 -04:00
Cameron Taylor 27da6fdba9 swipe cleanup 2021-08-25 12:18:12 -04:00
Cameron Taylor e20814cefa swipe prototype stuf pt 2 lol 2021-08-24 15:28:04 -04:00
Cameron Taylor a50eeee259 swiping prototype stuff 2021-08-24 15:27:53 -04:00
Cameron Taylor d77a983ff2 FlxActions/Controls.hx stuf for Android keys 2021-08-23 18:52:38 -04:00
Cameron Taylor f40b3a8fe3 FlxAction/Controls.hx accomodations for Android keys 2021-08-23 18:52:07 -04:00
Cameron Taylor 4d97591e30 android pause and controls tweaks 2021-08-22 16:54:22 -04:00
Cameron Taylor 61ba71d3db touch controls in progres 2021-08-22 10:37:06 -04:00
Cameron Taylor 1992d5363e camera zoom fixes for mobile 2021-08-21 20:45:03 -04:00
Cameron Taylor d25b81e1dc touch in progres 2021-08-21 19:53:08 -04:00
Cameron Taylor d4e955ce79 slowly chippin away 2021-08-21 13:19:56 -04:00
Cameron Taylor 0a0a1c4e2f more timeline shit in progress 2021-08-20 11:01:37 -04:00
Cameron Taylor b48685519a timeline viewer in progress 2021-08-19 14:53:18 -04:00
Cameron Taylor 8b172ac99d moving shader stuff in progress 2021-08-18 23:00:39 -04:00
Cameron Taylor 21e05b72c6 outline shader thing in progress 2021-08-16 23:20:00 -06:00
Cameron Taylor 0e15495796 Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret 2021-08-10 02:40:50 -04:00
Cameron Taylor 3c211b4756 shit in progress that i dont know, lol dont worry bout it 2021-08-10 02:40:47 -04:00
MtH 3c538395fa Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret 2021-08-09 13:32:43 +02:00
MtH ec139ce562 moving default RESET button on gamepad to right shoulder instead of Y bc Y is also UP 2021-08-09 13:30:55 +02:00
Cameron Taylor 3fe28602d3 chart shit cooler (hashlink saving workaround) 2021-08-02 14:11:43 -04:00
Cameron Taylor 122545405b chart editor slight fixins in progress 2021-08-02 13:54:19 -04:00
MtH 00ec466c76 sustain note scaling FIXED (imo) 
clipping is still wack. also i made it round instead of floor for the number of sus notes to place because that also just makes sense imo
thanks to @cuckydev again for good ideas
 2021-08-02 03:40:40 +02:00
MtH c9f31226e6 fix HealthIcon issues (expand for details) 
explicitly enable antialiasing (for switching to & from bf-old)
consistently apply scaling (for ChartingState)
 2021-07-16 04:30:19 +02:00
Cameron Taylor 471ffd7989 min timing shit in progres 2021-07-15 18:45:25 -04:00
Cameron Taylor f314fe3a4b wombo combo 2021-07-15 18:22:15 -04:00
Cameron Taylor 98a77811be new combo stuf 2021-07-14 20:32:09 -04:00
Cameron Taylor 9cb1c6b0ea combo stuf in progress, lil cleanups 2021-07-14 19:00:22 -04:00
Cameron Taylor 85bff686a4 WACKY HTML FILE LOADING TESTS?? 2021-06-24 03:15:14 -04:00
Cameron Taylor fcc7a91597 flxg import.hx thing lol 2021-06-23 04:15:44 -04:00
Cameron Taylor 39d93616d2 comment support for CoolUtil.cooltextFile() 2021-06-22 21:15:40 -04:00
Cameron Taylor 6add378535 pure pixel icon support done 2021-06-22 21:11:06 -04:00
Cameron Taylor f4c3d826f2 lil antialiasing bullshit 2021-06-22 20:32:37 -04:00
Cameron Taylor 11b35adecd pixel icon code in progress 2021-06-22 20:21:54 -04:00
Cameron Taylor 94d805136c pixel icon shit in progress 2021-06-22 20:18:22 -04:00
Cameron Taylor e2fbf5a300 Revert "in-engine shit for new chart format" 
This reverts commit 4b5173f9b7.
 2021-06-22 16:06:40 -04:00
Cameron Taylor 4b5173f9b7 in-engine shit for new chart format 2021-06-22 15:54:53 -04:00
Cameron Taylor e49a3c9b03 songFormmatting shit in progress 2021-06-22 15:41:15 -04:00
Cameron Taylor 819d6d570d fix layering jitter 2021-06-18 14:18:56 -04:00
Cameron Taylor 1927be79f8 animation fixing for FlxSymbol in progress 2021-06-17 01:42:31 -04:00
Cameron Taylor 4137687f26 proper layering 2021-06-15 21:15:06 -04:00
Cameron Taylor e120578642 ANIMATION SHIT MORE IN PROGRESS LOL 2021-06-15 17:43:46 -04:00
Cameron Taylor 6b595165be lil files cleanup 2021-06-14 19:36:56 -04:00
Cameron Taylor 7ebc7e4ffb quick title screen optimize 2021-06-08 23:05:38 -04:00
Cameron Taylor 2db47b1ba9 memory optimizations 2021-06-07 21:14:50 -04:00
Cameron Taylor 2323000381 nice lil control shti 2021-06-05 00:58:10 -04:00
Cameron Taylor 7e213cb5cb different offset view shit 2021-06-05 00:46:03 -04:00
Cameron Taylor 44ba266b88 offset view thingie 2021-06-05 00:24:55 -04:00
Cameron Taylor 8aa50b9d47 remvoed animationdebug shit 2021-06-05 00:01:15 -04:00
Cameron Taylor 820ee969d0 AnimationDebug removed, replaced by DebugBoundingState 2021-06-05 00:00:30 -04:00
Cameron Taylor 4211bc7344 mouse movement for offset shit 2021-06-04 17:39:28 -04:00
Cameron Taylor 699a89198e onion skinning when pressing F 2021-06-04 16:45:08 -04:00
Cameron Taylor 1301cf3ab6 WASD controls for animation 2021-06-04 12:53:53 -04:00
Cameron Taylor 2a2fd39d1c new offset shit in progress 2021-06-04 03:06:15 -04:00
Cameron Taylor 78e205d60f offset moving shit 2021-06-04 02:57:43 -04:00
Cameron Taylor accbae3c80 anim swapping easier 2021-06-04 02:43:05 -04:00
Cameron Taylor 52b0f17ac7 animation playing dropdown menu 2021-06-04 02:31:27 -04:00
Cameron Taylor ae37e98cdf anim debug bullshit 2021-06-04 02:01:34 -04:00
Cameron Taylor 1fa00fab9b lil keyboard control shit 2021-06-02 21:12:23 -04:00
Cameron Taylor 58cede8706 undo of movements 2021-06-02 21:04:43 -04:00
Cameron Taylor 1f91c3bdef undo/redo selections 2021-06-02 20:41:06 -04:00
Cameron Taylor 65d187f511 cursor shit and tool shit i duno lol! 2021-06-01 02:39:30 -04:00
Cameron Taylor 6c47686ee8 the friday night funkin creepypasta 2021-05-27 22:45:23 -04:00
Cameron Taylor bab7c0130d drag n drop layer type beat 2021-05-27 19:56:56 -04:00
Cameron Taylor 3f53371f30 dragging shit 2021-05-27 19:15:03 -04:00
Cameron Taylor be4b35938b debug anim shit in progress 2021-05-26 19:22:15 -04:00
Cameron Taylor a2360dde70 stage build drag and drop, and removed FAXE bullshiiiit 2021-05-23 23:20:57 -04:00
Cameron Taylor 20f627b98e Merge branches 'master' and 'master' of https://github.com/ninjamuffin99/funkin-secret 2021-05-22 12:54:33 -04:00
Cameron Taylor 30a6db615b middle click drag 2021-05-16 19:17:58 -04:00
MtH 123a7ae59b boopin boppers.. head lerp 2021-05-15 23:39:13 +02:00
MtH d49858217e Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-05-15 23:28:17 +02:00
Cameron Taylor bd6936734a polymooooood shoutouts laaarsssss 2021-05-15 12:00:21 -04:00
Cameron Taylor dd41cc19e1 polymod IN PROGRESS 2021-05-15 10:30:09 -04:00
Cameron Taylor 47102b2431 cache shit idk lol 2021-05-14 18:21:34 -04:00
MtH 63cdbc84ee easteregg crash fix 2021-05-15 00:02:29 +02:00
Cameron Taylor 72e6a47716 NG logo easter egg shit 2021-05-14 17:53:34 -04:00
Cameron Taylor 9df52f2982 Merge branch 'master' of https://github.com/ninjamuffin99/funkin 2021-05-14 17:33:00 -04:00
Cameron Taylor 592204bfa7 Merge branch 'swf' 2021-05-14 17:21:50 -04:00
Cameron Taylor 6f0b0fc6bb cheat code bullshit oops im on swf branch LOL! 2021-05-14 17:20:01 -04:00
PurpleButNotALight 3d78fa2e7e Delete BeatBattle.hx 
this file was annoying me
 2021-05-08 17:15:29 +02:00
MtH 5891bb7f16 custom camera for lerp fix 2021-05-06 14:08:51 +02:00
MtH ba19234176 improve rating & combo visibility 2021-05-06 12:55:33 +02:00
MtH 2bce5151ba test in freeplay if debug 2021-05-06 12:54:57 +02:00
MtH a1b927175a just pushin b4 i switch branch 2021-04-23 19:15:40 +02:00
MtH 356a9ad337 dope sprite bounds 2021-04-23 13:30:39 +02:00
MtH 41e66b5d69 Merge branch 'nitpix' of github.com:ninjamuffin99/Funkin-secret 2021-04-22 22:02:02 +02:00
MtH c5d33192a4 fix crash when going back to title 2021-04-22 21:36:56 +02:00
MtH fea40412ec swf shit 2021-04-22 17:19:55 +02:00
MtH 5ee0ef8f4e big cleanup 2021-04-22 04:17:00 +02:00
MtH d882d6568d move song end into debug block 2021-04-21 22:58:36 +02:00
MtH adb41ce289 wocky slush 
debug shit, gf in animdebug, changesection
 2021-04-21 15:07:36 +02:00
MtH b88ad022f2 fix susnotes after note miss changes oops 2021-04-20 22:25:38 +02:00
MtH 7c2cc40d7b smol move 2021-04-20 21:50:26 +02:00
MtH 1431b19e57 combo counter fixes & tweaks 2021-04-20 21:48:16 +02:00
MtH 788c4e6f1b combo counter fixes & tweaks 2021-04-20 20:38:07 +02:00
MtH 5aefe519e0 note miss stuff, clean up 'stunned' remnants 2021-04-20 17:55:42 +02:00
MtH e6f115dbfe cam lerp on gameover 2021-04-19 19:11:30 +02:00
MtH 5dddfd7160 bf old icon switch switches back to proper player1 2021-04-19 18:19:40 +02:00
MtH e005ac382c don't play game over music if already ending 2021-04-19 10:43:21 +02:00
MtH ece27cd23a load songs from reload json button 2021-04-19 10:35:39 +02:00
Cameron Taylor fe4c61124e they hate to see a girlboss winning 2021-04-19 02:46:02 -04:00
Cameron Taylor 56cbb276fa touchups and shit 2021-04-18 17:28:10 -04:00
Cameron Taylor c60bd8b12f optimiiiizeeee 2021-04-18 16:54:21 -04:00
Cameron Taylor 157769b41a that pussy be yankin 2021-04-18 13:23:09 -04:00
Cameron Taylor 08971e185d wtf cutscene shit 2021-04-18 06:53:23 -04:00
Cameron Taylor 5bc6bebb67 Merge branch 'nitpix' of https://github.com/ninjamuffin99/funkin-secret 2021-04-18 05:26:52 -04:00
Cameron Taylor 6f840a9b40 MOVING ANIMATIONS LOL 2021-04-18 05:25:44 -04:00
Cameron Taylor 75fa0dcada number thing 2021-04-18 04:29:01 -04:00
Cameron Taylor 7c120efc66 loading screen interactivity 2021-04-18 04:28:50 -04:00
Cameron Taylor e1a6325e02 cutscene shit in progress 2021-04-18 04:09:56 -04:00
Cameron Taylor ac8a8aef42 seen video save data shit 2021-04-18 03:47:48 -04:00
Cameron Taylor b501d620b8 tank rolling lol XD 2021-04-18 03:35:43 -04:00
Cameron Taylor 2f63837430 pico stage shader 2021-04-18 01:43:28 -04:00
Cameron Taylor 8f2b147d58 in-game animation cutscene type beat 2021-04-17 23:19:33 -04:00
Cameron Taylor 8db0a2cced SKEW SHIT I THINK 2021-04-15 23:13:52 -04:00
Cameron Taylor 3b4129921c guns and animation shit in progress 2021-04-15 11:57:59 -04:00
MtH f7bb96c49c menu back sounds on all menus 2021-04-15 16:19:02 +02:00
MtH 366b6242c0 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-04-15 15:29:08 +02:00
MtH 76dbe40e11 sus cliprect frameWidth / Height 2021-04-15 04:24:32 +02:00
MtH 86e1aed2fa week6 cam center and move senpaiEvil 2021-04-15 03:56:42 +02:00
Cameron Taylor 75c1cbdbd3 animation playback wip 2021-04-14 21:52:43 -04:00
MtH 5cc9f5532b eggnog > winter-horrorland transiton FIX 2021-04-15 02:18:59 +02:00
Cameron Taylor 8524f244c7 animation rotations 2021-04-14 11:31:52 -04:00
MtH b2cff72608 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-04-14 04:06:08 +02:00
MtH 84be474f15 framerate adjusted lerps for all menu shit that isnt cameras 2021-04-14 04:02:21 +02:00
Cameron Taylor 605c9066c1 Merge branch 'nitpix' of https://github.com/ninjamuffin99/funkin-secret 2021-04-11 19:08:46 -04:00
Cameron Taylor c61529d40f sprite animation shit idk lol who cares loL! 2021-04-11 19:08:36 -04:00
MtH b4274343c5 double gf on tutorial fix and inCutscene for week7 2021-04-12 00:53:37 +02:00
MtH e4f21d9ba7 bf gf dead offsets 
also lets you enter anim debug from game over screen, and with player1 if holding shift
 2021-04-11 18:41:23 +02:00
Cameron Taylor 672e3d6970 ugh and stress animations 2021-04-10 18:23:56 -04:00
Cameron Taylor 8b1fa3fb31 colors wip 2021-04-10 11:21:04 -04:00
Cameron Taylor 0ed4f87bdb weird polish bullshit 2021-04-10 02:53:23 -04:00
Cameron Taylor 3df90b6777 recycling and groups i guess 2021-04-10 01:49:57 -04:00
Cameron Taylor 26f690a264 quieter trailer and GF doin shit 2021-04-09 22:49:25 -04:00
Cameron Taylor 3f1552be6e tankman shit maybe 2021-04-09 20:34:25 -04:00
Cameron Taylor 0e373a0d42 video, and load screenshit 2021-04-09 19:17:14 -04:00
Cameron Taylor 1f45a072c0 cutscenes, menu, story shit 2021-04-09 16:37:54 -04:00
Cameron Taylor d9612ebb2b Merge branch 'nitpix' of https://github.com/ninjamuffin99/funkin-secret 2021-04-09 15:48:16 -04:00
Cameron Taylor 7fa9700664 jeff gameover censor 2021-04-09 11:38:09 -04:00
Cameron Taylor 80c6609ef9 load screen and censors 2021-04-09 03:03:27 -04:00
Cameron Taylor 7f80550598 tanky 2021-04-08 22:50:29 -04:00
Cameron Taylor 462734d87b tankman anims song 2 lil thing 2021-04-08 22:02:49 -04:00
Cameron Taylor b06cc7b105 pico asset re export 2021-04-08 21:52:21 -04:00
Cameron Taylor e85f883fa3 thingie LOL 2021-04-08 20:58:07 -04:00
MtH f10a935a75 menu scroll sound on pause screen 2021-04-09 02:56:17 +02:00
MtH af5abd27d1 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-04-09 02:52:41 +02:00
Cameron Taylor f696c0909c pico offsets 2021-04-08 20:48:11 -04:00
Cameron Taylor 11d9998539 stress cunt cutscene stuff 2021-04-08 18:59:37 -04:00
Cameron Taylor ea430156e2 cutscene polish in progress 2021-04-08 17:31:08 -04:00
MtH 662711b787 freeplay 2021-04-08 23:29:31 +02:00
MtH ab6cd0e34e Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-04-08 18:51:01 +02:00
MtH 35516cb8f9 discord rpc ignore unfocus if autopause disabled 2021-04-08 18:45:59 +02:00
Cameron Taylor 7c75bfaf31 tank cutscene GUNS 2021-04-08 12:33:19 -04:00
MtH cdd93d8e48 merge from PUBLIC 2021-04-08 14:44:13 +02:00
MtH 729d48707d don't try to resync vocals after vocals already ended or song fading out 2021-04-08 14:17:21 +02:00
MtH 10bb5d8a30 im dumb 2021-04-08 13:33:36 +02:00
MtH ba62e4cb0e NEEDS TESTING: delay note miss by one frame to fix lag causing misses 2021-04-08 03:29:32 +02:00
Cameron Taylor 29a5802a5b cutscene shit in progress 2021-04-07 20:19:49 -04:00
Cameron Taylor 3db5184b71 cutscene character work in progress 2021-04-06 18:12:31 -04:00