Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-24 00:27:59 -05:00
Code Issues Projects Releases Packages Wiki Activity
1375 commits 30 branches 20 tags 3 GiB
Commit graph

1106 commits

Author SHA1 Message Date
Eric Myllyoja
79751222e1 Merge remote-tracking branch 'origin/note-redux' into feature/chart-editor 2022-09-16 15:38:19 -04:00
Eric Myllyoja
3597b09a46 Finished song data loader 2022-09-16 15:37:00 -04:00
Cameron Taylor
f07d172219 data stuff moved OUT of Note.hx! 2022-09-16 01:44:50 -04:00
Eric Myllyoja
848874eaac Fix merge conflicts 2022-09-14 22:28:37 -04:00
Eric Myllyoja
51a7282d40 Merge remote-tracking branch 'origin/note-redux' into feature/chart-editor 2022-09-14 22:28:04 -04:00
Eric Myllyoja
194d8e6ce6 WIP on song data loading 2022-09-13 01:09:30 -04:00
Cameron Taylor
43b952b321 char input haxeUI stuff 2022-09-08 16:39:31 -04:00
Cameron Taylor
e15815afa8 initial haxeui for character offset editor 2022-09-08 04:03:50 -04:00
Eric Myllyoja
3a085e9333 Combo counter tweaks, stage position tweaks 2022-09-08 02:48:51 -04:00
Eric Myllyoja
baab8e101f Stage builder improvements, Weekend 1 stage 2022-09-08 01:09:22 -04:00
Eric Myllyoja
d84be39a5e Minor tweaks and fixes 2022-09-07 22:57:40 -04:00
Eric Myllyoja
e3857d789f Merge branch 'master' into feature/week-4-gameplay 2022-09-07 19:12:18 -04:00
Eric Myllyoja
eb3ad49a30 Work in progress on HaxeUI chart editor 2022-09-07 19:07:08 -04:00
Eric Myllyoja
f790cd8fd6 WIP 2022-09-06 00:59:54 -04:00
Eric Myllyoja
7c88032551 More code for Blazin, additional shaders 2022-09-03 22:21:54 -04:00
Eric Myllyoja
c26b3a828d First work in progress for Blazin 2022-08-31 02:24:09 -04:00
Eric Myllyoja
31487c0a32 Logic for double cans, partial implementation of cans into 2hot 2022-08-27 02:02:29 -04:00
Cameron Taylor
36e6d6bd91 fft... 2022-08-26 16:46:58 -04:00
Cameron Taylor
07fb4039dc dipshit FFT fixing in progress... 2022-08-26 16:46:48 -04:00
Cameron Taylor
eaab159c73 lit-up on street stage 2022-08-25 20:15:50 -04:00
Cameron Taylor
aaf1376b53 stage editor Y key fix (and streets repositioning) 2022-08-25 05:18:09 -04:00
Cameron Taylor
59aae9c3d9 storymenu stuff for now 🤝 2022-08-25 01:40:39 -04:00
Cameron Taylor
831626a156 stuff for storymenu 2022-08-25 01:35:47 -04:00
Cameron Taylor
8f4855852e BASE PROTOTYPE WORKING W/ HaxeUI 2022-08-24 05:44:22 -04:00
Eric Myllyoja
2bef1cb88a Adjusted firing streak and angle. 2022-08-22 21:55:30 -04:00
Cameron Taylor
3be4530fa5 code in place for story week 2022-08-22 20:18:54 -04:00
Eric Myllyoja
fe9a319814 Latest WIP on Weekend 1 appearance stuff 2022-08-16 20:26:34 -04:00
Eric Myllyoja
2760a9ae9a Polished Week 4 light post code. 2022-07-24 14:44:17 -04:00
Eric Myllyoja
600c7e5441 F3 to toggle debug markers, various visual tweaks 2022-07-24 00:49:54 -04:00
Eric Myllyoja
aa0962fe62 Cleanup of GameOverSubstate, fix GF duck animation duration 2022-07-22 22:25:19 -04:00
Eric Myllyoja
c456355366 Scripted states and shaders. 2022-07-22 16:11:18 -04:00
Cameron Taylor
a731ccf0ad dipshit latency stuff WIP still 2022-07-19 14:19:03 -04:00
Eric Myllyoja
4172fd861d First prototype of can logic 2022-07-14 19:03:42 -04:00
Cameron Taylor
f3e0b0ec5b input accuracy testing 2022-07-12 19:02:38 -04:00
Cameron Taylor
5778e979d9 lil fix for end number hehe 2022-07-11 15:14:59 -04:00
Cameron Taylor
05858a4f6c crash fix when pressing before loop 2022-07-11 15:04:41 -04:00
Eric Myllyoja
ee3e1750df Work in progress on Week 8 stuff (animation offsets, death animation) 2022-07-06 21:49:42 -04:00
Cameron Taylor
4d3766b65b better traces hehe 2022-07-06 20:58:13 -04:00
Cameron Taylor
c3995ef557 different timestamping 2022-07-06 20:54:07 -04:00
Cameron Taylor
5e630dc214 latency debugging stuff in progress 2022-07-06 20:37:35 -04:00
Cameron Taylor
1c1974bae5 better beat visualizations 2022-07-06 18:45:27 -04:00
Cameron Taylor
f797f6a7b1 music debug stuff in progress 2022-07-06 15:27:45 -04:00
Cameron Taylor
53d703cfcd spectogram tweakin hehe 2022-07-05 14:36:01 -04:00
Cameron Taylor
9cf2598951 spectogram placeholder 2022-07-05 14:34:08 -04:00
Cameron Taylor
b5d85c3fd6 latency stuff in progress maybe? 2022-07-05 14:24:02 -04:00
Eric Myllyoja
05148ee4f0 GF now ducks (a little glitchy tho) 2022-06-12 00:53:39 -04:00
Eric Myllyoja
705d0ed5b9 Updated hmm deps, no more forks! 2022-06-12 00:02:49 -04:00
Eric Myllyoja
05db82c828 Added blood to henches, added moving limo, added dynamic GF combo/drop animations 2022-06-09 22:28:58 -04:00
Cameron Taylor
3f84a5514f POV i learning how macros work 2022-06-09 02:27:20 -04:00
Eric Myllyoja
1c62dc1274 First revision of henchmen killing. 2022-06-01 22:07:42 -04:00
Cameron Taylor
853820c56b animation timing fixes 2022-05-30 23:59:12 -04:00
Eric Myllyoja
9dfbfad926 First test of Week 4 Gameplay, plus fixes for MultiSparrow 2022-05-29 21:40:13 -04:00
Cameron Taylor
64b40ce7b8 bf default cam position fix 2022-05-29 19:33:04 -04:00
Cameron Taylor
e844b93641 spookeez scared animation lightning fix 2022-05-29 19:13:21 -04:00
MtH
02255a61d9 oopy forgot the comment 2022-05-07 22:33:18 +02:00
MtH
8bd876ed1c flipx 2022-05-07 22:07:09 +02:00
MtH
8e2eefb605 0.2.8 character positions, dont multiply zoom, chara scaling fix 2022-05-07 18:45:49 +02:00
Cameron Taylor
bfce579cd5 Merge remote-tracking branch 'origin/master' into feature/scripted-characters 2022-05-04 12:27:18 -04:00
Cameron Taylor
f37c2cbbf6 cameraOffset stuff defaulted properly 2022-05-03 14:07:18 -04:00
Cameron Taylor
d835bed813 senpai stage tweaks 2022-05-03 13:27:14 -04:00
Cameron Taylor
f9f711a179 charting editor head fix 2022-05-03 13:09:02 -04:00
Cameron Taylor
be995f0702 note styles in Note.hx that use StrumlineStyle 2022-05-03 13:02:37 -04:00
Cameron Taylor
4245bd4777 spooky mansion, and also fix for introText # thing 2022-05-03 11:01:29 -04:00
Cameron Taylor
3a327f5c5d pico fixes teehee 2022-05-02 23:00:00 -04:00
Cameron Taylor
79ce2237fc small cam fix anotha hehe 2022-05-01 15:23:09 -04:00
Cameron Taylor
769969898b camera positioning fixes 2022-05-01 15:20:15 -04:00
Cameron Taylor
992ff442c0 evil senpai hehe 2022-05-01 15:02:51 -04:00
Cameron Taylor
d12f0dc7b9 rough senpai repositioning 2022-05-01 14:59:18 -04:00
Cameron Taylor
8231f432ff can move the characters around, and some pos fixes 2022-05-01 14:52:58 -04:00
Cameron Taylor
a5857313c5 prototype character mover thing lol 2022-04-30 00:37:05 -04:00
Eric Myllyoja
5bb1376459 Added cornerPosition and feetPosition properties for easy reference 2022-04-29 23:51:52 -04:00
Cameron Taylor
282e93e1ff character repositioning proof of concept stuf 2022-04-29 23:46:41 -04:00
Cameron Taylor
231f76c893 pixel icon placement fix 2022-04-29 21:45:56 -04:00
Cameron Taylor
31b393b014 character animation dance force is OFF 2022-04-29 11:56:08 -04:00
Cameron Taylor
112a9ee329 main menu storymode anim fix 2022-04-29 11:10:43 -04:00
Cameron Taylor
60e0668e74 icon fixes (week 4 + positions) 2022-04-29 00:22:42 -04:00
Cameron Taylor
a8218d2542 main menu fix, and it BUILDS 2022-04-28 23:52:19 -04:00
Cameron Taylor
e24de498a1 import fix + weird git merge thing lol (doesnt build) 2022-04-28 23:46:37 -04:00
Eric Myllyoja
43dbce2be1 Merge remote-tracking branch 'origin/feature/scripted-modules' into feature/scripted-characters 2022-04-18 20:39:41 -04:00
Cameron Taylor
061b16bde7 Merge branch 'feature/scripted-modules' of https://github.com/ninjamuffin99/Funkin-secret into feature/scripted-modules 2022-04-18 20:24:03 -04:00
Cameron Taylor
22de93705c quick thing to put back my ez debug skip thing lol 2022-04-18 20:24:01 -04:00
Eric Myllyoja
e4e516dd30 Crash fix for Stress 2022-04-18 20:09:02 -04:00
Cameron Taylor
4fedb9e34a derp XD 2022-04-18 19:51:18 -04:00
Eric Myllyoja
0b17f74f48 Merge remote-tracking branch 'origin/master' into feature/scripted-modules 2022-04-18 19:46:39 -04:00
Eric Myllyoja
d5d1c0ae95 Merge branch 'feature/scripted-modules' of github.com:ninjamuffin99/Funkin-secret into feature/scripted-modules 2022-04-18 19:36:18 -04:00
Eric Myllyoja
b6da0b5e20 Fixed Week 4 boppers and car. 2022-04-18 19:36:09 -04:00
Cameron Taylor
b145e7629f html5 fixes... again lol 2022-04-18 15:00:12 -04:00
Cameron Taylor
1485d27b07 debug thing to hide pause menu 2022-04-18 13:53:48 -04:00
Cameron Taylor
967f847800 nicer pausemenu exit, and force loading for ez tests 2022-04-15 17:11:01 -04:00
Eric Myllyoja
25dc011df2 Many bug fixes; combo meter now works; main menu graphics split up 2022-03-29 21:56:04 -04:00
Eric Myllyoja
4b7744f4e3 Additional fixes for health icons and camera positioning. 2022-03-26 22:18:26 -04:00
Eric Myllyoja
3634346072 Stable, only position adjustments needed. 2022-03-25 22:30:37 -04:00
Cameron Taylor
3f634a6657 -DANIMDEBUG initstate fix 2022-03-25 17:56:47 -04:00
Cameron Taylor
8302b2d2ba quick and dirty freeplay exit transition fix 2022-03-23 23:27:48 -04:00
MtH
9cb269a19c pixel pause & misc 2022-03-23 19:29:02 +01:00
Eric Myllyoja
386e8db830 Ported all base game characters 2022-03-23 01:18:23 -04:00
Eric Myllyoja
a7d338becb First iteration of stable custom characters, plus some other neat changes. 2022-03-21 00:19:05 -04:00
Cameron Taylor
10bafff63e Merge branch 'master' into feature/scripted-stages 2022-03-18 21:54:16 -04:00
Cameron Taylor
5f98aa7fb5 busted input fix (breaks pyro test probably) 2022-03-18 21:47:30 -04:00
Cameron Taylor
a40a4663d8 parse animate removed an import lol! 2022-03-18 12:28:25 -04:00
Eric Myllyoja
1a85b4a1ce First WIP of scripted characters (NOT WORKING) 2022-03-17 01:40:08 -04:00
Eric Myllyoja
7c0cb9c69c Archiving hookablemacro 2022-03-14 22:02:44 -04:00
Eric Myllyoja
60c6e5ee29 Various bug fixes for strumlines 2022-03-14 20:48:45 -04:00
Eric Myllyoja
1935373963 Hide song name in play state 2022-03-13 14:47:59 -04:00
Eric Myllyoja
0cc4f8a982 Scripted modules are stable but missing some features. 2022-03-13 14:36:03 -04:00
Eric Myllyoja
49b2907a30 Scripted module and script event systems, reworked strumlines. 2022-03-11 01:30:01 -05:00
MtH
449af0ea18 rise from your grave 2022-03-10 01:33:05 +01:00
MtH
151c96afc8 voicesgroup resync 2022-03-10 01:07:39 +01:00
Cameron Taylor
d477320894 xmas mall positioning fix (plus score reset, lol!) 2022-03-09 18:57:36 -05:00
Cameron Taylor
ef665df9d0 hold note balance shit lol! unrelated to polymod!! 2022-03-09 15:04:35 -05:00
Cameron Taylor
9dcffaa3fa spirit layering fix 2022-03-09 14:06:10 -05:00
Eric Myllyoja
fe109f878f Merge remote-tracking branch 'origin/master' into feature/scripted-stages 2022-03-09 10:37:21 -05:00
Eric Myllyoja
19cda4ed15 Merge branch 'feature/scripted-stages' of github.com:ninjamuffin99/Funkin-secret into feature/scripted-stages 2022-03-09 10:36:39 -05:00
Eric Myllyoja
57fcb74657 Spirit trail is now behind 2022-03-09 10:36:13 -05:00
Cameron Taylor
45b9d725f2 tankman cloud reset? 2022-03-09 10:29:03 -05:00
Eric Myllyoja
404b2b648e Modified every file in the codebase to solve a single bug. 2022-03-08 03:13:53 -05:00
Cameron Taylor
7f9cd6824c fixed wiggle, just made effect non required param lol 2022-03-07 20:25:00 -05:00
Cameron Taylor
8ff1a3cb85 no traces? *funny megamind picture* 2022-03-07 18:36:29 -05:00
Eric Myllyoja
6475a49bf4 Final cleanup before PR. 2022-03-06 03:33:12 -05:00
Eric Myllyoja
b19478cd1e Scripted stages are done (weeks 1-7) 2022-03-06 02:37:38 -05:00
Eric Myllyoja
d50a82cdf6 Work-in-progress for Week 7 2022-03-02 01:20:27 -05:00
Eric Myllyoja
ef53acb3a3 Week 5 changes 2022-03-01 22:07:33 -05:00
Eric Myllyoja
8eef111021 Fixed shaders on schoolEvil 2022-03-01 20:57:05 -05:00
Eric Myllyoja
f74962f8e8 WIP on Week 6 2022-03-01 11:29:01 -05:00
Eric Myllyoja
00497ee729 Added spacebar to attack 2022-02-28 23:23:42 -05:00
Eric Myllyoja
f2b4dbe751 Pyro test 2022-02-28 23:04:55 -05:00
Eric Myllyoja
c995870bac Cleaned up Week 4, Week 5 Nice done, Week 8 Placeholder 2022-02-27 01:12:08 -05:00
Eric Myllyoja
591ec3bdec Goodbye, BackgroundDancer... 2022-02-26 23:35:15 -05:00
Eric Myllyoja
c1cea068d4 Added boppers, started work on Week 4. 2022-02-26 23:26:30 -05:00
Eric Myllyoja
d795f4fa5c Week 3 complete. 2022-02-26 13:02:28 -05:00
Eric Myllyoja
301399200d Ported Weeks 1 and 2, WIP Week 3 2022-02-26 09:06:49 -05:00
Eric Myllyoja
2cfeffb791 Merge remote-tracking branch 'origin/master' into feature/scripted-stages 2022-02-25 02:22:45 -05:00
Eric Myllyoja
a0f285e319 Script-driven stages are done! 2022-02-25 02:02:06 -05:00
Eric Myllyoja
c0c1fb482f Add stage data files 2022-02-23 16:58:23 -05:00
Eric Myllyoja
af21a56dc0 Move songs to their own folder 2022-02-23 16:51:24 -05:00
Eric Myllyoja
7b8883d3dd Work in progress, basic stage done 2022-02-23 16:49:54 -05:00
George Kurelic
37517e1e16 use type inference instead of conditional type 2022-02-22 13:03:01 -06:00
George Kurelic
b50364edcf check #if polymod instead of cpp 2022-02-22 12:57:29 -06:00
Cameron Taylor
f158a3929c weekend fighting in progress + del superlinter 2022-02-18 16:29:29 -05:00
Cameron Taylor
f5c3b7db02 dumb useless lol 2022-02-16 16:57:08 -05:00
Cameron Taylor
d6db576585 some combo popup / playstate lil cleanup 2022-02-16 16:31:20 -05:00
Cameron Taylor
5c09417329 revert to shitty spectogram back... 2022-02-11 21:39:43 -05:00
Cameron Taylor
804e084668 polygon spectogram stuff redo 2022-02-11 14:21:42 -05:00
Cameron Taylor
ef67aacf86 polygon spectogram fix 2022-02-11 12:03:54 -05:00
Cameron Taylor
75938a5daf Merge pull request #9 from ninjamuffin99/george_helpers 
George helpers
 2022-02-11 10:24:33 -05:00
