gabry/Funkin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,014 Commits 1 Branch 38 Tags
cdca3bf3078422fcd1e1edf28a6e8e09c96827dc
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Cameron TaylorandHundrec 26fe00b559 fix a few of the scripts to point from art/ -> scripts/ when needed 2026-01-29 22:07:57 -07:00
Cameron TaylorandHundrec 899d793e1c move some scripts from art/ submodule to main funkin repo 2026-01-29 22:07:57 -07:00
Cameron Taylor b04ad86537 assets submod: fabs freeplay scroll work 2025-12-30 02:10:00 -05:00
Cameron Taylor f2bf74b4d1 assets submod: fabs work final stretch 2025-12-29 01:55:23 -05:00
Cameron Taylor 38e7874b42 assets submod: feat j-hope of bts 2025-12-29 00:51:20 -05:00
Cameron Taylor bc200f3677 story menu tracklist spacing tweak 2025-12-29 00:50:28 -05:00
Cameron Taylor f7cc0ffd27 asset submod: mp3 files 2025-12-27 20:15:55 -05:00
Cameron Taylor 91429de35d assets submod 2025-12-27 20:10:50 -05:00
Cameron Taylor 7197c28f62 update difficulty ratings for spaghetti (fixes FUNK-4119) 2025-12-26 15:10:34 -05:00
Cameron Taylor 8640a2a18b assets submod fabs spaghetti 2025-12-26 15:03:46 -05:00
Cameron Taylor 99c67e963b assets submod fabs spaghetti 2025-12-23 02:03:53 -05:00
Cameron TaylorandKade 9d3ae3c974 remove some redundant getControls() in FreeplayState, just access controls directly 2025-12-12 08:34:59 -08:00
Cameron TaylorandHundrec e1e49bb19b change capsuleOptionsMenu -> instSelectMenu in FreeplayState 2025-12-12 08:16:37 -05:00
Cameron TaylorandHundrec ca7891e5cb remove some redundant getControls() in FreeplayState, just access controls directly 2025-12-12 08:16:37 -05:00
Cameron TaylorandHundrec dbf0776dbf remove all the letterSort.inputEnabled stuff, only use the FreeplayState's uiStateMachine to check if inputs should be enabled 2025-12-12 08:16:37 -05:00
Cameron TaylorandHundrec 040605e2a9 use UIStateMachine in FreeplayState instead of checking/modifying controls.active everywhere 
thus making it easier to fix the "unlocked inputs" issue (fix FUNK-2021)
 2025-12-12 08:16:37 -05:00
Cameron TaylorandEric bdddf364a0 change fpScoreDisplay to private variable 2025-12-08 21:03:11 -05:00
Cameron TaylorandEric 109fa509fa change fp -> fpScoreDisplay, as a more descriptive variable name 2025-12-08 21:03:11 -05:00
Cameron Taylor 90f79be163 assets submod more le sserafim stuff from fabs 2025-12-08 19:32:05 -05:00
Cameron TaylorandEric d361a323a2 early return in playVocals() to remove a level of nesting 2025-12-08 15:30:02 -05:00
Cameron TaylorandEric ceb364472e reduce code copypaste a tiny smidge for chart editor waveforms 2025-12-08 15:30:02 -05:00
Cameron TaylorandAbnormal 9654d5ad98 remove unused pitch stuff in CharSelect 2025-12-06 16:37:21 -06:00
Cameron TaylorandAbnormal 07fb33be62 fix char select inputs for keyb and controllers 2025-12-06 16:37:21 -06:00
Cameron TaylorandEric 3a0e32d24f update our custom FunkinAction check() function with newer logic from FlxAction 2025-11-29 06:41:33 -05:00
Cameron TaylorandEric 6eba4bbeda remove the unused _P and _R stuff from the Action enum abstract 2025-11-29 06:41:33 -05:00
Cameron TaylorandEric 724286f497 more controls.hx cleanup, remove a few unused functions, and add Void return types to make checkstyle happier 2025-11-29 06:41:33 -05:00
Cameron TaylorandEric 7c8b7eee57 remove keyboard "scheme" related code, completely unused 2025-11-29 06:41:33 -05:00
Cameron TaylorandEric c23472903a remove more unused vars in controls.hx 2025-11-29 06:41:33 -05:00
Cameron TaylorandHundrec f3057dd9c3 use FlxMath.wrap() to make this cursor wrapping cleaner in CharSelectSubState 2025-11-28 20:34:58 -05:00
Cameron TaylorandHundrec 0e195cfb9e clean up spamDirection code, use FlxDirectionFlags 2025-11-28 20:34:58 -05:00
Cameron TaylorandAbnormal 326b81c225 move character select cursor sprite code into it's own class 2025-11-28 18:35:10 -06:00
Cameron TaylorandKade ff4a08541c early return for Chart Editor handleCursor() 2025-11-28 10:36:08 -08:00
Cameron Taylor 3e4c15e019 fabs work for le sserafim in progress 2025-11-24 20:54:21 -05:00
Cameron Taylor fe6f5eb821 small typo in pausesubstate UI_DOWN -> controls.UI_DOWN 2025-11-21 19:17:13 -05:00
Cameron Taylor 512a3fc927 some extra pausesubstate tidyings/organization 2025-11-21 18:58:16 -05:00
Cameron Taylor 18d8fe7248 only show that giant white debug box thing on mobile 2025-11-21 02:05:01 -05:00
Cameron Taylor 06246aa3d7 assets submod fix -> master 2025-11-17 17:05:45 -05:00
Cameron Taylor 0fe226132d quick fix for incorrect flush() usage 2025-11-04 15:24:28 -05:00
Cameron Taylor 452e3a58d8 modify chart editor to save some preferences more immediately 2025-11-04 14:59:24 -05:00
Cameron Taylor e8f60a23ef helpers for data binding in progress in Save.hx 
move buncho save data stuff to our new SaveProperty class

