1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-12 17:52:45 +00:00
Commit graph

3242 commits

Author SHA1 Message Date
Cameron Taylor a7e73cfa32 Merge pull request #525 from FunkinCrew/cutscene-updates
Cutscene updates
2024-04-29 22:23:16 -04:00
Cameron Taylor 12f5904aa5 Merge branch 'rewrite/master' into cutscene-updates 2024-04-29 22:21:06 -04:00
Eric b83efae7b7 Merge pull request #522 from FunkinCrew/hxcodec-hmm
hxcodec bump, and some load optimization for LoadingState.preloadLevelAssets()
2024-04-29 22:12:50 -04:00
Eric 4856ea4435 Merge branch 'rewrite/master' into hxcodec-hmm 2024-04-29 22:12:41 -04:00
Eric 9ff8c66a6e Merge pull request #523 from FunkinCrew/freeplay-no-randoms
sets the selected track as first one in group when swapping sorts on freeplay
2024-04-29 19:50:48 -04:00
EliteMasterEric dbae4aff8f Fix crash when initializing screenshots when there is no save data 2024-04-29 19:28:47 -04:00
EliteMasterEric 3b1f84b4bd Fixes to attract state. 2024-04-29 18:31:27 -04:00
EliteMasterEric 3786b0a23a Fix build issue on release builds. 2024-04-29 18:31:20 -04:00
EliteMasterEric ea61c19aa5 Replace cutscenes. 2024-04-29 17:51:36 -04:00
EliteMasterEric c9f023be1f Some doc cleanup. 2024-04-29 17:51:12 -04:00
EliteMasterEric e4ae935ae5 Update hxCodec to latest. 2024-04-29 17:50:58 -04:00
Eric c8dcda89a1 Merge branch 'rewrite/master' into freeplay-no-randoms 2024-04-29 15:55:52 -04:00
Eric 9599536ffc Merge branch 'rewrite/master' into hxcodec-hmm 2024-04-29 15:55:45 -04:00
Hazel 3a7efeeca3 fix(ci): linux private repo issues (#524) 2024-04-29 20:04:01 +01:00
Cameron Taylor 81f8338c99 sets the selected track as first one in group when swapping sorts on freeplay 2024-04-29 03:49:28 -04:00
Cameron Taylor 64b416e956 async the LoadingState asset preloads 2024-04-29 02:31:40 -04:00
Cameron Taylor 450a232eb8 hxcodec version commit bump 2024-04-29 01:39:19 -04:00
Cameron Taylor a88c8e9812 Merge pull request #517 from FunkinCrew/blazin-screenshake
blazin slight screenshake
2024-04-29 01:21:03 -04:00
Cameron Taylor c5c22b245d assets submod 2024-04-29 01:20:52 -04:00
Cameron Taylor 21ab198c58 assets submod 2024-04-29 01:19:58 -04:00
Eric 347b1b59ac Merge pull request #520 from FunkinCrew/ui+camera-fixes
UI+Camera fixes
2024-04-28 22:24:00 -04:00
FabsTheFabs 333b177ffb update assets submod 2024-04-29 02:22:49 +01:00
FabsTheFabs c609e3591b fixed classic camera reset 2024-04-29 02:22:33 +01:00
FabsTheFabs b35822f9a4 soundtray fade 2024-04-29 02:22:11 +01:00
FabsTheFabs 3083305f51 fix pixel combo numbers being huge 2024-04-29 02:21:44 +01:00
Eric 24a58b33f5 Merge pull request #337 from FunkinCrew/input-offsets
Input offsets
2024-04-28 20:25:09 -04:00
EliteMasterEric 01b80ab5c8 Merge remote-tracking branch 'origin/input-offsets' into rewrite/master 2024-04-28 19:07:44 -04:00
Cameron Taylor 1fc4f36810 asset submod 2024-04-28 03:17:37 -04:00
Cameron Taylor 0f84050957 Merge pull request #515 from FunkinCrew/debug-stuff
homemade flixel tracker button
2024-04-28 02:45:28 -04:00
Cameron Taylor beab2d13f9 Merge pull request #514 from FunkinCrew/a-bot-bar-height
change the initial animation frame for abot
2024-04-28 02:45:14 -04:00
Cameron Taylor 46dcd4c8ea homemade flixel tracker button 2024-04-27 01:17:15 -04:00
Cameron Taylor 99934c8039 change the initial animation frame for abot 2024-04-26 23:48:17 -04:00
Cameron Taylor 85350013d7 Merge pull request #511 from FunkinCrew/freeplay/cam-move
fix main menu -> freeplay camera positioning
2024-04-25 05:55:57 -04:00
Cameron Taylor 6808f872f9 Merge pull request #513 from FunkinCrew/bugfix/various-week7+weekend1-fixes
Various Week 7 + Weekend 1 fixes
2024-04-25 05:55:32 -04:00
Cameron Taylor 9b6cf26ea1 Merge branch 'rewrite/master' into bugfix/various-week7+weekend1-fixes 2024-04-25 05:55:06 -04:00
Cameron Taylor 4b01bf4022 assets submod 2024-04-25 05:54:55 -04:00
Cameron Taylor 09ef915877 creds tweakin / polish 2024-04-25 05:45:27 -04:00
FabsTheFabs f9c4d2b8a3 update assets submod 2024-04-25 07:21:23 +01:00
Cameron Taylor 2c17fcd90c Merge pull request #512 from FunkinCrew/bugfix/results-fixins
Bugfix/results fixins
2024-04-25 01:56:16 -04:00
Cameron Taylor 7d2713a731 this doesn't need to be here 2024-04-25 01:55:51 -04:00
Cameron Taylor 12b5d6d086 some result screen polish 2024-04-25 01:53:13 -04:00
EliteMasterEric dd90d430ee Replace the zoom with a fade (for now) 2024-04-24 23:50:19 -04:00
EliteMasterEric 7c6bf7ef45 Fix the alignment of the song name in the results screen 2024-04-24 23:50:11 -04:00
EliteMasterEric 85e06ef18f Make it possible to escape the input offsets menu on controller. 2024-04-24 22:08:20 -04:00
EliteMasterEric c3ba4081f1 Fix a crash issue caused when pressing a key after leaving the input offsets state. 2024-04-24 21:57:50 -04:00
EliteMasterEric e0721b901e Fix a bug where negative visual offsets would break the countdown. 2024-04-24 21:57:23 -04:00
EliteMasterEric 17a15a3947 Reposition notes based on the configured input offset (so you still hit them when centered) 2024-04-24 21:57:17 -04:00
EliteMasterEric f474bc32a5 Merge remote-tracking branch 'origin/rewrite/master' into input-offsets 2024-04-24 21:54:45 -04:00
Cameron Taylor 1197f9646e fix main menu -> freeplay camera positioning 2024-04-24 19:45:17 -04:00
Cameron Taylor e72c2ed41b Merge pull request #507 from FunkinCrew/bugfix/wednesday-fixes
Bugfix/wednesday fixes
2024-04-24 19:27:00 -04:00