Merge branch 'openfrontio:main' into custom-flag

src/client/graphics/layers/OptionsMenu.ts

@@ -205,7 +205,7 @@ export class OptionsMenu extends LitElement implements Layer {
                 ? "Opens menu"
                 : "Attack"),
           })}
-          ${button({
+          <!-- ${button({
             onClick: this.onToggleFocusLockedButtonClick,
             title: "Lock Focus",
             children:
@@ -213,7 +213,7 @@ export class OptionsMenu extends LitElement implements Layer {
               (this.userSettings.focusLocked()
                 ? "Focus locked"
                 : "Hover focus"),
-          })}
+          })} -->
         </div>
       </div>
     `;

src/client/graphics/layers/TerrainLayer.ts

@@ -58,7 +58,6 @@ export class TerrainLayer implements Layer {
   }
 
   renderLayer(context: CanvasRenderingContext2D) {
-    console.log(this.transformHandler.scale);
     if (this.transformHandler.scale < 1) {
       context.imageSmoothingEnabled = true;
       context.imageSmoothingQuality = "low";

src/client/graphics/layers/TerritoryLayer.ts

@@ -55,7 +55,7 @@ export class TerritoryLayer implements Layer {
   paintPlayerBorder(player: PlayerView) {
     player.borderTiles().then((playerBorderTiles) => {
       playerBorderTiles.borderTiles.forEach((tile: TileRef) => {
-        this.paintTerritory(tile); // Immediately paint the tile instead of enqueueing
+        this.paintTerritory(tile, true); // Immediately paint the tile instead of enqueueing
       });
     });
   }