cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-09-03 04:07:53 +00:00
Code Issues Releases Wiki Activity
7035 commits 33 branches 30 tags 4.1 GiB
Commit graph

1298 commits

Author SHA1 Message Date
sector-a 5d7517b839 Fix sustain notes vibrations for pixel notes 2025-04-17 12:08:23 +03:00
sector-a 1790c13fac Changed vibration at rank tally animation end in results screen 2025-04-17 12:08:13 +03:00
sector-a 180ec17ce3 Prevent sustained vibrations not ending 2025-04-17 12:07:59 +03:00
KarimAkra 5a39439fcc Align the pause button with the notch 2025-04-17 12:07:17 +03:00
KarimAkra 67f0425e89 Fixed the result screen scroll text not being aligned properly on notched displays 2025-04-17 12:06:43 +03:00
zacksgamerz 31c96bc6a1 Added mobile compiler flag for the size change. 2025-04-17 12:04:09 +03:00
zacksgamerz f439624404 Scaled down the size of the incomming notes for the player for the default control scheme. 2025-04-17 12:03:58 +03:00
zacksgamerz e4733f9a5c Tune the size for the player strumline a tiny bit. 2025-04-17 12:03:32 +03:00
sector-a 6b3fb46ae5 Forgot some few vars 2025-04-17 01:03:58 +03:00
zacksgamerz def86a44eb Refactored the middle offset code for the default control scheme, added amplification and increased it by 15 px. 2025-04-17 01:02:28 +03:00
zacksgamerz 3b3f4543b4 Increased player strumline size by 0.05 percent for the default control scheme. 2025-04-17 01:02:28 +03:00
zacksgamerz d92d3130c8 Fixed opponentStrumline wacky positioning. 2025-04-17 01:02:28 +03:00
zacksgamerz 01cc9f1ae4 Added aspect ratio amplification to opponent's strumline in default controls. 2025-04-17 01:02:28 +03:00
Mihai Alexandru 824767af66 Replace the traditional lime Haptics with funkin.haptic 
Co-Authored-By: sector-a <82838084+sector-a@users.noreply.github.com>
 2025-04-17 01:01:26 +03:00
zacksgamerz 86d050a11f Refactor swipe threshold calculation to use SwipeUtil across multiple states. 2025-04-17 00:31:19 +03:00
KarimAkra 616004d7f6 move FullScreenScaleMode from flixel.system.scaleModes to funkin.ui 2025-04-17 00:29:45 +03:00
zacksgamerz 45986f34c1 Adjust note hitbox calculations for mobile to be more wide-screen friendly. 2025-04-17 00:27:30 +03:00
Mihai Alexandru 3386d62951 Video Playback Optimization. 2025-04-17 00:27:13 +03:00
zacksgamerz 85330f73a1 Small readability tuning for initNoteHitbox in PlayState. 2025-04-17 00:26:46 +03:00
zacksgamerz 318e73a030 Fixed a small typo in playstate. 2025-04-17 00:26:20 +03:00
zacksgamerz 62acfd8365 Add TODO comment to address touch pointer positioning issue in PlayState 2025-04-17 00:25:56 +03:00
sector-a 16f8678d0f Bound currentEntry in Pause SubState for targets with touch support 2025-04-16 23:41:18 +03:00
zacksgamerz 7a747993e7 Fixed issues with pixel notes' hitboxes on the default control scheme, adjusted positioning and scaled down the size even further. 2025-04-16 23:32:22 +03:00
sector-a 6c2ff099da Uncomment swipeThreshold.set() calls 2025-04-16 16:05:53 +03:00
KarimAkra a289fb7f54 Fixed common issues with the Pointer Plugin 2025-04-16 16:05:20 +03:00
KarimAkra c636024f75 Fixed pausing in PlayState when fake cutouts are present. 2025-04-16 15:59:28 +03:00
sector-a 0e256021b1 Made note vibrations weaker, removed HAPTIC_VIBRATIONS define, moved vibration option from mobileOptions to options 2025-04-16 15:29:26 +03:00
zacksgamerz 18dcb8f446 Replaced all old flick checks, swipe checks, etc. with the proper checks from Flixel. Updated flixel ref. Removed justFlicked checks as they are unused. 
Replace swipeThreshold updates with the one in FlxTouchManager

Temporarily remove swipeThreshold sets for testing.

Proper SwipeUtil refactoring. Completely replaced all flick and movement checks with the one in Flixel. Rewrote most of the documentation to be more accurate.

Invert flick checks as it already comes inverted from FlxFlick.

Define fixes for SwipeUtil

Fixed null safety issues on compiling.
 2025-04-16 15:22:10 +03:00
sector-a ca391c6e32 Add Sustain Note vibration 2025-04-16 15:15:15 +03:00
sector-a 5ae73361b0 Move noteVibrations variable to Strumline and Add Sustain note splash vibration 2025-04-16 15:15:15 +03:00
sector-a 4cee6a9d56 Make Note Vibrations stacked amplitude work as intended 2025-04-16 15:15:15 +03:00
KarimAkra c3ed2019b5 Change System.allowScreenTimeout on state/substate destroy instead of close 2025-04-16 15:10:46 +03:00
KarimAkra ea9938a318 rename DISABLE_ADMOB_ADS to FEATURE_ADMOB_ADS 2025-04-16 15:06:07 +03:00
zacksgamerz f17b9d234c Scale down the strumline size visually but increase the hitbox to be bigger for the default control scheme. Added double note overlap. 2025-04-16 15:03:07 +03:00
sector-a f970ea6acf Move TouchUtil and SwipeUtil to funkin.util 2025-04-16 15:00:02 +03:00
sector-a e3e98dc057 Note vibrations with stackable amplitude 2025-04-16 14:54:31 +03:00
KarimAkra 3e75701c1c Adjust Arrows control scheme notes sizes for easier reading & pressing 
Co-Authored-By: MoonDroid <81515012+moondroidcoder@users.noreply.github.com>
Co-Authored-By: sector-a <82838084+sector-a@users.noreply.github.com>
 2025-04-16 14:35:28 +03:00
