Commit graph

202 commits

Author SHA1 Message Date
EliteMasterEric
214c706cac Fix a story menu crash 2023-08-10 14:03:57 -04:00
EliteMasterEric
de6972cb90 Fix issue where stage wasn't loaded properly, and metronome would play in song preview. 2023-08-09 18:11:50 -04:00
EliteMasterEric
92e94a84b6 Fix a bug where returning to title displays a black screen. 2023-08-08 16:41:23 -04:00
EliteMasterEric
ea31d72cbe AttractState now properly plays the trailer 2023-08-08 16:37:17 -04:00
EliteMasterEric
ec76c54ccd Implement basic AttractState. 2023-08-08 15:41:48 -04:00
EliteMasterEric
3f99e0e3da Move TitleState into its own package. 2023-08-08 15:41:25 -04:00
EliteMasterEric
b9c25d6ed9 Fix crashing, broken countdown, broken miss muting in song preview 2023-08-04 17:25:13 -04:00
EliteMasterEric
a0a8d47216 Imported music now plays properly in chart editor state 2023-08-04 16:15:07 -04:00
EliteMasterEric
4852515c42 Fix bug where pressing ENTER in UI would cause song to try to preview. Fix bug where trying to preview a newly created song would crash. 2023-08-04 11:18:00 -04:00
EliteMasterEric
3a31c9731c Fixed several bugs with Play State (mostly restarting the song) 2023-08-02 18:08:49 -04:00
EliteMasterEric
0136202c36 Janky fix 2023-08-02 10:15:54 -04:00
EliteMasterEric
005ffafe23 Merge remote-tracking branch 'origin/master' into feature/chart-editor-song-preview 2023-08-01 16:03:34 -04:00
EliteMasterEric
979a5ad493 Merge branch 'master' into feature/chart-editor-bpm 2023-08-01 14:08:41 -04:00
EliteMasterEric
d0ef34ced6 Merge branch 'master' into feature/new-input-system-yay 2023-07-26 22:00:14 -04:00
EliteMasterEric
b974e6d6d7 Fix issues with playtest and backwards time travel 2023-07-26 21:34:38 -04:00
EliteMasterEric
2048e65bf2 Added ability to start song at a specific timestamp 2023-07-26 20:03:31 -04:00
EliteMasterEric
5ff546bacc First iteration of song playtesting from editor! 2023-07-26 16:52:58 -04:00
EliteMasterEric
a6daf3b0d6 Resolved lag issues caused by creating too many notes in the pool. 2023-07-25 23:11:12 -04:00
Cameron Taylor
211ccc2e47 Merge pull request #107 from FunkinCrew/feature/offset-editor-tweaks
Tweaks and improvements to the animation editor
2023-07-24 16:26:04 -04:00
EliteMasterEric
3c218ec01c Done with BPM change fixes, currently working on rendering efficiency 2023-07-22 20:16:43 -04:00
Cameron Taylor
85af96d654 Merge branch 'master' into feature/chart-editor-importer 2023-07-22 14:43:05 -04:00
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
ce0be2374d Event notes have different sprites for each type. 2023-07-19 01:29:13 -04:00
EliteMasterEric
16bcf2c767 Rework note sprites to pull note style data 2023-07-13 20:27:45 -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
24c9786166 Merge branch 'master' into feature/new-input-system-yay 2023-07-10 18:16:16 -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
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
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
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
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
338342ad5e Tweaks and improvements to the animation editor 2023-06-13 17:13:14 -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
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
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
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
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