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

1030 commits

Author SHA1 Message Date
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
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