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

335 commits

Author SHA1 Message Date
Cameron Taylor
6fe747eac1 true perfect 2023-04-19 04:08:03 -04:00
Cameron Taylor
b4468a45c3 no more shit loops! 2023-04-19 03:00:52 -04:00
Cameron Taylor
2fefb657ec excellent looping issue 2023-04-19 02:51:47 -04:00
Cameron Taylor
7c225bea18 no forced shit mode 2023-04-17 17:59:47 -04:00
Cameron Taylor
e872dddd15 looping fix 2023-04-17 17:59:22 -04:00
Cameron Taylor
b1dfbb2ef2 shit one 2023-04-17 11:02:45 -04:00
Cameron Taylor
c2e340ef19 variation and hmm fix 2023-04-16 18:57:18 -04:00
Cameron Taylor
f411cdac88 different result screen in progress 2023-04-16 15:33:20 -04:00
Cameron Taylor
1a5b68acd8 substate loading type beat 2023-04-05 00:56:02 -04:00
Ravy
c68ed233f9 make game use rfc format for spitting inputs 2023-03-18 19:47:23 +00:00
Cameron Taylor
f32330914e score fix for ravy teehe 2023-03-09 12:39:56 -05:00
Cameron Taylor
bf7a42d143 Merge pull request #20 from FunkinCrew/chart-editor-fixes-with-dave 
Chart editor fixes with dave
 2023-03-08 13:24:39 -05:00
