Commit Graph
100 Commits
Author SHA1 Message Date
EliteMasterEric 87b1fc92f8 Renamed the new controls (I had to edit the margins to make the name fit) 2025-02-17 23:25:09 -05:00
EricandGitHub 6f40aeac1c Merge pull request #4106 from FunkinCrew/main
Merge from main into develop
2025-02-05 05:51:43 -05:00
EricandGitHub ca16d41592 Merge pull request #4100 from Lasercar/update-art-submodule
Update art submodule commit version
2025-02-04 05:23:10 -05:00
EricandGitHub 796cbb3812 Merge pull request #4095 from AbnormalPoof/main-to-develop
Move changes from `main` to `develop`
2025-02-03 18:24:40 -05:00
a08da8793b Move changes made in main to develop (#4006)
* Rewrite CHANGELOG.md for v0.5.2

* [docs] Add missing changes and links to Changelog (#3655)

* changelog sweep

* Resolve a few conflicts

* Resolve more conflicts

* DadBattle

* Re-add @ianharrigan

* Add links to 0.5.0

* Add links and contributors to 0.4.1 and 0.4.0

* Add links to 0.3.3 and finishing touches

* Add and polish 0.5.3 changes

* Make spacing consistent

* Make label actions more convenient (#3771)

* fixed a plethora of dead links (#3831)

* Add `status: planned` label to label actions (#3910)

* Make label actions more convenient

* chore: Add status: planned to label actions

* Bump the Stage data version to indicate that new values were added.

* Updated Save data version to indicate new values.

* Only display the Stage Editor in builds that enable it, and enable it by default (this re-enables the Stage Editor keybind).

* Enable log messages on all builds by default after we got too many complaints.

* Remove unused custom type resolver.

* Update save data format and error handling.

* Fix a typo.

* proj hxp version bump

* changelog yoink

* Remove duplicate issue detector. (#3944)

---------

Co-authored-by: Hundrec <hundrecard@gmail.com>
Co-authored-by: Abnormal <86753001+AbnormalPoof@users.noreply.github.com>
Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
2025-01-16 19:50:07 -05:00
EricandGitHub cb131d8c9d Merge branch 'develop' into main 2025-01-16 19:49:59 -05:00
EricandGitHub bb24821f13 Remove duplicate issue detector. (#3944) 2024-12-18 10:44:01 -05:00
EliteMasterEric d6db842efb Fix a typo. 2024-12-17 21:47:40 -05:00
EliteMasterEric ec9ec2031a Update save data format and error handling. 2024-12-17 21:47:40 -05:00
EliteMasterEric 2383fdfade Remove unused custom type resolver. 2024-12-17 21:47:40 -05:00
EliteMasterEric 36d7de5692 Enable log messages on all builds by default after we got too many complaints. 2024-12-17 21:47:40 -05:00
EliteMasterEric 7f8937d540 Only display the Stage Editor in builds that enable it, and enable it by default (this re-enables the Stage Editor keybind). 2024-12-17 21:47:39 -05:00
EliteMasterEric 4ce83b2ac5 Updated Save data version to indicate new values. 2024-12-17 21:47:39 -05:00
EliteMasterEric 517359914b Bump the Stage data version to indicate that new values were added. 2024-12-17 21:47:39 -05:00
EricandGitHub 62de2a0345 ...sandwiches. 2024-10-23 13:40:35 -04:00
EricandGitHub 8cf346c3b0 Update CHANGELOG.md 2024-10-22 20:36:10 -04:00
EliteMasterEricandCameron Taylor 5819a43522 Fix a typo. 2024-10-18 19:11:27 -04:00
EliteMasterEricandCameron Taylor dff4135fc9 Update save data format and error handling. 2024-10-18 19:11:27 -04:00
EliteMasterEricandCameron Taylor 24ad7f4a39 Remove unused custom type resolver. 2024-10-18 19:11:27 -04:00
EliteMasterEricandCameron Taylor 4dbb0baa17 Enable log messages on all builds by default after we got too many complaints. 2024-10-18 19:11:27 -04:00
EliteMasterEricandCameron Taylor ce85ee20a7 Only display the Stage Editor in builds that enable it, and enable it by default (this re-enables the Stage Editor keybind). 2024-10-18 19:11:27 -04:00
EliteMasterEricandCameron Taylor 4effd709eb Updated Save data version to indicate new values. 2024-10-18 19:11:27 -04:00
Eric 09b42f3f08 Rewrite CHANGELOG.md for v0.5.2 2024-10-11 23:57:06 -04:00
EliteMasterEric 55c2dabe84 Bump the Stage data version to indicate that new values were added. 2024-10-11 23:44:31 -04:00
Eric 31d1b3e246 Finish the sentence. 2024-10-08 14:15:30 -04:00
EliteMasterEric bc546e86aa Clean up documentation in StrumlineNote 2024-10-05 13:34:08 -04:00
EliteMasterEric de5cca1120 Add some cutom logic to determine if this.active is needed. 2024-10-05 13:34:08 -04:00
EliteMasterEricandCameron Taylor bc8f506193 Update changelog 2024-10-04 12:41:45 -04:00
EliteMasterEricandCameron Taylor f52472a476 fix: Exiting the chart editor doesn't crash the game anymore 2024-10-04 12:41:45 -04:00
EliteMasterEricandCameron Taylor 711e0a6b75 fix: Main menu music doesn't cut out when switching states anymore. 2024-10-04 12:15:20 -04:00
EliteMasterEricandCameron Taylor 1fde59f999 fix: The dialog now shows up on the animation debugger view 2024-10-04 12:15:20 -04:00
EliteMasterEricandHundrec a4ed55721f Fix duplicate combo counter on combo break
Co-authored-by: Eric <ericmyllyoja@gmail.com>
Co-authored-by: Hundrec <hundrecard@gmail.com>
2024-10-04 08:09:18 -04:00
EricandGitHub f1b6e6c4e4 Merge pull request #3537 from afreetoplaynoob/patch-1
Enhancement: Properly format the chart editor playbar
2024-10-03 23:55:33 -04:00
EliteMasterEricandCameron Taylor b0b73c8399 fix: Add additional classes to Polymod Blacklist 2024-10-03 21:25:34 -04:00
EliteMasterEricandCameron Taylor 89ee33e9b9 Update changelog for v0.5.1
Fix typo and start changelog for next hotfix
2024-10-03 21:25:34 -04:00
EricandGitHub f61789e453 Merge pull request #3509 from FunkinCrew/bugfix/git-submodule-url
Fix an issue where .gitmodules would point to the wrong repository
2024-10-01 02:31:11 -04:00
EliteMasterEric 1da0da249d Fix an issue where .gitmodules would point to the wrong repository 2024-10-01 02:30:26 -04:00
EliteMasterEric 90f6f80a71 Fix issues with animation offsets breaking on restart on characters with high offstes. 2024-09-29 07:06:11 -04:00
EliteMasterEric e3ed153a7c Add a "persist" argument to FunkinSound to prevent Results music from continuing in Freeplay. 2024-09-29 06:59:49 -04:00
EliteMasterEric 7ce7d7839e Update stage data version after adding new values. 2024-09-28 09:51:41 -04:00
EliteMasterEric 042dfb7442 Merge branch 'rewrite/master' into abnormalpoof/stage-prop-flipx 2024-09-28 09:18:41 -04:00
EliteMasterEric 8a8160dfe7 Update assets submodule 2024-09-27 14:26:46 -04:00
EliteMasterEric 5630e74584 Rework Freeplay variation handling... again. 2024-09-27 14:26:08 -04:00
EliteMasterEric 067f52ca91 Kill intro music when leaving Results state. 2024-09-27 14:25:32 -04:00
EliteMasterEric 2eb5208c46 Hide the pixel icon in the Results screen when there's no matching character 2024-09-27 14:25:17 -04:00
EliteMasterEric b5f3996236 Properly sort difficulties/variations. Validate variation IDs (alphanumeric only) 2024-09-27 12:21:17 -04:00
EliteMasterEric 378179d1f7 Change crash keybind to Ctrl-Alt-Shift-L 2024-09-27 12:20:36 -04:00
EliteMasterEric f1c1e63375 Use more dynamic API version rules for checking mod versions. 2024-09-27 12:19:41 -04:00
EricandGitHub ec749c7157 Merge pull request #3465 from AbnormalPoof/patch-5
chore: Add a link to `credits.json`
2024-09-27 03:56:08 -04:00
EliteMasterEric e321861b9f Fix an issue where animations wouldn't loop properly on AnimateAtlasCharacters. 2024-09-27 03:09:59 -04:00
EliteMasterEric c4ed31b246 Fix a bug where force-ending a song could occasionally try to draw destroyed sprites. 2024-09-27 02:52:01 -04:00
EliteMasterEric 2053f0d691 Fix a missing import in Pico (Blazin) 2024-09-27 02:51:31 -04:00
EliteMasterEric 67126b33fa Suppress some spammy log calls 2024-09-25 10:02:18 -04:00
EliteMasterEric a84ae6069e Fix an issue where Pico wouldn't shoot in Stress 2024-09-25 10:02:11 -04:00
EricandGitHub c3f982b32c Merge pull request #3435 from NotHyper-474/patch/upgrade-example-mods
Chore: Upgrade Example Mods to latest API version
2024-09-25 08:52:55 -04:00
EricandGitHub 67bce85343 Merge branch 'develop' into patch/upgrade-example-mods 2024-09-25 08:51:57 -04:00
EliteMasterEric 998bbb213a Merge branch 'rewrite/master' into nebulazorua/classic-camera-fix 2024-09-25 08:48:20 -04:00
EliteMasterEric 8d02a3f984 A bunch of controls fixes 2024-09-25 08:39:57 -04:00
EricandGitHub 85763813ae Merge branch 'develop' into patch-2 2024-09-25 07:38:14 -04:00
EricandGitHub b29296288e Merge pull request #3438 from TechnikTil/fix-develop-branch
[BUGFIX] Fix develop branch
2024-09-25 06:55:39 -04:00
EliteMasterEric 5693d626b5 Update so that album art works. 2024-09-25 03:58:43 -04:00
EliteMasterEric 84d8c02920 Update art repo 2024-09-25 00:39:37 -04:00
EliteMasterEric ec9b5db210 Create shader for Week 5 once and reuse it rather than recreating it every frame. 2024-09-23 21:41:48 -04:00
EliteMasterEric 52f5c24f96 Add frame market support, and enable on demand tracing. 2024-09-23 16:09:34 -04:00
EliteMasterEric 0389cd6760 Fix a compile issue on HTML5 with video sprites 2024-09-23 14:45:12 -04:00
EliteMasterEric 0bf1bead03 Fix some issues causing the Input Offsets view to crash on web. 2024-09-22 12:14:15 -04:00
EliteMasterEric 28d50a4567 Merge branch 'rewrite/master' into nothyper474/chart-selection 2024-09-22 01:10:56 -04:00
EricandGitHub 6a113addca Merge branch 'develop' into bugfix/chart-selection 2024-09-22 01:09:37 -04:00
EliteMasterEric c7238fcfd1 Stop the volume tray from hiding as long as the game is muted 2024-09-22 00:45:30 -04:00
EliteMasterEric 29a7005d8a Fix a bug where you can hear the game a little when setting the volume to 0 ticks 2024-09-22 00:44:57 -04:00
EliteMasterEric d23ae7c55b Merge remote-tracking branch 'public/develop' into docs/updated-changelog 2024-09-21 23:31:25 -04:00
EliteMasterEric d11acfd83b Merge remote-tracking branch 'public/main' into docs/updated-changelog 2024-09-21 23:31:21 -04:00
EricandGitHub 754e2edbeb Merge pull request #3420 from JVNpixels/patch-4
[DOCUMENTATION/BUG-FIX] Fix changelog for v0.5.0
2024-09-21 23:12:57 -04:00
EliteMasterEric 5548fd52f4 Update default mod so it actually loads 2024-09-21 20:33:59 -04:00
EliteMasterEric 6c743b3b89 Remove some spammy trace calls. 2024-09-21 20:33:51 -04:00
EliteMasterEric 2c73b241e8 Rework offset+vocal sync handling to fix the "Swing Mode" bug 2024-09-21 06:33:47 -04:00
EricandGitHub 3ef238a2f6 Merge pull request #3282 from TechnikTil/playsound-typo
[DOCUMENTATION] playSound Typo in NoteScriptEvent
2024-09-21 05:45:35 -04:00
EliteMasterEric 143ef88e6f Update assets submodule 2024-09-20 03:42:48 -04:00
EricandGitHub 249ff69f9f Merge branch 'rewrite/master' into lemz1/fps-setting 2024-09-20 00:05:17 -04:00
EliteMasterEricandCameron Taylor 3cbba8ba29 Resolve merge issues. 2024-09-19 17:16:31 -04:00
EliteMasterEric bfee63f588 Update hmm.json 2024-09-19 11:15:56 -04:00
EliteMasterEric 35aa8731d0 Better status messages, buttons, updated album art, basic chart editor support 2024-09-19 11:13:05 -04:00
EliteMasterEric 8fd84f9d13 Functioning Discord Rich Presence! 2024-09-19 10:03:16 -04:00
EliteMasterEric 25cafe7550 Resolve merge issues. 2024-09-19 04:22:05 -04:00
EliteMasterEric 7d6fa19ff4 Merge remote-tracking branch 'secret/rewrite/master' into lemz1/substate-event-dispatch 2024-09-19 04:20:24 -04:00
EliteMasterEric 9f0bc2bd52 Refactor char select GF data handling. 2024-09-19 04:16:40 -04:00
EricandGitHub d81e09b1c3 Merge branch 'rewrite/master' into abnormalpoof/opening-urls 2024-09-19 03:46:46 -04:00
EricandGitHub a128afedf7 Merge pull request #772 from FunkinCrew/results-sfx-fix
Results Percentage Sound Spam Fix
2024-09-19 03:24:52 -04:00
EliteMasterEric 9d5cde0bf1 Update assets submodule 2024-09-18 06:48:45 -04:00
EliteMasterEric 5efbff044b Resolve merge issues 2024-09-18 06:32:06 -04:00
EliteMasterEric a469385cdb Resolve merge issues 2024-09-18 06:22:02 -04:00
EricandGitHub 970816592f Merge branch 'develop' into bugfix/charselect-crash 2024-09-18 06:20:44 -04:00
EliteMasterEric ba90a6abe0 Add behavior when setting status: rejected 2024-09-18 06:08:18 -04:00
EliteMasterEric d54dc6179a Add several new Github Actions for issue management 2024-09-18 06:02:13 -04:00
EliteMasterEric b5ed7f40d4 Remove redundant character type assignment 2024-09-18 05:24:57 -04:00
EliteMasterEric b28af79eb3 Fix build issues 2024-09-18 05:18:16 -04:00
EricandGitHub 5f563f0555 Merge branch 'develop' into chart-editor-icon-fix 2024-09-18 05:10:30 -04:00
EliteMasterEric 1beb21e57a Replace all instances of openfl/lime Assets with funkin.Assets 2024-09-18 05:04:32 -04:00
EliteMasterEric b6b2248aa3 Make funkin.Assets and funkin.Paths default imports for all scripts 2024-09-18 05:04:10 -04:00
EliteMasterEric d30fe61ca0 Add a bunch of other functions to funkin.Assets, and add documentation 2024-09-18 05:03:04 -04:00