1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-09-20 09:09:00 +00:00
Commit graph

948 commits

Author SHA1 Message Date
Cameron Taylor 42d89426a4 sidebar preview 2022-02-03 19:13:39 -05:00
Cameron Taylor d0134a3701 song difficulty swapper 2022-02-03 10:39:07 -05:00
Cameron Taylor 7958c49007 charting editor diff selector in progress 2022-02-03 10:32:29 -05:00
Cameron Taylor bec17ca5f4 notes to map in progress 2022-01-31 14:45:38 -05:00
Cameron Taylor 1aef44b905 quik thing lol! 2022-01-31 14:17:37 -05:00
Cameron Taylor 9f3a11a01a dynamic chart difficulties in progress 2022-01-31 14:16:28 -05:00
Cameron Taylor fc209188f2 lerp polish chart editor lol! 2022-01-28 20:03:38 -05:00
Cameron Taylor d8b6be43ed few comments so I dont forget why my brain busted 2022-01-28 12:24:50 -05:00
Cameron Taylor 1b61a535d4 Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret 2022-01-28 12:20:16 -05:00
Cameron Taylor b46a276671 song load fix lol woops! 2022-01-28 12:20:03 -05:00
Eric Myllyoja 8479b0b671 A memory usage counter ingame to complement the FPS counter 2022-01-27 22:20:38 -05:00
Eric Myllyoja 71ca1f8d3a Added zIndex via macro. 2022-01-26 14:19:57 -05:00
Eric Myllyoja eda3a2b809 Added translation via FireTongue. Fixed symbols in AtlasText. 2022-01-26 00:41:14 -05:00
Eric Myllyoja 9d5841a7bb Merge remote-tracking branch 'origin/master' into feature/polymod 2022-01-26 00:38:59 -05:00
Cameron Taylor 6fd71599eb dumbass sound shit that dont work lol 2022-01-25 23:11:43 -05:00
Cameron Taylor a0271a3e92 null check if difficulties dont exist 2022-01-25 21:14:31 -05:00
Cameron Taylor 21726ee56a super quick and cute comments hehe 2022-01-25 20:34:21 -05:00
Cameron Taylor 5e55a397fe crackhead save/loading chart shit 2022-01-25 20:30:29 -05:00
Cameron Taylor 4f1a413430 JSON load fixins 2022-01-25 13:30:08 -05:00
Eric Myllyoja 023ab8bded Merge remote-tracking branch 'origin/master' into feature/polymod 2022-01-22 20:40:04 -05:00
Cameron Taylor 649fa99999 autosave fix 2022-01-22 17:06:40 -05:00
Cameron Taylor 2b51038be1 alt note fuk 2022-01-22 16:58:59 -05:00
Cameron Taylor 6fec9e2c7e note format stuff in progress - noteData 2022-01-22 16:57:49 -05:00
Cameron Taylor df53254945 note data shit in progress - strumTime 2022-01-22 16:53:38 -05:00
Cameron Taylor 2a2d6fdf41 changing note array stuff for songload 2022-01-21 17:23:12 -05:00
Cameron Taylor 10da0ea80f lol holy fuk why was that shit so long and gross 2022-01-20 23:36:57 -05:00
Cameron Taylor 7fec1f1805 charting editor controls polish 2022-01-20 23:33:51 -05:00
Cameron Taylor 8df7eb4044 charting editor init fix 2022-01-20 22:55:19 -05:00
Cameron Taylor 7e1ea55ca9 darnell spray paint and also 300fps lol 2022-01-20 22:15:32 -05:00
Eric Myllyoja bfad5b3352 Properly implemented Polymod for mod loading. 2022-01-20 17:47:42 -05:00
Cameron Taylor 56d59774e3 charting editor / notespeed stuff and senpai voice 2021-12-30 00:09:16 -05:00
Cameron Taylor df4788dcf4 PureColor shader 2021-12-07 22:34:01 -05:00
Cameron Taylor c58ee24579 difficulty selector stuff 2021-12-07 19:29:26 -05:00
Cameron Taylor d51fffd6d1 difficulty stuff lol! 2021-12-07 17:41:18 -05:00
Cameron Taylor c5196e715c number tweak lol 2021-12-06 22:39:03 -05:00
Cameron Taylor 1e70829799 funny note tween on restart! 2021-12-06 22:35:14 -05:00
Cameron Taylor 652a2c0ead funny optimize 2021-12-06 21:36:44 -05:00
Cameron Taylor ef0db547b7 mid song difficulty selector fix 2021-12-06 21:33:55 -05:00
Cameron Taylor bbc22483f1 easy / hard fixed i think for freeplay 2021-12-06 20:35:15 -05:00
Cameron Taylor f4a02cb5f1 FUCKED CHART STUFF RIGHT NOW BUT COMPILES / RUNS 2021-12-06 17:49:05 -05:00
Cameron Taylor 77f45962d8 lil lerp tweak 2021-12-06 15:28:14 -05:00
Cameron Taylor aee759d05b rip my hair out wit these numbers dawg 2021-12-06 01:45:45 -05:00
Cameron Taylor 3c1ed09994 freeplay menu teehee 2021-12-06 00:50:50 -05:00
Cameron Taylor 5c14a5e5e3 cool funny light 2021-12-06 00:41:10 -05:00
Cameron Taylor 0b1bac9db4 Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret 2021-12-06 00:13:14 -05:00
Cameron Taylor 87727942b1 scrolling text framerate type beat 2021-12-06 00:13:11 -05:00
MtH c143bbae23 make sustain release less tight 2021-12-06 00:51:31 +01:00
Cameron Taylor 06da64ac20 some timing polish 2021-12-04 22:52:21 -05:00
Cameron Taylor 80892bd3a2 removed shitty freeplay bold art 2021-12-04 22:40:15 -05:00
Cameron Taylor 181e950216 stroke shader replacement freeplay text 2021-12-04 22:38:33 -05:00
Cameron Taylor 8795514361 freeplay as a substate instead 2021-12-04 20:24:53 -05:00
Cameron Taylor e4aed63740 potential polish? 2021-12-04 09:54:21 -05:00
Cameron Taylor 4d11007f66 freeplay text prototype 2021-12-04 01:34:58 -05:00
Cameron Taylor 2b144fa0ab more freeplay polish shit 2021-12-04 01:19:25 -05:00
Cameron Taylor 83ddb13f71 freeplay menu shit in progres animation 2021-12-04 00:38:45 -05:00
Cameron Taylor 7e1dfd67d3 accomodate for map stuff IN PROGREESSSS 2021-12-03 07:29:47 -05:00
Cameron Taylor 5d37413c35 map bullshit in progress songconverter 2021-11-30 13:22:42 -05:00
Cameron Taylor 34dc1826ef MAIN BIG FORMAT?? 2021-11-29 22:12:18 -05:00
Cameron Taylor 06c1b79761 rename Song.hx class to SongLoad, and removed unneeded shit 2021-11-29 21:43:38 -05:00
Cameron Taylor 47703418bf IN PROGRESS AND WORKING WITH NEW CHART STUFF 2021-11-29 15:26:45 -05:00
Cameron Taylor 8df91344f2 chart formatter/converter interp path fix 2021-11-29 13:13:48 -05:00
Cameron Taylor 2d3fb5c29a small shit dont worry bout it 2021-11-28 20:26:47 -05:00
Cameron Taylor a24f6c533a playstate cleanup in progress, create() cleanup lil 2021-11-23 15:00:10 -05:00
Cameron Taylor 7c3916cdaf small fix for song instrumental 2021-11-02 10:28:26 -04:00
Cameron Taylor c0660bd0c2 cool shit 2021-10-21 23:08:48 -04:00
Cameron Taylor b54c459539 more freeplay stuff in progress 2021-10-21 17:40:53 -04:00
Cameron Taylor 2dd270f83e freeplay stuff in progress teehee 2021-10-21 15:05:32 -04:00
Cameron Taylor ec959f5d83 freq balancing, and also sum math shit lol! 2021-10-08 20:44:32 -04:00
Cameron Taylor 33ed47bbf5 made fft stuff less copypastiues 2021-10-07 21:06:45 -04:00
Cameron Taylor 09bb68f7ad a bot FFT stuf fin progress MESSY LOL 2021-10-07 21:01:46 -04:00
Cameron Taylor 478818a4c1 almost sorta properly exponent bullshit for frequencies 2021-10-06 19:27:45 -04:00
Cameron Taylor 3a3d68424d sorta seperated out some vis / audio data stuff 2021-10-06 18:46:14 -04:00
Cameron Taylor 02973078df wacky zany shit idk lol! 2021-09-28 18:12:32 -04:00
Cameron Taylor e8a3b901c2 FFT IN PROGRESS LOL 2021-09-27 22:30:38 -04:00
Cameron Taylor c5bca599ad song reset redo to make shit reload faster 2021-09-24 11:51:15 -04:00
Cameron Taylor 707c7b6f0a lil healthbar polsih hehe 2021-09-24 11:21:34 -04:00
Cameron Taylor f060e6689c removed unused gameoverstate 2021-09-24 11:09:49 -04:00
Cameron Taylor 65bbee0e36 easy quick reset stuff in progres 2021-09-24 10:56:05 -04:00
Cameron Taylor dc74a434c0 lil HTML5 multivoice fixins 2021-09-22 21:09:28 -04:00
Cameron Taylor 43f43f6f6f evil mf shit 2021-09-22 16:04:34 -04:00
Cameron Taylor 91f1c816b9 TWEAKIN, and pico game over music 2021-09-22 15:33:30 -04:00
Cameron Taylor 52f9155ef9 2Hot in progress 2021-09-22 15:09:32 -04:00
Cameron Taylor db561adbc7 lit up charted, and lil cleanups 2021-09-21 15:39:30 -04:00
Cameron Taylor 4fb8342103 head muting lol! 2021-09-20 22:08:24 -04:00
Cameron Taylor dc050f2040 chart editor imporvements and whatnot 2021-09-20 13:21:25 -04:00
Cameron Taylor ac2d0d2a38 more voice group stuff in progress 2021-09-20 11:50:52 -04:00
Cameron Taylor 466181bbbd sound grouping in progress 2021-09-20 11:32:35 -04:00
Cameron Taylor b8cc6d5df6 less noisy spectogram 2021-09-17 14:56:57 -04:00
Cameron Taylor 38e8b80ed9 charting section visulizer stuff 2021-09-17 14:12:36 -04:00
Cameron Taylor 2eedd1a20f more cool spectogram shit 2021-09-16 15:28:29 -04:00
Cameron Taylor 4212e59937 slightly diff spectogram / optimize 2021-09-16 14:50:02 -04:00
Cameron Taylor a2eeaf5c3c more bro charting in progres 2021-09-16 14:21:11 -04:00
Cameron Taylor d00f2268f9 spectogram visulizer in progress 2021-09-16 12:04:46 -04:00
Cameron Taylor 39404d35c7 more charting editor noises 2021-09-16 00:56:49 -04:00
Cameron Taylor cfc3febccf charting UI sounds in progress 2021-09-16 00:34:51 -04:00
Cameron Taylor 39dac70c01 chart push / bro song update 2021-09-15 15:33:05 -04:00
Cameron Taylor d2f638302e nene before u get a whoopin 2021-09-14 17:12:11 -04:00
Cameron Taylor 60e0076642 moved shader camera stuff to CoolUtil, for use later? 2021-09-14 16:40:20 -04:00
Cameron Taylor f3bf578d4e screen wipe shader stuff testing 2021-09-11 14:08:34 -04:00
Cameron Taylor d13aa24fc8 even more cleanup 2021-09-11 11:55:31 -04:00
Cameron Taylor b1a4bc29de FlxSymbol cleanup, and other shit in PROGRESS 2021-09-11 11:54:38 -04:00
Cameron Taylor 7ed4405ec3 Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret 2021-09-11 09:38:28 -04:00
Cameron Taylor a6a4ed2c44 new wacky matrix stuff lil messy teehee 2021-09-11 09:37:04 -04:00
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