Squashed commit of the following:

commit ca86facc9275b4ca743cd30b97260e85f59a33e8
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Sep 18 12:51:42 2013 +0200

    Merge Pro into Free

commit e288c91a75c2113f4a7184b4fadf298257eab546
Merge: 33b14a2 b62a6d2
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Sep 18 12:51:42 2013 +0200

    Merge branch 'KoboldKit-Free-master' into pro2free

commit 33b14a272e7d50166d079211a1179c8ac2bf5b5f
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Sep 18 11:14:58 2013 +0200

    wip

commit 5da3d7d3896895f0122a22808c64229cbda60a56
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Sep 18 11:14:51 2013 +0200

    wip checkin

commit 239a4f4f88c6bb77e9ad4bf7b7a62dbf44b8a041
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Mon Sep 16 17:19:45 2013 +0200

    separate pro from standard tilemap renderer

commit df53196478f84948ffbfc7f8ffcb3b9693f4c7da
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Mon Sep 16 16:52:28 2013 +0200

    started OpenGW, misc stuff (I really need to make my commits more atomic)

commit d4c297f3f87d1b34ea2b6fab820f477c14144c27
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Mon Sep 9 19:04:36 2013 +0200

    gl context ifdef for Mac

commit 1f485f1f9290ef29939547baa9952e8bf64adb95
Merge: f107dda 4b45853
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Mon Sep 9 18:51:50 2013 +0200

    Merge branch 'master' of github.com:LearnCocos2D/KoboldKit

commit f107dda3d38e4496838a85543776b3b16e7c86b2
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Mon Sep 9 18:51:31 2013 +0200

    add EAGLContext property to KKView

commit 4b45853e0940e5e3235ebda4faaff9b4aa14c92c
Author: amorwilliams <amorwilliams@hotmail.com>
Date:   Sun Sep 8 21:07:50 2013 +0800

    Revert f54422d..249a03d

    This rolls back to commit f54422d4903b005e4516378c6aae198fc10e0d0b.

commit 249a03d5f9d64388263c22ca1612e5b44b797939
Author: amorwilliams <amorwilliams@hotmail.com>
Date:   Sun Sep 8 21:01:06 2013 +0800

    Revert "tool updates"

    This reverts commit f54422d4903b005e4516378c6aae198fc10e0d0b.

commit 288a0f800b7a8f735e72c03e89bfd99213d5bf07
Author: amorwilliams <amorwilliams@hotmail.com>
Date:   Sun Sep 8 20:55:28 2013 +0800

    aaaa

commit f54422d4903b005e4516378c6aae198fc10e0d0b
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Thu Sep 5 22:24:51 2013 +0200

    tool updates

commit 81ea7d172f0cc6f11a50b509caac7945162560b4
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Thu Aug 29 22:16:34 2013 +0200

    starter project improved, fixed icons

commit 102f78aab93d5b9e201ca00510ce529e074cdd4d
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Thu Aug 29 18:16:47 2013 +0200

    KK template project

commit 665fb9a88d07a2ecec39e1a274fb4f057175f7b8
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Thu Aug 29 16:04:24 2013 +0200

    icons & launch images

commit 54e200d366b6262cab451cc4bf350a5db7bb703d
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Aug 28 23:01:39 2013 +0200

    finish KKNewProject.app, added licenses

commit c28da81fe9a596b18ba892aa6306e5517d0d7d4e
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Tue Aug 27 13:17:30 2013 +0200

    docs

commit fafc060b1e28878c21df419ced34a7b7ec2db47a
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Tue Aug 27 01:04:05 2013 +0200

    typio

commit c3908c2c31034851aeab39d9997ae3afbe74fa85
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Tue Aug 27 01:00:36 2013 +0200

    doc changes

commit 636859db80b5127137be2973e7a9b97deb36b7b7
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Tue Aug 27 00:40:42 2013 +0200

    changed project structure

commit 2b27787637a0b4263ffb2bbc26e987bd43519adf
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Aug 21 20:12:49 2013 +0200

    jump, fall, land

commit 994c2eb6d7354cefbc047b662afaea3e6e993b45
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Mon Aug 19 00:21:23 2013 +0200

    suppress deprecated macro

commit ea5f29d5cf599a3059fa695a87273146d940d3e8
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Aug 18 22:06:47 2013 +0200

    project separation + tilemap dynamics wip

commit a513e9ead978a054e24f2823f718d1c561264321
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Aug 18 17:23:01 2013 +0200

    remove cocosdenshion

commit 060239318b67623801722e1b39197b73085dbdf5
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Aug 18 17:08:45 2013 +0200

    integrated ObjectAL

commit 8b5d9bc6ead8e290542fb94aa1510f7e0f3773c9
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Aug 18 16:19:37 2013 +0200

    add submodule ObjectAL

commit 2c61f0a90bfc3a39205e8cf74fdb9022efd4a053
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Aug 18 16:14:53 2013 +0200

    del

commit 0ca5992fdf658dfb63048e3a0eacf63a4ab9beec
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Aug 18 16:05:02 2013 +0200

    kk split into pro & community projects

commit b70cfd3047de5b6d979acbd813097c76f603fd8c
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Aug 18 15:26:32 2013 +0200

    split project in regular and pro versions

commit c88e14671413be51a6001669df68cc8023f63f64
Merge: 632cbea f05da36
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Aug 18 14:39:07 2013 +0200

    Merge branch 'refs/heads/master' into separating-projects-theorem

commit f05da36b841b5e1a7e5eaa827cb94bbeac90cb4b
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Aug 18 14:38:34 2013 +0200

    move tilemap node

commit f2e0f7744aba0aa546993c0f18d119b7ab7b849f
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Aug 18 11:48:39 2013 +0200

    update readme

commit c4340eea65ffefee74ef227655d8db2f21bf85f5
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Aug 18 11:40:50 2013 +0200

    project folder structure simplified

commit 632cbeac30e19efb0a9cfb960f81fc1cdd53d858
Merge: 7f33ba1 fe205e8
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Aug 17 23:39:14 2013 +0200

    Merge branch 'refs/heads/master' into separating-projects-theorem

commit fe205e83414fb2a1d3ed65db700372436a872388
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Aug 17 23:29:10 2013 +0200

    osx documents dir fix

commit 5f0138bcc8fc56c81e275382e46fd51a34508b0a
Merge: 42eba90 461cf0a
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Aug 17 23:24:19 2013 +0200

    Merge branch 'refs/heads/project-split-merge'

commit 461cf0a0913eb1416c38c4fc5ebf9f8dd161eb07
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Aug 17 23:08:56 2013 +0200

    projects separated

commit 0661cba1f6b3a5ea5d5a06254a48e5f6a5f47983
Merge: 42eba90 7f33ba1
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Aug 17 22:59:43 2013 +0200

    Merge branch 'refs/heads/separating-projects-theorem' into project-split-merge