Cameron Taylor
5c45f7a092 new spectro vis in progress + sustain note charting ed vis 2022-02-10 14:23:45 -05:00
Cameron Taylor
c73e8e1a4d audiovis reorganize + MeshRender obj in progres 2022-02-10 13:17:46 -05:00
George FunBook
2aee6bcab8 dir/color note helpers 2022-02-09 19:31:36 -06:00
George FunBook
fc2a20a1fd add song/week/dif compile directives 2022-02-09 19:24:33 -06:00
Cameron Taylor
96540fc09e more spectogram optimiz in progress 2022-02-09 14:00:04 -05:00
Cameron Taylor
0b9c9d7533 stinky dipshit specto viz optimization 2022-02-09 13:37:57 -05:00
Cameron Taylor
44e720ee28 click and drag sustain 2022-02-06 13:56:18 -05:00
Cameron Taylor
36b5466057 Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret 2022-02-05 11:12:03 -05:00
Cameron Taylor
2c91016e76 diffifulcty adder in progress while i go to library loL! 2022-02-04 12:04:59 -05:00
George FunBook
53cb4fa78d fix crash on week 1 2022-02-04 10:58:24 -06:00
Cameron Taylor
db1d9c1824 saving files for notemap 2022-02-04 09:25:29 -05:00
Cameron Taylor
b263c553ad optimized lol 2022-02-03 19:54:32 -05:00
Cameron Taylor
f710ad78bc side preview (needs optimization) 2022-02-03 19:51:16 -05:00
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