cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-10-27 09:54:16 +00:00
Code Issues Releases Wiki Activity
1697 commits 3 branches 3 tags 3 GiB
Commit graph

1337 commits

Author SHA1 Message Date
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 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 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
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
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
EliteMasterEric a672db7b0e Messing around with logic for hold note misses/health gain 2023-06-27 13:43:42 -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
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 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
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
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
EliteMasterEric 7a47221250 Fixes for FlxVideo 2023-06-15 00:30:01 -04:00
EliteMasterEric dddd050268 Move debug menu to main menu only 2023-06-15 00:29:54 -04:00
EliteMasterEric 3d8dd8d604 More conductor rework changes 2023-06-15 00:29:40 -04:00
EliteMasterEric 3c558ce192 Pixel fixes 2023-06-15 00:29:18 -04:00
EliteMasterEric 5729eb0413 Fix reloading song events 2023-06-15 00:28:52 -04:00
EliteMasterEric 1191fff913 Additional controls (volume, cutscene skip) 2023-06-15 00:28:40 -04:00
EliteMasterEric 506e4bf680 Propagate Conductor rework to dependent classes. 2023-06-15 00:15:57 -04:00
EliteMasterEric f6c38f9bdd Refactor conductor (crochet->lengthMs) 2023-06-15 00:13:18 -04:00
EliteMasterEric 6ac4db48d9 Rename combo milestone 2023-06-15 00:12:35 -04:00
EliteMasterEric b783271451 ComboCounter->ComboMilestone 2023-06-15 00:11:20 -04:00
EliteMasterEric 338342ad5e Tweaks and improvements to the animation editor 2023-06-13 17:13:14 -04:00
Cameron Taylor a42daecdc1 Delete ScriptedMusicBeatSubstate.hx 2023-06-13 01:31:41 -04:00
Cameron Taylor b564ad087b vocals fix... lol! 2023-06-13 01:04:29 -04:00
EliteMasterEric b847212375 Migrator fixes 2023-06-10 03:59:25 -04:00
EliteMasterEric 6f676a5896 Added new "Mods" story menu section (hidden when no mods are installed) 2023-06-10 02:56:03 -04:00
EliteMasterEric 109676522a Rewrite freeplay state to use correct week IDs. 2023-06-09 18:25:21 -04:00
EliteMasterEric 4dcdca51ae Fix camera issue with stickers 2023-06-09 16:54:13 -04:00
Cameron Taylor 4daf644284 ree 2023-06-09 16:03:45 -04:00
Cameron Taylor b95dc5604d Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret 2023-06-09 16:03:36 -04:00
Cameron Taylor 4fae8bcad2 file renames... 2023-06-09 16:02:57 -04:00
EliteMasterEric ba20e5c39c Merge remote-tracking branch 'origin/recapitalizing' into bugfix/character-data 2023-06-09 15:46:40 -04:00
Cameron Taylor a7eb91ce29 the SubState... 2023-06-09 15:44:29 -04:00
EliteMasterEric 2d04b1c5f1 Merge branch 'master' into bugfix/character-data 2023-06-09 15:34:56 -04:00
EliteMasterEric 6f846751c7 Typo fix 2023-06-09 15:32:44 -04:00
EliteMasterEric 038d258233 Chart editor changes (support for legacy import) 2023-06-09 15:28:14 -04:00
EliteMasterEric 2200b6a24a File renames 2023-06-09 15:27:23 -04:00
Cameron Taylor 27a9ef211e Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret into bugfix/formatting-cleanup 2023-06-09 14:12:37 -04:00
EliteMasterEric 6f802f7658 Merge branch 'bugfix/formatting-cleanup' into feature/chart-editor-importer 2023-06-08 17:13:56 -04:00
EliteMasterEric 26998c9164 More chart editor changes 2023-06-08 17:07:35 -04:00
EliteMasterEric c3577b32ef Port changes to ChartEditorState 2023-06-08 16:53:52 -04:00
EliteMasterEric f959cbd950 ACTUALLY move MusicBeatSubState 2023-06-08 16:52:44 -04:00
EliteMasterEric 3005aa1f3b Added legacy importer 2023-06-08 16:48:34 -04:00
EliteMasterEric ac876c2f59 Fixes to Character preview window 2023-06-08 16:48:13 -04:00
EliteMasterEric 91a9c385b3 WIP of note preview 2023-06-08 16:47:48 -04:00
EliteMasterEric 657d898090 Additional file read/write functions 2023-06-08 16:42:02 -04:00
EliteMasterEric 3f2558d26a Validated formatting of 338 XML files. 2023-06-08 16:34:06 -04:00
EliteMasterEric e68f9ca9a1 Validated formatting of 203 HX files. 2023-06-08 16:30:45 -04:00
EliteMasterEric a2b08e3e34 Update hxCodec 2023-06-06 17:38:40 -04:00
EliteMasterEric 1d3c4d61a6 Syntax fixes to get the branch to build 2023-06-06 17:38:31 -04:00
Cameron Taylor 7a04a2d774 blueball check 2023-06-04 01:19:08 -04:00
Cameron Taylor 2d772a526b no skipping easter egg!! 2023-06-02 15:56:40 -04:00
EliteMasterEric 9f8d1dbac2 Playstate fixes WIP (TODO: fix compile errors) 2023-06-02 15:35:01 -04:00
EliteMasterEric a017fb2074 Remove old charting state 2023-06-02 15:25:36 -04:00
EliteMasterEric 123682dc69 Added new constants/defaults. 2023-06-02 15:25:28 -04:00
EliteMasterEric c9fb6bc51f Further typo fixes 2023-06-02 15:25:13 -04:00
EliteMasterEric 4851ff5c27 Internal rework to song events 2023-06-02 14:35:28 -04:00
EliteMasterEric 57caeef802 Work on re-enabling cutscenes 2023-06-02 14:35:08 -04:00
EliteMasterEric b126ac28f4 state->State 2023-06-02 14:34:47 -04:00
EliteMasterEric 4d539fdda2 Substate -> SubState (capitalization fix) 2023-06-01 18:52:58 -04:00
EliteMasterEric fd5c546005 Fixed a bug where assets from other weeks wouldn't load 2023-06-01 16:00:15 -04:00
EliteMasterEric 09318c258b Remove old story menu state 2023-06-01 15:59:56 -04:00
Eric b49a2857e5 Revert guaranteed fakeout 2023-06-01 00:33:30 -04:00
EliteMasterEric 374f03dae3 Fakeout death now uses HScript 2023-06-01 00:31:32 -04:00
Cameron Taylor 2d16aab488 snds effects 2023-05-31 03:28:53 -04:00
Cameron Taylor dbab5a912d death alt easter egg 2023-05-31 03:03:10 -04:00
EliteMasterEric 121fc13153 Added some utility functions 2023-05-30 16:21:24 -04:00
EliteMasterEric 6412cb3aee Fix bug where story mode breaks after first playthrough 2023-05-30 16:21:12 -04:00
EliteMasterEric a2ddeec5bb Daddy Dearest animation fixes 2023-05-30 16:20:57 -04:00
EliteMasterEric 4efafe8a78 Health icon refactors/fixes 2023-05-26 17:10:35 -04:00
EliteMasterEric 872f7c93e8 Added onAdd event so GF character can fix position in Tutorial 2023-05-26 17:10:08 -04:00
Cameron Taylor 6ab391d57a Merge pull request #99 from FunkinCrew/feature/split-vocals 
Ported chart format (fixing story menu) and split vocals
 2023-05-26 14:13:14 -04:00