commit 7f33ba1365685149cac1526d23d469c2a14d9879
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Aug 17 22:59:11 2013 +0200

    split projects

commit 925eb796f318f97689d5d2fcc6f9d043c6011ac9
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Aug 17 22:33:19 2013 +0200

    split projects

commit e14e6b124a9ee46cc1eada83a3702fc901012afb
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Aug 17 22:18:13 2013 +0200

    remove kk

commit 6ccca64bdb1d244964b9a385c3cbe83bfd6ac8d7
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Aug 17 22:17:04 2013 +0200

    remove sss

commit 42eba90e781634a97addb37bdd0394c4aaccb8a8
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Aug 17 20:13:51 2013 +0200

    developer messages

commit d73c09c3e8e18599e6f2eaba1e8650aeeced86f1
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Aug 17 19:38:07 2013 +0200

    project layout refactored

commit e920c89f6fa2829aa3fa18993f21dc5aaa086a55
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Aug 17 19:08:58 2013 +0200

    new folder layout for code

commit 77a4b64dd25eac691dfe3e25df3058658262ebaa
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Aug 17 18:15:24 2013 +0200

    convert CD to ARC (first pass, no test)

commit 6abfbf2879ec080eab18895147099948cdd465e2
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Aug 17 18:01:56 2013 +0200

    mcs

commit 6b739f09e68f432115a89783d06cdc74c64b1b64
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Thu Aug 15 19:35:42 2013 +0200

    update control pad fix

commit e864ee8e4a659342a99f3778fe45f471b3097a8c
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Thu Aug 15 19:17:35 2013 +0200

    fix direction pad getting stuck

commit 74d5326983a715a4f2e861f4f08a34898c1c24bd
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Thu Aug 15 15:07:01 2013 +0200

    reactivate mac target

commit 7895d858aee2b49c3f4d9c6420d69a4012764fa0
Merge: e3688db 119c804
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Thu Aug 15 15:00:45 2013 +0200

    Merge branch 'master' of github.com:LearnCocos2D/KoboldKit

commit e3688db53a8260a01c97ef8ac262f3dacde6266f
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Thu Aug 15 14:59:56 2013 +0200

    behaviors: don't copy on add

commit 070d072c37c5f5f52bb21e581726ef721df912bb
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Thu Aug 15 14:39:01 2013 +0200

    fix jump button always highlighted

commit 119c804d38370484d4f4e6d530aea8f7485fd01c
Author: MarcusHimself <marcushimself@web.de>
Date:   Thu Aug 15 02:55:42 2013 +0200

    debug buttons

commit 74f7f12c34324f5f9360dfaf6467a4e36330b881
Merge: 41f86b9 0c14e37
Author: MarcusHimself <marcushimself@web.de>
Date:   Thu Aug 15 01:54:57 2013 +0200

    Merge branch 'master' of https://github.com/LearnCocos2D/KoboldKit

commit 41f86b9757147dd76883aa9b73cc932dabd3c98c
Author: MarcusHimself <marcushimself@web.de>
Date:   Thu Aug 15 01:54:31 2013 +0200

    stuff

commit 0c14e37c23797887a0fb44610ed7df77b60233b5
Merge: e892922 ea22280
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Thu Aug 15 01:48:33 2013 +0200

    Merge branch 'master' of github.com:LearnCocos2D/KoboldKit

commit e892922b138d1a51364d7153dd12705ed6fd56e2
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Thu Aug 15 01:47:23 2013 +0200

    tilemap renderer, cocosdenshion, cgvector extensions

commit 1427a497feb36a0d31182ffd3523b73af02ff4af
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Tue Aug 13 00:35:20 2013 +0200

    mcs

commit ee3f45f65972009282a4ff662c32bc315781334e
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Tue Aug 13 00:20:42 2013 +0200

    minor rendering optimizations

commit 40ef9e4a6a55d0a31fcdae7689836d8e125a7afe
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Mon Aug 12 23:18:46 2013 +0200

    tilemap renderer: reduce number of texture switches

commit d30e9c288dd47d282dd16287b83f4d29c346e2cf
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Mon Aug 12 19:02:36 2013 +0200

    improved tilemap render performance, now 60 fps constant

commit e739000b026824f36f861b1d3c48d72827c73caf
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Mon Aug 12 18:34:57 2013 +0200

    improve tilemap render performence

commit 3565f956ba09433cd09273b381a93f0002e8dd2d
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Mon Aug 12 18:18:50 2013 +0200

    performance with add/remove sprite

commit ea22280c299a75a8f0cb1d7659eef0656c33140a
Author: MarcusHimself <marcushimself@web.de>
Date:   Sun Aug 11 00:57:28 2013 +0200

    Mission "Lets open a door" accomplished

commit 8f8760d2a152058c6ab1269285fe964304acf9da
Merge: 944a259 38db994
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Aug 10 21:39:45 2013 +0200

    Merge branch 'master' of github.com:LearnCocos2D/KoboldKit

commit 944a25998b5a83eb0c7c507e80942c0e7d4e80ac
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Aug 10 21:39:31 2013 +0200

    menu on

commit 38db9944095378663d0a496a73446a880fe6806b
Author: MarcusHimself <marcushimself@web.de>
Date:   Sat Aug 10 18:36:09 2013 +0200

    update

commit 82fe87806c06bea2de176861d15ec7215989f2a1
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Aug 10 16:05:37 2013 +0200

    docs

commit 3ad01e9652ea9fe034a25244e0799a97b1831504
Author: MarcusHimself <marcushimself@web.de>
Date:   Sat Aug 10 13:37:18 2013 +0200

    map update

commit 86a3c900c159d846970d2e79ed6e5fcd3d9df53c
Author: MarcusHimself <marcushimself@web.de>
Date:   Sat Aug 10 13:26:51 2013 +0200

    map stuff

commit f69a48b2a7518b64772da56fee9b84e21519d727
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Aug 9 01:12:07 2013 +0200

    undo concurrent rendering test

commit c2837fcddb88cf2b377ceb9199ac2111e021d583
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Aug 9 01:05:07 2013 +0200

    interesting glitch :)

commit 4b3c34cf98ba47606ddb5b88e3aedcb8de2aecbb
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Aug 9 00:15:22 2013 +0200

    tilemap rendering performance++

commit 743d6db1fc75454c64ce8f11c6c09ae3226f9e92
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Aug 9 00:03:56 2013 +0200

    couple % better tilemap performance

commit bb116d50d00d602591e70933ba021574a84021e4
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Thu Aug 8 22:43:13 2013 +0200

    remove test tileset

commit eb1f056352aa68566396f69ab008b4006329b03d
Author: MarcusHimself <marcushimself@web.de>
Date:   Thu Aug 8 20:37:37 2013 +0200

    DemoStage002 done

commit 3f8ca0df5803feccf6dde9c46787f89bf1de3894
Author: MarcusHimself <marcushimself@web.de>
Date:   Thu Aug 8 18:42:52 2013 +0200

    level update

