Merge branch 'release/0.13.0.1401'

CHANGELOG.md

@@ -1,3 +1,38 @@
+# Version 0.13.0.1401 - 2017-12-24
+
+## Additions
+- Added connected sprites for walls and fences.
+- Added custom item sprites and colors.
+- Added versioning for the settings file. If the game detects an outdated file, it will replace it with the updated one.
+- Added new section to the options screen which allows the reconfiguration of keybindings.
+- Added key controls for panning the camera.
+- Added option to activate mouse panning (deactivated by default).
+
+## Removals
+- Removed map exploration. Instead of hiding unexplored tiles, the map is now fully visible to the player. Tiles which can't be seen by the player's characters are still drawn in greyscale.
+- Removed restrictions for the pathfinding algorithm. Characters can now find a path from one side of the map to the other (but it might take a while). Performance improvements for the pathfinding are being worked on as well.
+- Removed manual flushing of LuaJIT cache. This was necessary originally since LuaJIT had troubles freeing memory with the closure based approach to oop used before. Now that all classes are using a metatable based approach the garbage collector works as expected.
+
+## Fixes
+- Fixed badly placed windows in small house prefab.
+- Fixed prefab-editor being updated and drawn when menu is open.
+- Fixed settings screen warning about unsaved changes even if none of the values had changed.
+- Fixed faulty offset between sections in changelog screen.
+- Fixed the heuristic of the pathfinding module for diagonal movement.
+- Fixed volume calculation for backpacks dropped at invalid locations (e.g. outside of the inventory screen).
+
+## Other Changes
+- Changed translator warnings so they are only logged once.
+- Changed spawnpoints to ignore certain tiles (e.g. shallow water).
+- Changed input dialog to only delete the full text the first time backspace is pressed. Every press after that will only remove a single character.
+- Changed health screen to give better indication of a character's current health and status.
+- Changed controls to be saved in and loaded from the settings file instead of being hardcoded.
+- Changed pathfinding algorithm to prevent pathfinding to invalid target tiles
+- Changed threshold for dying from bleeding. A creature now dies when its blood volume reaches 50%.
+
+
+
+
 # Version 0.12.2.1222 - 2017-11-29
 
 ## Fixes

README.md

@@ -1,6 +1,6 @@
 # On The Roadside
 
-[![Version](https://img.shields.io/badge/Version-0.12.2.1222-blue.svg)](https://github.com/rm-code/on-the-roadside/releases/latest)
+[![Version](https://img.shields.io/badge/Version-0.13.0.1401-blue.svg)](https://github.com/rm-code/on-the-roadside/releases/latest)
 [![LOVE](https://img.shields.io/badge/L%C3%96VE-0.10.2-EA316E.svg)](http://love2d.org/)
 [![Build Status](https://travis-ci.com/rm-code/On-The-Roadside.svg?token=q3rLXeyGTBN9VB2zsWMr&branch=develop)](https://travis-ci.com/rm-code/On-The-Roadside)
 

lib/screenmanager/ScreenManager.lua

@@ -26,7 +26,7 @@
 -- @module ScreenManager
 --
 local ScreenManager = {
-    _VERSION     = '2.1.1',
+    _VERSION     = '2.1.1 (modified)',
     _DESCRIPTION = 'Screen/State Management for the LÖVE framework',
     _URL         = 'https://github.com/rm-code/screenmanager/',
 }
@@ -92,10 +92,8 @@ local function push( screen, args )
     end
 
     -- Push the new screen onto the stack.
-    stack[#stack + 1] = screens[screen].new()
-
-    -- Create the new screen and initialise it.
-    stack[#stack]:init( unpack( args ) )
+    stack[#stack + 1] = screens[screen]( unpack( args ))
+    ScreenManager.peek():setActive( true )
 end
 
 ---

main.lua

@@ -77,12 +77,14 @@ function love.load( args )
         mapeditormenu    = require( 'src.ui.screens.MapEditorMenu'          ),
         prefabeditor     = require( 'src.ui.screens.PrefabEditor'           ),
         prefabeditormenu = require( 'src.ui.screens.PrefabEditorMenu'       ),
-        editorloading    = require( 'src.ui.mapeditor.EditorLoadingScreen'  )
+        editorloading    = require( 'src.ui.mapeditor.EditorLoadingScreen'  ),
+        keybindingeditor = require( 'src.ui.screens.KeybindingScreen' ),
+        keybindingmodal = require( 'src.ui.screens.KeybindingModal' ),
     }
 
     ScreenManager.init( screens, 'bootloading' )
 
-    letterbox = Letterbox.new()
+    letterbox = Letterbox()
 end
 
 function love.draw()
@@ -107,6 +109,10 @@ function love.keypressed( key, scancode, isrepeat )
     ScreenManager.keypressed( key, scancode, isrepeat )
 end
 
+function love.keyreleased( key, scancode )
+    ScreenManager.keyreleased( key, scancode )
+end
+
 function love.resize( w, h )
     ScreenManager.resize( w, h )
 end