Commit Graph

184 Commits

Author SHA1 Message Date
Kingdaro
6cf4a54d9d Fix for :during() call without an after function 2016-05-23 19:03:58 -04:00
Kingdaro
08354c472d Write unit test for timer 2016-05-23 19:03:41 -04:00
Kingdaro
d77e0a2324 Fix for https://github.com/vrld/hump/issues/66 2016-05-23 18:45:20 -04:00
Kingdaro
dc589adc32 Merge pull request #2 from Kingdaro/vrld/master
Merge into master
2016-05-23 17:58:16 -04:00
Kingdaro
9a1c4c8b78 Merge remote-tracking branch 'refs/remotes/origin/master' into vrld/master
Resolved conflicts
2016-05-23 17:52:49 -04:00
Matthias Richter
40f0820d3c Add viewport support to camera (fixes #64) 2016-05-01 16:20:43 +02:00
Matthias Richter
edf115f19a Fix #58 - inconsistent naming in camera documentation 2016-05-01 15:03:01 +02:00
Matthias Richter
dff00cc1dc Document changes due to issue #60 2016-05-01 14:56:12 +02:00
Matthias Richter
8435fc798f Fix #60 - Inconsistent self:calls() in timer and signal 2016-05-01 14:40:58 +02:00
Matthias Richter
3a5573b1df Fix #59 - Error in example 2016-01-19 09:19:27 +01:00
Matthias Richter
448ecf704b Document Timer.script 2015-12-14 12:11:17 +01:00
Matthias Richter
c7c1b8e269 add timer.script(f) 2015-12-13 22:49:18 +01:00
vrld
2de9a30153 Fix #57: remove writing to global variable in smooth.linear 2015-11-27 10:34:38 +01:00
Matthias Richter
2cf3f19ff0 Fix documentation errors found by z0rg 2015-11-08 23:02:46 +01:00
Matthias Richter
acbd215840 Corrent syntax for signal instances (related to issue #55) 2015-11-02 21:24:04 +01:00
Matthias Richter
487b1a1921 Clear warning when making documentation 2015-11-02 21:23:33 +01:00
vrld
fa1071c5e1 Merge pull request #55 from tesselode/timer-docs-fix
Small fixes to timer docs
2015-11-02 21:11:02 +01:00
Matthias Richter
f00de3c0a4 Revert "Update timer.rst"
This reverts commit 8e65618e3c.
2015-11-02 21:09:44 +01:00
vrld
8e65618e3c Update timer.rst
Clearly show colon-syntax for timer-instance calls
2015-11-02 12:13:29 +01:00
vrld
8440ee1d9c Merge pull request #56 from alesegdia/master
fixing scale for camera:lockWindow
2015-11-02 12:02:37 +01:00
Alejandro Seguí
00a3f9becc fixing scale for camera:lockWindow 2015-10-31 00:04:42 +01:00
tesselode
b85922d470 Small fixes to timer docs
Timer instances created using Timer.new don't use colon syntax, which
the docs seem to indicate. Also I changed "menu_timer" to menuTimer to
make it consistent with the rest of the page.
2015-10-30 13:07:02 -04:00
vrld
7fb1142234 Merge pull request #54 from tesselode/master
Fixed a typo in the gamestate docs
2015-10-20 12:15:39 +02:00
tesselode
7713d054b3 Fixed a typo in the gamestate docs
Sorry about Atom doing its thing with empty lines...
2015-10-19 09:47:54 -04:00
vrld
5e02dcdba2 Fix #53: Typo in camera.lua 2015-10-16 11:20:08 +02:00
vrld
12761564b9 Document changes 2015-10-13 15:37:23 +02:00
vrld
523502ca80 [camera] More consistent naming 2015-10-13 15:35:46 +02:00
vrld
2257ab025c Update camera.rst 2015-10-13 15:34:59 +02:00
Matthias Richter
f851254f26 Fix #52 - Gamestate require init function.
Use __NULL__ when init is not defined in the state.
2015-10-13 08:11:49 +02:00
vrld
37f4ed9e43 Update README.md 2015-10-12 08:29:36 +02:00
Matthias Richter
fa89556eb6 Documentation with sphinx 2015-10-12 08:21:56 +02:00
Matthias Richter
52324d5368 Documentation with sphinx 2015-10-12 08:21:31 +02:00
Matthias Richter
f6c5f621e7 Code cleanup 2015-10-12 08:21:16 +02:00
vrld
ca7fa8acb3 (Issue #49) Don't overwrite state.init on gamestate.switch 2015-10-07 21:48:20 +02:00
Matthias Richter
eb05aee86f Add support for camera locking.
Currently supports:

- Position locking (lock camera at target)
- Window locking (constrain target to be inside rectangular region)
- Position smoothing (none, linear, damped)

With these you can also implement horizontal/vertical camera windows,
target focus, projected focus, etc.

See the great article "Scroll Back: The Theory and Practice of Cameras
in Side-Scrollers" by Itay Keren [1] for details.

[1] http://gamasutra.com/blogs/ItayKeren/20150511/243083/Scroll_Back_The_Theory_and_Practice_of_Cameras_in_SideScrollers.php#h.949uhirhz51j
2015-05-30 20:21:48 +02:00
Matthias Richter
3c666c558b Fix #46: GS.switch should halt current state cycle
`switch`, `push` and `pop` now set a flag marking the new state as
dirty. Dirty states will not receive any callbacks except `update`.
Before executing `update` the state is marked as clean, so it will
receive callbacks from thereon.
2015-05-30 16:41:37 +02:00
Matthias Richter
5c9d51d356 Fetch event callbacks from love instead of hardcoding it 2015-05-30 16:19:26 +02:00
vrld
c06e8e6ee8 Merge pull request #47 from kneeko/bug-fix
Fixed include helper skipping false values.
2015-05-30 16:13:07 +02:00
Nico Prins
038bc9025f Changed how includes are referenced. 2015-05-08 15:41:38 -07:00
Nico Prins
656fd17dc4 Added string includes using import method. 2015-05-06 18:05:19 -07:00
Nico Prins
dbf60e3dc5 Fixed include helper skipping falsy values. 2015-05-05 09:26:52 -07:00
vrld
672a91b56c Merge pull request #44 from harris-m/master
Add mousemoved callback to gamestate callbacks (added in LOVE 0.9.2)
2015-03-21 18:22:33 +01:00
Harris Munir
f984cc87e6 add mousemoved callback to gamestate callbacks (added in LOVE 0.9.2) 2015-03-18 20:08:38 -05:00
vrld
b18c399def Add missing argument to gs:resume(pre, ...) 2014-12-16 18:07:32 +01:00
vrld
605953dddf Merge pull request #43 from xpol/master
Fixes wrong arg #1 for resume().
2014-12-16 18:06:21 +01:00
xpol
bdd9ad5c04 Fixes wrong arg #1 for resume(). 2014-12-15 15:06:05 +08:00
Matthias Richter
537ca76264 [signal] Use . instead of : in registry instances.
Mirrors behavior of the timer.lua
2014-11-23 18:02:38 +01:00
Matthias Richter
a9061c68f0 [timer] Place new() at the end of the module. 2014-11-23 18:00:50 +01:00
vrld
03505b9b77 Merge pull request #42 from headchant/master
Makes sense. The same should be done for `hump.signal`.
2014-11-21 11:53:11 +01:00
Tilmann Hars
49a1e33c56 Merge https://github.com/vrld/hump 2014-11-13 16:03:35 +01:00