commit fbd732810a764fbd1f7b34c73a83adcdc2ddd68a
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Thu Aug 8 15:08:58 2013 +0200

    added tmx, remove old tileset

commit aa29c33f66e3e789e6775aed148b1a28554dc1e1
Merge: f076f57 91fa920
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Thu Aug 8 14:41:52 2013 +0200

    Merge branch 'master' of github.com:LearnCocos2D/KoboldKit

commit 91fa920a988e095687503c29b05c2e738f0006e3
Author: MarcusHimself <marcushimself@web.de>
Date:   Thu Aug 8 14:35:09 2013 +0200

    new tiles

commit f076f57c16d746470a9dcedccfe7e3eaeb3c846b
Merge: c4a519b 20a11ed
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Thu Aug 8 14:00:20 2013 +0200

    Merge branch 'refs/heads/SSSM-StarterProject' into Super-Stick-Spy-Minigame

commit 20a11ed26a20385220dcaad1514e69b92aeb42d8
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Thu Aug 8 13:59:34 2013 +0200

    mcs

commit c4a519b8ba9390de82c3209a22ffcd247da95c19
Merge: da40927 088acde
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Thu Aug 8 00:50:25 2013 +0200

    Merge branch 'master' of github.com:LearnCocos2D/KoboldKit

    Conflicts:
    	KoboldKit/Super_Stick_Spy/Resources/Config/objectTemplates.lua

commit da40927f5da4fd566ee00492896837ce5b4e1dc5
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Thu Aug 8 00:49:55 2013 +0200

    anchorpoint removed

commit 088acde5a686426614c5f38e253aa33955d356fe
Author: MarcusHimself <marcushimself@web.de>
Date:   Thu Aug 8 00:29:14 2013 +0200

    blurry

commit 5ca9aec8af5a2d56acd71cbbd52192c048fc6a3d
Author: MarcusHimself <marcushimself@web.de>
Date:   Thu Aug 8 00:20:54 2013 +0200

    test

commit 262790e41618ef592adbcd3466f1e375f37434b4
Author: MarcusHimself <marcushimself@web.de>
Date:   Wed Aug 7 23:20:06 2013 +0200

    tiles test

commit 1b147247bac2b56f498d80525be8a3d51fbcfc59
Merge: 7918d53 f4dd757
Author: MarcusHimself <marcushimself@web.de>
Date:   Wed Aug 7 22:46:49 2013 +0200

    Merge branch 'master' of https://github.com/LearnCocos2D/KoboldKit

    Conflicts:
    	KoboldKit/KoboldKit.xcodeproj/project.pbxproj

commit 7918d5304ee8a98915c3d059bd9edac4cdee094b
Author: MarcusHimself <marcushimself@web.de>
Date:   Wed Aug 7 22:46:17 2013 +0200

    tiles test

commit f4dd75738c5c4f979f723b91c091d0ffb2d2230b
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Aug 7 22:42:56 2013 +0200

    player anchorpoint

commit 7f666878aa2ea0546cbb672c5e2b6419dc909875
Author: MarcusHimself <marcushimself@web.de>
Date:   Wed Aug 7 20:54:29 2013 +0200

    stuhuff

commit 96c84f303bee3dc1f10b005fcef061ea97d24020
Author: MarcusHimself <marcushimself@web.de>
Date:   Wed Aug 7 20:19:57 2013 +0200

    tileset

commit 655812418f919a07c7f9c85838a5cd730ed031f7
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Aug 7 20:14:32 2013 +0200

    menu font size

commit 10d905bf4c20657690d683bf70d58fd1a276da0b
Author: MarcusHimself <marcushimself@web.de>
Date:   Wed Aug 7 20:11:52 2013 +0200

    way better… or not?

commit 81062f81eb4798384ab6d9dbe21ab2cdef30cbbf
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Aug 7 19:51:21 2013 +0200

    mcs

commit b17dfe366c679fc090ce7bc7d341d52b0f7a003b
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Aug 7 19:04:42 2013 +0200

    rename project folder

commit 26c71548aa63a9e734511db6f445657203e427eb
Merge: 19a2c54 570de86
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Aug 7 18:53:44 2013 +0200

    Merge branch 'refs/heads/platformer-demo-for-book'

commit 570de86da28db46979e25f5432b2deea9d0358b0
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Aug 7 18:52:11 2013 +0200

    fix debug draw always enabled

commit 19a2c540d33a057b02db1fcddbd05e8c8a377029
Author: MarcusHimself <marcushimself@web.de>
Date:   Wed Aug 7 17:34:12 2013 +0200

    levels

commit a15d8e03fca2d3d5edda4f95ec67ef03eabe0d53
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Aug 7 17:33:04 2013 +0200

    music

commit 41c26ce9b60661a1a5c391f02f2e2b35bea90e1b
Author: MarcusHimself <marcushimself@web.de>
Date:   Wed Aug 7 17:20:52 2013 +0200

    levels extravaganza

commit 5c59dc78252442db5ffcceed1ae1853e5ded512e
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Aug 7 16:54:34 2013 +0200

    re-enable dev menu

commit 1bb46c9b901703a7d9323bff2645bc1221ced3ab
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Aug 7 16:29:54 2013 +0200

    audio added

commit e0054adc85763d2d9b4bf06fd4fd86718a3b6d6d
Merge: 4410763 516d53e
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Aug 7 14:39:26 2013 +0200

    Merge branch 'refs/heads/master' into platformer-demo-for-book

commit 516d53e90b922cbfbdb06711b5c7cbfa32e3cfda
Merge: 08c554b 5370d39
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Aug 7 14:35:51 2013 +0200

    Merge branch 'master' of github.com:LearnCocos2D/KoboldKit

commit 08c554b2bbf90304b32cf83548fd067134a33f42
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Aug 7 14:35:28 2013 +0200

    rename project files

commit 5370d39af36fb305925f25f6a982273819c99b00
Author: MarcusHimself <marcushimself@web.de>
Date:   Tue Aug 6 17:43:33 2013 +0200

    levels

commit 5b675ef0c1cad9e0cbe611c95ac04a50afc389b4
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Tue Aug 6 17:41:50 2013 +0200

    fix texture stretching

commit 477874e4f56c4c22426a452bcec3add2009ce85a
Author: MarcusHimself <marcushimself@web.de>
Date:   Tue Aug 6 17:32:35 2013 +0200

    levels

commit 44107630dfffb73db7e0ed917866fe0caa640798
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Tue Aug 6 17:20:44 2013 +0200

    book demo cleanup

commit c0c02e74ef6e5be001b73503de717d3b0010b228
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Tue Aug 6 14:48:40 2013 +0200

    demolevel improvements

commit 0f9da7d5d61c4b324730abe098327e77e2266ce6
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Mon Aug 5 00:47:06 2013 +0200

    docs

