Merge branch 'release/0375'

Author: rm-code

CHANGELOG.md

@@ -1,3 +1,16 @@
+
+# Version 0375 - 2015/11/11
+
+**Important**: With this version LoGiVi now ***requires*** LÖVE Version [0.10.0](https://love2d.org/wiki/0.10.0) to run and will no longer work with LÖVE 0.9.2! LÖVE 0.10.0 has not yet been officially released, but can be compiled from the source. For more information check out the [official LÖVE repository](https://bitbucket.org/rude/love/overview).
+
+### Fixes
+- Fixed [#43](https://github.com/rm-code/logivi/issues/43) - Allow more printable characters as keys in config file
+- Fixed [#42](https://github.com/rm-code/logivi/issues/42) - Prevent crash with faulty info files
+- Fixed [#41](https://github.com/rm-code/logivi/issues/41) - Make sure paths lead to a valid git repository
+
+### Other Changes
+- Updated LoGiVi to run on LÖVE 0.10.0
+
 # Version 0351 - 2015/08/01
 
 ### Additions

LICENSE LICENSE.mdLICENSE renamed to LICENSE.md

@@ -1,11 +1,19 @@
 # LoGiVi
 
-LoGiVi is a git-repository visualisation tool inspired by [Gource](https://code.google.com/p/gource/) and __currently in development__. It was written from scratch using [Lua](http://www.lua.org/) and the [LÖVE](https://love2d.org/) framework.
+LoGiVi is a git-repository visualisation tool inspired by [Gource](http://gource.io/) and __currently in development__. It was written from scratch using [Lua](http://www.lua.org/) and the [LÖVE](https://love2d.org/) framework.
 
-![Example Visualization](https://github.com/rm-code/logivi/wiki/media/logivi_0312.gif)
+![Example Visualization](https://github.com/rm-code/logivi/wiki/media/logivi_0312.gif)
 
 # Instructions
-When you run LoGiVi for the first time it will set up all necessary folders, an example git log and a config file in the save directory on your harddrive. A dialog will pop up which allows you to view the save directory.
+When you run LoGiVi for the first time it will set up all necessary folders, an example git log and a config file in the save directory on your harddrive. 
+
+The location of this save directory depends on the OS you are using:
+
+- ***OSX*** ```/Users/user/Library/Application Support/LOVE/rmcode_LoGiVi```
+- ***WINDOWS*** ```C:\Users\user\AppData\Roaming\LOVE``` or ```%appdata%\LOVE\```
+- ***LINUX*** ```~/.local/share/love/```
+
+A dialog will pop up which allows you to view the save directory on your computer.
 
 ## Generating git logs automatically
 LoGiVi can generate git logs automatically when you specify a path to a git repository on your harddrive. Open the _settings.cfg_ file in the LoGiVi save directory and look for the _[repositories]_ section. Add the absolute path to the folder containing the git repository like this:
@@ -38,6 +46,9 @@ This will create the file _log.txt_ in the folder you are currently in. Take thi
 /Users/Robert/Library/Application Support/LOVE/rmcode_LoGiVi/logs/yourProject/log.txt
 ```
 LoGiVi will use the folder's name to identify the log so make it informative.
+
+# LÖVE Version
+Version 0351 and all prior versions of LoGiVi are written for Version 0.9.2 of the LÖVE framework. ___All future versions will be based on LÖVE 0.10.0 (currently unreleased).___
 
 # License
 

README.md

@@ -1,32 +1,10 @@
---==================================================================================================
--- Copyright (C) 2014 - 2015 by Robert Machmer                                                     =
---                                                                                                 =
--- Permission is hereby granted, free of charge, to any person obtaining a copy                    =
--- of this software and associated documentation files (the "Software"), to deal                   =
--- in the Software without restriction, including without limitation the rights                    =
--- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                       =
--- copies of the Software, and to permit persons to whom the Software is                           =
--- furnished to do so, subject to the following conditions:                                        =
---                                                                                                 =
--- The above copyright notice and this permission notice shall be included in                      =
--- all copies or substantial portions of the Software.                                             =
---                                                                                                 =
--- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                      =
--- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                        =
--- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                     =
--- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                          =
--- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,                   =
--- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                       =
--- THE SOFTWARE.                                                                                   =
---==================================================================================================
-
 local PROJECT_TITLE = "LoGiVi";
 
-local PROJECT_VERSION = "0351";
+local PROJECT_VERSION = "0375";
 
 local PROJECT_IDENTITY = "rmcode_LoGiVi";
 
-local LOVE_VERSION = "0.9.2";
+local LOVE_VERSION = "0.10.0";
 
 ---
 -- Initialise löve's config file.
@@ -46,7 +24,7 @@ function love.conf(t)
     t.window.minwidth = 800;
     t.window.minheight = 600;
     t.window.fullscreen = false;
-    t.window.fullscreentype = "normal";
+    t.window.fullscreentype = "exclusive";
     t.window.vsync = true;
     t.window.fsaa = 0;
     t.window.display = 1;

conf.lua

@@ -45,6 +45,10 @@ function Screen.new()
 
     function self:focus(dfocus) end
 
+    function self:directorydropped(path) end
+
+    function self:filedropped(file) end
+
     function self:resize(w, h) end
 
     function self:visible(dvisible) end
@@ -53,6 +57,8 @@ function Screen.new()
 
     function self:keyreleased(key) end
 
+    function self:lowmemory() end
+
     function self:textinput(input) end
 
     function self:mousereleased(x, y, button) end
@@ -65,6 +71,14 @@ function Screen.new()
 
     function self:quit(dquit) end
 
+    function self:touchmoved(id, x, y, pressure) end
+
+    function self:touchpressed(id, x, y, pressure) end
+
+    function self:touchreleased(id, x, y, pressure) end
+
+    function self:wheelmoved(x, y) end
+
     function self:isActive()
         return active;
     end
@@ -84,4 +98,4 @@ return Screen;
 
 --==================================================================================================
 -- Created 02.06.14 - 20:25                                                                        =
---==================================================================================================
+--==================================================================================================

lib/screenmanager/Screen.lua

@@ -21,7 +21,7 @@
 --===============================================================================--
 
 local ScreenManager = {
-    _VERSION     = '1.4.1',
+    _VERSION     = '1.6.0',
     _DESCRIPTION = 'Screen/State Management for the LÖVE framework',
     _URL         = 'https://github.com/rm-code/screenmanager/',
 };
@@ -161,6 +161,22 @@ function ScreenManager.resize(w, h)
     end
 end
 
+---
+-- Callback function triggered when a directory is dragged and dropped onto the window.
+-- @param file - The full platform-dependent path to the directory.
+--
+function ScreenManager.directorydropped(path)
+    ScreenManager.peek():directorydropped(path);
+end
+
+---
+-- Callback function triggered when a file is dragged and dropped onto the window.
+-- @param file - The unopened File object representing the file that was dropped.
+--
+function ScreenManager.filedropped(file)
+    ScreenManager.peek():filedropped(file);
+end
+
 ---
 -- Update all screens on the stack whenever the game window gains or
 -- loses focus.
@@ -198,6 +214,13 @@ function ScreenManager.keyreleased(key)
     ScreenManager.peek():keyreleased(key);
 end
 
+---
+-- Callback function triggered when the system is running out of memory on mobile devices.
+--
+function ScreenManager.lowmemory()
+    ScreenManager.peek():lowmemory();
+end
+
 ---
 -- Reroute the textinput callback to the currently active screen.
 -- @param input
@@ -253,6 +276,47 @@ function ScreenManager.quit(dquit)
     ScreenManager.peek():quit(dquit);
 end
 
+---
+-- Callback function triggered when a touch press moves inside the touch screen.
+-- @param id - The identifier for the touch press.
+-- @param x - The x-axis position of the touch press inside the window, in pixels.
+-- @param y - The y-axis position of the touch press inside the window, in pixels.
+-- @param pressure - The amount of pressure being applied. Most touch screens aren't pressure sensitive, in which case the pressure will be 1.
+--
+function ScreenManager.touchmoved(id, x, y, pressure)
+    ScreenManager.peek():touchmoved(id, x, y, pressure);
+end
+
+---
+-- Callback function triggered when the touch screen is touched.
+-- @param id - The identifier for the touch press.
+-- @param x - The x-axis position of the touch press inside the window, in pixels.
+-- @param y - The y-axis position of the touch press inside the window, in pixels.
+-- @param pressure - The amount of pressure being applied. Most touch screens aren't pressure sensitive, in which case the pressure will be 1.
+--
+function ScreenManager.touchpressed(id, x, y, pressure)
+    ScreenManager.peek():touchpressed(id, x, y, pressure);
+end
+
+---
+-- Callback function triggered when the touch screen stops being touched.
+-- @param id - The identifier for the touch press.
+-- @param x - The x-axis position of the touch press inside the window, in pixels.
+-- @param y - The y-axis position of the touch press inside the window, in pixels.
+-- @param pressure - The amount of pressure being applied. Most touch screens aren't pressure sensitive, in which case the pressure will be 1.
+--
+function ScreenManager.touchreleased(id, x, y, pressure)
+    ScreenManager.peek():touchreleased(id, x, y, pressure);
+end
+
+---
+-- Callback function triggered when the mouse wheel is moved.
+-- @param x - Amount of horizontal mouse wheel movement. Positive values indicate movement to the right.
+-- @param y - Amount of vertical mouse wheel movement. Positive values indicate upward movement.
+function ScreenManager.wheelmoved(x, y)
+    ScreenManager.peek():wheelmoved(x, y);
+end
+
 -- ------------------------------------------------
 -- Return Module
 -- ------------------------------------------------
@@ -261,4 +325,4 @@ return ScreenManager;
 
 --==================================================================================================
 -- Created 02.06.14 - 17:30                                                                        =
---==================================================================================================
+--==================================================================================================

lib/screenmanager/ScreenManager.lua

@@ -1,25 +1,3 @@
---==================================================================================================
--- Copyright (C) 2014 - 2015 by Robert Machmer                                                     =
---                                                                                                 =
--- Permission is hereby granted, free of charge, to any person obtaining a copy                    =
--- of this software and associated documentation files (the "Software"), to deal                   =
--- in the Software without restriction, including without limitation the rights                    =
--- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                       =
--- copies of the Software, and to permit persons to whom the Software is                           =
--- furnished to do so, subject to the following conditions:                                        =
---                                                                                                 =
--- The above copyright notice and this permission notice shall be included in                      =
--- all copies or substantial portions of the Software.                                             =
---                                                                                                 =
--- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                      =
--- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                        =
--- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                     =
--- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                          =
--- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,                   =
--- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                       =
--- THE SOFTWARE.                                                                                   =
---==================================================================================================
-
 local ScreenManager = require('lib.screenmanager.ScreenManager');
 
 -- ------------------------------------------------
@@ -36,18 +14,6 @@ local showDebug = false;
 -- Check if the hardware supports certain features.
 --
 local function checkSupport()
-    print("\n---- SUPPORTED ---- ");
-    print("Canvas:         " .. tostring(love.graphics.isSupported('canvas')));
-    print("PO2:            " .. tostring(love.graphics.isSupported('npot')));
-    print("Subtractive BM: " .. tostring(love.graphics.isSupported('subtractive')));
-    print("Shaders:        " .. tostring(love.graphics.isSupported('shader')));
-    print("HDR Canvas:     " .. tostring(love.graphics.isSupported('hdrcanvas')));
-    print("Multicanvas:    " .. tostring(love.graphics.isSupported('multicanvas')));
-    print("Mipmaps:        " .. tostring(love.graphics.isSupported('mipmap')));
-    print("DXT:            " .. tostring(love.graphics.isSupported('dxt')));
-    print("BC5:            " .. tostring(love.graphics.isSupported('bc5')));
-    print("SRGB:           " .. tostring(love.graphics.isSupported('srgb')));
-
     print("\n---- RENDERER  ---- ");
     local name, version, vendor, device = love.graphics.getRendererInfo()
     print(string.format("Name: %s \nVersion: %s \nVendor: %s \nDevice: %s", name, version, vendor, device));
@@ -57,20 +23,21 @@ local function checkSupport()
 end
 
 local function drawStats()
+    local h = love.graphics.getHeight();
     love.graphics.setColor(100, 100, 100, 255);
-    love.graphics.rectangle('fill', 5, love.window.getHeight() - 185, 200, 200);
+    love.graphics.rectangle('fill', 5, h - 185, 200, 200);
     love.graphics.setColor(255, 255, 255, 255);
-    love.graphics.print(string.format("FT: %.3f ms", 1000 * love.timer.getAverageDelta()), 10, love.window.getHeight() - 180);
-    love.graphics.print(string.format("FPS: %.3f fps", love.timer.getFPS()), 10, love.window.getHeight() - 160);
-    love.graphics.print(string.format("MEM: %.3f kb", collectgarbage("count")), 10, love.window.getHeight() - 140);
+    love.graphics.print(string.format("FT: %.3f ms", 1000 * love.timer.getAverageDelta()), 10, h - 180);
+    love.graphics.print(string.format("FPS: %.3f fps", love.timer.getFPS()), 10, h - 160);
+    love.graphics.print(string.format("MEM: %.3f kb", collectgarbage("count")), 10, h - 140);
 
     local stats = love.graphics.getStats();
-    love.graphics.print(string.format("Drawcalls: %d", stats.drawcalls), 10, love.window.getHeight() - 120);
-    love.graphics.print(string.format("Canvas Switches: %d", stats.canvasswitches), 10, love.window.getHeight() - 100);
-    love.graphics.print(string.format("TextureMemory: %.2f kb", stats.texturememory / 1024), 10, love.window.getHeight() - 80);
-    love.graphics.print(string.format("Images: %d", stats.images), 10, love.window.getHeight() - 60);
-    love.graphics.print(string.format("Canvases: %d", stats.canvases), 10, love.window.getHeight() - 40);
-    love.graphics.print(string.format("Fonts: %d", stats.fonts), 10, love.window.getHeight() - 20);
+    love.graphics.print(string.format("Drawcalls: %d", stats.drawcalls), 10, h - 120);
+    love.graphics.print(string.format("Canvas Switches: %d", stats.canvasswitches), 10, h - 100);
+    love.graphics.print(string.format("TextureMemory: %.2f kb", stats.texturememory / 1024), 10, h - 80);
+    love.graphics.print(string.format("Images: %d", stats.images), 10, h - 60);
+    love.graphics.print(string.format("Canvases: %d", stats.canvases), 10, h - 40);
+    love.graphics.print(string.format("Fonts: %d", stats.fonts), 10, h - 20);
 end
 
 -- ------------------------------------------------
@@ -82,7 +49,7 @@ function love.load()
     print(string.format("Title: '%s'", getTitle()));
     print(string.format("Version: %.4d", getVersion()));
     print(string.format("LOVE Version: %d.%d.%d (%s)", love.getVersion()));
-    print(string.format("Resolution: %dx%d", love.window.getDimensions()));
+    print(string.format("Resolution: %dx%d", love.graphics.getDimensions()));
 
     -- Check the user's hardware.
     checkSupport();
@@ -143,3 +110,7 @@ end
 function love.mousemoved(x, y, dx, dy)
     ScreenManager.mousemoved(x, y, dx, dy);
 end
+
+function love.wheelmoved(x, y)
+    ScreenManager.wheelmoved(x, y);
+end

main.lua

@@ -1,25 +1,3 @@
---==================================================================================================
--- Copyright (C) 2014 - 2015 by Robert Machmer                                                     =
---                                                                                                 =
--- Permission is hereby granted, free of charge, to any person obtaining a copy                    =
--- of this software and associated documentation files (the "Software"), to deal                   =
--- in the Software without restriction, including without limitation the rights                    =
--- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell                       =
--- copies of the Software, and to permit persons to whom the Software is                           =
--- furnished to do so, subject to the following conditions:                                        =
---                                                                                                 =
--- The above copyright notice and this permission notice shall be included in                      =
--- all copies or substantial portions of the Software.                                             =
---                                                                                                 =
--- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR                      =
--- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,                        =
--- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE                     =
--- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER                          =
--- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,                   =
--- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN                       =
--- THE SOFTWARE.                                                                                   =
---==================================================================================================
-
 local Resources = require('src.Resources');
 
 -- ------------------------------------------------