Merge branch 'release/1.8.0'

Author: rm-code

CHANGELOG.md

@@ -0,0 +1,30 @@
+## Version 1.8.0 ( 2016-01-30 )
+- Add gamepad and joystick callbacks
+- Add love.threaderror
+- Add varargs to ScreenManager.init
+
+## Version 1.7.0 ( 2016-01-12 )
+- Add textedited callback
+- Fix parameters for keypressed, keyreleased, mousepressed and mousereleased
+
+## Version 1.6.0 ( 2015-10-29 )
+- Add filedropped and directorydropped callbacks
+
+## Version 1.5.0 ( 2015-10-25 )
+- Add more callbacks
+
+## Version 1.4.1 ( 2015-04-14 )
+- Allow passing of varargs to new Screens
+
+## Version 1.3.1 ( 2015-03-24 )
+- Update library information
+
+## Version 1.3.0 ( 2015-02-20 )
+- Add mousemoved callback
+
+## Version 1.2.1 ( 2015-02-03 )
+- Add library information
+- Remove redundant code
+
+## Version 1.2.0 ( 2015-01-18 )
+ - Initial Release

LICENSE.md

@@ -0,0 +1,17 @@
+Copyright (c) 2014 - 2016 Robert Machmer
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.

Readme.md renamed to README.md

@@ -6,10 +6,9 @@ It also offers hooks for most of LÖVE's callback functions. Based on the type o
 
 ## Example
 
-This is a simple example of how the ScreenManager should be used (note: You will have to change the paths in the example to fit your setup). 
+This is a simple example of how the ScreenManager should be used (note: You will have to change the paths in the example to fit your setup).
 
-```
-#!lua
+```lua
 -- main.lua
 
 local ScreenManager = require('lib/ScreenManager');
@@ -32,8 +31,7 @@ end
 ```
 Note how MainScreen inherits from Screen.lua. This isn't mandatory, but recommended since Screen.lua already has templates for most of the callback functions.
 
-```
-#!lua
+```lua
 -- MainScreen.lua
 
 local Screen = require('lib/Screen');

Screen.lua

@@ -78,9 +78,11 @@ function Screen.new()
     function self:resize() end
 
     function self:textedited() end
-    
+
     function self:textinput() end
 
+    function self:threaderror() end
+
     function self:touchmoved() end
 
     function self:touchpressed() end
@@ -93,6 +95,24 @@ function Screen.new()
 
     function self:wheelmoved() end
 
+    function self:gamepadaxis() end
+
+    function self:gamepadpressed() end
+
+    function self:gamepadreleased() end
+
+    function self:joystickadded() end
+
+    function self:joystickaxis() end
+
+    function self:joystickhat() end
+
+    function self:joystickpressed() end
+
+    function self:joystickreleased() end
+
+    function self:joystickremoved() end
+
     return self;
 end