commit 5d51ef3551c364e5115e14573542140bcc3bd785
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Mon Aug 5 00:16:14 2013 +0200

    platform object, allow jumping on platform

commit 812ccda67481963a56bba7b015ced17f3080b795
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Aug 4 21:32:40 2013 +0200

    doc

commit b994ba1217b7329fde603930f7c02cf4c9267543
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Aug 4 21:27:11 2013 +0200

    object follows path

commit 652277bcc6580451a8157dac0904f2760ced50ad
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Aug 4 18:20:31 2013 +0200

    behavior templates

commit 9b24b004a7aa19cf9d489b18fb1d5c4ebe22bae0
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Aug 4 16:54:49 2013 +0200

    rename objecttypes.lua to objecttemplates.lua

commit 0e48c0c54f1f44fe636937b8208d7024ffd40718
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Aug 4 16:00:41 2013 +0200

    update Object names

commit a7bc1eec91b85fa2ae9e5103131a04d19ea2e8c4
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Aug 4 15:57:51 2013 +0200

    remove "Object" prefix

commit 4b86617a2b5fb0836e473e21be9242178c216aaf
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Aug 4 13:58:40 2013 +0200

    mcs

commit a11ea0a8bc28bd4271678da18641e4ddb3342926
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Aug 4 13:57:39 2013 +0200

    spawn at checkpoint, changed portal trigger notification parameters

commit 66152107a97c87e3c4519f09f18ce6fd1286b3d7
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Aug 3 21:58:39 2013 +0200

    checkpoints work within a level

commit 7927765eb2befc3678fab569999b27a23720a10a
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Aug 3 21:00:54 2013 +0200

    prevent double-jump

commit b3d5ffc57f3e9e3a71d9e6327b719c51026944b1
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Aug 3 16:17:36 2013 +0200

    respawn player

commit ed2f913696febfec19f02be8fb319e5615bc3dbd
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Aug 3 16:00:54 2013 +0200

    emitter object for tiled

commit 71049dff49e7c82a672d7b46df2c01ced669c204
Merge: 5dfb2e4 992ad33
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Aug 3 14:45:34 2013 +0200

    Merge branch 'master' of github.com:LearnCocos2D/KoboldKit

commit 5dfb2e4101bd81ccc09927259fdf05925ec98b49
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Aug 3 14:45:19 2013 +0200

    player death effect, death trap

commit 992ad336ce71e32eca019c4a33a8c7832565d275
Author: MarcusHimself <marcushimself@web.de>
Date:   Sat Aug 3 14:34:09 2013 +0200

    spike example

commit f148a463ec3f06e05ee89abd8fe8a6ef49b44880
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Aug 3 13:41:54 2013 +0200

    portal trigger

commit 1e3c93ae3a4c2469673516d79607664cfccc423f
Author: MarcusHimself <marcushimself@web.de>
Date:   Sat Aug 3 13:24:08 2013 +0200

    buttons

commit d50ac9ee418e2eec96126ba64f4ac443c8778217
Merge: 9903f3b 0c91bd9
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Aug 3 13:22:54 2013 +0200

    Merge branch 'master' of github.com:LearnCocos2D/KoboldKit

commit 9903f3bcd3db3a8007096e61b98ca0b6dd9d98f3
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Aug 3 13:22:38 2013 +0200

    re-add player _boundingBox

commit 0c91bd96674315a658d45cb4e03760bdae8b22fd
Author: MarcusHimself <marcushimself@web.de>
Date:   Sat Aug 3 12:07:43 2013 +0200

    buttons

commit d5d76f1313928a89de8ba9dc3ddfb94d3291055f
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Aug 3 11:47:46 2013 +0200

    prefer status bar hidden

commit a5999d51768720602e283788c3448ef393d03660
Merge: bf5f45b fb857be
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Aug 3 11:46:08 2013 +0200

    Merge branch 'master' of github.com:LearnCocos2D/KoboldKit

commit bf5f45b5ca5e0181efab6e383062f4494a393b62
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Aug 3 11:45:54 2013 +0200

    status bar hidden

commit fb857be352ac7b60d99e43a90028231efd0131c0
Author: MarcusHimself <marcushimself@web.de>
Date:   Sat Aug 3 10:42:05 2013 +0200

    buttons and types

commit 8c00bff35e6e641b46ab6f3bbdd164eddbdfe7a6
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Aug 2 23:46:33 2013 +0200

    unscale jump button

commit e5c7ea5cb805b768fd2efc1bf0e1f36b4033d94c
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Aug 2 23:42:47 2013 +0200

    testlevel

commit 1d920ac2ad0d7dbb9317c8ec4b09cef110d3f2c2
Merge: 30fc3c0 fb6ece1
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Aug 2 23:42:04 2013 +0200

    Merge branch 'master' of github.com:LearnCocos2D/KoboldKit

    Conflicts:
    	KoboldKit/PlatformerDemo/Resources/Demo/DemoLevel01.tmx

commit 30fc3c08f1b541d5e2e57b4bc6214c7996ed54ce
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Aug 2 23:40:38 2013 +0200

    load level (wip)

commit f4160b1cf3fbae0c4ac8842d91deac79b7411331
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Aug 2 23:06:03 2013 +0200

    fix tilemap object position offset, add notification node

commit fb6ece17f4d7d8ed1ccf7536543b48218d18f4d1
Author: MarcusHimself <marcushimself@web.de>
Date:   Fri Aug 2 21:11:24 2013 +0200

    again and again and again

commit ebf72e0c15942b396b1c5aa8b145d7d4ba42b800
Author: MarcusHimself <marcushimself@web.de>
Date:   Fri Aug 2 19:52:59 2013 +0200

    lots of stuff

commit 272bf62fa19f96a98d0354513f4729a3b3b7db0a
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Aug 2 18:53:48 2013 +0200

    visualized exit door example

commit d821da1164e176c1afbcdebd26e487b4d3540428
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Aug 2 18:41:57 2013 +0200

    renamed notification

commit 77eb0f2d201acdc842583e03fc2fe49d1ae69ff7
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Aug 2 18:39:41 2013 +0200

    count items, send notification, remove on notification behavior

commit 7ca98a08586b40bef0e7b3e55f5e667fa279e7aa
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Aug 2 17:42:48 2013 +0200

    revert demosandbox

commit 7352ffae0bf0d19d7141914d6514b8d66cfa1e8a
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Aug 2 17:41:03 2013 +0200

    fix tileset filtering issue

commit bb419758a35257dc23400138dfe59fbc0a6e22a2
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Aug 2 17:17:32 2013 +0200

    project resources readded

commit f1ff5e91faad904400dc2ef2e5b2d12ebfe4dba4
Author: MarcusHimself <marcushimself@web.de>
Date:   Fri Aug 2 17:10:56 2013 +0200

    rename magic

