1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-27 07:27:12 +00:00
Commit graph

1134 commits

Author SHA1 Message Date
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 6412cb3aee Fix bug where story mode breaks after first playthrough 2023-05-30 16:21:12 -04:00
EliteMasterEric 2af4a51b15 Merge branch 'master' into feature/split-vocals 2023-05-25 18:39:41 -04:00
EliteMasterEric 317c127730 Deprecation warning fixes (no actual logic changes tho) 2023-05-25 18:33:39 -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 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
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 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
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 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 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
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
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 49edef40cc Tried to get spectogram working 2022-11-09 21:33:39 -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
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
Cameron Taylor 1a1ac2a866 timing stuff all nice XD 2022-09-22 16:21:31 -04:00
Cameron Taylor 46c15e76f1 colors and numbers teehee 2022-09-22 04:09:06 -04:00
Eric Myllyoja 3597b09a46 Finished song data loader 2022-09-16 15:37:00 -04:00
Eric Myllyoja 51a7282d40 Merge remote-tracking branch 'origin/note-redux' into feature/chart-editor 2022-09-14 22:28:04 -04:00
Cameron Taylor 43b952b321 char input haxeUI stuff 2022-09-08 16:39:31 -04:00
Cameron Taylor e15815afa8 initial haxeui for character offset editor 2022-09-08 04:03:50 -04:00
Eric Myllyoja 3a085e9333 Combo counter tweaks, stage position tweaks 2022-09-08 02:48:51 -04:00
Eric Myllyoja baab8e101f Stage builder improvements, Weekend 1 stage 2022-09-08 01:09:22 -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 31487c0a32 Logic for double cans, partial implementation of cans into 2hot 2022-08-27 02:02:29 -04:00
Cameron Taylor aaf1376b53 stage editor Y key fix (and streets repositioning) 2022-08-25 05:18:09 -04:00
Cameron Taylor 8f4855852e BASE PROTOTYPE WORKING W/ HaxeUI 2022-08-24 05:44:22 -04:00
Cameron Taylor f3e0b0ec5b input accuracy testing 2022-07-12 19:02:38 -04:00
Eric Myllyoja 705d0ed5b9 Updated hmm deps, no more forks! 2022-06-12 00:02:49 -04:00
Cameron Taylor 769969898b camera positioning fixes 2022-05-01 15:20:15 -04:00
Cameron Taylor 992ff442c0 evil senpai hehe 2022-05-01 15:02:51 -04:00
Cameron Taylor d12f0dc7b9 rough senpai repositioning 2022-05-01 14:59:18 -04:00
Cameron Taylor 8231f432ff can move the characters around, and some pos fixes 2022-05-01 14:52:58 -04:00
Cameron Taylor a5857313c5 prototype character mover thing lol 2022-04-30 00:37:05 -04:00
Cameron Taylor 282e93e1ff character repositioning proof of concept stuf 2022-04-29 23:46:41 -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 b6da0b5e20 Fixed Week 4 boppers and car. 2022-04-18 19:36:09 -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 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
Eric Myllyoja 49b2907a30 Scripted module and script event systems, reworked strumlines. 2022-03-11 01:30:01 -05:00
Eric Myllyoja 404b2b648e Modified every file in the codebase to solve a single bug. 2022-03-08 03:13:53 -05:00