Commit Graph

20 Commits

Author SHA1 Message Date
Kenneth Chan a2fa6ef2d5 Fix lua project template crash on iOS5.1 device 2014-04-18 18:02:40 -07:00
chuanweizhang2013 337bc2f2e8 Merge pull request #22 from cocos2d/develop
update cocos2d-x
2014-04-11 09:33:04 +08:00
James Chen 43d6e1176a issue #4729: Compilation error fixes for linux 2014-04-10 00:36:42 +08:00
cw c0fe791aae Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into luaruntime
Conflicts:
	templates/lua-template-runtime/src/main.lua
2014-04-04 18:17:54 +08:00
James Chen 96e7bad7e3 Updates templates for linux platform 2014-04-01 01:49:24 -07:00
samuele3hu 0a1d23753b fix the lua template error that would lead to crash when do rotate 2014-03-31 23:11:26 +08:00
faryang-rmbp 491dc202df remove deprecated code in lua tests & template 2014-03-26 19:42:07 +08:00
cw 749a00e5a9 update sim to support Xcode 5.1 2014-03-26 11:27:50 +08:00
Dhilan007 c642d4d4c4 update templates for remove native activity 2014-03-25 15:43:42 +08:00
samuele3hu d3487d2d3c close #4400: Use the newest version of LuaSocket for lua 2014-03-20 17:04:54 +08:00
minggo dfb3b6719c Merge pull request #5818 from boyu0/support_for_xcode_iphone_64bit_simulator
build lua.a for arm64bit and iOS simulator 64 bit architectures, change ...
2014-03-15 01:22:28 +08:00
boyu0 f23db68151 build lua.a for arm64bit and iOS simulator 64 bit architectures, change .ma3 files to .caf files. 2014-03-15 01:19:06 +08:00
minggo 1aedf01590 copy lua files 2014-03-14 18:01:53 +08:00
minggo 3c96ef9394 add websockets link 2014-03-14 17:46:18 +08:00
minggo 7bddf7f36a lua tempalte support for linux 2014-03-14 16:58:33 +08:00
chuanweizhang2013 0dc85e42a7 modify module_path 2014-03-13 09:51:43 +08:00
minggo 656211a72f add description for how to load .so 2014-03-12 21:28:38 +08:00
andyque 2c2a5ee38e rename gui to ui 2014-03-12 10:46:49 +08:00
cw 133a68f614 add runtime template 2014-03-11 16:52:06 +08:00
James Chen cf5dacb24e Re-add lua template. 2014-03-10 19:33:57 +08:00