KarimAkra f23a6a8ac8 Adjust notes scale & spacing for Arrows control scheme 
Co-Authored-By: luckydog7 <59097731+luckydog7@users.noreply.github.com>
Co-Authored-By: sector-a <82838084+sector-a@users.noreply.github.com>
 2025-04-16 13:52:00 +03:00
sector-a 4b797d3526 allow input offset on mobile and gameover input delay 2025-04-16 13:39:04 +03:00
KarimAkra 82a9dabc7f Added ability to swipe on difficulties to change them on FreeplayState 
Co-Authored-By: Karim Akra <144803230+karimakra@users.noreply.github.com>
Co-Authored-By: MoonDroid <81515012+moondroidcoder@users.noreply.github.com>
 2025-04-16 13:21:16 +03:00
lemz1 14975212a9 macro 
registry macro

Merge branch 'lemz1/registry-entry-data' into lemz1/registry-macro-stufff
 2025-04-15 20:25:18 -04:00
KarimAkra e9b1800ec9 Improves HapticUtil's code a bit 
Co-Authored-By: Mihai Alexandru <77043862+majigsaw77@users.noreply.github.com>
Co-Authored-By: Karim Akra <144803230+karimakra@users.noreply.github.com>
Co-Authored-By: sector-a <82838084+sector-a@users.noreply.github.com>
 2025-04-16 00:22:56 +03:00
sector-a bee846ec8c Rename NoteDPad controls scheme to Arrows 
my bad
 2025-04-16 00:09:46 +03:00
KarimAkra d80afc35b4 Fixed a few issues with touch controls & flicks 
Co-Authored-By: MoonDroid <81515012+moondroidcoder@users.noreply.github.com>
 2025-04-15 23:39:17 +03:00
KarimAkra 2a6720da2e Added a new "Note DPad" control scheme 
Co-Authored-By: MoonDroid <81515012+moondroidcoder@users.noreply.github.com>
Co-Authored-By: sector-a <82838084+sector-a@users.noreply.github.com>
Co-Authored-By: luckydog7 <59097731+luckydog7@users.noreply.github.com>
 2025-04-15 22:54:00 +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
sector-a 4962d55b22 hide hitbox if game is paused 
forgot something!!!!
 2025-04-15 21:37:29 +03:00
KarimAkra 66e6ea9d41 Fixed few issues with extension-admob implementation 
Co-Authored-By: sector-a <82838084+sector-a@users.noreply.github.com>
Co-Authored-By: Mihai Alexandru <77043862+majigsaw77@users.noreply.github.com>
 2025-04-15 21:37:22 +03:00
KarimAkra d43dfac3e4 Added vibrations to most ResultState ranks and more! 
* Vibrations for most ranks
* Vibrations when scrolling through FreeplayState
* Vibrations for notes hits
* Vibrations for game over

Co-Authored-By: sector-a <82838084+sector-a@users.noreply.github.com>
 2025-04-15 21:37:14 +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 7b1abe437f Add proper configuration for AdMob ads 
Co-Authored-By: sector-a <82838084+sector-a@users.noreply.github.com>
Co-Authored-By: Lily <egzozu.be.bas@gmail.com>
 2025-04-15 21:37:00 +03:00
KarimAkra 193d293dea Added HapticUtil and some vibrations to some menus & scenes! 
Added vibrations to:

* TitleState on beat hits during into
* Freeplay when a new rank is slammed to the capsule
* Some vibrations on ResultState (such as when the tally counter increases...)

Co-Authored-By: sector-a <82838084+sector-a@users.noreply.github.com>
 2025-04-15 21:36:54 +03:00
sector-a 530ca0d929 play video ad after results screen instead of in it 2025-04-15 21:36:49 +03:00
KarimAkra 9dc48978f8 Massive Touch Controls Overhaul 
Co-Authored-By: MoonDroid <81515012+moondroidcoder@users.noreply.github.com>

This overhaul includes:

* Flicks on menus
* Changing options by sliding the finger over screen
* Changing options by pressing the option itself
* Touch Pointers
* And more!

Co-Authored-By: MoonDroid <81515012+moondroidcoder@users.noreply.github.com>
Co-Authored-By: sector-a <82838084+sector-a@users.noreply.github.com>
 2025-04-15 21:36:28 +03:00
KarimAkra 7babcfaf6b Implement extension-admob for mobile ads 
forgor that

videos and fixed banner size

make this a define

keep thes demo units when using TESTING_ADS only

always enable it on debug builds (?)

Update AdMobUtil.hx

admob features

Update PlayState.hx

Update AdMobUtil.hx

Update AdMobUtil.hx

Show privacy options form if required.

Update Main.hx

Update Main.hx

Update PlayState.hx

Update AdMobUtil.hx

Update AdMobUtil.hx

Update AdMobUtil.hx

Co-Authored-By: Mihai Alexandru <77043862+majigsaw77@users.noreply.github.com>
Co-Authored-By: sector-a <82838084+sector-a@users.noreply.github.com>
 2025-04-15 21:36:05 +03:00