SaveMacro to generate save property stuff
 2025-11-04 14:59:24 -05:00
Cameron Taylor 958a6f49ce some data binding funzies i think 2025-11-04 14:59:24 -05:00
Cameron Taylor 2005628358 move these vars up with the rest of em 2025-11-04 14:59:24 -05:00
Cameron Taylor 439901b42e buncho lil null tidying 2025-11-04 14:59:24 -05:00
Cameron Taylor 7bbe356009 move a buncho stuff from Save.hx to SaveSystem.hx 
to rebase
 2025-11-04 14:59:24 -05:00
Cameron Taylor 9d710b0490 some more Save.hx cleanup worky 2025-11-04 14:59:24 -05:00
Cameron Taylor d140caf4ba move Save.hx consts to Constants.hx file 2025-11-04 14:59:24 -05:00
Cameron TaylorandKade e3a5f329ad some spring cleaning on AtlasText.hx 
these shouldn't affect functionality at all, just some things to make haxe checkstyle a bit less annoying and other lil cleanings

Merge branch 'master' into atlas-text-tidy

more AtlasText cleaning
 2025-09-30 14:22:28 -07:00
Cameron TaylorandAbnormal 17bafc2b5e cleanup on DebugDisplayMode enum abstract so we don't need to cast/convert to string all the time 2025-09-25 04:19:19 -05:00
Cameron TaylorandMoonDroid db67a6928c ignroe VarTypeHint since it's a bit incompatible with final 2025-09-03 17:35:24 +07:00
Cameron TaylorandMoonDroid 9c34ab5f9c checkstyle fixins for AnsiTrace.hx 2025-09-03 17:35:24 +07:00
Cameron TaylorandMoonDroid f09074b79d add checkstyle regex to ignore long lines if they are strings (w/ whitespace) 2025-09-03 17:35:24 +07:00
Cameron TaylorandMoonDroid a5842fbe3f some checkstyle changes 2025-09-03 17:35:24 +07:00
Cameron TaylorandHundrec f6fb11de4c hardcode 'touch here to play' graphic to be scaled at 0.5x instead FUNK-2710 2025-08-28 03:25:53 +08:00
Cameron TaylorandEric 520f7fbe68 create ConsoleMacro to allow easy initialization of classes into flixels console 2025-08-19 16:05:08 -04:00
Cameron TaylorandEric aaa722abcf change debug_dumpSave -> debug_dumpSaveJsonSave 2025-08-19 16:05:08 -04:00
Cameron TaylorandMoonDroid 7f6c0d56cd fix options menu being able to be pressed during fade 2025-08-19 19:28:23 +07:00
Cameron TaylorandMoonDroid a21eace70c fix main menu spam when FlxTransition stuff ends 2025-08-19 19:28:23 +07:00
Cameron TaylorandHundrec 943afe2ffc remove mconsole, mcover, mockatoo, and munit from hmm 2025-08-19 04:53:39 +08:00
Cameron TaylorandEric 517eb4eb48 input util functions for less verbose key combos 2025-08-14 14:34:55 -04:00
Cameron TaylorandKade 5831852edf use x and o as placeholder cross and checkmark 2025-08-13 19:50:33 -07:00
Cameron TaylorandKade 114bb37c7f some unicode/utf windows fixies 2025-08-13 19:50:33 -07:00
Cameron TaylorandKade 1db75cc55e use different unicode for checkmark and X 2025-08-13 19:50:33 -07:00
Cameron TaylorandKade 248516244c string sort the feature flags 2025-08-13 19:50:33 -07:00
Cameron TaylorandKade b108c0fd95 render feature flags in the compile debug into cute table 2025-08-13 19:50:33 -07:00
Cameron TaylorandKade 2a804f29fd rework main menu a lot more to use our state machine stuff 2025-08-13 19:49:21 -07:00
Cameron TaylorandKade b03828adf3 implement more verbose state machine to handle main menu navigation 2025-08-13 19:49:21 -07:00
Cameron TaylorandKade 17ece1423a don't log "starting prebuild tasks" 2025-08-11 18:26:50 -07:00
Cameron TaylorandKade a7156978a1 small regex change to checkstyle to allow leading underscores (_instance is now an allowed variable name) 2025-08-07 13:29:44 -07:00
Cameron TaylorandMoonDroid 967397311b remove tiny uncommented code, and simplify an unneeded variable initialization 2025-08-01 13:15:56 +07:00
Cameron TaylorandMoonDroid 542f59ef72 tallyCompletion() function for cleanup + constency 2025-08-01 13:15:56 +07:00
Cameron TaylorandMihai Alexandru 52f3c63071 mobile fix where the capsules don't properly shift away from the letter sorting crap 2025-07-26 12:31:38 +03:00
Cameron TaylorandMihai Alexandru e71062b914 some lil variable renaming in SongMenuItem.hx 2025-07-26 12:31:38 +03:00
Cameron TaylorandMihai Alexandru 3aa6a36b5e small function renaming 2025-07-26 12:31:38 +03:00
Cameron TaylorGitHubMihai Alexandru
 		444697620c Use round instead of floor to fix rounding errors in Preferences. 