commit 7b150b51a4986f98a6a4103fe68150e993a9acda
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Aug 2 16:52:50 2013 +0200

    remove old tilemaps

commit 274efe310c79315ab096372c0ee89dbffb16c3dd
Merge: 6d2c51a 6274f3a
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Aug 2 16:48:28 2013 +0200

    Merge branch 'master' of github.com:LearnCocos2D/KoboldKit

commit 6d2c51ab650a285406755767850246413cf22dc5
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Aug 2 16:45:45 2013 +0200

    dispatch physics events via controller

commit 6274f3ab097a59278a272e594322cb40776356fd
Author: MarcusHimself <marcushimself@web.de>
Date:   Fri Aug 2 16:36:40 2013 +0200

    maps

commit 387b2b2e078264d236f539404af0c9a905cc112a
Author: MarcusHimself <marcushimself@web.de>
Date:   Fri Aug 2 16:23:51 2013 +0200

    diveres Zeug

commit 8535785626aa3338d43499737713f39300efc29c
Author: MarcusHimself <marcushimself@web.de>
Date:   Fri Aug 2 15:32:59 2013 +0200

    commit before sync… kinda annoying

commit c7773cb84a76a71310c1561c1f84a3692a451caf
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Thu Aug 1 20:57:52 2013 +0200

    item pickup

commit 796e806db912cacec3e4129a430992b0bc88087b
Merge: 42cfb63 34a7477
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Thu Aug 1 17:32:20 2013 +0200

    Merge branch 'master' of github.com:LearnCocos2D/KoboldKit

    Conflicts:
    	KoboldKit/PlatformerDemo/Resources/Config/objectTypes.lua

commit 42cfb6356c790652af7603c86df1358bccc5b3e7
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Thu Aug 1 17:26:19 2013 +0200

    wip

commit 34a7477cd0512c1f8e3866371652d97627b17ee8
Author: MarcusHimself <marcushimself@web.de>
Date:   Thu Aug 1 17:24:38 2013 +0200

    Demo Sandbox

commit ee5417c368a1f7b97ac76eae2864e8cbecee1fbf
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Thu Aug 1 17:15:48 2013 +0200

    item pickup wip

commit 6e55705017b07559835a598301d54ea2e0f1d24c
Author: MarcusHimself <marcushimself@web.de>
Date:   Thu Aug 1 17:09:23 2013 +0200

    DemoSandbox

commit 1be2af17a05be502f6f37fe94a1de86d4e632b79
Merge: a44cb0c 83f8b38
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Thu Aug 1 14:45:58 2013 +0200

    Merge branch 'master' of github.com:LearnCocos2D/KoboldKit

commit 83f8b38075ab5f32276cdf941be5af1b14d205a8
Author: MarcusHimself <marcushimself@web.de>
Date:   Thu Aug 1 14:40:15 2013 +0200

    maps

commit a44cb0cff44c3d0c324a3f086f632bfcf30f637e
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Thu Aug 1 14:37:38 2013 +0200

    sprite & label objects, convert color

commit a830f5135b50e7dc648c39adbe30648fce3d9713
Author: MarcusHimself <marcushimself@web.de>
Date:   Wed Jul 31 21:17:20 2013 +0200

    neue Map wird nicht mehr geladen… :(

commit 37db9d9aef5bac590a96f2c462bdcc1061bc779b
Author: MarcusHimself <marcushimself@web.de>
Date:   Wed Jul 31 20:46:31 2013 +0200

    new images for needed items to unlock areas

commit a2a7df1b3e13a154a905fe89e8f7dbda57d4a18c
Author: MarcusHimself <marcushimself@web.de>
Date:   Wed Jul 31 17:20:11 2013 +0200

    new player, tileset and level update

commit 735d2329d0a4a449ea2bc95b5854012455821792
Author: MarcusHimself <marcushimself@web.de>
Date:   Wed Jul 31 17:15:17 2013 +0200

    addes icons and ui

commit a35564c1c80c97a1f238bebca369e4797f310843
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Jul 31 16:25:25 2013 +0200

    tiled objects spawn on object layer, object layer child of tile layer, tiled properties override objecttypes.lua values

commit 8e3a8d1bbec9fb3155f2a0ee94841e83120ae23e
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Jul 31 14:48:38 2013 +0200

    mcs

commit 455eb5e9c96694385316d0227b503854c5c46797
Author: MarcusHimself <marcushimself@web.de>
Date:   Wed Jul 31 10:57:45 2013 +0200

    New Map

commit 522f2c422fc192aea245c7bb6385430894ab5471
Author: MarcusHimself <marcushimself@web.de>
Date:   Tue Jul 30 18:17:36 2013 +0200

    changed rectangle size of player

commit 5e8969543ff179c286125e18807e4fc7d91c3255
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Mon Jul 29 14:29:15 2013 +0200

    more doc updates & fixes

commit 9e485eac11f9bdd819f6bd092c4ac8889803ffb8
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Jul 28 21:27:32 2013 +0200

    doc update

commit fa7c3b0416e1888356b9272989cf4c6a66fefa7e
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Jul 28 19:36:50 2013 +0200

    object system with behaviors, doc fixes

commit 697c3983c2b1e1893a12498cfc29601f3f6dc01a
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Jul 28 14:36:24 2013 +0200

    object types create physics body

commit 118107e128420b1b0a6afb3650af1e5a229bc884
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Jul 27 23:02:19 2013 +0200

    initial version of game object system (objectTypes.lua)

commit 96f9f791bf60ce4fb290b0b6a634b4a3e52099a2
Merge: 67f64b2 28cdeb2
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Jul 26 15:44:37 2013 +0200

    Merge branch 'refs/heads/platformer-demo-for-book'

commit 28cdeb24cfd41c614987d67da6131d581386dca0
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Jul 26 15:41:46 2013 +0200

    fix controls

commit 67f64b26ac3c328fb1e5cc81c124ce5dc49d6259
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Jul 26 15:17:26 2013 +0200

    remove test levels

commit b7788e07211cd780af347872b3fbc551987cee26
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Jul 26 15:06:54 2013 +0200

    fix iOS not showing bundled TMX files without dev server/wifi

commit 64e1131a51f416f0725cca3feac724bb7d307fc1
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Thu Jul 11 22:05:24 2013 +0200

    fix player anchor offset, fix analyzer warnings

commit 4b8286856eb625437d8076a2288ef266236cccaa
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Thu Jul 11 19:09:55 2013 +0200

    fix pixel-offset

commit e76c0a445dd5841d0fbc1dfbac9d7172ea329b85
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Thu Jul 11 15:11:42 2013 +0200

    fix parallax/background layers lag 1 frame behind when scrolling

commit 25a104d05b9e3fd61643ee7852857a70d2cbb904
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Thu Jul 11 00:45:09 2013 +0200

    debug flags for show node frame & anchor point

commit b86a80aafdbd2dd70cd7d4aae31ca3c17020420a
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Jul 10 23:57:28 2013 +0200

    disabled doublejump

commit 882ba8a987c475a3a31396231714263455ec1913
Author: MarcusHimself <marcushimself@web.de>
Date:   Wed Jul 10 23:47:44 2013 +0200

    Commiting wip files all the time to sync the project kinda sucks

commit 857080c7adb6d8d3c645bb8b9612cc562c1c1c7f
Merge: 536d433 65c4058
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Jul 10 23:45:34 2013 +0200

    Merge branch 'master' of github.com:LearnCocos2D/KoboldKit

commit 536d4332dfd83d0977950f7de80e97c75284ae52
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Jul 10 23:45:19 2013 +0200

    fixed the jump button that was driving Marcus crazy :)