Cameron Taylor
f9a7e309fb score change 2023-03-02 04:20:03 -05:00
EliteMasterEric
75b4c732db Mac fix, doh! 2023-03-01 18:22:28 -05:00
EliteMasterEric
fe92d00a04 Numerous chart editor fixes. 2023-02-28 21:06:09 -05:00
Cameron Taylor
9ef5974e52 build fix? 2023-02-22 15:30:58 -05:00
Cameron Taylor
9ff3d4355d Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret 2023-02-22 15:01:07 -05:00
Cameron Taylor
dd73539294 inputSpitter for ravy 2023-02-22 14:46:46 -05:00
EliteMasterEric
e035adab72 Merge branch 'feature/flxanimate' 2023-02-21 21:01:22 -05:00
EliteMasterEric
cdd8cd2ed2 Basic working tankman sprites and cutscenes 2023-02-21 20:58:15 -05:00
Cameron Taylor
ca443411be stage edit funny moments 2023-02-03 18:10:06 -05:00
Cameron Taylor
0f9d0a6c98 stage editor in progress 2023-01-27 02:38:37 -05:00
EliteMasterEric
634258535c Applied new code style to source/ and assets/data/ 2023-01-22 22:25:45 -05:00
EliteMasterEric
6d7913786e Working events in chart editor 2023-01-22 19:55:30 -05:00
EliteMasterEric
7f9171203a Merge branch 'feature/2-chart-2-editor' 2023-01-02 17:43:19 -05:00
EliteMasterEric
6d233b93e0 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret 2023-01-02 17:41:19 -05:00
EliteMasterEric
6b3c15348b Autosave and save-on-quit for chart editor 2023-01-02 17:40:53 -05:00
EliteMasterEric
b3b7fb49c2 Difficulty selector and player previews 2022-12-17 15:19:42 -05:00
Cameron Taylor
e1f53d288d freeplay highscore stuff 2022-12-16 17:10:22 -05:00
EliteMasterEric
a2d803cc83 Note quant snapping 2022-12-14 15:33:30 -05:00
Eric Myllyoja
234dc0ac19 Vocal group work 2022-12-13 17:38:55 -05:00
Eric Myllyoja
9db6f7f32a Merge remote-tracking branch 'origin/feature/week-4-gameplay' 2022-12-08 19:52:09 -05:00
Eric Myllyoja
19b2f3799a Chart wizard plus shader fixes 2022-12-08 19:33:47 -05:00
Cameron Taylor
6a01c3008c proper result screen masking ! 2022-12-07 02:29:48 -05:00
Cameron Taylor
3f28fdb92c song name on result screen stuff WIP 2022-12-02 21:37:07 -05:00
Eric Myllyoja
7190a3b47a Pico flips you off now 2022-11-14 23:30:35 -05:00
Eric Myllyoja
709cfab6a7 Merge branch 'feature/chart-editor' 2022-10-27 09:37:13 -04:00
Eric Myllyoja
6e8feecef1 Many improvements to chart system and song format logic 2022-10-26 01:14:29 -04:00
Eric Myllyoja
a423424715 Notifications and more 2022-10-13 21:32:19 -04:00
Eric Myllyoja
cedb224783 More chart editor progress (selection) 2022-10-12 21:42:40 -04:00
Eric Myllyoja
7d21d80915 Clipboard rework 2022-10-11 03:14:57 -04:00
Eric Myllyoja
175908f827 Updated chartformat v7 2022-10-10 20:04:09 -04:00
Eric Myllyoja
36a49affee Chart editor basic difficulty switching 2022-10-07 00:37:21 -04:00
MasterEric
8a2e4687b2 Fixed TitleState not firing onBeat 2022-09-26 17:18:19 -04:00
Eric Myllyoja
679ca4aafb Tweaks to song events 2022-09-24 15:02:10 -04:00
MasterEric
cdc23f0809 Working new chart format (not working everything else :') ) 2022-09-24 01:28:39 -04:00
Cameron Taylor
182c7e3aa4 new highscore thingie 2022-09-23 16:28:17 -04:00
Cameron Taylor
4eb1b5bb78 quick and dirty new highscore check 2022-09-23 16:12:18 -04:00
Cameron Taylor
84b5c9e0fd score popin thingie 2022-09-23 15:42:12 -04:00
Cameron Taylor
58fe9c8f8c got g-friend codeed 2022-09-23 14:26:50 -04:00
Eric Myllyoja
bb5ed65d27 Further conductor/bpm stuff 2022-09-23 00:49:42 -04:00
Cameron Taylor
1a1ac2a866 timing stuff all nice XD 2022-09-22 16:21:31 -04:00
Cameron Taylor
becef12c9f positioning enough... 2022-09-22 15:48:27 -04:00
Eric Myllyoja
9ebb566b2a WIP on conductor rework 2022-09-22 06:34:03 -04:00
Cameron Taylor
46c15e76f1 colors and numbers teehee 2022-09-22 04:09:06 -04:00
Cameron Taylor
8cd96a7b0d difficulties 2022-09-21 21:03:31 -04:00
Cameron Taylor
6b0e009b05 boom box stuff for results XD 2022-09-21 20:26:16 -04:00
Cameron Taylor
3f42d22d5b name change stuff and some placements 
also commit lol!
 2022-09-21 18:01:48 -04:00
Cameron Taylor
7c0c09775a results ending variations 2022-09-20 13:18:40 -04:00
Cameron Taylor
37267dd7e2 songs in progres 2022-09-20 13:01:37 -04:00
Cameron Taylor
afa1a9d13c better combo stuf 2022-09-20 02:37:43 -04:00
Cameron Taylor
1dbb4099ec basic result screen in progress counting tallies 2022-09-20 02:16:12 -04:00
Eric Myllyoja
7fbdbcdfad Fix merge issues 2022-09-16 15:38:36 -04:00
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
Eric Myllyoja
3a085e9333 Combo counter tweaks, stage position tweaks 2022-09-08 02:48:51 -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
eaab159c73 lit-up on street stage 2022-08-25 20:15:50 -04:00
Cameron Taylor
8f4855852e BASE PROTOTYPE WORKING W/ HaxeUI 2022-08-24 05:44:22 -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
Eric Myllyoja
4172fd861d First prototype of can logic 2022-07-14 19:03:42 -04:00
Eric Myllyoja
ee3e1750df Work in progress on Week 8 stuff (animation offsets, death animation) 2022-07-06 21:49:42 -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
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
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
be995f0702 note styles in Note.hx that use StrumlineStyle 2022-05-03 13:02:37 -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
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
60e0668e74 icon fixes (week 4 + positions) 2022-04-29 00:22:42 -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
Eric Myllyoja
e4e516dd30 Crash fix for Stress 2022-04-18 20:09:02 -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
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
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
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
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
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