KarimAkra b1b30ed09f Formatted some code for freeplay & fixed strumlines position on wide-screens 2025-04-15 21:35:19 +03:00
KarimAkra a732d27e93 Fix the background text of ResultState going off of FlxGame bounds 2025-04-15 21:33:18 +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
Eric 20c3228d8c Don't discount the score so much on miss, but still keep it meaningful. 2025-04-14 19:32:55 -04:00
EliteMasterEric 4d9638f0ac Fix the clamping. 2025-04-14 19:32:55 -04:00
EliteMasterEric 577421a782 Scoring rework: Penalize the player (deducting health and score) for dropping a hold note before it's finished. 2025-04-14 19:32:54 -04:00
EliteMasterEric 429f6f9bc0 Remove the unused input splitter. 2025-04-14 19:32:16 -04:00
EliteMasterEric 550bf95c76 Split miss penalty and ghost miss penalty into two variables (but make them equal for now). 2025-04-14 19:32:16 -04:00
EliteMasterEric da686ed0c4 Scoring rebalance: Misses now reduce your final grade, which impacts your rank 2025-04-14 19:32:16 -04:00
EliteMasterEric 9f3711bf43 Scoring rebalance: Misses are now worth -250 points (up from -10). 2025-04-14 19:32:16 -04:00
EliteMasterEric 6390725ef0 Redo data format for sticker packs to make it simpler and allow for song-specific selections. 2025-04-14 19:25:42 -04:00
Abnormal 5be4f3bbb9 chore: Remove ComboMilestone 2025-04-14 15:28:14 -04:00
EliteMasterEric 9ff14aed42 Fix an issue where Pico's retry animation is broken on Ugh/Guns Pico Mix 2025-04-09 15:58:44 -04:00
VioletSnowLeopard 1f88a3b6e1 swap restart and skip in dialogue pause menu 2025-04-09 15:33:54 -04:00
EliteMasterEric c7d4406a34 Fix results screen music continuing to play when using the debugger 2025-04-03 22:01:32 -04:00
EliteMasterEric c157338783 Fix certain characters pixel icons not displaying properly in the chart editor. 2025-04-03 16:04:07 -04:00
EliteMasterEric afb4a3dd68 Remove some unused/redundant debug hotkeys. 2025-04-03 16:02:10 -04:00
Cameron Taylor 62621881c0 data -> data.score 2025-04-02 16:18:58 -04:00
EliteMasterEric 17a4be66b9 Fix highscores not submitting to the website unless they are a personal best. 2025-04-02 13:33:06 -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 3ff93f1923 Fixed some bugs with death quotes and added final lines. 2025-03-30 18:54:12 -04:00
EliteMasterEric 64d8e81ed1 Rework death quotes logic to make more sense. 2025-03-30 18:54:06 -04:00
Cameron Taylor f7a48bcb3b refactor some FreeplayRank stuff to hold both blurred and unblurred ranking 2025-03-27 20:26:50 -04:00
EliteMasterEric 0bc938d0fa Implement support for Newgrounds Events 2025-03-27 15:49:09 -04:00
EliteMasterEric d84c2e7875 Fix an issue where the game would try to render destroyed note graphics. 2025-03-25 22:02:43 -04:00
Cameron Taylor 431241bf19 quick fix for results screen debug crap 2025-03-25 18:14:53 -04:00
Hundrec 91a594cc85 Nudge Results totals left if 4 digits long 2025-03-25 15:03:08 -04:00
EliteMasterEric 43bdd38a44 Fix all game over screen being broken 2025-03-25 14:59:16 -04:00
Cameron Taylor 6e463e0188 debug: add simple result screen debug mode 2025-03-25 14:48:31 -04:00
Cameron Taylor e8c07c9ec6 debug: added debug menu option to open ResultsState (and fixed small crash when opening ResultsScreen in this way) 
part 1 of results screen debug stuff
 2025-03-24 19:20:25 -04:00
Lasercar 9c2ef02368 NuN GF 
Adds a none/null option for the character selector dropdown
Also fixes a few null references that happen when one or both characters are null in the playstate
 2025-03-24 15:00:01 -04:00
Cameron Taylor 07c433e6d4 Merge branch 'notehold-styles' into rewrite/master 2025-03-21 18:58:29 -04:00
EliteMasterEric febe5e84a2 Don't display the rank animation in Freeplay if Practice Mode or Bot Play Mode were enabled. 2025-03-20 15:13:32 -04:00
EliteMasterEric d7c3b64e02 Disable note inputs when the song is over. 2025-03-20 15:13:32 -04:00
EliteMasterEric 0f6e6c4701 Fix a crash when using -DRESULTS. playerCharacterId was already calculated earlier. 2025-03-20 15:13:32 -04:00
Cameron Taylor a72fce14d1 Merge branch 'public-develop' into rewrite/master 2025-03-17 22:20:28 -04:00
Lasercar e83b88d320 I'm so done with this stupid bug 
Eric wuz here!
 2025-03-17 06:44:21 -04:00
