Commit Graph

22325 Commits

Author SHA1 Message Date
minggo c7aac6b526 Merge pull request #579 from minggo/iss838_support_x86
android template supports x86
2011-11-23 00:46:42 -08:00
minggo c00d59a568 fixed #838: android template support x86 2011-11-23 16:43:52 +08:00
minggo d938968c4c Merge pull request #578 from minggo/iss838_support_x86
support x86
2011-11-23 00:04:56 -08:00
minggo 6aedc258b4 fixed #838: tests and HelloLua support x86 2011-11-23 15:51:30 +08:00
YuLei Liao 0ec47ddf38 * rename luax_initpreload() to luax_exts() 2011-11-23 13:55:07 +08:00
YuLei Liao a8240abbe2 * revert CCFileUtils_ios.mm to 0.9.2 2011-11-23 13:48:15 +08:00
YuLei Liao 4ff2bf96d1 * ccConfig: add LUA_ENGINE macro, turn on Lua support when LUA_ENGINE defined 2011-11-23 13:41:48 +08:00
YuLei Liao 32babee057 * update README 2011-11-23 13:38:56 +08:00
YuLei Liao fc9cabc447 * add lua_socket module 2011-11-23 13:37:32 +08:00
YuLei Liao 01c8f5f47e * CCFileUtils_ios dump error message to console 2011-11-23 13:36:32 +08:00
YuLei Liao 44b5e55876 * add lua_socket module 2011-11-23 12:24:14 +08:00
minggo 8b20639d75 issue #838: HelloWorld support x86 2011-11-23 11:02:18 +08:00
YuLei Liao 151b373239 * ccConfig: add LUA_ENGINE macro, turn on Lua support when LUA_ENGINE defined 2011-11-23 00:58:31 +08:00
minggo d62d8aee55 Merge pull request #577 from minggo/pthread_optimize
optimize CCTextureCache::addImageSync()
2011-11-22 00:50:39 -08:00
minggo bc60ed7856 issue #854: optimize CCTextureCache::addImageAsync() 2011-11-22 16:47:24 +08:00
YuLei Liao 53f73bb5a4 * update README 2011-11-21 21:45:14 +08:00
YuLei Liao 5bbe783d73 * add Lua README 2011-11-21 21:39:04 +08:00
YuLei Liao 43226d190f * CCFileUtils_ios dump error message to console 2011-11-21 18:50:45 +08:00
YuLei Liao a1f8433a47 * fix merge error 4 2011-11-21 18:50:19 +08:00
YuLei Liao 611e09fe2f * fix merge error 3 2011-11-21 17:09:23 +08:00
YuLei Liao 27ce997e36 * fix merge error 2 2011-11-21 17:07:16 +08:00
YuLei Liao 012ce7a04f * fix merge error 1 2011-11-21 17:00:56 +08:00
YuLei Liao 7a6253d9aa * merge cocos2d-1.0.1-x-0.9.2-luafix to master 2011-11-21 16:38:00 +08:00
YuLei Liao 396568a22e * merge upstream master -> master 2011-11-21 12:12:13 +08:00
minggo efa9275d7f save the codes for testing 2011-11-21 12:04:21 +08:00
YuLei Liao b34859108e * remove needless files 2011-11-21 11:58:55 +08:00
YuLei Liao 64a2027ba3 [iOS]fixed #667: [Xcode4 template] call AppDelegate::applicationDidEnterBackground() & AppDeleaget::applicationWillEnterForeground() when application enter background & enter foreground 2011-11-21 11:19:10 +08:00
minggo 51eb56075b Merge https://github.com/cocos2d/cocos2d-x into iss854_pthread 2011-11-21 09:36:55 +08:00
minggo 4226fcf355 issue #854: add CCThread_ios.mm 2011-11-21 09:34:49 +08:00
YuLei Liao 5b696828dc * update tolua++ .pkg files 2011-11-21 00:30:55 +08:00
YuLei Liao f928bc949f * tolua_pushusertype() push nil when ptr is NULL 2011-11-20 21:12:35 +08:00
YuLei Liao 4944d5ced8 * remove needless warning 2011-11-20 21:12:24 +08:00
YuLei Liao 57bf9453b7 * add CCLuaSupport.cpp/.h, CCSchedulerFuncEntry class
* move CCTimer from CCScheduler.cpp/.h to CCTimer.cpp/.h
2011-11-20 16:38:27 +08:00
YuLei Liao 01bf6b57f4 * import lua/exts (luasocket) 2011-11-18 21:31:01 +08:00
YuLei Liao 09d12be875 * format cocos2d-x source files 2011-11-18 21:23:54 +08:00
YuLei Liao 8afe909819 * merge LuaEngineImpl to LuaEngine 2011-11-18 20:36:39 +08:00
YuLei Liao f058eb3233 * format some files 2011-11-18 20:35:35 +08:00
YuLei Liao ca111e2937 * update tolua++ .pkg files 2011-11-18 20:34:39 +08:00
YuLei Liao ba3fa3fec0 * format tolua++ source files 2011-11-18 20:34:13 +08:00
YuLei Liao cfed3afa4c * format lua source files 2011-11-18 20:33:52 +08:00
minggo ba98c498a0 Merge pull request #575 from minggo/bada_merge
merge bada branch
2011-11-18 02:56:35 -08:00
minggo d48da20b0f synchrolize to master 2011-11-18 18:53:53 +08:00
U-zhangxm-PC\zhangxm d84b6c25be issue #223: merge bada branch and fix some error 2011-11-18 18:45:05 +08:00
minggo 50a2e2d5e9 Merge pull request #574 from minggo/iss854_pthread
remove unneeded files
2011-11-17 18:59:03 -08:00
minggo f36a7e19f1 Merge branch 'iss854_pthread' of https://github.com/minggo/cocos2d-x into iss854_pthread 2011-11-18 10:57:44 +08:00
minggo 5d8043ce7e issue854: remove unneeded files 2011-11-18 10:54:36 +08:00
minggo a7d6c90adb Merge pull request #571 from jbyu/master
fix memory-leak for lua engine
2011-11-17 18:53:14 -08:00
minggo 775c7ff847 Merge pull request #573 from minggo/iss854_pthread
support pthread
2011-11-17 18:40:30 -08:00
minggo 0676714436 issue #854: add TextureCacheTest into makefile 2011-11-17 18:32:52 -08:00
minggo 522386a6b7 issue #854: pthread work ok on iOS 2011-11-18 09:55:47 +08:00