Cameron Taylor 503a0107c7 Merge pull request #98 from FunkinCrew/bugfix/character-crashes 
Bugfix/character crashes
 2023-05-26 13:44:59 -04:00
EliteMasterEric dc932eb8d7 A few bug fixes related to vocal tracks 2023-05-25 19:36:32 -04:00
EliteMasterEric 2af4a51b15 Merge branch 'master' into feature/split-vocals 2023-05-25 18:39:41 -04:00
EliteMasterEric 2f10de3594 New refactor to VoicesGroup to make multiple vocal tracks actually work 2023-05-25 18:34:26 -04:00
EliteMasterEric 317c127730 Deprecation warning fixes (no actual logic changes tho) 2023-05-25 18:33:39 -04:00
EliteMasterEric 010d5672bb Fix for FlxSound error; fix typo in Spirit class 2023-05-24 16:11:29 -04:00
EliteMasterEric 482de2a122 Added Nightmare difficulty (stub) 2023-05-22 20:55:53 -04:00
EliteMasterEric 09654170ed Erect mixes play properly when selected 2023-05-22 13:47:01 -04:00
EliteMasterEric a599dbea11 Reworked Story Menu (data driven) 2023-05-17 16:42:58 -04:00
EliteMasterEric 021f7a0a1c Work in progress on story menu data storage rework 2023-05-16 22:09:53 -04:00
Cameron Taylor 03cab4a326 Merge pull request #81 from FunkinCrew/results-anims 
different result screen in progress
 2023-04-24 17:59:20 -04:00
Cameron Taylor e802aa885b gf shit fix 2023-04-21 17:39:27 -04:00
Cameron Taylor 03f48289e1 Merge pull request #84 from FunkinCrew/bugfix/songeventscriptevent 
Fixed an issue where SongEventScriptEvent would not be dispatched
 2023-04-20 16:56:05 -04:00