Kolo 3667c51c1e prevent unnecessary resync 2025-03-17 06:19:54 -04:00
Lasercar ea93ec90cb Fix strumline offset when downscroll 2025-03-15 13:20:39 +10:00
EliteMasterEric 20403eb80f Merge branch 'public-develop' into public-develop-2 2025-03-12 18:58:43 -04:00
Cameron Taylor 6b9e6c9ebc holdnotecover implementation stuff 2025-03-11 23:17:29 -04:00
Cameron Taylor 26de08c005 note hold and splash in progress 2025-03-11 18:46:06 -04:00
EliteMasterEric 6b404c4fcf Don't award Friday Night medal just for logging in, you have to beat a song. 2025-03-10 20:47:06 -04:00
EliteMasterEric 4e05d16cb6 Merge branch 'public-develop' into public-develop-merge 2025-03-10 20:46:33 -04:00
Cameron Taylor 93e6d0685b reimplement my notesplash stuff i accidentally deleted derp 2025-03-10 20:39:38 -04:00
Cameron Taylor ea3f1be425 NoteSplash animation cleanup 2025-03-10 20:39:38 -04:00
Cameron Taylor f9a40a2bf7 notesplash notestyle implementation 2025-03-10 20:39:32 -04:00
EliteMasterEric 63a8403e7b add bloody tankman song event 2025-03-07 21:56:44 -05:00
EliteMasterEric 7231b3f645 New chart event: Set the character's health icon. 2025-03-07 21:56:44 -05:00
Cameron Taylor 6e55bcfc77 fixing for loading .fnfc files 2025-03-06 18:09:13 -05:00
EliteMasterEric 2983c7b5bc Fix error spam when Nene tries to use hair blow. 2025-03-03 10:53:21 -05:00
JVN-Pixels edb270d15e Update ResultState.hx 2025-02-28 17:21:27 -05:00
Cameron Taylor bda3ab1192 update to latest upstream flixel + flixel-addon + flxanimate 2025-02-18 13:38:20 -05:00
Abnormal 128afcaad1 quick fixin 2025-02-17 23:28:38 -05:00
Abnormal f6d9d29181 add angle too bc why not 2025-02-17 23:28:38 -05:00
Abnormal ff56b1948a add scrollfactor and alpha + grammatical fix in StageData 2025-02-17 23:28:38 -05:00
Abnormal b13bf05d16 fix: Fix the difficulty graphic in the Result Screen cutting off 2025-02-17 21:56:22 -05:00
Cameron Taylor 0a911ae607 remove a buncho unused imports 2025-02-17 19:25:33 -05:00
EliteMasterEric 103a705e24 Update hxvlc to the latest version 2025-02-17 10:24:50 -05:00
Abnormal 6466b88d88 a -> an 2025-02-14 18:15:59 -05:00
Abnormal 9b774e3264 format a few files 2025-02-14 18:13:05 -05:00
Cameron Taylor 34c67fdb54 fix(debug): pressing H on pause screen removes the 'background' sprite properly as well now 2025-02-12 14:11:18 -05:00
EliteMasterEric 731f38a2bb Fix a bug with strum backgrounds when setting strumline.alpha (thanks QT:RW!) 2025-02-12 14:10:38 -05:00
fabs 58ea0287d3 disable pixel perfect rendering on sprites 2025-02-07 08:33:16 -05:00
EliteMasterEric ea2d45e6c9 Fix some warnings/crashes in Week 6 
assets submod
 2025-01-28 16:39:00 -05:00
