Commit Graph

20 Commits

Author SHA1 Message Date
samuele3hu 778708426c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into opengl_develop 2013-06-17 14:38:08 +08:00
samuele3hu 26f1bd5171 issue #2277: Add OpenGL lua binding 2013-06-17 14:19:00 +08:00
minggo cd5bcb87af issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
samuele3hu 836bfe1d3f issue #2103 modify audioEngine table name to AudioEngine 2013-06-08 14:06:19 +08:00
samuele3hu 4be415cc04 issue #2103 encapsulate SimpleAudioEngine to audioEngine in lua and modify CocosDenshionTest.lua 2013-06-08 11:23:21 +08:00
samuele3hu e4ec801363 issue #2103 add webSocket lua test sample 2013-06-06 22:29:02 +08:00
samuele3hu 6dd077b8bd issue #2103 add cocosbuilder lua test sample 2013-06-05 15:17:00 +08:00
samuele3hu 7101bc4377 issue #2103 remove simple cocosbuilder sample 2013-06-03 14:59:04 +08:00
samuele3hu afa6b81ba7 issue #2103 add cocosbuilder lua bind and add a simple sample 2013-06-03 13:47:12 +08:00
minggo 2cdb48bc22 enable c++11 for iOS projects 2013-06-03 10:57:06 +08:00
Jaroslaw Lewandowski 3f7c506638 Ability to save/retrieve CCData into/from CCUserDefault 2013-05-29 01:06:41 +01:00
minggo 55e4de40f6 make AssetsManagerTest and TestLua run on iOS device 2013-04-28 11:19:03 +08:00
James Chen 631b08e984 Updating project configuration for iOS. 2013-04-25 11:30:35 +08:00
James Chen 6a56bb6d73 issue #1847: [iOS] Using LuaJit for HelloLua and TestLua. 2013-04-17 09:51:28 +08:00
James Chen 57a76a3a86 Using universal config for TestLua. 2013-04-01 17:39:27 +08:00
minggo 07cd6d2bb2 issue #1689:modify lua samples to make them work correctly 2013-02-04 14:50:45 +08:00
James Chen 9ef74bef80 fixed #1636: Deleted CC_ENABLE_CHIPMUNK_INTEGRATION and CC_ENABLE_BOX2D_INTEGRATION in ccConfig.h since they are moved to extension, it doesn't depend on engine any more.
Added platform macro for CCEditBoxImpl* files.
2013-01-05 11:10:24 +08:00
James Chen e670d702a8 issue #1603: Updated TestLua project setting for iOS port. 2012-12-20 21:58:26 +08:00
minggo 65e01b9ade issue #1603:build ok on mac 2012-12-20 18:02:24 +08:00
James Chen 4660e72eda issue #1603: Moved the position of some projects. 2012-12-20 12:58:21 +08:00