From 183cec62dc1fd3c7f3f634dd3e2400e6ee77b476 Mon Sep 17 00:00:00 2001 From: Ralty <78720179+Raltyro@users.noreply.github.com> Date: Sun, 6 Apr 2025 16:27:30 +0700 Subject: [PATCH 1/3] Fix Lit Up being impossible to submit score into --- source/funkin/api/newgrounds/Leaderboards.hx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/funkin/api/newgrounds/Leaderboards.hx b/source/funkin/api/newgrounds/Leaderboards.hx index 5c7e5e73e..c59c092fe 100644 --- a/source/funkin/api/newgrounds/Leaderboards.hx +++ b/source/funkin/api/newgrounds/Leaderboards.hx @@ -285,7 +285,7 @@ enum abstract Leaderboard(Int) { case "darnell": return DarnellBFMix; - case "litup": + case "lit-up": return LitUpBFMix; default: return Unknown; @@ -379,7 +379,7 @@ enum abstract Leaderboard(Int) return Stress; case "darnell": return Darnell; - case "litup": + case "lit-up": return LitUp; case "2hot": return TwoHot; From 28363652ef71294542445a13376de29743be31e7 Mon Sep 17 00:00:00 2001 From: Karim Akra <144803230+KarimAkra@users.noreply.github.com> Date: Fri, 6 Jun 2025 08:57:50 +0300 Subject: [PATCH 2/3] Added outline for circle hints --- source/funkin/mobile/ui/FunkinButton.hx | 6 +----- source/funkin/mobile/ui/FunkinHitbox.hx | 28 ++++++++++++++++++------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/source/funkin/mobile/ui/FunkinButton.hx b/source/funkin/mobile/ui/FunkinButton.hx index 02a8a8b78..ce8798f19 100644 --- a/source/funkin/mobile/ui/FunkinButton.hx +++ b/source/funkin/mobile/ui/FunkinButton.hx @@ -92,13 +92,9 @@ class FunkinButton extends FunkinSprite implements IFlxInput */ public var limitToBounds:Bool = true; - /** - * Whether this button is a circle or not (This affects the overlap check method). - */ - public var isCircle:Bool = false; - /** * A radius for circular buttons. + * If this radius is larger than 0 then the overlap check will look if the touch point is inside this raius. */ public var radius:Float = 0; diff --git a/source/funkin/mobile/ui/FunkinHitbox.hx b/source/funkin/mobile/ui/FunkinHitbox.hx index 2f2ca2d08..2c0318a3e 100644 --- a/source/funkin/mobile/ui/FunkinHitbox.hx +++ b/source/funkin/mobile/ui/FunkinHitbox.hx @@ -45,7 +45,7 @@ class FunkinHint extends FunkinButton */ static final HINT_ALPHA_STYLE:Map> = [ INVISIBLE_TILL_PRESS => [0.3, 0.00001, 0.01], - VISIBLE_TILL_PRESS => [0.4, 0.2, 0.05] + VISIBLE_TILL_PRESS => [0.4, 0.2, 0.08] ]; /** @@ -348,7 +348,8 @@ class FunkinHitbox extends FlxTypedSpriteGroup } } case FunkinHitboxControlSchemes.DoubleThumbDPad: - final hintSize:Int = 80; + final hintSize:Int = 75; + final outlineThickness:Int = 5; final hintsAngles:Array = [Math.PI, Math.PI / 2, Math.PI * 1.5, 0]; final hintsZoneRadius:Int = 115; @@ -360,7 +361,7 @@ class FunkinHitbox extends FlxTypedSpriteGroup final y:Float = (FlxG.height - (hintSize * 3.75)) + Math.sin(hintsAngles[j]) * hintsZoneRadius; add(createHintCircle(i == 0 ? x + FullScreenScaleMode.gameNotchSize.x : x - FullScreenScaleMode.gameNotchSize.x, y, - hintsNoteDirections[j % hintsNoteDirections.length], hintSize, hintsColors[j % hintsColors.length])); + hintsNoteDirections[j % hintsNoteDirections.length], hintSize, outlineThickness, hintsColors[j % hintsColors.length])); } } case FunkinHitboxControlSchemes.Arrows: @@ -451,13 +452,14 @@ class FunkinHitbox extends FlxTypedSpriteGroup * @param y The y position of the circular button. * @param noteDirection The direction of the note the button represents (e.g., left, right). * @param radius The radius of the circular button. + * @param outlineThickness The thickness of the outline for the circle. * @param color The color of the circular button (default is white). * @return A new `FunkinHint` circular object. */ - function createHintCircle(x:Float, y:Float, noteDirection:NoteDirection, radius:Float, color:FlxColor = 0xFFFFFFFF):FunkinHint + function createHintCircle(x:Float, y:Float, noteDirection:NoteDirection, radius:Float, outlineThickness:Int, color:FlxColor = 0xFFFFFFFF):FunkinHint { final hint:FunkinHint = new FunkinHint(x, y, noteDirection, null); - hint.loadGraphic(createHintCircleGraphic(radius, color)); + hint.loadGraphic(createHintCircleGraphic(radius, outlineThickness, color)); hint.limitToBounds = false; hint.radius = radius; hint.onDown.add(onHintDown.dispatch.bind(hint)); @@ -611,17 +613,27 @@ class FunkinHitbox extends FlxTypedSpriteGroup * * @param radius The radius of the circle. * @param baseColor The base color of the circle graphic (default is white). + * @param outlineThickness The thickness of the outline for the circle. * @return A `FlxGraphic` object representing the circular button graphic. */ - function createHintCircleGraphic(radius:Float, baseColor:FlxColor = 0xFFFFFFFF):FlxGraphic + function createHintCircleGraphic(radius:Float, outlineThickness:Int, baseColor:FlxColor = 0xFFFFFFFF):FlxGraphic { + var brightColor:FlxColor = baseColor; + brightColor.brightness += 0.6; + + if (baseColor.brightness >= 0.75) baseColor.alphaFloat -= baseColor.brightness * 0.35; + final shape:Shape = new Shape(); shape.graphics.beginFill(baseColor.to24Bit(), baseColor.alphaFloat); + shape.graphics.lineStyle(outlineThickness, brightColor.to24Bit(), brightColor.alpha); shape.graphics.drawCircle(radius, radius, radius); shape.graphics.endFill(); - final graphicData:BitmapData = new BitmapData(Math.floor(radius * 2), Math.floor(radius * 2), true, 0); - graphicData.draw(shape, true); + final matrix:Matrix = new Matrix(); + matrix.translate(outlineThickness, outlineThickness); + + final graphicData:BitmapData = new BitmapData(Math.floor((radius + outlineThickness) * 2), Math.floor((radius + outlineThickness) * 2), true, 0); + graphicData.draw(shape, matrix, true); return FlxGraphic.fromBitmapData(graphicData, false, null, false); } From afcf9a26cc7e8f0035e2f11a6cf683a353fe6a2b Mon Sep 17 00:00:00 2001 From: Hundrec Date: Fri, 6 Jun 2025 00:30:29 -0600 Subject: [PATCH 3/3] first batch of public assets PRs --- assets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets b/assets index 8c515cdf3..1c9473f3d 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit 8c515cdf3c23ee5396bdb6d8d4cfcbbb7ae70254 +Subproject commit 1c9473f3dfdfb97d97f6c8457001055322abf5ab