fabs a6388962dd Merge branch 'public-develop' into rewrite/master 2025-01-27 22:31:38 +00:00
Kolo dfe02ec668
check if the vocal files actually exist (#3861) 
Co-authored-by: Kolo <67389779+JustKolosaki@users.noreply.github.com>
 2025-01-17 15:52:02 -05:00
Kade 785c4be88b
[ENHANCEMENT] [MODDING] Several QOL modding changes (#4009) 
* Custom render distance strumline

* Custom note positions

* Custom vertices for holds

* Song Retry Event

Song retry event for pausesubstate.hx
Song retry event for playstate.hx
Song retry event for stage.hx
Song retry event for bopper.hx
Song retry event for song.hx
Scripted class event
Module event

* this should be cast

* Show notesplash toggle

* Formatting and EOF
 2025-01-17 15:37:00 -05:00
Til 22d41d21b8
i think this does it (#3955) 2025-01-17 15:33:16 -05:00
Til 19023645df use event.isComboBreak instead of isComboBreak (#3936) 2025-01-17 12:17:48 -05:00
Til 3aad825f86
use event.isComboBreak instead of isComboBreak (#3936) 2025-01-16 19:41:04 -05:00
EliteMasterEric 04a7007f6e Move Tracy debug message into trace() 2025-01-13 14:33:21 -05:00
EliteMasterEric 1dd97ff9e2 Replace hxCodec with hxVLC 2025-01-06 22:29:31 -08:00
Cameron Taylor f4d4b67df4 fix: remove controls on results screen that allowed moving the results text 2024-12-19 18:33:22 -05:00
Cameron Taylor be3fe9028a fix: remove the input delay on pause menu, allowing for inputs immediately when opening the pause menu 2024-12-08 20:37:46 -05:00
Cameron Taylor 76bedb8079 some random hxformat crap fixes in Stage.hx 2024-11-26 16:08:45 -05:00
Victor G c6d5bda802
feat: Added non-naughty Perfect results screen animation for Boyfriend (#821) 
* change result state stuff

* add more fields

* change testing

* assets submod

---------

Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
 2024-11-26 15:39:12 -05:00
EliteMasterEric 2143792369 Fix an issue with setting music.asset to "" 2024-11-24 21:07:00 -05:00
CheemsAndFriends 490760caa0 fix the ignore in the ignore 2024-11-23 15:21:28 -05:00
CheemsAndFriends fcb48ea52f Remove traces 2024-11-23 15:20:30 -05:00
CheemsAndFriends 3d5e91f455 Fix blazin issue and holds not playing properly 2024-11-23 15:20:30 -05:00
CheemsAndFriends d3c001c673 Trying to fix blazin issues 2024-11-23 15:19:57 -05:00
EliteMasterEric 1212c694e8 Add a new option to put a transparent background on the strumline 2024-11-23 14:42:46 -05:00
EliteMasterEric b7f2112c60 feat: Add alternate sticker set, and sticker pack swapping. 2024-11-14 22:25:44 -05:00
EliteMasterEric e9e639500a Newly revamped Newgrounds integration, with working medals and leaderboards 2024-11-04 15:05:33 -05:00
Cameron Taylor 144ba00377 refactor: remove commented out code from draw() in PlayState.hx 2024-10-26 15:53:22 -04:00
Cameron Taylor 7159cad2c1 style: remove a buncho unused imports from PlayState.hx 2024-10-26 15:51:38 -04:00
Kolo 0a5419d7fc the stage editor shit 2024-10-10 13:28:00 -04:00
EliteMasterEric bc546e86aa Clean up documentation in StrumlineNote 2024-10-05 13:34:08 -04:00
EliteMasterEric de5cca1120 Add some cutom logic to determine if this.active is needed. 2024-10-05 13:34:08 -04:00
DaWaterMalone 3aa4591bab Fixed Modded StrumlineNote Sprite Looping Animation 
Within the playStatic function on the StrumlineNote.hx, setting this.active = true; will fix looping animations for modded in StrumlineNote sprites. Leaving this.active = false; will stop any modded StrumlineNote sprite animation when the player or opponent hits chart notes.
 2024-10-05 13:34:08 -04:00
Cameron Taylor d2e29879fe fix: Song.getFirstValidVariation() now properly takes into account multiple variations/difficulty input 
freeplay implement for NEW song stuff w/ assets submod

save data crap and crud

rank icon fixes for fixed pico menu
 2024-10-04 12:01:45 -04:00
Cameron Taylor c0314c85ec fix(freeplay)!: Proper variation / difficulty loading for Freeplay Menu 
Previously the game would load variations in a `variation-difficulty` string format, but now we map it out better and filter it based on that, rather than messing around with suffixes and whatnot. If you have a mod that depended on the functionality of the `variation-difficulty` format, you should accomodate that functionality in another way

re-add freeplay song preview

song names and icons implemented again

implement the scoring rank, bpm, and difficulty crud

albumId loading fix
 2024-10-04 12:01:45 -04:00
EliteMasterEric a4ed55721f Fix duplicate combo counter on combo break 
Co-authored-by: Eric <ericmyllyoja@gmail.com>
Co-authored-by: Hundrec <hundrecard@gmail.com>
 2024-10-04 08:09:18 -04:00
Kolo 410cfe972d fix: fix the user song offsets being applied incorrectly 2024-10-03 21:25:34 -04:00
Victor G 45a5160b06 Fix PlayState compilation crashes 2024-10-03 21:25:34 -04:00
Cameron Taylor 9d3131bc8d
Merge branch 'rewrite/master' into bugfix/two-fixes 2024-09-30 10:25:58 -04:00
EliteMasterEric 90f6f80a71 Fix issues with animation offsets breaking on restart on characters with high offstes. 2024-09-29 07:06:11 -04:00
Cameron Taylor a1370157a4
Merge pull request #803 from FunkinCrew/abnormalpoof/stage-prop-flipx 
[PUBLIC PR] Add flipX and flipY parameters to Stage props
 2024-09-28 12:30:57 -04:00
EliteMasterEric 042dfb7442 Merge branch 'rewrite/master' into abnormalpoof/stage-prop-flipx 2024-09-28 09:18:41 -04:00
Cameron Taylor 7a3d983bba Merge branch 'feature/discord-rpc-resurrected' into rewrite/master 2024-09-27 17:47:59 -04:00
Cameron Taylor db0944712d Merge branch 'rewrite/master' into bugfix/mod-dev-fixes 2024-09-27 17:27:59 -04:00
Cameron Taylor fb1b3cc1cd Merge branch 'bugfix/week-7-pico-stress' into rewrite/master 2024-09-27 17:00:54 -04:00
Cameron Taylor 9a57762a9c Merge remote-tracking branch 'origin/bugfix/web-screenshots' into rewrite/master 2024-09-27 16:56:12 -04:00
AbnormalPoof cd2b458da2 add flipx and flipy 2024-09-27 15:15:35 -05:00
EliteMasterEric 5630e74584 Rework Freeplay variation handling... again. 2024-09-27 14:26:08 -04:00
EliteMasterEric 067f52ca91 Kill intro music when leaving Results state. 2024-09-27 14:25:32 -04:00
EliteMasterEric b5f3996236 Properly sort difficulties/variations. Validate variation IDs (alphanumeric only) 2024-09-27 12:21:17 -04:00
EliteMasterEric e321861b9f Fix an issue where animations wouldn't loop properly on AnimateAtlasCharacters. 2024-09-27 03:09:59 -04:00
EliteMasterEric c4ed31b246 Fix a bug where force-ending a song could occasionally try to draw destroyed sprites. 2024-09-27 02:52:01 -04:00
EliteMasterEric 67126b33fa Suppress some spammy log calls 2024-09-25 10:02:18 -04:00
EliteMasterEric 998bbb213a Merge branch 'rewrite/master' into nebulazorua/classic-camera-fix 2024-09-25 08:48:20 -04:00
EliteMasterEric 8d02a3f984 A bunch of controls fixes 2024-09-25 08:39:57 -04:00
EliteMasterEric 5693d626b5 Update so that album art works. 2024-09-25 03:58:43 -04:00
Cameron Taylor 073dbaa023 Merge remote-tracking branch 'origin/bugfix/input-offsets-crash' into rewrite/master 2024-09-23 18:48:22 -04:00
Cameron Taylor 1c2a403dea Merge branch 'rewrite/master' into kadedev/fix-audio-offsets 2024-09-23 13:07:32 -04:00
Til Tjardes cca997b724 fix develop branch cuz git is on crack 2024-09-22 17:59:18 -06:00
EliteMasterEric 0bf1bead03 Fix some issues causing the Input Offsets view to crash on web. 2024-09-22 12:14:15 -04:00
EliteMasterEric 6c743b3b89 Remove some spammy trace calls. 2024-09-21 20:33:51 -04:00
EliteMasterEric 2c73b241e8 Rework offset+vocal sync handling to fix the "Swing Mode" bug 2024-09-21 06:33:47 -04:00
Cameron Taylor 690f3090b7 proper audio scaling for hxcodec / desktop 2024-09-20 20:11:12 -04:00
Cameron Taylor d02e834460 Merge branch 'rewrite/master' into abnormalpoof/assets-getpath 2024-09-20 18:13:13 -04:00
Cameron Taylor 426bff3bf5
Merge pull request #768 from FunkinCrew/kadedev/addcharacter-type 
[PUBLIC PR] Move characterType assignment to Stage.addCharacter
 2024-09-20 00:23:53 -04:00
Cameron Taylor 69bcd0834e
Merge branch 'rewrite/master' into techniktil/chart-editor-icons 2024-09-19 23:31:26 -04:00
Cameron Taylor 47ed9d7fb2 Merge branch 'rewrite/master' into dombomb64/note-style-scaling 2024-09-19 22:35:16 -04:00
Cameron Taylor 50de041251 Merge branch 'public-release/develop' into rewrite/master 2024-09-19 22:11:05 -04:00
Kade f9186b67a7
less tolerance 2024-09-19 17:00:52 -07:00
Kade a8aeae4f7f
do not include offset in vocal (they're offset by inst) 
Fix a tiny little issue with vocal resync @ start
 2024-09-19 14:26:18 -07:00
Kade 4d73e0cc47
fix some interesting issues with this 
redundant trace removal
 2024-09-19 14:26:18 -07:00
Kade b03c8a9cf8
Limit the song time to 0 and the songs max length 
use the new bool to tell if we should start the song

add a public static bool to countdown: finished
 2024-09-19 14:26:18 -07:00
EliteMasterEric 3cbba8ba29 Resolve merge issues. 2024-09-19 17:16:31 -04:00
EliteMasterEric 35aa8731d0 Better status messages, buttons, updated album art, basic chart editor support 2024-09-19 11:13:05 -04:00
EliteMasterEric 8fd84f9d13 Functioning Discord Rich Presence! 2024-09-19 10:03:16 -04:00
Cameron Taylor ab3b976f3c fix rounding for sound results sfx 2024-09-18 15:07:15 -04:00
EliteMasterEric 5efbff044b Resolve merge issues 2024-09-18 06:32:06 -04:00
EliteMasterEric b5ed7f40d4 Remove redundant character type assignment 2024-09-18 05:24:57 -04:00
EliteMasterEric b28af79eb3 Fix build issues 2024-09-18 05:18:16 -04:00
Eric 5f563f0555
Merge branch 'develop' into chart-editor-icon-fix 2024-09-18 05:10:30 -04:00
EliteMasterEric 1beb21e57a Replace all instances of openfl/lime Assets with funkin.Assets 2024-09-18 05:04:32 -04:00
Kade de07497ae3
Make addCharacter actually set the characters type 2024-09-17 17:29:12 -07:00
dombomb64 6e33cac9ec ...Okay it wasn't that simple 2024-09-17 16:47:16 -04:00
dombomb64 0706192cbe Fix note scaling with one simple trick! 2024-09-17 13:50:59 -04:00
Til Tjardes e6525d0129 stop being on the kickstarter crack me 2024-09-16 20:44:29 -06:00
Til Tjardes b7c3f5ac9f Chart Editor Icons are fixed now! 2024-09-16 20:04:04 -06:00
EliteMasterEric 2e9223ec72 Merge remote-tracking branch 'origin/develop' into anysad/custom-popups-countdowns 2024-09-16 20:50:13 -04:00
Eric 6ee1bddacb
Merge branch 'develop' into fix-sync 2024-09-16 18:27:27 -04:00
Eric bab4ac4902
Merge branch 'develop' into bugfix/default-face-icon 2024-09-16 18:21:20 -04:00
EliteMasterEric 517984d120 Fix a bug where Shit judgement would always display with anti-aliasing. 2024-09-13 18:46:49 -04:00
EliteMasterEric a9667c54f3 Fix FlxAtlasSprite completion handling and music looping 2024-09-12 15:48:41 -04:00
CheemsAndFriends 3553d008cf tinkering shit 2024-09-12 01:37:32 +02:00
CheemsAndFriends 68d87a0837 Add one more conditional in atlas + add ignoreExclusions in Bopper/BaseCharacter 2024-09-11 19:24:21 +02:00
CheemsAndFriends 0dc286e1d3 Fix Eggnog santa not playing plus Ugh fix 2024-09-11 18:29:31 +02:00
EliteMasterEric a530d91a76 Fix a bug where StickerSubState was being loaded as a state and not a substate, breaking some transitions 2024-09-10 19:16:48 -04:00
EliteMasterEric 4c1b4859e7 Fix a bug where the random event in Week 3 would always trigger 2024-09-09 22:35:02 -04:00
Cameron Taylor 591d4a29f4 gameover positioning fixes 2024-09-09 12:34:55 -04:00
Cameron Taylor a623ec77f7 Merge branch 'feature/char-unlock-notif' into rewrite/master 2024-09-06 19:44:58 -04:00
EliteMasterEric 34d13c61de Cleanup character unlock impl and queue it for after Story Mode is completed. 2024-09-05 17:54:03 -04:00
Cameron Taylor 33aaabe190 lil console command helper for camera zoom 2024-09-05 01:22:45 -04:00
EliteMasterEric 24096bd319 Fixed positioning in Blazin'. 2024-09-04 10:58:18 -04:00
EliteMasterEric 3a2ca6b525 Code changes to fix Blazin' 2024-09-04 09:58:04 -04:00
Cameron Taylor 788f0ee026 Merge branch 'bugfix/labor-daybor' into rewrite/master 2024-09-03 23:56:45 -04:00
EliteMasterEric 36505f75c1 The actual code for custom freeplay music LOL 2024-09-03 21:14:57 -04:00
Cameron Taylor 930f5ff5a6 Merge branch 'feature/instrumental-select-hud' into rewrite/master 2024-09-03 11:25:34 -04:00
Cameron Taylor b27aa4c94d Merge branch 'rewrite/master' into feature/pico-playable-christmas 2024-08-29 13:40:56 -04:00
EliteMasterEric 1fb5c31c22 Don't apply global offset twice (NOTE: this may break Nene again!) 2024-08-28 06:09:34 -04:00
EliteMasterEric 16a6dba9df Pico Fist Pump animation (with loss animation) 2024-08-28 06:08:30 -04:00
EliteMasterEric 89402f8bb8 Fix a bug where Bot Play could miss (via lag or the player mashing) and lose the song. 2024-08-28 05:47:34 -04:00
EliteMasterEric af93da6cd4 Fixes to Chart Editor toolboxes 2024-08-28 05:43:23 -04:00
EliteMasterEric b0f04779dc Fix to Spooky icon in Freeplay menu 2024-08-28 05:43:01 -04:00
EliteMasterEric 382af3b485 Reimplement ghost tapping (disabled via compile define) 2024-08-28 05:42:14 -04:00
EliteMasterEric 469ff6690f Fix a crash when skipping in the song before it started. 2024-08-28 05:40:50 -04:00
Cameron Taylor ce62c240fa Merge branch 'rewrite/master' into bugfix/nene-pico-offsets 2024-08-27 14:40:56 -04:00
Cameron Taylor a7334d8ff9
Merge pull request #705 from FunkinCrew/bugfix/week-4-boppers 
Fix a bug where stage props would receive events twice
 2024-08-27 14:26:19 -04:00
EliteMasterEric d02f632c0e Fix a bug where stage props would receive events twice 2024-08-27 04:54:02 -04:00
EliteMasterEric df42ac7531 Fixed issues with Nene offsets in Pico mode 2024-08-27 04:20:49 -04:00
EliteMasterEric 200b3c963b Updated compile defines to use feature flag system 2024-08-26 18:01:36 -04:00
Cameron Taylor df588f86af Merge branch 'rewrite/master' into applehair/storymode-valid-variation 2024-08-20 15:06:07 -04:00
Cameron Taylor 1b309e33ef
Merge branch 'rewrite/master' into 70ltan/char-path-fix 2024-08-20 14:21:36 -04:00
Cameron Taylor 0e46f91a60 Merge branch 'rewrite/master' into feature/album-art-swap 2024-08-16 20:21:51 -04:00
Eric 6e1ff4a6b1
Merge branch 'rewrite/master' into 70ltan/char-path-fix 2024-08-12 14:37:16 -04:00
Eric f5826e3a35
Merge branch 'rewrite/master' into applehair/storymode-valid-variation 2024-08-12 14:37:15 -04:00
Cameron Taylor 21fe5f12be Merge branch 'ninjamuffin99/funk-644' into rewrite/master 2024-08-09 23:02:02 -04:00
Cameron Taylor e105f933ac Merge branch 'rewrite/master' into anysad/custom-countdowns 2024-08-09 23:00:03 -04:00
Cameron Taylor 62d0b33689 Fix for switching to old icon on isPixel levels 2024-08-06 13:44:02 -04:00
Cameron Taylor f4a2ac4dde Merge branch 'rewrite/master' into bugfix/character-offset-fixes 2024-07-29 21:25:33 -04:00
7oltan e2297af1cd FIX CHARACTER PATHS ISSUE 2024-07-29 18:54:26 -04:00
AppleHair eb78b754f8 A fix requested by Eric 2024-07-29 18:34:59 -04:00
AppleHair bef2e98222 [BUGFIX] Ensure the variation used for the next song is valid. 
When playing in story mode, `PlayState` assumes all the songs use the same variation, which is usually true, but not guaranteed. This PR makes `PlayState` use the `getFirstValidVariation` method to find the valid variation instead of using the `currentVariation` variable, which might not be valid.
 2024-07-29 18:34:59 -04:00
Cameron Taylor f1af005cf3 Merge branch 'rewrite/master' into burgerballs/song-resync-tweaks 2024-07-29 14:04:41 -04:00
EliteMasterEric 41bd0246ac Custom coutndown, judgements, and combo count now use the note style file instead of hardcoded paths. 2024-07-28 17:10:32 -04:00
anysad d07564cdc2 hopefully final polish? 2024-07-28 02:44:16 -04:00
anysad 82a6ca5916 welcome fallback note styles! 2024-07-28 02:43:02 -04:00
anysad d3209e57b7 goodbye scripts, hello notestyles! 2024-07-28 02:34:12 -04:00
anysad bf1d4031af remove trace 2024-07-28 02:31:20 -04:00
anysad 0e7fad090b custom popups and countdowns yay!!! 2024-07-28 02:31:01 -04:00
EliteMasterEric f3624f7e76 Fixes for scripted song events, define vocal tracks per variation, display suffixed difficulties properly. 2024-07-28 01:42:09 -04:00
Burgerballs 1831daac38 Update PlayState.hx 2024-07-25 03:34:59 -04:00
Burgerballs 6e301bf648 Update PlayState.hx 2024-07-25 03:34:58 -04:00
Burgerballs 964f6878c3 Update PlayState.hx 2024-07-23 19:02:09 +01:00
Burgerballs 8778ab1d0e Update PlayState.hx 2024-07-23 18:09:39 +01:00
Cameron Taylor 4164329ca9 Merge branch 'rewrite/master' into lemz1/note-kind-scripts 2024-07-22 22:20:58 -04:00
EliteMasterEric a071e90746 Added alt vocal offsets feature, disabled alt instrumentals on Pico mix (for now?) 2024-07-22 20:52:03 -04:00
EliteMasterEric 1515719a0f Implemented instrumental select (you need to beat the song as Pico first)! 2024-07-22 18:38:22 -04:00
Cameron Taylor bfa0bafc6f
Merge pull request #675 from FunkinCrew/bugfix/hud-hiding 
Several tiny bug fixes
 2024-07-19 19:10:28 -04:00
EliteMasterEric 7547875535 Allow hiding HUD on launcher builds. 2024-07-18 23:27:41 -04:00
EliteMasterEric 558ec53532 Switch songs with no difficulties from an error to a warning. 2024-07-18 23:27:12 -04:00
Cameron Taylor f90c2bda99
Merge branch 'rewrite/master' into anysad/tutorial-hey-events 2024-07-18 15:08:10 -04:00
Cameron Taylor b0a842c2c7
Merge pull request #664 from FunkinCrew/gamerbross/chart-reload-f5 
[PUBLIC PR] Pressing F5 in play state now reloads the chart data from your assets folder
 2024-07-18 15:07:52 -04:00
anysad ba96b11196 hopefully final polish? 2024-07-18 17:56:54 +03:00
anysad ff1ab1eb42 welcome fallback note styles! 2024-07-17 23:19:18 +03:00
anysad ee44981995 you know what, make countdown sprites a little bigger 2024-07-16 22:02:05 +03:00
anysad f8a0627fd2 goodbye scripts, hello notestyles! 2024-07-16 20:53:12 +03:00
EliteMasterEric 416d60000f Implement Nene Christmas, and fix Nene offsets on other stages. 2024-07-15 06:30:10 -04:00
anysad 2547fbb8f4 remove trace 2024-07-13 23:08:16 +03:00
anysad 2993e17278 custom popups and countdowns yay!!! 2024-07-13 22:45:58 +03:00
EliteMasterEric 6116ec3639 Some more fixes for offsets handling and stuffs 2024-07-12 22:31:04 -04:00
EliteMasterEric 492874ce32 Merge branch 'sword352/indirect-anim-offsets' into bugfix/character-offset-fixes 2024-07-12 21:41:25 -04:00
EliteMasterEric d4cbe74939 Smaller fixes tied to note kinds 2024-07-12 21:40:46 -04:00
EliteMasterEric f76309c91e Update rendering for custom note styles 2024-07-12 04:13:20 -04:00
lemz 1fe44fa368 add from 2024-07-12 02:13:23 -04:00
lemz 4746c1da0e checking empty suffix is stupid 2024-07-12 02:13:22 -04:00
lemz f9bccb057a use suffixes instead of pixel boolean 2024-07-12 02:13:22 -04:00
lemz 492af8add4 String works now 2024-07-12 02:13:21 -04:00
lemz 44d9785317 editing them works now 
still need to implement String and do some testing
 2024-07-12 02:13:21 -04:00
lemz c41d846df5 store params in chart 
chart editor still doesnt fully work
 2024-07-12 02:13:20 -04:00
lemz 764cdee63d add more options 2024-07-12 02:13:20 -04:00
lemz 0fe726cefa fix min, max 2024-07-12 02:13:20 -04:00
lemz d9b9854d91 add params to toolbox 
not completely finished
 2024-07-12 02:13:18 -04:00
lemz 9a563ec46b switch seemingly doesnt work 2024-07-12 02:13:18 -04:00
lemz 94fe4a06b9 Update NoteKind.hx 2024-07-12 02:13:18 -04:00
lemz c8d019da2f Update NoteKind.hx 2024-07-12 02:13:17 -04:00
lemz acd8912d16 Add Custom Params For NoteKind 
still need to implement the chart editor stuff
 2024-07-12 02:13:17 -04:00
lemz 928de7b8eb check for pixel style if necessary 2024-07-12 02:13:16 -04:00
lemz c4855c0ca8 fix hold note 2024-07-12 02:13:15 -04:00
lemz ca2cbb44f5 display custom note style in chart editor 2024-07-12 02:13:14 -04:00
lemz 328e590f92 hold assets are updated aswell 2024-07-12 02:13:13 -04:00
lemz b6eda8e498 remove note kind logic from playstate 2024-07-12 02:13:12 -04:00
lemz 14771e72de no more note getter 2024-07-12 02:13:12 -04:00
lemz 3f39d9509c make custom note style less clunky 2024-07-12 02:13:12 -04:00
lemz e3e4e9fac0 helper function 2024-07-12 02:13:11 -04:00
lemz c83e505f5b onUpdate, etc. works now too 2024-07-12 02:13:11 -04:00
lemz 606d9d4af4 Update NoteKindManager.hx 2024-07-12 02:13:11 -04:00
lemz 134b467876 rename stuff 2024-07-12 02:13:10 -04:00
lemz a7482410b9 add note kind scripts 2024-07-12 02:13:10 -04:00