cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-30 18:53:35 +00:00
Code Issues Releases Wiki Activity
2094 commits 30 branches 20 tags 6.8 GiB
Commit graph

764 commits

Author SHA1 Message Date
Cameron Taylor df427c8ecb player vis in progress 2023-11-29 06:17:01 -05:00
Cameron Taylor eea614b4f5 samples stability 2023-11-29 05:49:59 -05:00
Cameron Taylor 73810a5059 Merge branch 'rewrite/master' of https://github.com/funkincrew/funkin-secret into feature/chart-waveform 2023-11-29 04:44:37 -05:00
Cameron Taylor 0899c60e8d Merge pull request #234 from FunkinCrew/polish/welcome-screen 
more info on playbar
 2023-11-29 04:25:11 -05:00
Cameron Taylor 87b1cabbac Merge branch 'rewrite/master' into bugfix/platform-fixes 2023-11-29 01:46:10 -05:00
Cameron Taylor ca9f42fedf waveform in progres 2023-11-29 01:43:59 -05:00
EliteMasterEric 99ed8b94d7 Target the current time change rather than the first one. 2023-11-28 21:44:09 -05:00
EliteMasterEric 90fc00f9bb Additional web fixes, Github CI should be happy now. 2023-11-28 21:19:07 -05:00
EliteMasterEric 9a2f235bed Platform-specific fixes for HTML5 and MacOS 2023-11-28 20:52:45 -05:00
EliteMasterEric ed10d2c5d0 Multiple chart editor bug fixes +tweaks 2023-11-28 20:36:59 -05:00
Cameron Taylor 21b79c0b83 bpm in playbar 2023-11-28 04:30:29 -05:00
Cameron Taylor d9d5744f1e difficulty playbar 2023-11-28 04:05:17 -05:00
Cameron Taylor aee8df4fcb default note snapps 2023-11-27 23:29:48 -05:00
Cameron Taylor e44559d056 last modified 2023-11-27 20:37:10 -05:00
Cameron Taylor 41384ddf0d playtesting fix 2023-11-25 03:50:22 -05:00
Cameron Taylor f3a38e0232 fixing the stop 2023-11-25 02:48:43 -05:00
Cameron Taylor 64a4512980 charting song polish + recents menu fix 2023-11-25 02:18:39 -05:00
EliteMasterEric 290c568cb5 Disable notification actions while playtest is open. 2023-11-24 16:11:53 -05:00
EliteMasterEric a2cee82779 Fixing up a rough Git merge 2023-11-24 00:58:12 -05:00
EliteMasterEric 4e1945b373 Merge remote-tracking branch 'origin/rewrite/master' into bugfix/chart-editor-macro-rework 2023-11-24 00:49:51 -05:00
EliteMasterEric 47f39b072a Convert chart editor to macro-based UIState 2023-11-24 00:42:07 -05:00
EliteMasterEric bab7d6cf53 Reworks to dialogs 2023-11-24 00:41:38 -05:00
Cameron Taylor 811640ef6a Merge branch 'rewrite/master' into feature/chart-editor-backup-popup 2023-11-23 20:08:13 -05:00
Cameron Taylor a2ce1fdd5e opening and selecting specific file 2023-11-23 19:54:34 -05:00
Cameron Taylor 2d33461a24 windows file slash fix for opening folders 2023-11-23 19:48:28 -05:00
Cameron Taylor 645b9b579a don't close backup dialog if opening folder 2023-11-23 18:35:57 -05:00
Cameron Taylor ecdb89c3a6 Merge pull request #228 from FunkinCrew/polish/chart-intro-screen 
Polish/chart intro screen
 2023-11-22 20:45:35 -05:00
