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

8197 Commits

Author SHA1 Message Date
James Chen a2248258b0 Merge pull request #2471 from dumganhar/master 
[Linux]Updating template of multi-platform-cpp
 2013-04-26 20:19:11 -07:00
minggo 9f7d091e95 Merge pull request #2470 from minggo/master 
disable menutest in lua
 2013-04-26 20:18:23 -07:00
James Chen ec3d870231 [Linux]Updating template of multi-platform-cpp 2013-04-27 11:18:09 +08:00
minggo ff207b68e0 disable menutest in lua 2013-04-27 11:17:10 +08:00
James Chen c60224a3c4 Merge pull request #2441 from natural-law/master 
Add social protocol & plugin twitter
 2013-04-26 19:36:13 -07:00
James Chen eeb1965710 Merge pull request #2468 from dumganhar/master 
[HelloLua] print ~> cclog
 2013-04-26 18:50:07 -07:00
James Chen 5b45f85216 [HelloLua] print ~> cclog 2013-04-27 09:48:35 +08:00
James Chen 98a2cdaf28 Merge pull request #2467 from dumganhar/master 
Fixing compilation errors for linux port.
 2013-04-26 18:35:05 -07:00
James Chen 8c779ff98f Fixing compilation errors for linux port. 2013-04-27 09:32:46 +08:00
zhangbin 7ccd6f5c9a Add licenses in source code files of HelloAds. 2013-04-26 17:18:17 +08:00
zhangbin 81e1f5c4c7 Optimize the interfaces design in ProtocolAds. 2013-04-26 17:16:06 +08:00
zhangbin 0b08d88f27 Optimize the interface & type names in plugin. 2013-04-26 17:12:51 +08:00
minggo f0b792eb2d Merge pull request #2462 from minggo/master 
add SpiteTest into Android.mk
 2013-04-25 23:03:05 -07:00
minggo d40fdd24b7 fixed #2075:add SpiteTest into Android.mk 2013-04-26 14:02:13 +08:00
minggo f29f84b0ab Merge pull request #2461 from minggo/lua-loader 
add lua loader for all platforms
 2013-04-25 21:14:01 -07:00
minggo 89591fdccc fixed #2084:add lua loader for all platforms 2013-04-26 12:12:19 +08:00
minggo 62231912be Merge https://github.com/cocos2d/cocos2d-x 2013-04-26 10:36:46 +08:00
James Chen b648d392ba Merge pull request #2457 from dumganhar/master 
Fixing a bug in CCFileUtilsIOS::isFileExist(). Improving performance of isFileExist for all platforms.
 2013-04-25 07:09:15 -07:00
James Chen c5cb886b72 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into lua-bytecode-test 2013-04-25 22:06:43 +08:00
James Chen d1afe6cfa6 Fixing a bug in CCFileUtilsIOS::isFileExist(). 2013-04-25 22:02:20 +08:00
James Chen 93a8b60111 If file path is an empty string, return false directly in CCFileUtils::isFileExist. 2013-04-25 21:51:13 +08:00
James Chen 1ff07223de Merge pull request #2456 from dumganhar/lua-bytecode-test 
fixed #2083: Bytecode of LuaJIT can't work on android.
 2013-04-25 06:48:01 -07:00
James Chen 30cc4bb1af Merge pull request #2454 from CocosRobot/updategeneratedsubmodule_1366896612 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenera...
 2013-04-25 06:36:14 -07:00
James Chen 5337234e22 Android also uses executeScript to load lua source file or byte code file. So unused codes need to be deleted. 2013-04-25 21:31:52 +08:00
CocosRobot c501a73a54 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-25 21:30:20 +08:00
James Chen 862ce85c7a fixed #2083: Bytecode of LuaJIT can't work on android. 2013-04-25 21:29:31 +08:00
James Chen bd4f2b51a2 Merge pull request #2452 from dumganhar/update-bindings-generator 
Updating bindings-generator.
 2013-04-25 06:11:54 -07:00
James Chen acaff0a208 Updating bindings-generator. 2013-04-25 21:10:10 +08:00
James Chen 7fc038c688 Merge pull request #2451 from dumganhar/master 
Synchronizing some JSB changes in cocos2d-iphone. Fix a bug of "Too much recursion" in loop.
 2013-04-25 05:58:38 -07:00
James Chen 5572990e5d Synchronizing some JSB changes in cocos2d-iphone. Fix a bug of "Too much recursion" in loop. 2013-04-25 20:56:27 +08:00
zhangbin 73f0b6df04 Add licenses in source code files. 2013-04-25 20:43:58 +08:00
minggo b6c8e78149 remove js files from compiling 2013-04-25 18:37:27 +08:00
zhangbin 2b5238c64b 1. Change the implementation of callback in Social plugins. 
2. Add licenses in source code files.
 2013-04-25 18:25:48 +08:00
zhangbin 4611027d47 1. Change the implementation of callback in IAP plugins. 
2. Add licenses in source code files.
 2013-04-25 17:33:42 +08:00
minggo 3f72473aba Merge https://github.com/cocos2d/cocos2d-x 2013-04-25 16:25:55 +08:00
James Chen 31a61072a4 Merge pull request #2449 from dumganhar/master 
Updating cocos2d-js-tests.
 2013-04-25 01:19:39 -07:00
James Chen 7bd1d8cde1 Updating cocos2d-js-tests. 2013-04-25 16:16:39 +08:00
James Chen f25ce0c256 Merge pull request #2448 from CocosRobot/updategeneratedsubmodule_1366871707 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenera...
 2013-04-25 00:50:34 -07:00
CocosRobot 1e4370f43b cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-25 14:35:16 +08:00
James Chen 1d7986cf59 Merge pull request #2446 from dumganhar/master 
Updating TestJavascript project configuration.Updating tools/tojs/cocos2dx.ini, adding CCReuseGrid and CCStopGrid bindings.
 2013-04-24 23:34:14 -07:00
James Chen a9f3ae0e33 Updating tools/tojs/cocos2dx.ini, adding CCReuseGrid and CCStopGrid bindings. 2013-04-25 14:32:52 +08:00
James Chen 9913358dde Updating TestJavascript project configuration. 2013-04-25 14:31:11 +08:00
minggo 9881012459 Merge https://github.com/cocos2d/cocos2d-x 2013-04-25 12:01:59 +08:00
James Chen e4a8d4ba91 Merge pull request #2445 from dumganhar/master 
Updating project configuration for iOS.
 2013-04-24 20:33:08 -07:00
James Chen 631b08e984 Updating project configuration for iOS. 2013-04-25 11:30:35 +08:00
James Chen ec26e52278 Update AUTHORS 2013-04-25 10:37:36 +08:00
James Chen 805285ab47 Merge pull request #2444 from dumganhar/iss2080-realOpacity 
fixed #2080: _realOpacity isn't assigned in CCLayerColor::initWithColor.
 2013-04-24 19:34:11 -07:00
Ed Bartley b2b10ba5f7 CCLayerColor::_realOpacity is not set in ::initWithColor(…) causing unexpected behavior if a ::runAction(CCFadeTo::create(…)) applied to the LayerColor. 2013-04-25 10:32:03 +08:00
zhangbin f30aaed426 Modify the permission of plugin twitter. 2013-04-24 17:23:35 +08:00
minggo fb7851b429 define checkAnim() before using it 2013-04-24 17:06:59 +08:00