commit 65c4058945a4f1e6e331ff4cd33a92981fcd2d6e
Author: MarcusHimself <marcushimself@web.de>
Date:   Wed Jul 10 23:35:23 2013 +0200

    Map update

commit 8b161241e0da33de21b2c02626cf58bedeefd347
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Jul 10 23:31:07 2013 +0200

    customizable bounding box

commit a91094945a07e6a22448290ab95ae77de84ada8b
Merge: 79f3f46 20fb451
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Jul 10 23:22:43 2013 +0200

    Merge branch 'master' of github.com:LearnCocos2D/KoboldKit

commit 79f3f46c1c9f47ed6d72e874322c5d2ec357faea
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Jul 10 23:22:09 2013 +0200

    fix jitter on floor

commit 20fb451bd8d98773d8e83908630acecc09d426a5
Author: MarcusHimself <marcushimself@web.de>
Date:   Wed Jul 10 23:07:48 2013 +0200

    Test Map

commit 6ad8c94a3e5560bd43373f8ca895b3233ab1e237
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Jul 10 23:02:34 2013 +0200

    fix player sliding when he should stop instantly

commit 643c8816ac222eb64aec314b3c916e83cfd3b562
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Jul 10 23:00:19 2013 +0200

    player jump abort velocity

commit 12077b2d41c2723fe22e8a404a8b3c18e3dc324f
Merge: 93f21cd 095fb2e
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Jul 10 22:49:00 2013 +0200

    Merge branch 'master' of github.com:LearnCocos2D/KoboldKit

commit 93f21cd15be19043d3431c6a9b4fcdc4d1afc73b
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Jul 10 22:48:41 2013 +0200

    improved jumping behavior

commit 095fb2eea4b2bcab130913f20949bd25db403fbc
Author: MarcusHimself <marcushimself@web.de>
Date:   Wed Jul 10 22:34:33 2013 +0200

    Map Update

commit da6ce3be75fcfe6ea5d2b31b11ff6a8d197da16d
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Jul 10 22:27:46 2013 +0200

    jump abort

commit 2bc4f76dc084b7b94585f428d55f3deaabf9b156
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Jul 10 22:20:03 2013 +0200

    continuous button

commit 8420b4cc057e4118d541e56850c90deea169bba5
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Jul 10 21:35:26 2013 +0200

    added more levels

commit f26ecbe2e258fb3dd4c20f6b0d9c4251bf2f517a
Merge: 50529e9 d769712
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Jul 10 21:34:19 2013 +0200

    Merge branch 'master' of github.com:LearnCocos2D/KoboldKit

commit 50529e9ef2d3c948a9213d53763c8e3cf3d07b65
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Jul 10 21:33:59 2013 +0200

    fix contour tracing endless loop, added levels

commit d7697123fb0479f5a385e5be4a1a426f91ceaf21
Author: MarcusHimself <marcushimself@web.de>
Date:   Wed Jul 10 21:27:18 2013 +0200

    Deleted unused map and tiles; added new map and tiles

commit 3b1b93a68b7fe36de797fae11fbd77801028b88c
Author: MarcusHimself <marcushimself@web.de>
Date:   Wed Jul 10 20:29:08 2013 +0200

    Test Map

commit 30d7d9942bc4259d8a9649d0f4d0288ab4636a05
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Jul 10 19:34:44 2013 +0200

    player jump fixes

commit 25511ab7ea7a36909e65f91d666c808f48f848ca
Merge: b26be2b 0936b17
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Jul 10 19:10:56 2013 +0200

    Merge branch 'master' of github.com:LearnCocos2D/KoboldKit

commit 0936b17bc509b428f6fa1ecdf88e8a3301f3c176
Author: MarcusHimself <marcushimself@web.de>
Date:   Wed Jul 10 19:08:25 2013 +0200

    new values again

commit cb84497aa1c9e4addced2a5dbcdd8a38b3300a98
Author: MarcusHimself <marcushimself@web.de>
Date:   Wed Jul 10 19:06:25 2013 +0200

    new values in test map

commit b26be2b46e19c91a1ba702eb67bed253e4aec1d4
Merge: ecf18a2 e7a17dd
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Jul 10 19:05:52 2013 +0200

    Merge branch 'master' of github.com:LearnCocos2D/KoboldKit

    Conflicts:
    	KoboldKit/KoboldKitDemo/Resources/32x32/PlayerValueTest.tmx

commit ecf18a234e78d8ca52b63fa1d2e45f21868dd6a2
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Jul 10 19:04:34 2013 +0200

    remove KoboldKitDemo

commit d83e40622ea2609c08aa3adc012fc47152621ced
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Jul 10 18:57:36 2013 +0200

    fix player bounces after jumping & hitting collision

commit e7a17ddc2a24fc8e5c878b5658ebc89e67d019bf
Author: MarcusHimself <marcushimself@web.de>
Date:   Wed Jul 10 18:45:01 2013 +0200

    New values in test map

commit 172ec236cd81c3b287a46c5309fe3cd13390a14e
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Jul 10 18:35:23 2013 +0200

    .gitignore

commit 3e653bd96596478b93b875837eaeb562dd2145cf
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Jul 10 18:34:10 2013 +0200

    ignore devconfig.lua

commit 5110adce00589953bf30656a0ae56bb463acd7ec
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Jul 10 16:17:07 2013 +0200

    player jumping

commit e0238ff22e8b7c4fef7b59639d90a36b824f3d1b
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Jul 10 13:16:41 2013 +0200

    readme

commit c2e407119bd683e2342d66d6b1b4760fa4bb07f5
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Jul 10 13:14:03 2013 +0200

    docs

commit b1bb250e5d8c2d51db1b3813da4af272320cdfc3
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Jul 10 13:09:51 2013 +0200

    button behavior with mouse

commit 59eaa2569b6844fa932516e4b970334f80fda864
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Tue Jul 9 23:03:06 2013 +0200

    rename KoboldKitLibrary -> Framework

commit 3f4dc8937beb47de6103c697d06d25746acaf8aa
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Tue Jul 9 22:57:34 2013 +0200

    player instant stop

