1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-29 10:13:32 +00:00
Commit graph

98 commits

Author SHA1 Message Date
EliteMasterEric 6d5c5f5acb Refactor InitState plus fix a couple crash bugs 2023-06-26 20:39:47 -04:00
EliteMasterEric 0fac918428 Reworked anti-aliasing code (sprites now default to true) 2023-06-25 12:36:00 -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
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 4dcdca51ae Fix camera issue with stickers 2023-06-09 16:54:13 -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
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 e68f9ca9a1 Validated formatting of 203 HX files. 2023-06-08 16:30:45 -04:00
EliteMasterEric 1d3c4d61a6 Syntax fixes to get the branch to build 2023-06-06 17:38:31 -04:00
EliteMasterEric c9fb6bc51f Further typo fixes 2023-06-02 15:25:13 -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 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