Cameron Taylor dbaaf639ac Merge branch 'rewrite/master' into feature/chart-editor-backup-popup 2023-11-22 20:27:37 -05:00
EliteMasterEric 668fbd3b37 Fixes for autosave notification 2023-11-22 20:25:25 -05:00
Cameron Taylor d66141c15a playhead dragging 2023-11-22 19:53:56 -05:00
EliteMasterEric 4ace7c9cf4 Add "Go to Backups" menu item 2023-11-22 19:42:28 -05:00
EliteMasterEric 700ebb6a83 Add action buttons for notifications 2023-11-22 19:41:52 -05:00
EliteMasterEric 97b259d1c2 Finalized backup handling 2023-11-22 19:17:35 -05:00
EliteMasterEric 780220c2d4 Move notification handling into its own class. 2023-11-22 19:16:38 -05:00
Cameron Taylor cdfb3fb172 dialog cursor fix 2023-11-21 18:45:31 -05:00
Cameron Taylor 63f65149f7 skip transition into chart editor 2023-11-21 16:09:13 -05:00
Cameron Taylor 25a66ddbfe open recent on welcome screen 2023-11-21 15:23:24 -05:00
Cameron Taylor 620cd50c1d Chart Editor: Sustain Note polish (#223) 
* light lerp polish on ghost sustains

* small hold fix

* small number tweak

---------

Co-authored-by: Eric <ericmyllyoja@gmail.com>
 2023-11-21 15:10:18 -05:00
Cameron Taylor b121a6bc65 Merge pull request #225 from FunkinCrew/debugging/folder-opening 
open log on debug menu
 2023-11-21 15:10:08 -05:00
EliteMasterEric 27234ddd67 Work in progress on backup popup 2023-11-21 13:31:02 -05:00
Eric 95b43cce55 Several UI tweaks and usability fixes. (#224) 
Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
 2023-11-21 02:12:34 -05:00
Cameron Taylor 98aa59f85a open log on debug menu 2023-11-21 01:37:49 -05:00
Eric e2250b18ff [BUGFIX] Chart Editor Event Handling (#220) 
* Fix a bug causing editing or removal of song events to not happen properly.

* Fix an exception thrown as the application closes.

* Fix an issue with moving events in the chart causing a crash.

---------

Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
 2023-11-21 01:00:06 -05:00
Eric daf1ba85dc Fix crash on completing song after playtesting (#217) 
Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
 2023-11-20 11:27:58 -05:00
Eric a1da5a5758 Bugfix/chart editor fixins (#222) 
* Rewrite crash log file to contain more information

* Detect host platform.

* Suppress shouldHandleCursor spam

* Fix bug where previous song's vocals are kept on new songs

* Fix an issue where note snapping could go negative.

---------

Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
 2023-11-20 11:26:58 -05:00
Eric 421358e069 Nightmare difficulty sprites + a options change (#219) 
* Made song variations array optional (defaulting to empty)

* Add support for animated difficulties in Freeplay menu

* Disable funny music thing; disable flashing nightmare graphic when turned off

* Update assets folder

* assets update

---------

Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
 2023-11-20 11:12:50 -05:00
Eric 4406677be7 Fix character camera offsets embedded in stage data (#218) 
* Make StageDataCharacter attributes mandatory, and remove defaults.

* Update character files

---------

Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
 2023-11-20 10:46:09 -05:00
Eric 260f1bd265 [BUGFIX] Fix an issue where PlayState would crash after the second song. (#216) 
* Ignore blank lines in intro text

* Add a check when trying to render destroyed graphics.

* Persist noteSplash graphic so it isn't destroyed.
 2023-11-20 10:42:23 -05:00
Cameron Taylor 0e21220e24 Merge pull request #215 from FunkinCrew/feature/rebind-debug-keys 
Debug Controls, plus a chart loading fix
 2023-11-16 02:20:53 -05:00
Cameron Taylor 270a527602 Merge branch 'rewrite/master' into bugfix/senpai-naughty 2023-11-16 02:02:08 -05:00
EliteMasterEric 2140158786 Debug controls, plus a chart loading fix 2023-11-16 00:02:42 -05:00
Cameron Taylor 4335e5a4dc Merge branch 'rewrite/master' into bugfix/chart-editor-preview-inst 2023-11-15 21:32:11 -05:00
Cameron Taylor ad345fd834 Merge branch 'rewrite/master' into bugfix/senpai-naughty 2023-11-15 19:52:14 -05:00
Cameron Taylor 38ffc37bb2 Merge branch 'rewrite/master' into bugfix/week-5-scripts 2023-11-15 19:44:45 -05:00
EliteMasterEric 398b2e386e Remove wonky Spectrogram code 2023-11-15 11:30:38 -05:00
Cameron Taylor 16eda2a717 Merge branch 'rewrite/master' into bugfix/chart-editor-preview-inst 2023-11-15 01:14:19 -05:00
Cameron Taylor aecd587ef0 Merge branch 'rewrite/master' into feature/chart-editor-open-recent 2023-11-15 01:10:26 -05:00
EliteMasterEric b8504c8e3a Merge remote-tracking branch 'origin/rewrite/master' into bugfix/senpai-naughty 2023-11-15 00:47:47 -05:00
Cameron Taylor 6b52a4b56b Merge branch 'rewrite/master' into rewrite/bugfix/input-issues 2023-11-14 23:21:35 -05:00
Cameron Taylor e4c248896a Merge branch 'rewrite/master' into feature/chart-editor-haxeui-update 2023-11-14 17:08:38 -05:00
Cameron Taylor 124a400e8b Merge branch 'rewrite/master' into rewrite/bugfix/chart-editor-event-placement 2023-11-14 17:05:07 -05:00
Cameron Taylor 12d5cf796b Merge branch 'rewrite/master' into feature/chart-editor-haxeui-update 2023-11-14 16:10:35 -05:00
Cameron Taylor dbeb2a1a1e Merge branch 'rewrite/master' into bugfix/cleanup 2023-11-14 15:31:54 -05:00
EliteMasterEric c7f35bed5d Fix a bug where completing a song in Preview would mute music. 2023-11-13 18:56:07 -05:00
EliteMasterEric ca3e00c1cd Merge branch 'rewrite/master' into feature/chart-editor-haxeui-update 2023-11-10 16:37:55 -05:00
Cameron Taylor ba5fa6b45e Merge pull request #211 from FunkinCrew/bugfix/overlapping-vocals 
Fix a bug where multiple vocal tracks would play at once
 2023-11-10 14:23:14 -05:00
EliteMasterEric a9dfd4adcf Fix a bug where multiple vocal tracks would play at once 2023-11-09 17:00:46 -05:00
EliteMasterEric 2728f34512 Fix bug where Freeplay random would crash the game 2023-11-07 18:53:50 -05:00
EliteMasterEric 3e1146aadf Fix bug where getDirection didn't work in scripts. 2023-11-07 18:32:00 -05:00
EliteMasterEric ce97a002cb Reorganize a whole bunch of classes and perform syntax cleanup. 2023-11-07 04:04:22 -05:00
EliteMasterEric 21ba81c799 Fix a bug where returning to a week in Story Mode would not play dialog 2023-11-06 17:51:56 -05:00
EliteMasterEric 4833c9bd2e Fix a bug where F5 would crash in Week 6. 2023-11-06 17:51:27 -05:00
EliteMasterEric 071114b6b4 Merge remote-tracking branch 'origin/rewrite/master' into rewrite/bugfix/input-issues 2023-11-06 17:08:25 -05:00
EliteMasterEric 66ae60e9e4 Updated syntax after merge 2023-11-05 01:19:47 -04:00
EliteMasterEric 4f34484689 Use correct location for js.html.Navigator. 2023-11-05 00:26:03 -04:00
EliteMasterEric a0ae4c418d Merge remote-tracking branch 'origin/rewrite/master' into rewrite/bugfix/chart-editor-event-placement 2023-11-05 00:14:44 -04:00
EliteMasterEric de5edb3cc2 Fix variation metadata and error message in 
ChartEditorImportExportHandler
 2023-11-05 00:08:18 -04:00
EliteMasterEric 27de7dc036 Update notification expiry time constant in 
ChartEditorState and ChartEditorDialogHandler
 2023-11-05 00:08:06 -04:00
EliteMasterEric efd29dafbf Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-haxeui-update 2023-11-04 23:51:15 -04:00
Cameron Taylor cf63f7d6b6 Merge branch 'rewrite/master' into feature/chart-editor-new-font 2023-11-04 16:09:34 -04:00
Cameron Taylor 47fd6426a6 Merge branch 'rewrite/master' into rewrite/feature/chart-editor-drag-notes 2023-11-04 15:07:53 -04:00
EliteMasterEric 2b468ad926 Fix issue where changing width of dropdown would cause a crash 2023-11-02 17:40:00 -04:00
EliteMasterEric 0dd9ba7fd2 Fix merge conflicts in FreeplayState 2023-11-01 23:20:47 -04:00
EliteMasterEric 4b92c145b4 Merge remote-tracking branch 'origin/rewrite/master' into bugfix/freeplay-fixins 2023-11-01 23:11:50 -04:00
EliteMasterEric 15ffbf2fe7 Fixed a MacOS-specific issue 2023-11-01 23:09:52 -04:00
EliteMasterEric b9b1461ab5 WIP on refactoring some classes related to controls 2023-10-31 15:30:47 -04:00
EliteMasterEric 73107dbc07 Update HaxeUI cursor handling, and remove Funkin components 2023-10-31 14:43:01 -04:00
EliteMasterEric d5cf9bfc22 New shortcut handler 2023-10-28 19:56:34 -04:00
EliteMasterEric b2dd58b904 Resolve several bugs related to event note placement. 2023-10-27 01:42:05 -04:00
EliteMasterEric eec3ac3ced Clean up several messy chunks of code, and add support for dragging notes and events. 2023-10-26 05:46:22 -04:00
EliteMasterEric 8d875949b9 Clean up several messy chunks of code, and add support for dragging selected notes. 2023-10-26 05:45:53 -04:00
EliteMasterEric e14e6448ac More event type refactors 2023-10-25 01:13:06 -04:00
EliteMasterEric acce2ac811 Move ScriptEventType to its own module. 2023-10-25 01:12:46 -04:00
EliteMasterEric 33a1b81737 Fixes for quicksave 2023-10-24 15:50:02 -04:00
EliteMasterEric a9e253a530 Save handling (with window title!) 2023-10-23 12:22:29 -04:00
EliteMasterEric 8664aed4cc Implement "Open Recent" menu 2023-10-22 15:43:39 -04:00
EliteMasterEric ffd0a98393 FNFC file rework (includes command line quicklaunch) 2023-10-21 01:04:50 -04:00
EliteMasterEric 92785166ef Remove duplicate pushUnique 2023-10-19 01:03:58 -04:00
EliteMasterEric 33644d0c7f Merge branch 'rewrite/master' into bugfix/freeplay-fixins 2023-10-19 00:46:25 -04:00
Cameron Taylor 041b5749d6 Merge pull request #188 from FunkinCrew/rewrite/bugfix/anim-editor-crash-fix 
Hide AnimateAtlas characters in the animation editor.
 2023-10-19 00:44:05 -04:00