commit 60a7aed398968a28de51070b36baf268feb76860
Merge: 0b56b4e 07b1ffb
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Tue Jul 9 22:49:27 2013 +0200

    Merge branch 'master' of github.com:LearnCocos2D/KoboldKit

commit 0b56b4ef3801781d020cec733ab94533868483b1
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Tue Jul 9 22:49:09 2013 +0200

    mac version, kk as framework, project refactoring

commit 07b1ffbd558784935d956bfac2f969e80a5c3712
Author: MarcusHimself <marcushimself@web.de>
Date:   Tue Jul 9 21:44:49 2013 +0200

    ValueTestMap

commit e70045f498328148df315d2928d46af2d148b7e9
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Jul 7 23:36:18 2013 +0200

    smaller bbox for player

commit c425f0d1eed8c483c4b964407073e88b39f28a13
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Jul 7 23:29:00 2013 +0200

    mcs

commit 9485bd9f6c675d9a44f75b0b59eaff26c1e732a0
Merge: 4dee8f7 34e2250
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Jul 7 23:28:42 2013 +0200

    Merge branch 'master' of github.com:LearnCocos2D/KoboldKit

commit 4dee8f74d78ee1ab932dbddb3d767f8478dedfa9
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Jul 7 23:22:28 2013 +0200

    show select menu when server is unreachable

commit 34e2250b086b883cf4d145d6f1ccda3c3575012e
Author: MarcusHimself <marcushimself@web.de>
Date:   Sun Jul 7 23:04:07 2013 +0200

    adjusted test level

commit 4608a65da9db0d9e846f584b086a1bfb74dc1b3c
Author: MarcusHimself <marcushimself@web.de>
Date:   Sun Jul 7 22:12:13 2013 +0200

    new size test

commit cc249f960572d24173cede4dee188dce33116b5f
Author: MarcusHimself <marcushimself@web.de>
Date:   Sun Jul 7 17:24:37 2013 +0200

    several size tests

commit 040dbac04dcb5fae28c43928e1609ecc6240db2a
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Jul 7 22:36:45 2013 +0200

    fix map border scroll 1-pixel offset

commit 0a2d77521d4c1d6c93d343e25f89a34672a732a1
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Jul 7 22:32:16 2013 +0200

    consider all tiles on main tile layer as blocking

commit fe7b6155c1f930ef01b1047ec2d4a8d1bcd6383a
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Jul 7 22:11:39 2013 +0200

    add menu button

commit e50b7fadac708b7bf448dec7056d1feed58eef17
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Jul 7 17:07:42 2013 +0200

    player fits in 1-tile wide spaces

commit cf0d6dc3fd12645dd1a9fa183cae1b36170f8010
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Jul 7 16:59:12 2013 +0200

    revert

commit 6d00a2d2d4834cf55e848f5d3eb3792303f08fa8
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Jul 7 16:56:11 2013 +0200

    reload label color

commit 5420086ae8710924a70396101789f4a54630c1e4
Merge: 709d1b7 909a1cb
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Jul 7 16:52:12 2013 +0200

    Merge branch 'master' of github.com:LearnCocos2D/KoboldKit

commit 709d1b744cfc6418debf0438f42c9d0638ff5e73
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Jul 7 16:50:39 2013 +0200

    nonBlockingTiles property, blockingTiles = all keyword

commit 909a1cb1c0d27ed1d1e9db4891a37bf9058d5ee0
Author: MarcusHimself <marcushimself@web.de>
Date:   Sun Jul 7 00:19:55 2013 +0200

    updated level

commit 64dd23327579304cb600bdb0f2e6082ae6767e4f
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Jul 7 15:51:05 2013 +0200

    fix camera not sticking to bounds

commit ade013c3be7ddb0c884c753778677bc736d26e84
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Jul 7 15:46:00 2013 +0200

    reduce player bbox size

commit e1634d36802bbc15eac8bbafa0c12017df78165b
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Jul 7 15:09:07 2013 +0200

    fix contour tracing getting stuck, tracing contours too often

commit 4c3a0ee087785fec58f775374adce9655d3a174c
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Jul 7 00:01:21 2013 +0200

    revert tilemap

commit a198f9fb3393d4d513220067f50ad90eda9905f8
Merge: aabbd64 172ed26
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Jul 6 23:54:25 2013 +0200

    Merge branch 'master' of github.com:LearnCocos2D/KoboldKit

    Conflicts:
    	KoboldKit/KoboldKitDemo/Resources/24x24/24x24_Level01.tmx

commit aabbd64addff1755e2e1c0228e42397e06f11d0d
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Jul 6 23:52:10 2013 +0200

    apply tilemap's backgroundColor property

commit 172ed26fe133d348a770e70ac0a2de83b3191865
Author: MarcusHimself <marcushimself@web.de>
Date:   Sat Jul 6 23:25:53 2013 +0200

    updated tileset and level

commit 01e3be6d7a09dd12470061db5b031823d9d418ef
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Jul 6 23:23:56 2013 +0200

    fix flickering tiles

commit 1537bf468cb0ccfa65b5bee706eecbc71d665800
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Jul 6 21:47:21 2013 +0200

    added main tile layer flag

commit 1cbac9c9a6867f68104eaf8fe120ee9ec3842f2e
Author: MarcusHimself <marcushimself@web.de>
Date:   Sat Jul 6 20:34:15 2013 +0200

    Added several new tileset and map stuff

commit 0d34426633fa09f1a37bda5ccd9a4e71965ce597
Author: MarcusHimself <marcushimself@web.de>
Date:   Sat Jul 6 19:29:06 2013 +0200

    added several test stuff

    added new tileset
    added image for the player dummy
    added new map for the new tileset

commit fdf6341075301ff9ba9f5927e66d789daf707855
Author: MarcusHimself <marcushimself@web.de>
Date:   Fri Jul 5 22:24:45 2013 +0200

    Updated UI assets

commit 46b7b9c6d5254d0310b33a21958db36fe0060fb5
Author: MarcusHimself <marcushimself@web.de>
Date:   Fri Jul 5 22:14:03 2013 +0200

    Updated UI assets

commit be458dbd88366788a99818a437b87c08d704a3b3
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Jul 6 17:57:35 2013 +0200

    devconfig: made debug drawing flags editable

commit bc5d5950058299eedbd5c34ed9c571b17b164a4f
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Jul 6 16:57:36 2013 +0200

    fix bug #2: KKStayInBoundsBehavior does not consider sprite size

commit 22de08dd3e8b92b68e3a35804a54501b02d00629
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Jul 6 16:33:11 2013 +0200

    experiment with physics contacts

commit 3a9132ac10cbd399686be6bf1aaa9621e6ea8b61
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Jul 6 00:42:09 2013 +0200

    fix dpad L/R textures

commit 921576600dbcea117e011c1aaf90b617bda99fc8
Merge: 9ebcab0 d7e03e6
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Jul 6 00:38:05 2013 +0200

    Merge branch 'master' of github.com:LearnCocos2D/KoboldKit

