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

3472 commits

This branch
This branch
All branches
Author SHA1 Message Date
EliteMasterEric
796a51325f Hold note covers are in and properly positioned 2023-07-08 01:03:46 -04:00
EliteMasterEric
54a9b09155 Merge branch 'master' into bugfix/conductor-monster 2023-07-06 12:35:49 -04:00
EliteMasterEric
a9d8fb8dfb Updated HaxeUI for good measure 2023-07-06 12:33:50 -04:00
EliteMasterEric
a3929db7a8 Merge branch 'master' into feature/offset-editor-tweaks 2023-07-06 01:00:32 -04:00
EliteMasterEric
8e071221ff Work in progress on hold covers 2023-07-05 22:11:58 -04:00
Cameron Taylor
6a3c32bfa6 Merge pull request #111 from FunkinCrew/feature/week-6-dialogue 
Week 6 dialogue
 2023-07-05 22:11:03 -04:00
EliteMasterEric
b615fbf82a WIP on hold covers 2023-07-04 16:38:10 -04:00
EliteMasterEric
f932422d74 Merge branch 'master' into feature/week-6-dialogue 2023-07-03 13:18:53 -04:00
EliteMasterEric
3bf7955ffa Conductor fix 2023-07-03 13:16:02 -04:00
EliteMasterEric
b764656a4e Merge branch 'master' into feature/chart-editor-importer 2023-07-03 13:09:40 -04:00
EliteMasterEric
39cd304ef2 Expanded shortcut list, fixed build errors 2023-07-03 12:51:27 -04:00
EliteMasterEric
90bd5af376 Merge branch 'master' into feature/offset-editor-tweaks 2023-07-03 12:22:33 -04:00
EliteMasterEric
36898a8c04 Few more conductor tweaks 2023-07-02 16:46:49 -04:00
EliteMasterEric
bb8b0b59b1 Video cutscenes in Week 7 no longer broken 2023-07-02 16:46:40 -04:00
EliteMasterEric
49ce962e34 Make metadata file loading actually work 2023-07-02 16:17:25 -04:00
EliteMasterEric
cddc50bbe5 Rework quickWatch 2023-07-02 16:17:04 -04:00
EliteMasterEric
1ef17770e9 crochet->lengthMs 2023-07-02 16:16:49 -04:00
EliteMasterEric
8685054696 Freaky Menu uses metadata.json for BPM data. 2023-07-02 15:34:34 -04:00
EliteMasterEric
66f56dbf2c system->sound 2023-07-02 15:34:07 -04:00
EliteMasterEric
956277ff4e Updates and fixes to Conductor for use with changing BPMs. 2023-07-02 15:33:34 -04:00
EliteMasterEric
93f653969a Added new set of constants 2023-07-02 15:33:12 -04:00
Cameron Taylor
2ce3228bd5 Merge pull request #109 from FunkinCrew/feature/week-7-cutscenes 
Week 7 Cutscenes
 2023-06-28 21:15:23 -04:00
EliteMasterEric
100565f9fc Messing with transitions. 2023-06-27 21:29:58 -04:00
EliteMasterEric
085d7aaa9d Fix for note splashes 2023-06-27 21:29:50 -04:00
EliteMasterEric
d91c341bd2 Fixed a bug where you could hold notes forever 2023-06-27 18:06:33 -04:00
EliteMasterEric
2f7708c106 Hold notes pretty much done! yay! 2023-06-27 17:22:51 -04:00
Cameron Taylor
740c547293 Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret into feature/week-7-cutscenes 2023-06-27 17:07:35 -04:00
EliteMasterEric
983466c0fe Visual fixes for story menu 2023-06-27 15:21:09 -04:00
Cameron Taylor
ed728e460b hxcodec branch fix 2023-06-27 14:52:09 -04:00
EliteMasterEric
a672db7b0e Messing around with logic for hold note misses/health gain 2023-06-27 13:43:42 -04:00
Eric
a4a4e705a1 Merge pull request #105 from FunkinCrew/feature/modded-story 
Mods in story menu
 2023-06-27 13:26:44 -04:00
Cameron Taylor
6bf6cbbccc Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret into feature/modded-story 2023-06-27 13:11:20 -04:00
Cameron Taylor
d1333b9b24 new hxcodec stuff 2023-06-27 12:45:41 -04:00
EliteMasterEric
47d8d9e4db Work in progress on redoing hold note rendering 2023-06-26 20:40:26 -04:00
EliteMasterEric
6d5c5f5acb Refactor InitState plus fix a couple crash bugs 2023-06-26 20:39:47 -04:00
EliteMasterEric
4c85e59037 Rewrote documentation for InitState 2023-06-25 12:36:21 -04:00
EliteMasterEric
6f737a1805 Update hxCodec to latest stable. 2023-06-25 12:36:12 -04:00
EliteMasterEric
0fac918428 Reworked anti-aliasing code (sprites now default to true) 2023-06-25 12:36:00 -04:00
EliteMasterEric
2cae781984 Sustains are kinda working? 2023-06-22 19:28:39 -04:00
EliteMasterEric
25c70564bd WIP on new note rendering, inputs. 2023-06-22 01:41:01 -04:00
Cameron Taylor
6bce92e54a Merge pull request #110 from FunkinCrew/actions-cache-fix 
.haxelib caching
 2023-06-17 16:27:33 -04:00
EliteMasterEric
28ddadffff Week 6 dialogue support + bug fixes 2023-06-16 17:37:56 -04:00
Cameron Taylor
092dcb5a35 counter fix thing 2023-06-15 14:31:49 -04:00
Cameron Taylor
0b42b6e305 moved caching so html5 can also cache haxelibs 2023-06-15 14:12:39 -04:00
Cameron Taylor
a7aafa9e3e .haxelib caching 2023-06-15 14:09:19 -04:00
Cameron Taylor
dff48c3013 Merge pull request #101 from FunkinCrew/death-alt 
Death alt
 2023-06-15 13:19:21 -04:00
EliteMasterEric
9a541c5769 Merge branch 'death-alt' of https://github.com/FunkinCrew/Funkin-secret into death-alt 2023-06-15 03:49:24 -04:00
EliteMasterEric
02632a623c Disable fakeout happening 100% of the time. 2023-06-15 03:48:52 -04:00
Cameron Taylor
aabf36a788 Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret into death-alt 2023-06-15 03:27:03 -04:00
EliteMasterEric
594cec62ad Results screen now moves to Story menu if we are in story mode 2023-06-15 00:30:20 -04:00