Co-authored-by: Mihai Alexandru <77043862+MAJigsaw77@users.noreply.github.com>
 2025-07-26 10:04:00 +03:00
Cameron TaylorandHundrec 949f409cff a few little FreeplayScore tidying perhaps 2025-07-17 04:28:52 +08:00
Cameron TaylorandHundrec 4c5aa9743e a few little FreeplayState tidying perhaps 2025-07-17 04:28:52 +08:00
Cameron TaylorandHundrec 3fa2b3574b potential fix for FUNK-2563 (incorrectly rounds to negative integer limit?) 2025-07-17 04:28:52 +08:00
Cameron TaylorandGitHub 6467cd75a8 IAP compiler conditional fix (#1416) 2025-07-16 01:39:12 +03:00
Cameron TaylorandMoonDroid f8634e2b81 tidy: small preloader code removing 2025-07-16 00:54:35 +07:00
Cameron TaylorandMoonDroid 4f68f63e2d preloader lookin alright on iOS now 2025-07-16 00:54:35 +07:00
Cameron TaylorandMoonDroid e9e0567f8b preloader placement wips 
more preloader placeholder wips
 2025-07-16 00:54:35 +07:00
Cameron TaylorandMoonDroid 8db768fd2a tidy(preloader): some variable renaming 2025-07-16 00:54:35 +07:00
Cameron TaylorandMoonDroid cf814ee4e2 tidy(preloader): stop the preloader from spamming traces after completing 2025-07-16 00:54:35 +07:00
Cameron TaylorandHundrec 126ed3a67a use unicode in the iOS app title to force spacing 2025-07-15 14:54:35 +08:00
Cameron TaylorandGitHub 7f17ad8bb8 Merge pull request #1400 from FunkinCrew/jni-conditionals 
quick android conditionals
 2025-07-14 15:34:17 -04:00
Cameron TaylorandGitHub 61bda6c2c2 Merge pull request #1394 from FunkinCrew/freeplay-sound-fix 
Freeplay sound fix and other little freeplay cleanups and tidyings
 2025-07-14 14:48:28 -04:00
Cameron Taylor 07f649ca37 LetterSort was causing that freeplay sound bug 2025-07-14 14:47:24 -04:00
Cameron Taylor 11ecd07606 various tiny lil tidyings in FreeplayState 2025-07-14 14:47:24 -04:00
Cameron Taylor 822c5ba405 use controls.active instead of busy for FreeplayState 2025-07-14 14:47:24 -04:00
Cameron Taylor d61f89b0e4 make quick and easy little currentCapsule getter 2025-07-14 14:47:24 -04:00
Cameron Taylor 9dfae07225 capsule song text no longer exposed 2025-07-14 14:47:24 -04:00
Cameron Taylor 01fad012f2 quick android conditionals 2025-07-14 14:45:06 -04:00
Cameron TaylorandKade 044106e8a9 WaveformDataParser memory optimize + speed optimize perhaps + refactor mini 2025-07-14 10:38:27 -07:00
Cameron TaylorandKade d338be9270 removed some unused code in WaveformDataParser.hx 2025-07-14 10:38:27 -07:00
Cameron TaylorandKade e4d3e18e4f charteditor: player and opponent toolboxes are disabled, so we don't want to run their handler code (since it initalizes them, which takes about 0.5s extra to load!) 2025-07-14 10:38:27 -07:00
Cameron TaylorandMoonDroid 21e5501835 difficulty touch controls implementation 2025-07-06 15:23:18 +07:00
Cameron TaylorandMoonDroid 125aa0a438 some cute guard clauses 2025-07-06 15:23:18 +07:00
Cameron TaylorandMoonDroid 6591fd8f2a remove some unused/redundant variables 2025-07-06 15:23:18 +07:00
Cameron TaylorandMoonDroid b205a0b931 top left freeplay text grab stuff take it out 2025-07-06 15:23:18 +07:00
Cameron TaylorandMoonDroid 7a6326b178 freeplay backingCard proper null safety 2025-07-06 15:23:18 +07:00