commit 9ebcab05b0097c5ee8fd5d20f3fefd1affd0996e
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Jul 6 00:37:24 2013 +0200

    sample devconfig, update remote file transfer

commit 492467e5fbc01ffbccdbdefdca8a3bb69330687b
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Jul 6 00:14:54 2013 +0200

    add lua, config loading

commit d7e03e6ff724e4a94d68dabce236587199ed9c01
Author: MarcusHimself <marcushimself@web.de>
Date:   Fri Jul 5 22:06:45 2013 +0200

    Updated UI assets

commit c8897524fcb9e245a5201aabf55c378a2fe56a14
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Jul 5 21:48:01 2013 +0200

    reload button position change

commit 99bd19223769d20aebe69868ad9b1b5849d41aba
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Jul 5 21:30:24 2013 +0200

    mcs

commit e1d961935b8c7011a67ca7ee98007bf7e064428d
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Jul 5 17:16:03 2013 +0200

    testing texture atlas rotation bug

commit ee7e32b8362aef4e48b83492a06db618e2de01e0
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Jul 5 14:44:49 2013 +0200

    view model, reload project files on reload

commit 6e01005f104084c378a614831a5df4c6e4db9fac
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Jul 5 14:16:20 2013 +0200

    download project's resource files to device via Wifi
    menu launch screen shows all available TMX
    TMX file and textures load from app support dir first, if available

commit 4f9d2e51001bbfdb818db211b229d8b12343a5aa
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Thu Jul 4 15:19:22 2013 +0200

    limit velocity behavior

commit 430b37d6482d219cdb7e6f48449018568c03a0c7
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Jul 3 23:46:41 2013 +0200

    new buttons and 2-way dpad control scheme

commit b4f7c1d5227d937a828a697e06787b4129129559
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Jul 3 19:27:53 2013 +0200

    blocking GIDs are editable per tileset

commit c9718fabcb41c07fc2fbf4cf7aee87e1b94066e0
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Jul 3 18:48:48 2013 +0200

    defaultImage editable in Tiled

commit cb33a1ae81768aa1f4269e8e36befd734d950b82
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Jul 3 18:27:03 2013 +0200

    demo game: settings editable in Tiled, button behavior with "executesOnPress"

commit 9c195e3f69f28092d2f7a4b32797fc69134fe144
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Jun 29 23:34:53 2013 +0200

    collisions from tiled objects, border scrolling

commit c22fb694b3ebea89f80bbe903950b496da0c5847
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Jun 28 18:33:10 2013 +0200

    fix buttons can scale up indefinitely if clicked fast and repeatedly

commit 777c882e195ccef741ba2b49860fe6b138a3303b
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Jun 28 17:37:21 2013 +0200

    readme

commit bd86b7a5546e5c77463cc895dc23f37e8829f7c4
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Jun 28 17:36:30 2013 +0200

    physics & gfx finally match

commit 158893f4a1b812649d7de197a3083224ff38c692
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Jun 28 00:27:09 2013 +0200

    contour tracing & physics collisions & collision debug drawing

    note: there's a bug that has physics collisions offset or scaled by some amount, may take another day to debug

commit 28dac0961d6c410f2d5df0c39af1911a9835c5ab
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Jun 26 22:33:47 2013 +0200

    contour tracing, physics collisions wip (bug: position offset)

commit a16ed4c99fd776c49d6d1a87c1f35faeb53ec2f9
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Jun 23 21:06:20 2013 +0200

    camer follow behavior, stay in bounds behavior (wip)

commit 686875db90e1f180e0bbecc2b24b263a530aaed7
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Jun 22 17:47:03 2013 +0200

    camera follow target, tilemap scrolling world with offset in regards to camera/scene

commit 76e987d9653e0efe55782295fe7069b2600f69cc
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Jun 22 01:47:29 2013 +0200

    doc update

commit 0eba4c1fc03d59d2eaf05dcaa148dc533a1c7a21
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Jun 22 01:34:29 2013 +0200

    doc update

commit b4548d9eaea8d9e23cd44a92f4285d72bd357d98
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Jun 21 22:57:27 2013 +0200

    doc update

commit 104c96184825b7058a9129083babdea33c2fca19
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Jun 21 20:00:09 2013 +0200

    cleanup project structure

commit 61f8d8b38d86656ebd354039c11941323effd37a
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Jun 21 19:30:45 2013 +0200

    added virtual joypad, control pad behavior, updated button behavior

commit 583c5f333064a43a30b75f026a372919b4e010ea
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Thu Jun 20 15:57:39 2013 +0200

    doc update

commit ca1e9494fcfe93a3fb1e3d93a5555ea77b3fb2ee
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Jun 19 19:54:46 2013 +0200

    readme

commit b0c1fae28aa387af282649be62305059d8d0197d
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Wed Jun 19 19:48:12 2013 +0200

    tilemap renderer flipping, parallax & endless scrolling

commit 2731c05bb3d8a46ad197ce854bd06d68909eda5a
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sun Jun 16 22:44:07 2013 +0200

    reamde

commit 40e791d81fc1802e31febd11903d95e0c81a1406
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Jun 15 22:55:15 2013 +0200

    tilemap model, TMX reader, scheduling updates, observing notifications

commit 4ebbf6059c6a53d2e5bdf7aced52c6621725b2f3
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Jun 15 12:35:05 2013 +0200

    readme

commit f7ca7ec6c090d53be9eed562323e864c2ffdeb71
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Jun 15 03:47:49 2013 +0200

    remove logfile

commit befa86e0adab5030999e4b4f608e0e5c2b5a7b01
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Jun 15 03:46:10 2013 +0200

    readme & small docs update

commit 9f0e33dd885653b8fd5c2040b914fe8b0de4bfc0
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Jun 15 02:26:41 2013 +0200

    push/pop scenes, docs updated

commit d8b0e44bdd4cc5212c97e2ee672518768742b40c
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Sat Jun 15 00:01:03 2013 +0200

    finished copy/coding test, added docs

commit f588ae19fad90e09f513af841b2e2570eb44492d
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Jun 14 22:51:49 2013 +0200

    readme

commit 4a19f876d80ff8f901bb5117ce87cb67b1b44c5c
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Jun 14 22:36:27 2013 +0200

    readme

commit beaf6c821b97c7353db4ebf058ba3a10107240d0
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Jun 14 22:36:12 2013 +0200

    first commit, totally wip

commit a8fa70034199420ce180a6fa81db9a49b7e866ca
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Fri Jun 14 22:35:12 2013 +0200

    readme

commit 5f2af3ab55493763fb2640af954b40bf28bf8358
Author: Steffen Itterheim <steffen@learn-cocos2d.com>
Date:   Thu Jun 13 04:51:23 2013 -0700

    Initial commit
version 7.0