Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,340 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

2340 Commits

Author SHA1 Message Date
Walzer e39195d996 issue #580 add RootViewController to xcode4 templates, issue #398 fix the duplicate names to cocos2d-x 2011-06-24 12:43:45 +08:00
Walzer 37e5c21aba issue #580 add RootViewController to xcode4 templates 2011-06-24 11:38:23 +08:00
Walzer d4aa30a850 Merge remote branch 'origin/master' 2011-06-24 11:22:29 +08:00
Walzer 8f770ec929 issue #540 for HelloWorld/ios, split main.m, add pause/resume/startAnimation/stopAnimation controls 2011-06-24 11:22:11 +08:00
Walzer 4bb1ef5c72 Merge pull request #319 from liswei/issue539 
Issue539
 2011-06-23 18:58:46 -07:00
liswei 0c5f28fc11 fixed #539 call unzOpen, then may not call unzClose(WVGA) 2011-06-24 09:29:55 +08:00
liswei 4793713daa fixed #539 call unzOpen, then may not call unzClose(WVGA) 2011-06-23 18:24:32 +08:00
Walzer a676e0d401 [ios] issue #538, add xcode4 template for lua project 2011-06-23 17:13:53 +08:00
Walzer 156dfa8859 Merge remote branch 'origin/master' 2011-06-23 16:31:52 +08:00
Walzer 9dd436a96e Merge pull request #317 from minggo/master 
[Android] Exit program when key back is entered
 2011-06-23 01:31:38 -07:00
Walzer 9e74b1f50d fixed #534, use #if (CC_TARGET_PLATFORM != CC_PLATFORM_IOS) - #endif to wrap the useless codes on ios. 2011-06-23 16:31:04 +08:00
minggo e13247afc9 [android] synchrolize java code to HelloLua 2011-06-23 16:10:59 +08:00
Walzer 481010a417 Merge pull request #316 from minggo/iss364 
[Android] line break ok on Android
 2011-06-23 01:04:22 -07:00
Walzer 39d62d69a7 add script_support into cocos2dx/proj.wophone/Makefile.ARM, but untest. 2011-06-23 16:02:16 +08:00
Walzer fea9f3b943 add script_support to cocos2d-wophone.vcproj 2011-06-23 15:59:28 +08:00
Walzer d6a729d7f1 update cocos2d-win32.vc2008.sln to match the new folder structure of cocos2d-x/lua 2011-06-23 15:47:56 +08:00
Walzer 14956c4f87 add icon for HelloLua on ios 2011-06-23 15:36:25 +08:00
Walzer 1239af43ba Merge commit '0530d21725b5b4d811fa45eed84d1d711530831f' from lua-branch 2011-06-23 15:18:04 +08:00
Walzer 0530d21725 Merge commit 'fad68460540a7f924bad3e0c46391377fc26ee63' into lua 2011-06-23 14:53:36 +08:00
Walzer c5f230ccab #issue 528, update HelloLua.xcodeproj for new folder name 2011-06-23 14:51:44 +08:00
minggo 626d3e0921 [android] fixed #364: synchrolize java code to HelloLua 2011-06-23 14:46:58 +08:00
Walzer fad6846054 [win32] fix a bug in HelloLua.win32.vcproj.user to find Resource path 2011-06-23 14:46:16 +08:00
minggo 53eafa77ff Merge https://github.com/cocos2d/cocos2d-x into iss364 2011-06-23 14:45:25 +08:00
minggo 10cdd7f798 [android] fixed #364: line break ok on Android 2011-06-23 14:44:20 +08:00
Walzer d0ab7fcd3f Merge pull request #315 from minggo/master 
HelloLua works ok on android
 2011-06-22 22:42:26 -07:00
minggo d4bd6e63d2 synchrolize java code to HelloLua 2011-06-23 12:47:02 +08:00
Walzer 19c539247d [android] issue #528, rename the folders in cocos2d-x/lua, for xcode4 template generator. 2011-06-23 12:01:02 +08:00
Walzer 3323b806d0 Merge remote branch 'origin/master' 2011-06-23 11:34:56 +08:00
Walzer 4781b09170 [android] make HelloLua/build_native.sh can be executed on mac osx, remove skia dependance. 2011-06-23 11:34:33 +08:00
Walzer d4e9e5a9d9 Merge pull request #314 from yangws/master 
PVRFrame lib update to version 2.8 r1 (2.08.28.0634)
 2011-06-22 20:10:09 -07:00
Walzer 094b2e7ac0 [ios] add script_support into xcode3 templates 2011-06-23 10:11:09 +08:00
Walzer 3498a91710 [ios] issue #528, add script_support into xcode4 template 2011-06-23 10:01:57 +08:00
Walzer a98a3b9ca7 [airplay] add script_support 2011-06-23 09:31:18 +08:00
yangws 2c22cf0621 fixed #537 update to version 2.8 r1 (2.08.28.0634) 2011-06-22 17:55:03 +08:00
Walzer 45933b177f Merge pull request #313 from minggo/iss535 
[Android] Use Android widget Bitmap to drawing string
 2011-06-22 02:17:07 -07:00
Walzer 67ac46647f issue #531, Merge liswei/issue531 manually. 2011-06-22 17:13:01 +08:00
minggo 71c13b34bf Merge https://github.com/cocos2d/cocos2d-x into iss535 2011-06-22 17:00:11 +08:00
minggo 1122a7c7d0 [android] use Android widget Bitmap other than skia to drawstring 2011-06-22 16:58:50 +08:00
Walzer 96996d4d52 Merge pull request #311 from yangws/master 
Sync java code in Helloworld and tests and Add icon for Helloworld and tests on Android..
 2011-06-22 01:11:49 -07:00
Walzer 1485a35338 update tests.xcodeproject to add lua support in cocos2dx lib. I finished it in xcode4 but don't know if this xcodeproject file will work on xcode4 2011-06-22 15:36:53 +08:00
Walzer 8bab593246 move extensions/NDControls to cocos2d-x-extensions repository 2011-06-22 14:54:45 +08:00
yangws 01f277674e Add icon for Helloworld and tests on Android. 2011-06-22 13:59:31 +08:00
yangws 4d8596169e Sync java code in Helloworld and tests. 2011-06-22 11:37:42 +08:00
minggo ce1e7fa0e4 Merge pull request #310 from minggo/master 
Make HelloWorld work ok
 2011-06-21 19:21:57 -07:00
minggo 4f7db6b134 fixed #528: modify HelloWorld to works ok 2011-06-22 10:18:51 +08:00
minggo fd86f1ef8c Merge pull request #309 from minggo/master 
fix a compile bug
 2011-06-21 02:39:45 -07:00
minggo 53a5ec412e fixed #528: fix a compile bug 2011-06-21 17:36:38 +08:00
minggo 6cb6359168 Merge pull request #308 from minggo/master 
fixed #528
 2011-06-21 02:06:11 -07:00
Walzer f3375f0dbb issue #528, improve CCScriptEngineManager. AppDelegate should hold the whole lifecycle of LuaEngine object. 2011-06-21 17:02:08 +08:00
minggo 00cc1d277d fixed #528: safe call of CCScriptEngineManager::sharedScriptEngineManager()->getScriptEngine()->xxx() 2011-06-21 16:59:17 +08:00