1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-09-03 20:28:04 +00:00
Commit graph

126 commits

Author SHA1 Message Date
zacksgamerz 9d48a04564 Fixed issue where you can't confirm your selection by tapping the icons in the character select menu. 2025-04-16 15:00:52 +03:00
sector-a f970ea6acf Move TouchUtil and SwipeUtil to funkin.util 2025-04-16 15:00:02 +03:00
zacksgamerz 3bcb63cb84 Made minor changes to the overlap checks in CharSelectSubState, and added another way for the player to accept by tapping on the character. Replaced FlxSprite hitboxes with FlxObject. 2025-04-16 14:56:44 +03:00
KarimAkra 068747b01a Optimized Memory Usage & Added FunkinMemory
Co-Authored-By: MoonDroid <81515012+moondroidcoder@users.noreply.github.com>
2025-04-15 22:20:01 +03:00
KarimAkra 9cf134fc2a Made more menus adapted to wide-screens & fixed some bugs
* Made stuff on the edge of the screen get moved away by the notch
* Made FreeplayState look better on wide-screens
* Adapted StoryMenuState to wide-screens
* Fixed the transition being small on some screen sizes
* refactored some code
2025-04-15 21:37:06 +03:00
KarimAkra ad4b1ce51b Adjusted freeplay to work on wide-screens
fixed some backing cards and the capsule ranking position
2025-04-15 21:34:00 +03:00
KarimAkra 944141292d Move part of the code from the old repository
Co-Authored-By: sector-a <82838084+sector-a@users.noreply.github.com>
Co-Authored-By: mcagabe19 <egzozu.be.bas@gmail.com>
Co-Authored-By: Mihai Alexandru <77043862+majigsaw77@users.noreply.github.com>
Co-Authored-By: MoonDroid <81515012+moondroidcoder@users.noreply.github.com>
Co-Authored-By: luckydog7 <59097731+luckydog7@users.noreply.github.com>
2025-04-15 21:32:39 +03:00
EliteMasterEric afb4a3dd68 Remove some unused/redundant debug hotkeys. 2025-04-03 16:02:10 -04:00
EliteMasterEric 54cd52db76 Fix an issue where story mode medals would not be awarded without a personal best. 2025-04-02 13:33:06 -04:00
EliteMasterEric e5e3453c1f Add Stress Pico + Char Select medals, and fix medals to work on release builds 2025-03-30 21:59:17 -04:00
EliteMasterEric 4e05d16cb6 Merge branch 'public-develop' into public-develop-merge 2025-03-10 20:46:33 -04:00
Abnormal 7058126e99 fix: Actually check if the Playable Character is unlocked 2025-02-17 21:26:16 -05:00
Cameron Taylor 0a911ae607 remove a buncho unused imports 2025-02-17 19:25:33 -05:00
EliteMasterEric 1dd97ff9e2 Replace hxCodec with hxVLC 2025-01-06 22:29:31 -08:00
Cameron Taylor ab5bda3ee5 fix: Character Select cursor moves properly at lower framerates 2024-10-04 12:32:36 -04:00
ACrazyTown dbf66ac250 fix: Stop allowing inputs after selecting a character 2024-10-03 21:25:34 -04:00
gamerbross c5a76cf1d5 another little fix 2024-09-30 17:17:20 -04:00
gamerbross 30a9887136 Fix bf changing twice on enter 2024-09-30 17:17:20 -04:00
gamerbross 9324359d2f Some fixes to Character Select 2024-09-30 17:17:20 -04:00
Cameron Taylor 690f3090b7 proper audio scaling for hxcodec / desktop 2024-09-20 20:11:12 -04:00
Cameron Taylor 2a6eadcbff Merge branch 'justkolosaki/char-select-gf' into rewrite/master 2024-09-20 18:11:14 -04:00
Cameron Taylor 29e89c8acb
Merge branch 'rewrite/master' into actualmandm/char-select-crash 2024-09-19 22:50:18 -04:00
EliteMasterEric 9f0bc2bd52 Refactor char select GF data handling. 2024-09-19 04:16:40 -04:00
Kolo 3bb981adb0
Update CharSelectGF.hx 2024-09-18 17:32:37 +02:00
Michael f2b3f47e73 Disable input in CharSelect until stayFunky plays 2024-09-17 15:57:50 -07:00
EliteMasterEric fd6ca6e267 Remove some spammy log traces. 2024-09-14 20:26:33 -04:00
EliteMasterEric d59594ee45 Fix animations not looping on Char Select 2024-09-12 22:02:05 -04:00
Cameron Taylor 47f3c6f00a vid sizing 2024-09-12 19:56:04 -04:00
Cameron Taylor d826f2a7bc Merge branch 'rewrite/master' into char-unlock-tinkers 2024-09-12 19:55:35 -04:00
CheemsAndFriends 1e9c6f0c4c Add Char Select stuff 2024-09-13 00:31:52 +02:00
FabsTheFabs 703e899288 apply shader filter 2024-09-12 22:43:12 +01:00
CheemsAndFriends 34d1c568ea locked fixin 2024-09-12 23:22:20 +02:00
CheemsAndFriends 6dca858fd7 Introbizz 2024-09-12 23:13:30 +02:00
CheemsAndFriends 395de4ee95 Char select subs stuff 2024-09-12 22:53:01 +02:00
CheemsAndFriends 3553d008cf tinkering shit 2024-09-12 01:37:32 +02:00
CheemsAndFriends 70ab000be4 Readd CharSelectSubState from char unlock 2024-09-11 21:16:02 +02:00
CheemsAndFriends 9f5c154b1d readd IntroSubState from char unlock 2024-09-11 20:49:55 +02:00
CheemsAndFriends bea23c37a8 readd FlxAtlasSprite from char unlock branch 2024-09-11 20:47:45 +02:00
CheemsAndFriends 5c1766a00f Fix char select substate crash 2024-09-11 18:29:47 +02:00
Cameron Taylor 22b1a5d9c0 Merge branch 'rewrite/master' into feature/char-unlock-merging 2024-09-10 23:52:52 -04:00
CheemsAndFriends f74365f230 Add Changes 2024-09-11 00:55:14 +02:00
CheemsAndFriends 35af057f88 Fix scaleY not parsing 2024-09-09 17:41:25 +02:00
CheemsAndFriends 6961e6cc63 Add a buncho Gizmos 2024-09-09 08:23:46 +02:00
CheemsAndFriends f3722e5da2 Add hmm flxanimate, new conditional for Cheems' PC sake and more wip char select animation 2024-09-07 02:07:00 +02:00
Cameron Taylor 89e1cb8258 small null fix for if we're not playing music 2024-09-06 19:44:33 -04:00
CheemsAndFriends a901677853 Merge branch 'feature/char-unlock' of https://github.com/FunkinCrew/Funkin-secret into feature/char-unlock 2024-09-06 06:33:01 +02:00
CheemsAndFriends a61f40571d add wip bizz 2024-09-06 06:28:08 +02:00
CheemsAndFriends 1021f5c2ee wip sequence 2024-09-05 22:44:05 -04:00
CheemsAndFriends 4cad56705a Add lock bizz 2024-09-05 22:40:27 -04:00
CheemsAndFriends 677357ba37 wip sequence 2024-09-06 02:55:47 +02:00
EliteMasterEric 34d13c61de Cleanup character unlock impl and queue it for after Story Mode is completed. 2024-09-05 17:54:03 -04:00
CheemsAndFriends def2b64a41 Add lock bizz 2024-09-04 20:08:38 +02:00
EliteMasterEric 24096bd319 Fixed positioning in Blazin'. 2024-09-04 10:58:18 -04:00
Cameron Taylor bd144d6adb Merge branch 'rewrite/master' into bugfix/friday-fixes 2024-09-03 23:42:51 -04:00
Cameron Taylor 498cd4a830 Merge branch 'cards-and-char-select' into rewrite/master 2024-09-01 17:56:12 -04:00
EliteMasterEric 7511de1e7a A bunch of Freeplay visual fixes 2024-09-01 03:28:56 -04:00
FabsTheFabs 60c10aae99 char select to freeplay transition, backing card implementation, beatHit for backing cards 2024-08-30 01:04:30 +01:00
Cameron Taylor 737a679196 merge conflict fixins 2024-08-29 15:26:35 -04:00
Cameron Taylor 825327e1c8 Merge branch 'rewrite/master' into feature/charSelect 2024-08-29 15:13:58 -04:00
Cameron Taylor 0392eddba6 gf/nene char select mini optimization 2024-08-29 14:32:10 -04:00
Cameron Taylor 1fbca9ab6a Merge branch 'bugfix/various-develop-fixes' into rewrite/master 2024-08-28 16:32:50 -04:00
EliteMasterEric 6cff1efc72 Fix several compile errors, and update assets submodule. 2024-08-28 06:45:18 -04:00
EliteMasterEric e7fca119f8 Logic + animations for new unlocks 2024-08-28 06:11:01 -04:00
EliteMasterEric 7e39687994 Data driven char select grid positions 2024-08-28 06:09:14 -04:00
CheemsAndFriends 353aa42f5b Fixes for the atlasSprite bizz 2024-08-28 02:48:56 +02:00
Cameron Taylor 9b712ce2aa bump flixel 2024-08-27 16:13:52 -04:00
FabsTheFabs e37330f288 character select transition 2024-08-23 13:36:00 +01:00
CheemsAndFriends 7f0f0efe46 initial Commit 2024-08-22 23:36:43 +02:00
EliteMasterEric 2ae6882241 Swappable album art and updated FlxAnimate 2024-07-10 17:25:52 -04:00
Cameron Taylor 57c995e19d char select screen controls stuff 2024-07-08 16:30:17 -04:00
Cameron Taylor 105e3dccba spritesheet fixins for char select 2024-07-02 21:26:16 -04:00
FabsTheFabs 3fa9b2a635 new music 2024-07-01 22:18:04 -04:00
Cameron Taylor 8dfd36d227 menu spam fixie 2024-07-01 22:18:03 -04:00
FabsTheFabs b1b7a032be music updates 2024-07-01 22:17:55 -04:00
FabsTheFabs 28068b1a86 updating more stuff 2024-07-01 22:17:55 -04:00
FabsTheFabs d686890f76 most of the old code 2024-07-01 22:16:56 -04:00