Commit graph

3439 commits

Author SHA1 Message Date
gamerbross
f1a0692c51 Fix ChartingState GameOver Crashes 2024-05-15 22:50:34 +02:00
Cameron Taylor
28bee8397e git submodules trolled 2024-05-14 23:19:02 -04:00
Cameron Taylor
1befa9f548 Merge branch 'develop-0.3.3' into develop 2024-05-14 23:17:47 -04:00
Cameron Taylor
e724373563 more changeloggy 2024-05-14 22:16:57 -04:00
Cameron Taylor
bd7b1fb544 Merge branch 'public-release/main' into develop-0.3.3 2024-05-14 22:15:29 -04:00
Cameron Taylor
37fc84946d
Merge pull request #2357 from FunkinCrew/bugfix/shader-crash-freeplay
Fix an AMD shader crash on Freeplay.
2024-05-14 22:14:22 -04:00
Cameron Taylor
1a8706b031 project.xml version bump 2024-05-14 22:11:57 -04:00
Cameron Taylor
4e6d980447 0.3.3 changelog 2024-05-14 22:10:13 -04:00
Cameron Taylor
ac06c23577 assets submod 2024-05-14 21:41:42 -04:00
Cameron Taylor
5e70d9fcef
Merge pull request #2390 from ImCodist/polish/game-over-transition
Polish for the transition from GameOverSubState back into PlayState.
2024-05-14 21:32:19 -04:00
Cameron Taylor
84a4a23d3c Merge branch 'polish/game-over-transition' into public-release/develop 2024-05-14 21:32:05 -04:00
Cameron Taylor
86de75feab
Merge pull request #2466 from JugieNoob/freeplayscrollwheel-bugfix
Fixed Freeplay Scrolling Issue
2024-05-14 21:23:10 -04:00
Cameron Taylor
41686dce9e assets submod 2024-05-14 21:22:17 -04:00
Cameron Taylor
2434f64381 web fix for scroll 2024-05-14 21:21:47 -04:00
Cameron Taylor
1619751eab Merge branch 'public-release/develop' into freeplayscrollwheel-bugfix 2024-05-14 21:13:48 -04:00
Cameron Taylor
20810d4787
Merge pull request #2470 from gamerbross/bugfix/freeplay-exiting-active
Fixed doing actions when exiting Freeplay menu
2024-05-13 21:30:49 -04:00
Cameron Taylor
0428482d04 Merge branch 'bugfix/freeplay-exiting-active' into public-release/develop 2024-05-13 21:30:02 -04:00
Cameron Taylor
e26d4ac440
Merge pull request #554 from FunkinCrew/bugfix/public-fixes
Eric's public bug fixes
2024-05-13 21:20:47 -04:00
Cameron Taylor
3be1056e35
Merge pull request #2499 from lemz1/loadingbar-fix
Fix Web Loading Bar
2024-05-13 21:08:13 -04:00
Cameron Taylor
259df760bc re-add lerp to load screen 2024-05-13 21:06:41 -04:00
lemz
54f337fe9c Merge remote-tracking branch 'origin/develop' into loadingbar-fix 2024-05-14 00:17:25 +02:00
lemz
4e935b47c6 Update LoadingState.hx 2024-05-14 00:04:45 +02:00
gamerbross
090e4fc6e8 Fixed doing actions when exiting Freeplay menu 2024-05-12 02:42:02 +02:00
JugieNoob
b22f09d4da Fixed Scrolling on HTML5 Platforms 2024-05-12 02:21:59 +02:00
JugieNoob
4f8a0dbebf Fixed Freeplay Scrolling Issue 2024-05-12 01:35:04 +02:00
EliteMasterEric
2aae46ab90 Merge remote-tracking branch 'public/bugfix/weekend-1-missing-asset' into bugfix/public-fixes 2024-05-09 16:41:49 -04:00
EliteMasterEric
99bd3a370f Merge remote-tracking branch 'public/bugfix/duplicate-controls-binds' into bugfix/public-fixes 2024-05-09 16:41:42 -04:00
EliteMasterEric
efe0a66934 Merge remote-tracking branch 'public/debug-hotkey-docs' into bugfix/public-fixes 2024-05-09 16:40:45 -04:00
EliteMasterEric
c2650c0810 Merge remote-tracking branch 'public/bugfix/freeplay-lerp' into bugfix/public-fixes 2024-05-09 16:40:18 -04:00
EliteMasterEric
3207fd82f3 Merge remote-tracking branch 'public/bugfix/easter-egg-crash' into bugfix/public-fixes 2024-05-09 16:40:11 -04:00
EliteMasterEric
0b82a206ef Merge remote-tracking branch 'public/bugfix/crash-handler-flxstate-check' into bugfix/public-fixes 2024-05-09 16:39:53 -04:00
codist
bfaa4626f8 Polish for the transition from GameOverSubState back into PlayState. 2024-05-09 01:10:53 -04:00
EliteMasterEric
4d5c0444c8 Fix an issue where control binds would be duplicated and quickly multiply. 2024-05-09 00:46:21 -04:00
EliteMasterEric
2e4baa8ab2 Fix a null object reference caused by accessing cut assets. 2024-05-09 00:43:33 -04:00
Eric
4fdc437840
Update Funkin' Debug Hotkeys.md 2024-05-08 23:55:19 -04:00
Cameron Taylor
77446f28d7
Merge pull request #549 from FunkinCrew/sanitized/bugfix/easter-egg
Fix an error related to an easter egg, plus some script warnings.
2024-05-08 23:30:50 -04:00
Cameron Taylor
928b3c4119 assets submod 2024-05-08 23:29:55 -04:00
Cameron Taylor
9730ef4280
Merge pull request #550 from FunkinCrew/sanitized/bugfix/shader-crash-freeplay
Fix a shader crash on Freeplay on some AMD cards.
2024-05-08 23:21:52 -04:00
Eric
34a6e16385
Merge pull request #2323 from nebulazorua/main
Chart debug key takes you back to chart editor if you're charting
2024-05-08 23:14:59 -04:00
Eric
e3ee68abf2
Merge pull request #2370 from MadBear422/main
Character selection fix for chart editor
2024-05-08 23:08:48 -04:00
Cameron Taylor
54fbb9a294 be careful with these gitmodules, we don't want to work out of funkin.art or funkin.assets 2024-05-08 22:45:13 -04:00
Cameron Taylor
20226baaba Merge branch 'public-release/develop' into develop-0.3.3 2024-05-08 22:43:36 -04:00
codist
df5bdc7b7d Fixed stutter once a transition to the main menu completes. 2024-05-08 22:42:33 -04:00
Cameron Taylor
4bd8542d3d
Merge pull request #2315 from ImCodist/bugfix/main-menu-camera-stutter
Fixed stutter once a wipe transition to the Main Menu completes.
2024-05-08 22:23:18 -04:00
MadBear422
4d1c2c1b88 Character selection fix for chart editor. 2024-05-08 15:30:40 -07:00
EliteMasterEric
d4f113df59 Fix a conflict between a shader variable name and a function on some graphics cards. 2024-05-08 14:23:33 -04:00
Eric
1e359030c3
Merge pull request #2302 from FunkinCrew/bugfix/funkvis-hmm
Fix an issue with an improper version of funkVis
2024-05-08 14:17:55 -04:00
nebulazorua
f5143c2d78 this is better 2024-05-08 19:56:13 +08:00
nebulazorua
6fdc090ecc i have accidentally done this and wiped out my chart many times 2024-05-08 19:53:47 +08:00
codist
b49fac742f Fixed stutter once a transition to the main menu completes. 2024-05-08 04:21:30 -04:00