cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-15 19:33:36 +00:00
Code Issues Releases Wiki Activity
3377 commits 30 branches 20 tags 6.8 GiB
Commit graph

2315 commits

Author SHA1 Message Date
Cameron Taylor 23dd9937ec black camera bg 2024-04-30 07:21:45 -04:00
Cameron Taylor 45941af161 Merge branch 'rewrite/master' into freeplay-objects-tweens 2024-04-30 04:15:22 -04:00
Cameron Taylor c0ae253c40 Merge branch 'rewrite/master' into preloader-fnf-spacing 2024-04-30 04:15:00 -04:00
Cameron Taylor 61012fab68 dad art tween and shader on ost text 2024-04-30 03:22:30 -04:00
Cameron Taylor 84668432ba better tween in for bg dad art 2024-04-30 01:38:00 -04:00
Cameron Taylor b12d86c959 completion number and box fadeout 2024-04-30 01:33:29 -04:00
Cameron Taylor 0c72f0f5a2 fix spacing on the fnf text on the preloader 2024-04-30 01:09:40 -04:00
Cameron Taylor ce24ad1a8a add fullscreen rebindable keybind across whole game 2024-04-30 00:40:42 -04:00
Cameron Taylor 7610fb4205 Merge pull request #528 from FunkinCrew/main-menu-cam 
persistentUpdate true main menu
 2024-04-30 00:19:28 -04:00
Cameron Taylor bd551092dc persistentUpdate true main menu 2024-04-29 23:31:55 -04:00
Cameron Taylor e1327f1b2c remove filter from touch here to play, and make it more responsive to input 2024-04-29 23:00:39 -04:00
Cameron Taylor 12f5904aa5 Merge branch 'rewrite/master' into cutscene-updates 2024-04-29 22:21:06 -04:00
Eric 4856ea4435 Merge branch 'rewrite/master' into hxcodec-hmm 2024-04-29 22:12:41 -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
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
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
EliteMasterEric 01b80ab5c8 Merge remote-tracking branch 'origin/input-offsets' into rewrite/master 2024-04-28 19:07:44 -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 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 09ef915877 creds tweakin / polish 2024-04-25 05:45:27 -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
EliteMasterEric b6247c933a Disable chart editor on web until it's fixed. 2024-04-24 16:00:50 -04:00
Cameron Taylor e33f14ea5c options screen menu bg fix 2024-04-24 12:11:37 -04:00
EliteMasterEric 3734c6ecd3 Make credits no longer pause and no longer autoformat. Add some names. 2024-04-24 01:48:39 -04:00
EliteMasterEric 374c042ad0 Fix a critical issue causing instrumental variations to not load on web. 2024-04-23 18:32:07 -04:00
Cameron Taylor def8fc6977 Merge pull request #494 from FunkinCrew/freeplay-sorting-fixes 
fix letter sort regex, and tiny LetterSort.hx cleanin
 2024-04-23 04:52:40 -04:00
Cameron Taylor 5aba4008ac Merge branch 'feature/2hot-cutscenes-eric' into bugfix/weekend-1-can-death-freeze 2024-04-23 04:20:28 -04:00
Cameron Taylor 6c63f84369 Merge branch 'rewrite/master' into bugfix/weekend-1-can-death-freeze 2024-04-23 04:14:41 -04:00
EliteMasterEric 1e5153f133 Fix an issue where zooming in the camera would persist to results screen 2024-04-22 23:04:57 -04:00
EliteMasterEric 6edd9e8c6a Make cars stop moving while the game is paused. 2024-04-22 22:30:29 -04:00
EliteMasterEric 66b45b526f Fix issue where controller couldn't switch difficulties in Story Menu 2024-04-22 21:24:44 -04:00
Cameron Taylor 23051a5c60 Merge branch 'rewrite/master' into feature/2hot-cutscenes-eric 2024-04-21 17:26:55 -04:00
EliteMasterEric d760a0d209 Add Ctrl-Alt-Shift-W as a debug hotkey to unlock all Darnell songs in Freeplay 2024-04-21 17:23:48 -04:00
Cameron Taylor 5063e747a1 Merge pull request #501 from FunkinCrew/bugfix/credits-ng-logo 
Fix the animated NG logo overlapping the text in the credits
 2024-04-21 17:20:55 -04:00
