Commit graph

1474 commits

Author SHA1 Message Date
EliteMasterEric
aaad06c97d Merge branch 'feature/new-input-system-yay' into feature/chart-editor-bpm 2023-07-19 21:19:21 -04:00
EliteMasterEric
16e3bfe85e Fix for BPM changes, plus working on hold note rendering 2023-07-19 21:16:39 -04:00
EliteMasterEric
c56517f94f Sort the template view 2023-07-19 01:30:43 -04:00
EliteMasterEric
140afd3c31 Redo note positioning 2023-07-19 01:30:36 -04:00
EliteMasterEric
ae76b24a65 New time calculation functions 2023-07-19 01:30:23 -04:00
EliteMasterEric
b572f518db Update HaxeUI 2023-07-19 01:29:50 -04:00
EliteMasterEric
adda3020a9 Alphabetical sort 2023-07-19 01:29:43 -04:00
EliteMasterEric
ce0be2374d Event notes have different sprites for each type. 2023-07-19 01:29:13 -04:00
EliteMasterEric
3d8459fe6f Added dependency to HTML5 lime build 2023-07-15 04:22:02 -04:00
EliteMasterEric
ddcb0474a3 Convert command to Bash 2023-07-14 23:07:17 -04:00
EliteMasterEric
5a70a50a56 Remember to build Lime on HTML5 too. 2023-07-14 22:53:11 -04:00
EliteMasterEric
f675a5c578 Fix actions more 2023-07-14 22:25:51 -04:00
EliteMasterEric
8fe837d76d Attempt to fix github actions 2023-07-14 19:51:45 -04:00
EliteMasterEric
16bcf2c767 Rework note sprites to pull note style data 2023-07-13 20:27:45 -04:00
EliteMasterEric
ba53957191 Fixed an issue where dialogue scripts were not being reloaded 2023-07-13 20:26:56 -04:00
EliteMasterEric
00cfeeff72 Created the Note Style class and data registry 2023-07-13 20:25:44 -04:00
EliteMasterEric
883ab87931 Moved AnimationData into the data package 2023-07-13 20:25:01 -04:00
EliteMasterEric
70584c6e88 Make funkin.util.Constants auto-imported 2023-07-13 01:13:26 -04:00
EliteMasterEric
736eecfd9a Fixed some random crash bug? 2023-07-13 00:37:54 -04:00
EliteMasterEric
b0b8b4fba0 Shut up StickerState 2023-07-10 23:23:18 -04:00
EliteMasterEric
6c9ec918af Attempt 2, with powershell 2023-07-10 20:49:28 -04:00
EliteMasterEric
364753286f Attempt at fixing custom Lime in build 2023-07-10 20:10:17 -04:00
EliteMasterEric
24c9786166 Merge branch 'master' into feature/new-input-system-yay 2023-07-10 18:16:16 -04:00
EliteMasterEric
17a8610640 Added colors to hold note covers 2023-07-10 18:14:34 -04:00
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
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
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
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