Skip to content

Commit 7138ebe

Browse files
committed
Merge branch 'release/1.8.1'
2 parents 6a7bfd9 + 501e8a0 commit 7138ebe

File tree

5 files changed

+30
-8
lines changed

5 files changed

+30
-8
lines changed

.luacheckrc

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
files['.luacheckrc'].global = false
2+
std = 'max+busted'
3+
4+
globals = {
5+
'love',
6+
'getVersion',
7+
'getTitle'
8+
}
9+
10+
exclude_files = {
11+
'./lua_install/*'
12+
}
13+
14+
ignore = {
15+
'/self'
16+
}

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2014 - 2016 Robert Machmer
1+
Copyright (c) 2014 - 2017 Robert Machmer
22

33
This software is provided 'as-is', without any express or implied
44
warranty. In no event will the authors be held liable for any damages

README.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,27 @@
11
#ScreenManager
22

3+
[![Version](https://img.shields.io/badge/Version-1.8.0-blue.svg)](https://github.com/rm-code/screenmanager/releases/latest)
4+
[![LOVE](https://img.shields.io/badge/L%C3%96VE-0.10.0-EA316E.svg)](http://love2d.org/)
5+
[![License](http://img.shields.io/badge/Licence-zlib-brightgreen.svg)](LICENSE.md)
6+
37
The ScreenManager library is a state manager at heart which allows some nifty things, like stacking multiple screens on top of each other.
48

59
It also offers hooks for most of LÖVE's callback functions. Based on the type of callback the calls are rerouted to either only the active screen (love.keypressed, love.quit, ...) or to all screens (love.resize, love.visible, ...).
610

711
## Example
812

13+
> For a more complete example check out the [example branch](https://github.com/rm-code/screenmanager/tree/example) in this repository.
14+
915
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).
1016

1117
```lua
1218
-- main.lua
1319

14-
local ScreenManager = require('lib/ScreenManager');
20+
local ScreenManager = require('lib.ScreenManager');
1521

1622
function love.load()
1723
local screens = {
18-
main = require('src/screens/MainScreen');
24+
main = require('src.screens.MainScreen');
1925
};
2026

2127
ScreenManager.init(screens, 'main');
@@ -34,7 +40,7 @@ Note how MainScreen inherits from Screen.lua. This isn't mandatory, but recommen
3440
```lua
3541
-- MainScreen.lua
3642

37-
local Screen = require('lib/Screen');
43+
local Screen = require('lib.Screen');
3844

3945
local MainScreen = {};
4046

Screen.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--===============================================================================--
22
-- --
3-
-- Copyright (c) 2014 - 2016 Robert Machmer --
3+
-- Copyright (c) 2014 - 2017 Robert Machmer --
44
-- --
55
-- This software is provided 'as-is', without any express or implied --
66
-- warranty. In no event will the authors be held liable for any damages --

ScreenManager.lua

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--===============================================================================--
22
-- --
3-
-- Copyright (c) 2014 - 2016 Robert Machmer --
3+
-- Copyright (c) 2014 - 2017 Robert Machmer --
44
-- --
55
-- This software is provided 'as-is', without any express or implied --
66
-- warranty. In no event will the authors be held liable for any damages --
@@ -21,7 +21,7 @@
2121
--===============================================================================--
2222

2323
local ScreenManager = {
24-
_VERSION = '1.8.0',
24+
_VERSION = '1.8.1',
2525
_DESCRIPTION = 'Screen/State Management for the LÖVE framework',
2626
_URL = 'https://github.com/rm-code/screenmanager/',
2727
};
@@ -193,7 +193,7 @@ end
193193
-- delay between key repeats depends on the
194194
-- user's system settings.
195195
--
196-
function ScreenManager.keypressed( key, scancode, isrepeat )
196+
function ScreenManager.keypressed( key, scancode, isrepeat )
197197
ScreenManager.peek():keypressed( key, scancode, isrepeat );
198198
end
199199

0 commit comments

Comments
 (0)