Merge branch 'release/0142'

Author: rm-code

LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 - 2015 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.

README.md

@@ -0,0 +1,49 @@
+# LoGiVi
+
+LoGiVi the "lovely Git-Viewer" is a git-repository visualisation tool inspired by [Gource](https://code.google.com/p/gource/). It was written from scratch using [Lua](http://www.lua.org/) and the [LÖVE](https://love2d.org/) framework.
+
+# Instructions
+LoGiVi can't read from a .git repository directly ([yet](https://github.com/rm-code/logivi/issues/3)). Instead you will have to create a git-log which needs to have a specific format. Please use this command to create the file:
+
+```bash
+git log --reverse --numstat --pretty=format:"author: %an|%ae%ndate: %ct%n" --name-status --no-merges > log.txt
+```
+
+This will create a log file in the same directory as the .git repository (If you want to write the log to a different location add its path after the '>' in the command above).
+
+When you run LoGiVi for the first time it will automatically open the folder in which you need to place the log. Depending on your operating system this can be one of the following locations:
+
+- Windows XP: C:\Documents and Settings\user\Application Data\LOVE\rmcode_logivi
+- Windows Vista and 7: C:\Users\user\AppData\Roaming\LOVE\rmcode_logivi
+- Linux: $XDG_DATA_HOME/love/ or ~/.local/share/love/rmcode_logivi
+- Mac: /Users/user/Library/Application Support/LOVE/rmcode_logivi
+
+For more information about the filesystem check the [LÖVE wiki](https://love2d.org/wiki/love.filesystem).
+
+As soon as the file is in the correct folder you can start LoGiVi and watch as it creates a visual representation of your git repository.
+
+Check the [wiki](https://github.com/rm-code/logivi/wiki) for instructions and further information.
+
+# License
+
+The MIT License (MIT)
+
+Copyright (c) 2014 - 2015 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.

Readme.md

@@ -24,7 +24,7 @@ local GAME_TITLE = "LoGiVi";
 
 local LOVE_VERSION = "0.9.2";
 
-local GAME_VERSION = "0104";
+local GAME_VERSION = "0142";
 
 -- ------------------------------------------------
 -- Local variables
@@ -60,6 +60,8 @@ function love.conf(t)
     t.window.display = 1;
     t.window.highdpi = false;
     t.window.srgb = false;
+    t.window.x = nil;
+    t.window.y = nil;
 
     t.modules.audio = true;
     t.modules.event = true;

conf.lua

@@ -61,6 +61,8 @@ function Screen.new()
 
     function self:mousefocus(focus) end
 
+    function self:mousemoved(x, y, dx, dy) end
+
     function self:quit(dquit) end
 
     function self:isActive()

lib/screenmanager/Screen.lua

@@ -21,9 +21,9 @@
 --===============================================================================--
 
 local ScreenManager = {
-    _VERSION     = '1.2.1',
+    _VERSION     = '1.3.1',
     _DESCRIPTION = 'Screen/State Management for the LÖVE framework',
-    _URL         = 'https://bitbucket.org/rmcode/screenmanager/',
+    _URL         = 'https://github.com/rm-code/screenmanager/',
 };
 
 -- ------------------------------------------------
@@ -234,6 +234,17 @@ function ScreenManager.mousefocus(focus)
     ScreenManager.peek():mousefocus(focus);
 end
 
+---
+-- Callback function triggered when the mouse is moved.
+-- @param x - Mouse x position.
+-- @param y - Mouse y position.
+-- @param dx - The amount moved along the x-axis since the last time love.mousemoved was called.
+-- @param dy - The amount moved along the y-axis since the last time love.mousemoved was called.
+--
+function ScreenManager.mousemoved(x, y, dx, dy)
+    ScreenManager.peek():mousemoved(x, y, dx, dy);
+end
+
 ---
 -- Reroute the quit callback to the currently active screen.
 -- @param dquit

lib/screenmanager/ScreenManager.lua

@@ -20,7 +20,7 @@
 -- THE SOFTWARE.                                                                                   =
 --==================================================================================================
 
-local ScreenManager = require('lib/screenmanager/ScreenManager');
+local ScreenManager = require('lib.screenmanager.ScreenManager');
 
 -- ------------------------------------------------
 -- Local Variables
@@ -88,7 +88,7 @@ function love.load()
     print("===================")
 
     local screens = {
-        main = require('src/screens/MainScreen');
+        main = require('src.screens.MainScreen');
     };
 
     ScreenManager.init(screens, 'main');
@@ -114,4 +114,18 @@ function love.keypressed(key)
     if key == 'f1' then
         showDebug = not showDebug;
     end
+
+    ScreenManager.keypressed(key);
+end
+
+function love.mousepressed(x, y, b)
+    ScreenManager.mousepressed(x, y, b);
+end
+
+function love.mousereleased(x, y, b)
+    ScreenManager.mousereleased(x, y, b);
+end
+
+function love.mousemoved(x, y, dx, dy)
+    ScreenManager.mousemoved(x, y, dx, dy);
 end

main.lua

@@ -0,0 +1,43 @@
+Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment.
+
+"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission.
+
+5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.