diff --git a/assets/images/editors/ui/button.png b/assets/images/editors/ui/button.png index cdc0d1b4..9b0a33e4 100644 Binary files a/assets/images/editors/ui/button.png and b/assets/images/editors/ui/button.png differ diff --git a/assets/images/editors/ui/checkbox.png b/assets/images/editors/ui/checkbox.png index 416c76fd..b297a7a7 100644 Binary files a/assets/images/editors/ui/checkbox.png and b/assets/images/editors/ui/checkbox.png differ diff --git a/assets/images/editors/ui/warning-popup.png b/assets/images/editors/ui/warning-popup.png index d8fa5d3f..f5c5b7fc 100644 Binary files a/assets/images/editors/ui/warning-popup.png and b/assets/images/editors/ui/warning-popup.png differ diff --git a/assets/shaders/editorBlur.frag b/assets/shaders/editorBlur.frag index 212f465c..761c4b15 100644 --- a/assets/shaders/editorBlur.frag +++ b/assets/shaders/editorBlur.frag @@ -13,13 +13,7 @@ void main() { color += flixel_texture2D(bitmap, openfl_TextureCoordv + vec2(strength * (inside / stepsInside) * cos(fi / fsteps * (PI * 2.0)), strength * (inside / stepsInside) * sin(fi / fsteps * (PI * 2.0)))); } } - /* - for(int x = -steps; x < steps+1; x++) { - for(int y = -steps; y < steps+1; y++) { - color += flixel_texture2D(bitmap, openfl_TextureCoordv + vec2(strength / steps * x, strength / steps * y)); - } - } - */ + color /= steps * stepsInside; gl_FragColor = color; } \ No newline at end of file diff --git a/buildnumber.txt b/buildnumber.txt index d85c25f9..66b06c1a 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -2547 \ No newline at end of file +2550 \ No newline at end of file diff --git a/source/funkin/editors/UIDebugState.hx b/source/funkin/editors/UIDebugState.hx index def210a0..c048ead3 100644 --- a/source/funkin/editors/UIDebugState.hx +++ b/source/funkin/editors/UIDebugState.hx @@ -5,7 +5,7 @@ import funkin.editors.ui.*; class UIDebugState extends UIState { public override function create() { super.create(); - var bg = new FlxSprite().makeGraphic(1, 1, 0xFF888888); + var bg = new FlxSprite().makeGraphic(1, 1, 0xFF444444); bg.scale.set(FlxG.width, FlxG.height); bg.updateHitbox(); bg.scrollFactor.set(); @@ -15,7 +15,7 @@ class UIDebugState extends UIState { add(new UICheckbox(10, 40, "Test checked", true)); add(new UIButton(10, 70, "Test button", function() { trace("Hello, World!"); - }, 120, 32)); + }, 130, 32)); add(new UIButton(10, 110, "Warning test", function() { openSubState(new UIWarningSubstate("Test", "This is a test message", [ { @@ -31,7 +31,7 @@ class UIDebugState extends UIState { } } ])); - }, 120, 32)); + }, 130, 32)); add(new UIButton(10, 150, "Warning test (Overflowing)", function() { openSubState(new UIWarningSubstate("Test", "This is a test message", [ { @@ -59,24 +59,8 @@ class UIDebugState extends UIState { { label: "4", onClick: function(t) {} - }, - { - label: "5", - onClick: function(t) {} - }, - { - label: "6", - onClick: function(t) {} - }, - { - label: "7", - onClick: function(t) {} - }, - { - label: "8", - onClick: function(t) {} } ])); - }, 120, 64)); + }, 130, 48)); } } \ No newline at end of file diff --git a/source/funkin/editors/ui/UIWarningSubstate.hx b/source/funkin/editors/ui/UIWarningSubstate.hx index 6ceb1b54..b6eb1dbe 100644 --- a/source/funkin/editors/ui/UIWarningSubstate.hx +++ b/source/funkin/editors/ui/UIWarningSubstate.hx @@ -44,7 +44,7 @@ class UIWarningSubstate extends MusicBeatSubstate { add(titleSpr = new UIText(spr.x + 25, spr.y, spr.bWidth - 50, title, 15, -1)); titleSpr.y = spr.y + ((30 - titleSpr.height) / 2); - add(messageSpr = new UIText(spr.x + 10, spr.y + 40, spr.bWidth - 20, message, 15, 0xFF000000)); + add(messageSpr = new UIText(spr.x + 10, spr.y + 40, spr.bWidth - 20, message, 15, -1)); var xPos = (FlxG.width - (30 + (170 * buttons.length))) / 2; for(k=>b in buttons) {