diff --git a/art/icon16.png b/art/icon16.png index e6a96a84..55a8c5e7 100644 Binary files a/art/icon16.png and b/art/icon16.png differ diff --git a/art/icon32.png b/art/icon32.png index 4fd7862b..b82216ed 100644 Binary files a/art/icon32.png and b/art/icon32.png differ diff --git a/art/icon64.png b/art/icon64.png index b82df79f..9680a80d 100644 Binary files a/art/icon64.png and b/art/icon64.png differ diff --git a/art/iconOG.png b/art/iconOG.png index 59deadea..9e0db770 100644 Binary files a/art/iconOG.png and b/art/iconOG.png differ diff --git a/assets/shared/images/credits/mykarm.png b/assets/shared/images/credits/mykarm.png new file mode 100644 index 00000000..606e9fe4 Binary files /dev/null and b/assets/shared/images/credits/mykarm.png differ diff --git a/source/mikolka/stages/erect/SpookyMansionErect.hx b/source/mikolka/stages/erect/SpookyMansionErect.hx index 2abc106e..3973082a 100644 --- a/source/mikolka/stages/erect/SpookyMansionErect.hx +++ b/source/mikolka/stages/erect/SpookyMansionErect.hx @@ -34,7 +34,7 @@ class SpookyMansionErect extends PicoCapableStage stairsLight.alpha = 0; halloweenWindow = new BGSprite('erect/bgtrees', 200, 50, 0.8, 0.8, ["bgtrees0"],true); - + halloweenWindow.animation.curAnim.frameRate = 5; add(halloweenWindow); add(halloweenBG); diff --git a/source/options/NotesColorSubState.hx b/source/options/NotesColorSubState.hx index 8273b112..c0601298 100644 --- a/source/options/NotesColorSubState.hx +++ b/source/options/NotesColorSubState.hx @@ -176,11 +176,13 @@ class NotesColorSubState extends MusicBeatSubstate controllerPointer.visible = controls.controllerMode; _lastControllerMode = controls.controllerMode; + #if TOUCH_CONTROLS_ALLOWED addTouchPad('NONE', 'B_C'); controls.isInSubstate = true; touchPad.buttonB.x = FlxG.width - 132; touchPad.buttonC.x = 0; touchPad.buttonC.y = FlxG.height - 135; + #end } function updateTip() @@ -483,7 +485,7 @@ class NotesColorSubState extends MusicBeatSubstate } } } - else if(touchPad.buttonC.justPressed || controls.RESET && hexTypeNum < 0) + else if(#if TOUCH_CONTROLS_ALLOWED touchPad.buttonC.justPressed || #end controls.RESET && hexTypeNum < 0) { if(FlxG.keys.pressed.SHIFT || FlxG.gamepads.anyPressed(LEFT_SHOULDER)) { @@ -723,4 +725,4 @@ class NotesColorSubState extends MusicBeatSubstate function setShaderColor(value:FlxColor) dataArray[curSelectedNote][curSelectedMode] = value; function getShaderColor() return dataArray[curSelectedNote][curSelectedMode]; function getShader() return Note.globalRgbShaders[curSelectedNote]; -} \ No newline at end of file +} diff --git a/source/states/CreditsState.hx b/source/states/CreditsState.hx index 781af206..bc0c627d 100644 --- a/source/states/CreditsState.hx +++ b/source/states/CreditsState.hx @@ -44,6 +44,7 @@ class CreditsState extends MusicBeatState [""], ['P-Slice Contributors'], ["Fazecarl", 'fazecarl', 'Made the new logo for P-Slice', 'https://gamebanana.com/members/2121406', '29170a'], + ["Mykarm", 'mykarm', 'Made the new icon for P-Slice', 'https://x.com/cronviersmeat/status/1849059676467417311?s=46&t=4dcTT7PAMkRJ8zYd4LgTow', '29170a'], [""], ["P-Slice server"], ["Join our community", "ppslice", "", "https://discord.gg/9FCyCqEvRf", "5e36c4"],