Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-12-04 13:21:25 -05:00
Code Issues Projects Releases Packages Wiki Activity
3265 commits 30 branches 20 tags 3 GiB
Commit graph

1418 commits

Author SHA1 Message Date
Cameron Taylor
92f45d93aa pixel icons 2023-10-09 18:09:59 -04:00
Cameron Taylor
8052773f92 comment 2023-10-09 18:09:25 -04:00
Cameron Taylor
ee7108757b proper fav and # symbol move 2023-10-09 18:09:24 -04:00
Cameron Taylor
9c641f9e90 tabbing movement 2023-10-09 18:09:24 -04:00
Cameron Taylor
c469d4b7c0 regexp filter 2023-10-09 18:09:24 -04:00
Cameron Taylor
ce2e6a3993 proper letter stuff 2023-10-09 18:09:24 -04:00
Cameron Taylor
e618fbc64f bouncing thingie 2023-10-09 18:09:23 -04:00
Cameron Taylor
c2f46309ab arrow and seperator back in 2023-10-09 18:09:20 -04:00
Cameron Taylor
11ffc62238 new letters 2023-10-09 18:08:13 -04:00
Cameron Taylor
f460af1ba0 positioning stuff 2023-10-09 18:05:01 -04:00
Cameron Taylor
dc452bbe9a different colors / sizes 2023-10-09 18:05:01 -04:00
Cameron Taylor
eb87d40d58 random capsule in progres 2023-10-09 18:04:50 -04:00
Cameron Taylor
65422393cf letter sort 2023-10-09 18:04:28 -04:00
Cameron Taylor
84f908fbde tween in fixed 2023-10-09 18:04:28 -04:00
Cameron Taylor
9571eb70e0 scaling of capsules 2023-10-09 18:04:28 -04:00
Cameron Taylor
7ac2e91c8d selected in middle-ish 2023-10-09 18:04:28 -04:00
EliteMasterEric
5ae2bc814b Fix issue causing crash on F5 2023-10-09 15:35:50 -04:00
EliteMasterEric
e967b1e7f3 Fix vocals not changing when switching difficulties. 2023-10-09 14:19:52 -04:00
EliteMasterEric
74b925d2c6 Assert the difficulty exists (and throw an error if it doesn't) before performing reset. 2023-10-09 14:13:14 -04:00
EliteMasterEric
4b23eaea59 Merge remote-tracking branch 'origin/rewrite/master' into rewrite/feature/chart-editor-erect-template 2023-10-09 12:15:05 -04:00
Cameron Taylor
5617f8f63e Merge pull request #165 from FunkinCrew/rewrite/feature/chart-editor-variation-button 
Chart Editor: Add Variation Button
 2023-10-09 05:20:11 -04:00
Cameron Taylor
9fe74d719b Merge pull request #175 from FunkinCrew/rewrite/bugfix/hold-note-scoring 
Fix a bug where hold notes wouldn't grant score
 2023-10-09 05:19:17 -04:00
EliteMasterEric
7a1a2e1ab4 Correct FunkinDropDown capitalization 2023-10-08 22:09:09 -04:00
EliteMasterEric
e33c825a1f Merge branch 'rewrite/master' into rewrite/feature/chart-editor-variation-button 2023-10-06 23:11:11 -04:00
EliteMasterEric
7c653a9e9b Merge branch 'rewrite/master' into rewrite/feature/chart-editor-wasd 2023-10-06 22:54:12 -04:00
EliteMasterEric
4a4708fe23 That is the fastest I have ever fixed a bug holy shit. 2023-10-06 11:42:39 -04:00
EliteMasterEric
5931345c71 Rewrite precise inputs to work on gamepad 2023-10-05 02:21:01 -04:00
EliteMasterEric
380d30d63f Rewrote code for preferences to use Save data. 2023-10-04 11:40:55 -04:00
EliteMasterEric
490b2f18d0 Rewrite save data functionality (now with type safety and migration) 2023-10-03 19:14:46 -04:00
EliteMasterEric
b6752531bf Add chart editor theme 2023-09-29 22:29:32 -04:00
EliteMasterEric
6c99f7161d Working Input Style, note snapping in menu, W/S to scroll 2023-09-29 21:49:07 -04:00
EliteMasterEric
8580cf1640 Snapped/unsnapped pasting, plus fixes for selection box and event rendering. 2023-09-26 20:36:41 -04:00
EliteMasterEric
2fcb906edf Fixed volume sliders, Load Instrumental button, and fixed hitsounds. 2023-09-26 17:46:07 -04:00
EliteMasterEric
be4fd74d40 Resolve metadata loading issues. 2023-09-25 23:24:18 -04:00
EliteMasterEric
42bb50882d "Add Variation" button, SongMetadata format changes, bug fixes, resolve metadata loading issues. 2023-09-25 23:24:07 -04:00
EliteMasterEric
dc728133d1 Merge remote-tracking branch 'origin/master' into feature/chart-editor-performance-revamp 2023-09-20 19:41:17 -04:00
Cameron Taylor
cbbdba031d Merge pull request #150 from FunkinCrew/bugfix-squash/song-data-parser-rework 
Chart Editor: Song Data Parser Rework
 2023-09-19 19:54:28 -04:00
Cameron Taylor
f6bcd8bf05 Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret into feature/chart-note-snapping-ui 2023-09-19 19:25:42 -04:00
Cameron Taylor
a2e43b8e4e Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret into feature/ghost-hold-notes 2023-09-19 19:16:02 -04:00
EliteMasterEric
86c105aff8 Merge remote-tracking branch 'origin/master' into bugfix-squash/song-data-parser-rework 2023-09-18 21:58:22 -04:00
EliteMasterEric
29c22a422f Fixed a JSON parser issue causing event data to be parsed wrong! 2023-09-18 20:14:43 -04:00
EliteMasterEric
06269e95fd Fix to crash in freeplay (swapped two args oops!) 2023-09-18 20:02:17 -04:00
EliteMasterEric
b56768d9b5 Fix an issue where the game would try and fail to load metadata for a newly created song in the Chart Editor. 2023-09-18 17:59:55 -04:00
EliteMasterEric
0d84559606 HTML5 should build now 2023-09-18 17:19:31 -04:00
EliteMasterEric
09b03efeea Merge branch 'master' into bugfix/chart-editor-null-safety 2023-09-18 16:52:47 -04:00
Cameron Taylor
35239909d0 woops fix conditional 2023-09-18 15:48:40 -04:00
Cameron Taylor
446dc30277 Merge branch 'master' into bugfix-squashed/macos-file-browse 2023-09-18 15:40:52 -04:00
EliteMasterEric
8dd07d2763 I discovered a new profiling tool and stayed up until 5 AM optimizing shit. 2023-09-13 14:51:12 -04:00
Cameron Taylor
5d7efcd6b9 Merge pull request #142 from FunkinCrew/bugfix/chart-editor-playbar-buttons 
Fixed a bug where the playbar buttons wouldn't work
 2023-09-13 00:09:37 -04:00
Cameron Taylor
fc3d2a17b6 Merge pull request #143 from FunkinCrew/feature/chart-editor-snap 
Chart Editor: Configure Snapping (+ important bug fix!)
 2023-09-12 23:56:05 -04:00
EliteMasterEric
b42e4ceb67 Fix cursor modes on toolboxes. 2023-09-12 23:37:07 -04:00
EliteMasterEric
257fa2da6a Remove old Notifbar code 2023-09-12 23:31:38 -04:00
Cameron Taylor
2b3f99547a Merge pull request #144 from FunkinCrew/feature/chart-editor-beat-lines 
Darkened beat dividers on chart grid.
 2023-09-12 22:41:46 -04:00
Cameron Taylor
ff34771ca3 Merge branch 'master' into feature/chart-editor-file-keybinds 2023-09-12 22:37:37 -04:00
Cameron Taylor
e02dee2601 fixed N -> O typo? 2023-09-12 22:34:49 -04:00
Cameron Taylor
b4042dba8c Merge pull request #155 from FunkinCrew/bugfix/story-menu-background 
Bugfixes: Story Menu Visuals
 2023-09-12 22:29:39 -04:00
EliteMasterEric
a02058b260 Merge branch 'feature/improved-cursor' into develop 2023-09-12 19:52:08 -04:00
EliteMasterEric
7083f6e7ce Additional cursor and playbar fixes. 2023-09-12 19:43:19 -04:00
EliteMasterEric
fa28932dea Implementing custom cursor modes for better interface readability. 2023-09-12 19:42:39 -04:00
EliteMasterEric
82a6549075 Merge remote-tracking branch 'origin/master' into feature/chart-editor-file-keybinds 2023-09-12 18:53:06 -04:00
EliteMasterEric
71e1fccce1 Merge remote-tracking branch 'origin/master' into bugfix/chart-editor-playbar-buttons 2023-09-12 18:51:16 -04:00
EliteMasterEric
1acb048930 Merge remote-tracking branch 'origin/bugfix/story-menu-background' into develop 2023-09-12 02:37:02 -04:00
EliteMasterEric
aa1ca65c35 Fix issue where title text wasn't displaying properly. 2023-09-12 01:17:15 -04:00
EliteMasterEric
acdb44703c Merge remote-tracking branch 'origin/bugfix/story-menu-background' 2023-09-12 01:06:35 -04:00
EliteMasterEric
2f16b9af96 Merge remote-tracking branch 'origin/feature/chart-editor-snap' into develop 2023-09-12 01:02:08 -04:00
EliteMasterEric
a63246ff51 Remove notification on snapping change. 2023-09-12 00:25:05 -04:00
EliteMasterEric
74bd9084b6 Merge remote-tracking branch 'origin/feature/ghost-hold-notes' into develop 2023-09-11 19:42:25 -04:00
EliteMasterEric
abcec3c5f6 Render a ghost hold note when dragging to place (plus fix for hold notes on different note quants) 2023-09-11 19:42:10 -04:00
EliteMasterEric
430c937811 Merge remote-tracking branch 'origin/feature/chart-editor-snap' into develop 2023-09-11 18:29:29 -04:00
EliteMasterEric
d3f5a81b13 Fix a bug where ghost note would be properly snapped but placed note would not. 2023-09-11 18:29:08 -04:00
EliteMasterEric
1524f6a96e Merge branch 'bugfix-squashed/macos-file-browse' into develop 2023-09-11 17:52:04 -04:00
EliteMasterEric
2dad5953fd I hope someone got fired for that blunder. 2023-09-11 17:42:46 -04:00
EliteMasterEric
2ea030d5a2 Merge remote-tracking branch 'origin/bugfix-squash/playbar-scrollarea-height' into HEAD 2023-09-08 18:25:40 -04:00
EliteMasterEric
1acce31123 Merge remote-tracking branch 'origin/feature/chart-note-snapping-ui' into HEAD 2023-09-08 18:25:20 -04:00
EliteMasterEric
a3e3341a1a Merge branch 'bugfix-squash/chart-editor-template-bpm' into HEAD 2023-09-08 18:24:21 -04:00
EliteMasterEric
ef1cb10bb3 Merge remote-tracking branch 'origin/bugfix-squash/song-data-parser-rework' into HEAD 2023-09-08 18:23:55 -04:00
EliteMasterEric
e8952d101a Merge remote-tracking branch 'origin/bugfix-squashed/macos-file-browse' into HEAD 2023-09-08 18:23:01 -04:00
EliteMasterEric
acadec80de Merge remote-tracking branch 'origin/feature/chart-editor-file-keybinds' into HEAD 2023-09-08 18:21:25 -04:00
EliteMasterEric
15741843fc Merge remote-tracking branch 'origin/feature/chart-editor-beat-lines' into HEAD 2023-09-08 18:21:08 -04:00
EliteMasterEric
f46c8821c8 Merge remote-tracking branch 'origin/feature/chart-editor-snap' into HEAD 2023-09-08 18:20:52 -04:00
EliteMasterEric
f8ae4b2a62 Merge remote-tracking branch 'origin/bugfix/chart-editor-playbar-buttons' into HEAD 2023-09-08 18:20:46 -04:00
EliteMasterEric
ee900fd7aa Merge branch 'bugfix/chart-editor-null-safety' into HEAD 2023-09-08 18:20:25 -04:00
EliteMasterEric
c24fa3c154 Fix issue where playbar scroll area wasn't scaled to the grid. 2023-09-08 18:07:08 -04:00
EliteMasterEric
7a161e4cec Improved UI for note snapping (and notif on difficulty change) 2023-09-08 18:04:25 -04:00
EliteMasterEric
8431e18d37 Fixed issue where ChartEditorState was not copying SongMetadata properly 2023-09-08 18:00:48 -04:00
EliteMasterEric
f4bc682ea1 Remove funkin.play.song.SongData and refactor app to match. 2023-09-08 17:46:44 -04:00
EliteMasterEric
7e1c11bb25 New song data parser 2023-09-08 17:45:47 -04:00
EliteMasterEric
2c3e513d5b Fixed bugs with saving charts on Mac 
Added FILE_DROP_SUPPORTED compilation flag and edited UI text to match.
 2023-09-08 17:41:20 -04:00
Cameron Taylor
96a0b2fe87 Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret into feature/chart-editor-snap 2023-09-04 23:30:02 -04:00
Cameron Taylor
222b364e75 Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret into feature/chart-editor-beat-lines 2023-09-04 23:28:18 -04:00
Cameron Taylor
f87a8ef412 Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret into bugfix/chart-editor-null-safety 2023-09-04 22:27:16 -04:00
Eric
bb09cc19e7 HTML5: Several fixes to asset loading (#136) 
* Update Polymod to fix async script loading.

* Got into the Main Menu but playstate doesn't work

* Got into PlayState but GF script breaks!

---------

Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
 2023-09-04 22:18:45 -04:00
EliteMasterEric
2b092abd8a Added missing File menu keybinds 2023-09-04 15:33:08 -04:00
EliteMasterEric
3a47eed3b9 Darkened beat dividers on chart grid. 2023-09-01 00:56:10 -04:00
EliteMasterEric
97b640f30b Note snapping yay! 2023-08-31 23:48:15 -04:00
EliteMasterEric
2f26a97dcb WIP on chart editor snapping 2023-08-31 21:56:49 -04:00
EliteMasterEric
bc5b34cdd2 Fixed a bug where the playbar buttons wouldn't work while the cursor was over the UI. 2023-08-31 19:14:01 -04:00
EliteMasterEric
c813e23203 Merge remote-tracking branch 'origin/master' into bugfix/chart-editor-null-safety 2023-08-31 18:47:31 -04:00
EliteMasterEric
c78c6439a6 Filled out null safety checks. 2023-08-31 18:47:23 -04:00
Eric
279277b18c Unit Tests: Coverage Reporting and Github Actions Integration (#131) 
* Initial test suite

* Fix some build warnings

* Implemented working unit tests with coverage

* Reduced some warnings

* Fix a mac-specific issue

* Add 2 additional unit test classes.

* Multiple new unit tests

* Some fixins

* Remove auto-generated file

* WIP on hiding ignored tests

* Added list of debug hotkeys

* Remove old website

* Remove empty file

* Add more unit tests

* Fix bug where arrows would nudge BF

* Fix bug where ctrl/alt would flash capsules

* Fixed bug where bf-old easter egg broke

* Remove duplicate lines

* More test-related stuff

* Some code cleanup

* Add mocking and a test assets folder

* More TESTS!

* Update Hmm...

* Update artist on Monster

* More minor fixes to individual functions

* 1.38% unit test coverage!

* Even more tests? :O

* More unit test work

* Rework migration for BaseRegistry

* gameover fix

* Fix an issue with Lime

* Fix issues with version parsing on data files

* 100 total unit tests!

* Added even MORE unit tests!

* Additional test tweaks :3

* Fixed tests on windows by updating libraries.

* A bunch of smaller syntax tweaks.

* New crash handler catches and logs critical errors!

* Chart editor now has null safety enabled.

* Null safety on all tests

* New Level data test

* Generate proper code coverage reports!

* Disable null safety on ChartEditorState for unit testing

* Update openfl to use latest fixes for crash reporting

* Added unit test to Github Workflow

* Updated unit tests to compile with null safety enabled by inlining assertions.

* Added coverage gutters as a recommended extension

* Impreovements to tests involving exceptions

* Disable a few incomplete tests.

* Add scripts for building unit coverage reports on linux

---------

Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
 2023-08-30 18:31:59 -04:00
Eric
3828179218 Chart Editor: Several bug fixes (#139) 
* Fix a crash bug caused by unhandled null value.

* Fix bug where note preview wouldn't update on song load

* Fix note preview not updating when loading inst, fixed BF health icon positioning
 2023-08-30 18:29:09 -04:00
EliteMasterEric
e157c23ea7 Apply @:nullSafety to chart editor classes. 2023-08-30 02:24:35 -04:00
Eric
cb81371b4a Fix an occasional bug where "default" will be used over "" causing a crash on song load. (#135) 2023-08-28 15:07:51 -04:00
Eric
21f44edf1d New crash handler + Additional null safety for ChartEditorState (#130) 
* A bunch of smaller syntax tweaks.

* New crash handler catches and logs critical errors!

* Chart editor now has null safety enabled.

* Fix -W build issue.

* Actually update hmm.json to use the crash handling branch

* Fix issues causing crash handler to trigger
 2023-08-28 15:03:29 -04:00
Eric
74dac9d830 Fix a story mode bug where charts would sometimes not be loaded for the second and third song. (#134) 2023-08-22 23:18:37 -04:00
Eric
235969e9a7 Fixed an issue where the Week 6 countdown was anti-aliased. (#133) 2023-08-22 22:45:58 -04:00
Eric
42d8d55067 Unit Test Suite (#119) 
* Initial test suite

* Fix some build warnings

* Implemented working unit tests with coverage

* Reduced some warnings

* Fix a mac-specific issue

* Add 2 additional unit test classes.

* Multiple new unit tests

* Some fixins

* Remove auto-generated file

* WIP on hiding ignored tests

* Added list of debug hotkeys

* Remove old website

* Remove empty file

* Add more unit tests

* Fix bug where arrows would nudge BF

* Fix bug where ctrl/alt would flash capsules

* Fixed bug where bf-old easter egg broke

* Remove duplicate lines

* More test-related stuff

* Some code cleanup

* Add mocking and a test assets folder

* More TESTS!

* Update Hmm...

* Update artist on Monster

* More minor fixes to individual functions

* 1.38% unit test coverage!

* Even more tests? :O

* More unit test work

* Rework migration for BaseRegistry

* gameover fix

* Fix an issue with Lime

* Fix issues with version parsing on data files

* 100 total unit tests!

* Added even MORE unit tests!

* Additional test tweaks :3

* Fixed tests on windows by updating libraries.

* Set versions for flixel-ui and hamcrest

---------

Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
 2023-08-22 04:27:30 -04:00
Cameron Taylor
ab34bbdcee Merge pull request #129 from FunkinCrew/feature/chart-editor-note-graph 
Chart Editor: Note Preview Graph
 2023-08-16 04:14:12 -04:00
Cameron Taylor
280ecc2003 Merge pull request #128 from FunkinCrew/feature/chart-editor-difficulty-stuff 
Chart Editor: Difficulty tweaks and bug fixes
 2023-08-16 04:12:07 -04:00
EliteMasterEric
a548a43759 Note preview graph renders nicely and is fully interactable! 2023-08-16 03:40:44 -04:00
Cameron Taylor
db9f7f503f Merge branch 'master' into bugfix/attract-screen 2023-08-15 22:10:22 -04:00
EliteMasterEric
8732adc144 Difficulty selection now updates metadata toolbox 2023-08-15 16:08:12 -04:00
EliteMasterEric
d03a2f0157 WIP on improving the difficulty toolbox 2023-08-14 23:13:12 -04:00
EliteMasterEric
c6a1f5ffea Work on fixing issues with difficulty/variation handling in charts 2023-08-11 14:00:38 -04:00
EliteMasterEric
68c85d9214 Made the currently-unused Divisions field optional. 2023-08-10 15:34:40 -04:00
EliteMasterEric
6096f12307 Fix an issue where new songs on specific stages would crash 2023-08-10 14:21:10 -04:00
EliteMasterEric
2226f1f05e Fix an issue where tracknames weren't loading properly 2023-08-10 14:04:09 -04:00
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
34abee594d Fix bug where onUpdate was called twice per frame 2023-08-09 18:11:19 -04:00
EliteMasterEric
859b543118 Merge branch 'bugfix/play-state-fix' into feature/chart-editor-song-preview 2023-08-09 17:53:25 -04:00
EliteMasterEric
3e02f7fca9 Fix a bug where beatState sometimes gets called before create 2023-08-09 00:28:09 -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
b7f5f33f3e Delete ancient VideoState. 2023-08-08 15:42:15 -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
3e093510af Fixed a bug where beat hit events were called multiple times during the conductor 2023-08-04 12:35:01 -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
13671cf290 Make sure timestamps are consistent with use of Int64. 2023-08-04 11:13:41 -04:00
EliteMasterEric
49622f2441 Fix build issues caused by int64 handling 2023-08-03 22:22:29 -04:00
EliteMasterEric
5590331e10 Fix HTML typing issue 2023-08-03 12:41:54 -04:00
EliteMasterEric
29466af4b7 Fix issue where strumline would stay pressed when resetting. 2023-08-03 12:19:36 -04:00
EliteMasterEric
050086fb36 Fixed camera focus on game over. 2023-08-03 11:40:19 -04:00
Cameron Taylor
5bbf279208 gameover fix 2023-08-03 11:22:52 -04:00
EliteMasterEric
3a31c9731c Fixed several bugs with Play State (mostly restarting the song) 2023-08-02 18:08:49 -04:00
EliteMasterEric
b54c335886 Fix for Menu->Freeplay and Play->Pause transitions 2023-08-02 11:00:23 -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
639a36a9c7 Fix some weird issues with constants 2023-08-01 15:29:17 -04:00
EliteMasterEric
9b66bc186a alphabetical -> alphabetically 2023-08-01 15:25:46 -04:00
EliteMasterEric
979a5ad493 Merge branch 'master' into feature/chart-editor-bpm 2023-08-01 14:08:41 -04:00
Cameron Taylor
d750af4396 directory fix and hmm lock 2023-07-31 15:40:47 -04:00
EliteMasterEric
624d4f5111 Fix asset redirection 2023-07-31 15:04:18 -04:00
EliteMasterEric
c0745d4ad7 Hide warning 2023-07-31 14:08:48 -04:00
EliteMasterEric
4e67791249 Vwoosh notes on reset 2023-07-31 13:42:13 -04:00
EliteMasterEric
92a0c367b7 Typo fixes 2023-07-31 13:31:17 -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
03444161e8 Merge branch 'feature/new-input-system-yay' into feature/chart-editor-song-preview 2023-07-26 20:03:37 -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
EliteMasterEric
6af5259a10 Fix an issue where sustain sprites were not killed when the song was reset. 2023-07-25 21:39:19 -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
Cameron Taylor
e21511bc13 Merge pull request #108 from FunkinCrew/feature/chart-editor-importer 
Chart editor legacy importer
 2023-07-22 22:48:43 -04:00
Cameron Taylor
cd2f0d840d Merge pull request #115 from FunkinCrew/feature/asset-redirect-2 
Asset redirecting
 2023-07-22 22:48:09 -04:00
EliteMasterEric
3c218ec01c Done with BPM change fixes, currently working on rendering efficiency 2023-07-22 20:16:43 -04:00
Cameron Taylor
f634a099c3 actual songdata git merge proper lol 2023-07-22 14:43:28 -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
ae76b24a65 New time calculation functions 2023-07-19 01:30:23 -04:00
EliteMasterEric
adda3020a9 Alphabetical sort 2023-07-19 01:29:43 -04:00
EliteMasterEric
ce0be2374d Event notes have different sprites for each type. 2023-07-19 01:29:13 -04:00
EliteMasterEric
d251d71daa Asset redirect 2023-07-17 21:54:58 -04:00
EliteMasterEric
16bcf2c767 Rework note sprites to pull note style data 2023-07-13 20:27:45 -04:00
EliteMasterEric
ba53957191 Fixed an issue where dialogue scripts were not being reloaded 2023-07-13 20:26:56 -04:00
EliteMasterEric
00cfeeff72 Created the Note Style class and data registry 2023-07-13 20:25:44 -04:00
EliteMasterEric
883ab87931 Moved AnimationData into the data package 2023-07-13 20:25:01 -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
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
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
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
085cc45253 cute hearts 2022-09-28 03:40:51 -04:00
Cameron Taylor
9c2efc4d0e fav in progress 2022-09-28 02:50:53 -04:00
Cameron Taylor
bbdd750d3b hold infinite scroll stuff 2022-09-27 04:53:34 -04:00
Cameron Taylor
4918c4f645 alphabetical sorting stuuuuf 2022-09-27 04:37:42 -04:00
Cameron Taylor
09a037b20b basic sort and search 2022-09-26 18:22:45 -04:00
MasterEric
8a2e4687b2 Fixed TitleState not firing onBeat 2022-09-26 17:18:19 -04:00
Eric Myllyoja
679ca4aafb Tweaks to song events 2022-09-24 15:02:10 -04:00
MasterEric
7b71fc2dff Merge remote-tracking branch 'origin/note-redux' into feature/chart-editor 2022-09-24 01:29:53 -04:00
MasterEric
cdc23f0809 Working new chart format (not working everything else :') ) 2022-09-24 01:28:39 -04:00
Cameron Taylor
182c7e3aa4 new highscore thingie 2022-09-23 16:28:17 -04:00
Cameron Taylor
4eb1b5bb78 quick and dirty new highscore check 2022-09-23 16:12:18 -04:00
Cameron Taylor
84b5c9e0fd score popin thingie 2022-09-23 15:42:12 -04:00
Cameron Taylor
58fe9c8f8c got g-friend codeed 2022-09-23 14:26:50 -04:00
Eric Myllyoja
bb5ed65d27 Further conductor/bpm stuff 2022-09-23 00:49:42 -04:00
Cameron Taylor
1a1ac2a866 timing stuff all nice XD 2022-09-22 16:21:31 -04:00
Cameron Taylor
becef12c9f positioning enough... 2022-09-22 15:48:27 -04:00
Eric Myllyoja
9ebb566b2a WIP on conductor rework 2022-09-22 06:34:03 -04:00
Cameron Taylor
46c15e76f1 colors and numbers teehee 2022-09-22 04:09:06 -04:00
Cameron Taylor
8cd96a7b0d difficulties 2022-09-21 21:03:31 -04:00
Cameron Taylor
6b0e009b05 boom box stuff for results XD 2022-09-21 20:26:16 -04:00
Cameron Taylor
3f42d22d5b name change stuff and some placements 
also commit lol!
 2022-09-21 18:01:48 -04:00
Cameron Taylor
3d8d5ebdec Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret 2022-09-20 15:53:57 -04:00
Cameron Taylor
7c0c09775a results ending variations 2022-09-20 13:18:40 -04:00
Cameron Taylor
37267dd7e2 songs in progres 2022-09-20 13:01:37 -04:00
Cameron Taylor
afa1a9d13c better combo stuf 2022-09-20 02:37:43 -04:00
Cameron Taylor
1dbb4099ec basic result screen in progress counting tallies 2022-09-20 02:16:12 -04:00
Cameron Taylor
f70b581bf8 song event trace prototype 2022-09-17 05:51:21 -04:00
Cameron Taylor
f47e67e073 event parsing prototyping 2022-09-17 05:38:45 -04:00
Eric Myllyoja
7fbdbcdfad Fix merge issues 2022-09-16 15:38:36 -04:00
Eric Myllyoja
79751222e1 Merge remote-tracking branch 'origin/note-redux' into feature/chart-editor 2022-09-16 15:38:19 -04:00
Eric Myllyoja
3597b09a46 Finished song data loader 2022-09-16 15:37:00 -04:00
Cameron Taylor
f07d172219 data stuff moved OUT of Note.hx! 2022-09-16 01:44:50 -04:00
Eric Myllyoja
848874eaac Fix merge conflicts 2022-09-14 22:28:37 -04:00
Eric Myllyoja
51a7282d40 Merge remote-tracking branch 'origin/note-redux' into feature/chart-editor 2022-09-14 22:28:04 -04:00
Eric Myllyoja
194d8e6ce6 WIP on song data loading 2022-09-13 01:09:30 -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
f790cd8fd6 WIP 2022-09-06 00:59:54 -04:00
Eric Myllyoja
7c88032551 More code for Blazin, additional shaders 2022-09-03 22:21:54 -04:00
Eric Myllyoja
c26b3a828d First work in progress for Blazin 2022-08-31 02:24:09 -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
36e6d6bd91 fft... 2022-08-26 16:46:58 -04:00
Cameron Taylor
07fb4039dc dipshit FFT fixing in progress... 2022-08-26 16:46:48 -04:00
Cameron Taylor
eaab159c73 lit-up on street stage 2022-08-25 20:15:50 -04:00
Cameron Taylor
aaf1376b53 stage editor Y key fix (and streets repositioning) 2022-08-25 05:18:09 -04:00
Cameron Taylor
59aae9c3d9 storymenu stuff for now 🤝 2022-08-25 01:40:39 -04:00
Cameron Taylor
831626a156 stuff for storymenu 2022-08-25 01:35:47 -04:00
Cameron Taylor
8f4855852e BASE PROTOTYPE WORKING W/ HaxeUI 2022-08-24 05:44:22 -04:00
Eric Myllyoja
2bef1cb88a Adjusted firing streak and angle. 2022-08-22 21:55:30 -04:00
Cameron Taylor
3be4530fa5 code in place for story week 2022-08-22 20:18:54 -04:00
Eric Myllyoja
fe9a319814 Latest WIP on Weekend 1 appearance stuff 2022-08-16 20:26:34 -04:00
Eric Myllyoja
2760a9ae9a Polished Week 4 light post code. 2022-07-24 14:44:17 -04:00
Eric Myllyoja
600c7e5441 F3 to toggle debug markers, various visual tweaks 2022-07-24 00:49:54 -04:00
Eric Myllyoja
aa0962fe62 Cleanup of GameOverSubstate, fix GF duck animation duration 2022-07-22 22:25:19 -04:00
Eric Myllyoja
c456355366 Scripted states and shaders. 2022-07-22 16:11:18 -04:00
Cameron Taylor
a731ccf0ad dipshit latency stuff WIP still 2022-07-19 14:19:03 -04:00
Eric Myllyoja
4172fd861d First prototype of can logic 2022-07-14 19:03:42 -04:00
Cameron Taylor
f3e0b0ec5b input accuracy testing 2022-07-12 19:02:38 -04:00
Cameron Taylor
5778e979d9 lil fix for end number hehe 2022-07-11 15:14:59 -04:00
Cameron Taylor
05858a4f6c crash fix when pressing before loop 2022-07-11 15:04:41 -04:00
Eric Myllyoja
ee3e1750df Work in progress on Week 8 stuff (animation offsets, death animation) 2022-07-06 21:49:42 -04:00
Cameron Taylor
4d3766b65b better traces hehe 2022-07-06 20:58:13 -04:00
Cameron Taylor
c3995ef557 different timestamping 2022-07-06 20:54:07 -04:00
Cameron Taylor
5e630dc214 latency debugging stuff in progress 2022-07-06 20:37:35 -04:00
Cameron Taylor
1c1974bae5 better beat visualizations 2022-07-06 18:45:27 -04:00
Cameron Taylor
f797f6a7b1 music debug stuff in progress 2022-07-06 15:27:45 -04:00
Cameron Taylor
53d703cfcd spectogram tweakin hehe 2022-07-05 14:36:01 -04:00
Cameron Taylor
9cf2598951 spectogram placeholder 2022-07-05 14:34:08 -04:00
Cameron Taylor
b5d85c3fd6 latency stuff in progress maybe? 2022-07-05 14:24:02 -04:00
Eric Myllyoja
05148ee4f0 GF now ducks (a little glitchy tho) 2022-06-12 00:53:39 -04:00
Eric Myllyoja
705d0ed5b9 Updated hmm deps, no more forks! 2022-06-12 00:02:49 -04:00
Eric Myllyoja
05db82c828 Added blood to henches, added moving limo, added dynamic GF combo/drop animations 2022-06-09 22:28:58 -04:00
Cameron Taylor
3f84a5514f POV i learning how macros work 2022-06-09 02:27:20 -04:00
Eric Myllyoja
1c62dc1274 First revision of henchmen killing. 2022-06-01 22:07:42 -04:00
Cameron Taylor
853820c56b animation timing fixes 2022-05-30 23:59:12 -04:00
Eric Myllyoja
9dfbfad926 First test of Week 4 Gameplay, plus fixes for MultiSparrow 2022-05-29 21:40:13 -04:00
Cameron Taylor
64b40ce7b8 bf default cam position fix 2022-05-29 19:33:04 -04:00
Cameron Taylor
e844b93641 spookeez scared animation lightning fix 2022-05-29 19:13:21 -04:00
MtH
02255a61d9 oopy forgot the comment 2022-05-07 22:33:18 +02:00
MtH
8bd876ed1c flipx 2022-05-07 22:07:09 +02:00
MtH
8e2eefb605 0.2.8 character positions, dont multiply zoom, chara scaling fix 2022-05-07 18:45:49 +02:00
Cameron Taylor
bfce579cd5 Merge remote-tracking branch 'origin/master' into feature/scripted-characters 2022-05-04 12:27:18 -04:00
Cameron Taylor
f37c2cbbf6 cameraOffset stuff defaulted properly 2022-05-03 14:07:18 -04:00
Cameron Taylor
d835bed813 senpai stage tweaks 2022-05-03 13:27:14 -04:00
Cameron Taylor
f9f711a179 charting editor head fix 2022-05-03 13:09:02 -04:00
Cameron Taylor
be995f0702 note styles in Note.hx that use StrumlineStyle 2022-05-03 13:02:37 -04:00
Cameron Taylor
4245bd4777 spooky mansion, and also fix for introText # thing 2022-05-03 11:01:29 -04:00
Cameron Taylor
3a327f5c5d pico fixes teehee 2022-05-02 23:00:00 -04:00
Cameron Taylor
79ce2237fc small cam fix anotha hehe 2022-05-01 15:23:09 -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
Eric Myllyoja
5bb1376459 Added cornerPosition and feetPosition properties for easy reference 2022-04-29 23:51:52 -04:00
Cameron Taylor
282e93e1ff character repositioning proof of concept stuf 2022-04-29 23:46:41 -04:00
Cameron Taylor
231f76c893 pixel icon placement fix 2022-04-29 21:45:56 -04:00
Cameron Taylor
31b393b014 character animation dance force is OFF 2022-04-29 11:56:08 -04:00
Cameron Taylor
112a9ee329 main menu storymode anim fix 2022-04-29 11:10:43 -04:00
Cameron Taylor
60e0668e74 icon fixes (week 4 + positions) 2022-04-29 00:22:42 -04:00
Cameron Taylor
a8218d2542 main menu fix, and it BUILDS 2022-04-28 23:52:19 -04:00
Cameron Taylor
e24de498a1 import fix + weird git merge thing lol (doesnt build) 2022-04-28 23:46:37 -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
Cameron Taylor
061b16bde7 Merge branch 'feature/scripted-modules' of https://github.com/ninjamuffin99/Funkin-secret into feature/scripted-modules 2022-04-18 20:24:03 -04:00
Cameron Taylor
22de93705c quick thing to put back my ez debug skip thing lol 2022-04-18 20:24:01 -04:00
Eric Myllyoja
e4e516dd30 Crash fix for Stress 2022-04-18 20:09:02 -04:00
Cameron Taylor
4fedb9e34a derp XD 2022-04-18 19:51:18 -04:00
Eric Myllyoja
0b17f74f48 Merge remote-tracking branch 'origin/master' into feature/scripted-modules 2022-04-18 19:46:39 -04:00
Eric Myllyoja
d5d1c0ae95 Merge branch 'feature/scripted-modules' of github.com:ninjamuffin99/Funkin-secret into feature/scripted-modules 2022-04-18 19:36:18 -04:00
Eric Myllyoja
b6da0b5e20 Fixed Week 4 boppers and car. 2022-04-18 19:36:09 -04:00
Cameron Taylor
b145e7629f html5 fixes... again lol 2022-04-18 15:00:12 -04:00
Cameron Taylor
1485d27b07 debug thing to hide pause menu 2022-04-18 13:53:48 -04:00
Cameron Taylor
967f847800 nicer pausemenu exit, and force loading for ez tests 2022-04-15 17:11:01 -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
4b7744f4e3 Additional fixes for health icons and camera positioning. 2022-03-26 22:18:26 -04:00
Eric Myllyoja
3634346072 Stable, only position adjustments needed. 2022-03-25 22:30:37 -04:00
Cameron Taylor
3f634a6657 -DANIMDEBUG initstate fix 2022-03-25 17:56:47 -04:00
Cameron Taylor
8302b2d2ba quick and dirty freeplay exit transition fix 2022-03-23 23:27:48 -04:00
MtH
9cb269a19c pixel pause & misc 2022-03-23 19:29:02 +01: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
Cameron Taylor
10bafff63e Merge branch 'master' into feature/scripted-stages 2022-03-18 21:54:16 -04:00
Cameron Taylor
5f98aa7fb5 busted input fix (breaks pyro test probably) 2022-03-18 21:47:30 -04:00
Cameron Taylor
a40a4663d8 parse animate removed an import lol! 2022-03-18 12:28:25 -04:00
Eric Myllyoja
1a85b4a1ce First WIP of scripted characters (NOT WORKING) 2022-03-17 01:40:08 -04:00
Eric Myllyoja
7c0cb9c69c Archiving hookablemacro 2022-03-14 22:02:44 -04:00
Eric Myllyoja
60c6e5ee29 Various bug fixes for strumlines 2022-03-14 20:48:45 -04:00
Eric Myllyoja
1935373963 Hide song name in play state 2022-03-13 14:47:59 -04:00
Eric Myllyoja
0cc4f8a982 Scripted modules are stable but missing some features. 2022-03-13 14:36:03 -04:00
Eric Myllyoja
49b2907a30 Scripted module and script event systems, reworked strumlines. 2022-03-11 01:30:01 -05:00
Cameron Taylor
d477320894 xmas mall positioning fix (plus score reset, lol!) 2022-03-09 18:57:36 -05:00
Cameron Taylor
ef665df9d0 hold note balance shit lol! unrelated to polymod!! 2022-03-09 15:04:35 -05:00
Cameron Taylor
9dcffaa3fa spirit layering fix 2022-03-09 14:06:10 -05:00
Eric Myllyoja
fe109f878f Merge remote-tracking branch 'origin/master' into feature/scripted-stages 2022-03-09 10:37:21 -05:00
Eric Myllyoja
19cda4ed15 Merge branch 'feature/scripted-stages' of github.com:ninjamuffin99/Funkin-secret into feature/scripted-stages 2022-03-09 10:36:39 -05:00
Eric Myllyoja
57fcb74657 Spirit trail is now behind 2022-03-09 10:36:13 -05:00
Cameron Taylor
45b9d725f2 tankman cloud reset? 2022-03-09 10:29:03 -05:00
Eric Myllyoja
404b2b648e Modified every file in the codebase to solve a single bug. 2022-03-08 03:13:53 -05:00