Merge branch 'master' into ui-olympUI

README.md

@@ -68,6 +68,7 @@ Lönn supports a couple of keybinds and special mouse functionality, with more t
  - Ctrl + ➕ (plus): Zoom in
  - Ctrl + ➖ (minus): Zoom out
  - F11: Toggle fullscreen
+ - Arrow keys: Navigate lists
 
  #### Placements
 
@@ -97,6 +98,7 @@ Lönn supports a couple of keybinds and special mouse functionality, with more t
  - Holding Ctrl + any of the above: use 1 as step size instead of 8 for more fine-grained control
  - L, R: Rotate supported objects counter-clockwise / clockwise
  - V, H: Flip supported objects vertically / horizontally
+ - Shift + V / Shift + H: Flip selected area vertically / horizontally
  - N on entity/trigger: Add starting node to entity/trigger
  - N on node: Add node to entity/trigger after selected node
  - Delete: Delete selected objects
@@ -110,7 +112,12 @@ Lönn supports a couple of keybinds and special mouse functionality, with more t
  - Left click & drag: Drag brush
  - Middle click: Change material to tile under cursor
 
- #### Debug - For developers
+#### Stylegrounds
+
+ - Arrow keys: Navigate list
+ - Alt + Arrow keys: Rearrange Stylegrounds
+
+#### Debug - For developers
 
  - F5: Reload entities and triggers
  - F6: Clear rendering cache and redraw map

src/brushes.lua

@@ -259,7 +259,7 @@ function brushHelper.cleanMaterialPath(path, layer, displayName)
     return utils.humanizeVariableName(path)
 end
 
-function brushHelper.getMaterialLookup(layer)
+function brushHelper.getMaterialLookup(layer, addAir)
     local lookup = {}
     local tilesets = brushHelper.getTilerMeta(layer)
 
@@ -269,6 +269,10 @@ function brushHelper.getMaterialLookup(layer)
         lookup[cleanPath] = id
     end
 
+    if addAir ~= false then
+        lookup["Air"] = "0"
+    end
+
     return lookup
 end
 

src/entities/fireball.lua

@@ -3,7 +3,7 @@ local fireball = {}
 fireball.name = "fireBall"
 fireball.depth = 0
 fireball.nodeLineRenderType = "line"
-fireball.nodeLimits = {0, -1}
+fireball.nodeLimits = {1, -1}
 fireball.fieldInformation = {
     amount = {
         fieldType = "integer",
@@ -39,4 +39,4 @@ function fireball.texture(room, entity)
     end
 end
 
-return fireball
+return fireball

src/lang/en_gb.lang

@@ -15,7 +15,7 @@ scenes.startup.os_x=Please select Celeste.exe or Celeste.app in the dialog.
 # -- Layers --
 # layers.name.layerName
 # layers.description.layerName
-layers.name.all_layers=All
+layers.name.allLayers=All
 layers.name.tilesFg=Foreground Tiles
 layers.name.tilesBg=Background Tiles
 layers.name.decalsFg=Foreground Decals