diff --git a/assets/shaders/pixelZoomShader.frag b/assets/shaders/pixelZoomShader.frag index 17635ebf..a3e4d71e 100644 --- a/assets/shaders/pixelZoomShader.frag +++ b/assets/shaders/pixelZoomShader.frag @@ -3,7 +3,7 @@ uniform float pixelZoom; // zooms the game 6 times void main() { - vec2 camPos = getCamPos(openfl_TextureCoordv); + vec2 camPos = getCamPos(floor(openfl_TextureCoordv * openfl_TextureSize) / openfl_TextureSize); camPos = vec2(0.5, 0.5) + ((camPos - vec2(0.5, 0.5)) * pixelZoom); diff --git a/buildnumber.txt b/buildnumber.txt index f0b4b2f3..f0acbc2e 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -1248 \ No newline at end of file +1251 \ No newline at end of file diff --git a/source/funkin/game/NoteGroup.hx b/source/funkin/game/NoteGroup.hx index 0f45abc5..de27f91e 100644 --- a/source/funkin/game/NoteGroup.hx +++ b/source/funkin/game/NoteGroup.hx @@ -17,6 +17,8 @@ class NoteGroup extends FlxTypedGroup { public function sortNotes() { sort(function(i, n1, n2) { + if (n1.strumTime == n2.strumTime) + return n1.isSustainNote ? -1 : 1; return FlxSort.byValues(FlxSort.ASCENDING, n1.strumTime, n2.strumTime); }); } diff --git a/source/funkin/options/Options.hx b/source/funkin/options/Options.hx index 45b269a8..32c58fda 100644 --- a/source/funkin/options/Options.hx +++ b/source/funkin/options/Options.hx @@ -166,7 +166,7 @@ class Options public static function applySettings() { PlayerSettings.player1.setKeyboardScheme(Solo); - FlxG.forceNoAntialiasing = !antialiasing; + FlxG.game.stage.quality = (FlxG.forceNoAntialiasing = !antialiasing) ? 2 : 0; FlxG.autoPause = autoPause; FlxG.sound.volume = volume; } diff --git a/source/funkin/system/Paths.hx b/source/funkin/system/Paths.hx index a15edbc7..71c7fbee 100644 --- a/source/funkin/system/Paths.hx +++ b/source/funkin/system/Paths.hx @@ -220,8 +220,6 @@ class Paths } } - - if (includeSource) { var sourceResult = getFolderContent(key, false, addPath, true); for(e in sourceResult) @@ -229,7 +227,6 @@ class Paths content.push(e); } - return content; } }