1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-15 19:33:36 +00:00
Commit graph

3485 commits

Author SHA1 Message Date
lemz 01b1ce679c
Merge branch 'develop' into fps-setting 2024-05-29 06:42:46 +02:00
Eric eeaae74b46
Merge pull request #2603 from gamerbross/bugfix/unscripted-stage-trace
[BUGFIX] Unscripted Stage Log Trace (missing toString for Stage)
2024-05-29 00:27:36 -04:00
Eric fd9cfc2cb1
Merge pull request #2457 from gamerbross/bugfix/freeplay-no-song-data-crash
[BUGFIX] Freeplay Crash when song is invalid
2024-05-28 23:47:46 -04:00
Eric 5e1f61665a
Merge pull request #2553 from lemz1/loadingbar-fix
[BUGFIX] Fix Web Loading Bar (Again)
2024-05-28 23:37:16 -04:00
Eric 34ca8dcd24
Merge pull request #2488 from MaybeMaru/downscroll
Fix hold notes on downscroll
2024-05-28 22:02:46 -04:00
gamerbross cf61b9ef90 Add toString to Stage + Revert "Fix Unscripted Stage Log Trace" 2024-05-28 14:51:16 +02:00
lemz 267fd0eadc alpha stuff and correct text positioning 2024-05-25 16:30:08 +02:00
lemz 814d72cb3f sounds 2024-05-25 03:06:27 +02:00
lemz b75f6e5853 Update PreferencesMenu.hx 2024-05-25 02:19:11 +02:00
lemz dd6d12de23 rename vars 2024-05-25 01:20:10 +02:00
lemz f86a163692 Merge branch 'develop' into fps-setting 2024-05-25 01:16:34 +02:00
lemz e0fe7cb1eb add fps option 2024-05-25 01:11:34 +02:00
gamerbross 07959d3e88 Fix Unscripted Stage Log Trace 2024-05-25 01:08:17 +02:00
Eric b167e485a1
Merge pull request #2593 from gamerbross/feature/legacy-healthicon-winning
[FEATURE] Add Winning support to Legacy Health Icons
2024-05-24 01:51:10 -04:00
Eric b6724eb8c6
Merge pull request #2581 from Keoiki/playstate-notestyles-query
[FEATURE] Custom Note Style Support
2024-05-24 01:39:04 -04:00
Cameron Taylor 1326dcdc97
Merge pull request #2594 from FunkinCrew/language-labels
add simple PR auto labelling action
2024-05-23 15:06:09 -04:00
Cameron Taylor 5d866cb186 pr target 2024-05-23 14:53:25 -04:00
Cameron Taylor 28bf46022a add simple PR auto labelling action 2024-05-23 14:37:50 -04:00
gamerbross 5e130eeffc Add Winning support to Legacy Health Icons 2024-05-23 18:18:37 +02:00
Keoiki 4e47bfe68b Fix Note Styles in PlayState & Chart Editor 2024-05-21 23:52:40 +03:00
lemz e0867643d0 fix the setgraphicsize stuff 2024-05-19 01:39:30 +02:00
Eric 25016f45f9
Merge pull request #2508 from TechnikTil/main
Ludum Dare 47 typo
2024-05-18 14:17:44 -04:00
Eric 6744c1d261
Merge pull request #2518 from gamerbross/bugfix/gameover-charting-crash
[BUGFIX] ChartingState GameOver Crashes
2024-05-18 14:17:29 -04:00
Eric 0a4cbf4ef8
Merge pull request #2469 from gamerbross/vscode-just-debug
Add debugging without compiling to VSCode
2024-05-18 14:16:52 -04:00
Eric 8432f0668a
Merge pull request #2540 from gamerbross/bugfix/attract-toycommercial-allow-volume
[BUGFIX] Allow Volume Keys while watching Toy Commercial (AttractState)
2024-05-18 14:13:28 -04:00
Eric 311fb1bca1
Merge pull request #2544 from SanicBTW/develop
Keep the consistency in Conductor
2024-05-18 14:12:59 -04:00
Eric 12f2d9010d
Merge pull request #2396 from gedehari/compile-docs-fix
Add a fix guide for those with poor internet connection
2024-05-18 14:02:42 -04:00
SanicBTW 6b42da0902
Keep the consistency in Conductor 2024-05-18 09:04:27 +02:00
Eric 6e5783ce8b
Merge pull request #2493 from richTrash21/develop-char-opt
Use OR operator instead of Array.contains() in BaseCharacter
2024-05-17 19:30:51 -04:00
Eric 6a33f5026b
Merge pull request #2542 from FunkinCrew/main
Apply fixes from main branch.
2024-05-17 19:29:27 -04:00
Eric f4a31b30c3
Merge pull request #2472 from Noobz4Life/hxcodec-fix
Bump hxCodec commit (fixes Linux issue where it crashes after load)
2024-05-17 19:27:36 -04:00
gamerbross 85b9de1de9 Allow Volume Keys while watching Toy Commercial (AttractState) 2024-05-17 23:53:43 +02:00
gamerbross f1a0692c51 Fix ChartingState GameOver Crashes 2024-05-15 22:50:34 +02:00
rich a8279cdd76
Merge branch 'FunkinCrew:main' into develop-char-opt 2024-05-15 16:32:22 +04:00
Cameron Taylor 7490b7eab7 Merge branch 'develop-0.3.3' 2024-05-14 23:29:27 -04:00
Cameron Taylor f21cff86be asset submod grr... 2024-05-14 23:29:09 -04: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