EliteMasterEric 337802a6bf Fixed an issue where SongEventScriptEvent would not be dispatched 2023-04-20 13:48:15 -04:00
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 2271025bc2 sticker loadin up nice! 2023-04-10 16:05:37 -04:00
Cameron Taylor 6fb517059d proper load/deload on freeplay and story 2023-04-10 14:44:32 -04:00
Cameron Taylor 67a56f7416 loaded up teehee 2023-04-06 01:39:27 -04:00
Cameron Taylor de7fab4371 sticker funzies 2023-04-05 17:35:19 -04:00
Cameron Taylor 1a5b68acd8 substate loading type beat 2023-04-05 00:56:02 -04:00
Cameron Taylor 41e6a270f0 sticker swag out 2023-04-04 22:38:45 -04:00
Cameron Taylor 2de744cdcf stickers uploaded 2023-04-04 22:24:00 -04:00
Cameron Taylor 5a0ce60b36 Merge pull request #73 from FunkinCrew/inputspitter-rfc 
make game use rfc format for spitting inputs
 2023-03-28 12:21:43 -04:00
Ravy c68ed233f9 make game use rfc format for spitting inputs 2023-03-18 19:47:23 +00:00
Cameron Taylor 0905b2c4b1 fixed exit bugs 2023-03-16 22:02:56 -04:00
Cameron Taylor 0d9c19d630 freeplay exit generally workin 2023-03-16 01:03:45 -04:00
Cameron Taylor 91724133d7 lil polish stuff! 2023-03-16 00:55:25 -04:00
Cameron Taylor 4a6b961046 ezier transition stuff 2023-03-16 00:17:52 -04:00
Cameron Taylor 014a8f320b freeplay exiting stuff 2023-03-15 21:05:15 -04: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
Cameron Taylor d76bb07935 windows fix thing for mac 2023-03-01 20:27:29 -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
EliteMasterEric 20e6c7a2be Fix 5 or 6 issues with charting 2023-02-28 13:17:28 -05:00
EliteMasterEric f0432773e8 Merge branch 'master' of https://github.com/FunkinCrew/Funkin-secret 2023-02-23 22:15:31 -05:00
Cameron Taylor 9ef5974e52 build fix? 2023-02-22 15:30:58 -05:00
EliteMasterEric 9455689de9 Adobe animate fixes 2023-02-22 15:26:01 -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 460da18804 slowly implementing CTRL-z movement 2023-02-09 01:31:43 -05:00
Cameron Taylor 169309e17d selection and ctrl Z 2023-02-08 04:34:32 -05:00
Cameron Taylor 33976a619e selection command in progress 2023-02-08 04:17:47 -05:00
Cameron Taylor 501e159797 selection outline 2023-02-08 01:40:27 -05:00
Cameron Taylor b8f9a241f4 stuff in progress teehee 2023-02-03 20:21:04 -05:00
Cameron Taylor ca443411be stage edit funny moments 2023-02-03 18:10:06 -05:00
EliteMasterEric 8329196118 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret 2023-02-02 18:28:11 -05:00
EliteMasterEric 2ed4752399 Fixed bug where playbar wasn't showing 2023-02-02 18:26:03 -05:00
EliteMasterEric a598d88152 WIP 2023-02-02 18:08:30 -05:00
EliteMasterEric 39585f9794 WIP on Animate 2023-02-01 16:18:41 -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 e922c026a9 Merge branch 'feature/chart-editor-events' 2023-01-22 20:03:08 -05:00
EliteMasterEric 6d7913786e Working events in chart editor 2023-01-22 19:55:30 -05:00
Cameron Taylor 6ddc735445 2hot stuff in progress wahoo 2023-01-11 00:42:03 -05:00
Cameron Taylor 341d8726b2 PAUSE AND STEPPING WORKING WITH MUSIC 2023-01-06 03:21:54 -05:00
Cameron Taylor 968c5b7a50 can spin wahoo! also merge fixes hehe 2023-01-05 23:37:08 -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
Cameron Taylor 0b24dd537e Merge branch 'freeplay-sort' 2022-12-14 13:55:01 -05:00
Cameron Taylor 4af5905100 better freeplay number 2022-12-14 12:25:12 -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 fbf92acf23 Work on Upload Vocals dialog 2022-12-01 17:32:10 -05:00
Eric Myllyoja 3f6cbb61d4 WIP on new chart wizard 2022-11-25 20:48:05 -05:00
Eric Myllyoja 20ac91bbd9 WIP on splash screen 2022-11-24 19:09:47 -05:00
Eric Myllyoja 7ddfe82dab Polymod fix 2022-11-23 20:52:03 -05:00
Eric Myllyoja 37ae96fba7 Added confirm and AFK animations to BF on freeplay menu 2022-11-15 02:23:44 -05:00
Eric Myllyoja 7190a3b47a Pico flips you off now 2022-11-14 23:30:35 -05:00
Eric Myllyoja 49edef40cc Tried to get spectogram working 2022-11-09 21:33:39 -05:00
Eric Myllyoja 1dac530940 More cursor types 2022-11-08 17:28:09 -05:00
Eric Myllyoja ee89815981 Several QOL features for chart editor, custom cursor logic 2022-11-08 16:32:00 -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
MasterEric fc4f398157 Playbar fixes 2022-10-14 23:01:41 -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