EliteMasterEric 4671a9172c Fix the NG logo overlapping the text 2024-04-20 23:48:27 -04:00
EliteMasterEric 7f18eb62d7 Moved can explosion animation to weekend1 library so it's preloaded. 2024-04-20 23:04:08 -04:00
EliteMasterEric 84c3fd452b Update Weekend 1 cutscenes to use the instanced Conductor 2024-04-20 02:11:04 -04:00
EliteMasterEric a9dd85c865 Merge remote-tracking branch 'origin/feature/conductor-signal-rework' into feature/2hot-cutscenes 2024-04-19 18:49:18 -04:00
Cameron Taylor 678dbc0ab7 Merge branch 'rewrite/master' into a-bot-bars 2024-04-19 15:11:28 -04:00
Cameron Taylor 57df7db5f1 add small #if web define 2024-04-19 15:10:43 -04:00
Cameron Taylor 9500722a72 Merge branch 'rewrite/master' into polish/popup-combo-fixes-rebased 2024-04-19 15:00:37 -04:00
Cameron Taylor 49a81189c4 use funkinaction in controls.hx 2024-04-19 15:00:12 -04:00
FabsTheFabs 351cb8cbaa popupstuff changes + make combopopup able to be edited outside of playstate 2024-04-19 14:14:33 -04:00
Cameron Taylor 5d8c28ca2b Merge branch 'rewrite/master' into bugfix/blazin-death-confirm 2024-04-19 14:05:52 -04:00
Cameron Taylor 035db7f00a Merge branch 'rewrite/master' into bugfix/draw-crash 2024-04-19 14:03:58 -04:00
Cameron Taylor 22e411d43f Merge branch 'rewrite/master' into feature/chart-editor-gamepad-support 2024-04-19 13:57:42 -04:00
Cameron Taylor 93ae7692c8 Merge branch 'rewrite/master' into bugfix/weekend-1-bug-fixes 2024-04-19 13:55:01 -04:00
Cameron Taylor 1adef48995 some cleanins with letter sorts 2024-04-18 11:32:11 -04:00
Cameron Taylor c3e777154e fix letter sort regex, and tiny LetterSort.hx cleanin 2024-04-18 11:32:11 -04:00
Cameron Taylor bb7b863272 Fix an issue where changing focus would pause some sounds but not others (#491) 
Repro: Start a song then switch to another window. Instrumental and opponent pause but player doesn't.
 2024-04-17 20:08:26 -04:00
Cameron Taylor fd2356aed4 Fix a crash in the Results state. also nudge GF over to the spot shes in in the FLA (#490) 2024-04-17 20:07:47 -04:00
EliteMasterEric b982484856 Properly fix the menu background to use the correct line colors. 2024-04-16 20:19:20 -04:00
Cameron Taylor 1405e21e3d Merge branch 'rewrite/master' into a-bot-bars 2024-04-16 20:02:08 -04:00
EliteMasterEric 80a558ac08 Fix an issue where changing focus would pause some sounds but not others. 2024-04-16 19:57:19 -04:00
EliteMasterEric d346c9387c Fix a crash in the Results state. also nudge GF over to the spot she's in in the FLA 2024-04-16 19:42:52 -04:00
EliteMasterEric bc0a27c985 Fix references to missing graphics in Freeplay 2024-04-16 18:43:11 -04:00
Cameron Taylor 2d5153cdbf Merge branch 'rewrite/master' into bugfix/remove-kickstarter-backers 2024-04-16 13:33:02 -04:00
Cameron Taylor fab6412bc6 Merge pull request #486 from FunkinCrew/bugfix/main-menu-color 
Fix the saturation on the main menu background.
 2024-04-16 13:25:46 -04:00
Cameron Taylor e6dc795d2a Merge branch 'rewrite/master' into bugfix/lingering-hold-cover 2024-04-16 13:25:00 -04:00
Eric b553dbd517 Remove janky animation on Freeplay menu. (#488) 2024-04-16 13:24:41 -04:00
EliteMasterEric 43ec72fb9d Ensure playNoteHoldCover doesn't call if note is judged as 'miss' 2024-04-15 20:36:38 -04:00
EliteMasterEric 4d1f60434a Fix the saturation on the main menu background. 2024-04-15 19:21:55 -04:00
Cameron Taylor bc0af9ae9f temp enabling fps 2024-04-14 03:01:07 -04:00
Cameron Taylor 658fd392fa Merge branch 'rewrite/master' into a-bot-bars 2024-04-14 02:57:05 -04:00
EliteMasterEric 5e7b417d6f Remove Kickstarter link from credits. 2024-04-12 14:44:01 -04:00
EliteMasterEric 6f5c3a043f Fix crash caused when game tries to render disposed sprites during a Sticker transition. 2024-04-10 14:45:07 -04:00
Cameron Taylor 5f48ca82bd Merge branch 'rewrite/master' into bugfix/additional-fixins 2024-04-09 23:50:05 -04:00
Cameron Taylor 54496c400b Merge pull request #479 from FunkinCrew/bugfix/no-save-data 
Fix bad initial save data when no save data present
 2024-04-09 23:34:28 -04:00
Cameron Taylor 0f9ecda2a1 Merge branch 'rewrite/master' into html5/asset-optimization 2024-04-09 20:25:37 -04:00
Cameron Taylor f00c6085e4 Merge pull request #477 from FunkinCrew/bugfix/song-compile-define 
Fix loading issue tied to -DSONG compile define.
 2024-04-09 20:15:24 -04:00
EliteMasterEric dbcbb73338 Main menu fix and Week 3 train fix 2024-04-09 15:10:58 -04:00
Mike Welsh 97884021c0 Fix bad initial save data when no save data present 
If no save data was present, the game would check for legacy save
data in the ninjamuffin99 path to migrate over. This code was
incorrectly checking `FlxSave.data == null` to determine if
legacy data was present.

This caused an empty legacy save being migrated over, resulting
in a `volume` of 0 for any new player of the game.
 2024-04-08 22:08:24 -07:00
EliteMasterEric 6d374c7af9 Fix loading issue tied to -DSONG compile define. 2024-04-08 18:39:51 -04:00
EliteMasterEric b464f51ba2 Fix an issue where a missing stage would cause a crash (rather than an error popup) 2024-04-06 22:38:32 -04:00
EliteMasterEric ea1d123c49 Fixes to Pico Blazin' animations. 2024-04-06 21:42:31 -04:00
EliteMasterEric 5beb20ec7c Fix bug where restarting the song would sometimes crash. 2024-04-06 21:42:18 -04:00
EliteMasterEric 14869b9373 Also disable highscores in botplay 2024-04-06 02:08:10 -04:00
EliteMasterEric 99ee2b07ca Make results screen use full campaign score in Story Mode 2024-04-06 02:06:06 -04:00
EliteMasterEric 29f105a44d Practice mode = no highscore! 2024-04-06 01:59:46 -04:00
Cameron Taylor 3b87ecf6f5 Merge branch 'html5/asset-optimization' of github.com:FunkinCrew/Funkin-secret into html5/asset-optimization 2024-04-05 19:59:25 -04:00