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

19392 Commits

Author SHA1 Message Date
samuele3hu 7e81f32016 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into devRichText 2014-04-18 11:55:30 +08:00
samuele3hu 914516a4e0 fix the compile error about luabindings and add the `RichText` test cases. 2014-04-18 11:54:57 +08:00
chuanweizhang2013 2a9c99ff66 Merge pull request #25 from cocos2d/develop 
update cocos2d-x
 2014-04-18 11:45:53 +08:00
cw a9e697523e amend comment 2014-04-18 11:40:51 +08:00
James Chen 8a80bac266 Merge pull request #6320 from CocosRobot/update_lua_bindings_1397789417 
[AUTO]: updating luabinding automatically
 2014-04-18 11:05:29 +08:00
CocosRobot a78a1090c3 [AUTO]: updating luabinding automatically 2014-04-18 02:51:14 +00:00
minggo 7399ef2527 Merge pull request #6308 from nutty898/develop_nutty_widgetsupportscontentsize 
Develop nutty widgetsupportscontentsize
 2014-04-18 10:47:10 +08:00
boyu0 f595413983 closed #4903: Build libcurl.a with openssl 2014-04-18 09:36:34 +08:00
minggo 74e9355119 Merge pull request #6317 from lmskater/fix-comment-body 
[Jenkins][ci skip] Fix result comment body of Emptytest
 2014-04-17 18:14:22 +08:00
lm dfeac8c7d2 [Jenkins][ci skip] Fix result comment body of Emptytest 2014-04-17 18:08:15 +08:00
zhangbin 0e14c2ad3f Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into issue4863 2014-04-17 17:19:57 +08:00
minggo bb0c62b724 Merge pull request #6314 from lmskater/add-internet-permission 
[Jenkins][ci skip] Add android.permission.INTERNET to cpp-empty-test
 2014-04-17 17:19:07 +08:00
zhangbin 33472c7805 closed #4863, Zipalign the apk generated with release mode. 2014-04-17 17:18:39 +08:00
lm c34b3d5324 [Jenkins][ci skip] Add android.permission.INTERNET to cpp-empty-test 2014-04-17 17:04:28 +08:00
cw 2914f60fcf fixed xiaomi show ip error 2014-04-17 16:50:11 +08:00
James Chen 0d7747e3b1 Merge pull request #6312 from heliclei/fix-jenkins-tool 
[jenkins]Add execute permission
 2014-04-17 15:12:24 +08:00
heliclei 70c20ddfb2 add execute permission 2014-04-17 15:08:49 +08:00
minggo b85a2c08e5 Merge pull request #6311 from minggo/comment-event-listener 
add comment for EventListenerTouchOneByOne::checkAvailable()
 2014-04-17 14:48:37 +08:00
minggo a8a8ef85e6 add comment for EventListenerTouchOneByOne::checkAvailable() 2014-04-17 14:46:52 +08:00
CaiWenzhi a8bfa094c0 Remove useless codes 2014-04-17 14:27:21 +08:00
CaiWenzhi ed4fcd5d1a Merge branch 'develop' into develop_nutty_modifylayout_add_Boxes 2014-04-17 14:23:08 +08:00
CaiWenzhi 19f6526ef8 Widget supports contentsize 2014-04-17 14:08:25 +08:00
minggo 5d90fd73d3 Merge pull request #6235 from natural-law/issue4727 
Support run sample projects with console.
 2014-04-17 12:05:50 +08:00
samuele3hu 11515f6ab3 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAudio 2014-04-17 11:06:20 +08:00
James Chen 57d1f00788 Merge pull request #6297 from lmskater/comment-emptytest-result 
[Jenkins][ci skip] Comment result of emptytest
 2014-04-17 10:41:46 +08:00
James Chen 68d5cec430 Merge pull request #6303 from andyque/issue4883 
closed #4883. fixed slider hittest problem
 2014-04-17 10:38:17 +08:00
samuele3hu 1331fff62c fix the bug that exit layer can’t end SimpleAudioEngine 2014-04-17 10:36:08 +08:00
James Chen 30e1d41dbf Makes 'compareRenderCommand' as a static function instead of a global function 2014-04-17 10:16:37 +08:00
andyque a9ed075d50 closed #4883. fixed slider hittest problem 2014-04-17 10:15:58 +08:00
James Chen 63f54cb5f7 closed #4568: Application crashes on closing if CC_ENABLE_CACHE_TEXTURE_DATA is enabled. 
CC_SAFE_RELEASE(_eventDispatcher); should be after 'delete _renderer;'
in Director's destructor.
 2014-04-17 10:15:11 +08:00
lm 008bdba373 [Jenkins][ci skip] Change 'GITHUB_ACCESS_TOKEN' to 'GITHUB_COMMENT_ACCESS_TOKEN' 2014-04-17 09:57:55 +08:00
zifter 08d975268d Fix for issue http://www.cocos2d-x.org/issues/4880. 2014-04-17 03:15:43 +03:00
Elviss Strazdins 5ddef013ba Flipping RenderTexture's sprite instead of scaling it by -1 2014-04-17 02:22:34 +03:00
lm fb462b90b6 [Jenkins][ci skip] Fix 'comments_url' parameter 2014-04-16 18:56:17 +08:00
lm 84b6981e2b [Jenkins][ci skip] Comment result of emptytest 2014-04-16 18:36:05 +08:00
James Chen ba38268167 Merge pull request #6292 from lmskater/add-emptytest-command 
[Jenkins][ci skip] Add [ci emptytest] command
 2014-04-16 17:28:20 +08:00
James Chen 3322a3540c Merge pull request #6296 from lmskater/fix-ftp-home 
[Jenkins][ci skip] Fix 'localfile' parameter
 2014-04-16 16:58:52 +08:00
minggo 83c41af1e0 Merge pull request #6293 from natural-law/issue4847 
Find ant path from system first when ANT_ROOT is not set.
 2014-04-16 16:34:23 +08:00
lm 3b16a267fb [Jenkins][ci skip] Fix 'localfile' parameter 2014-04-16 16:26:50 +08:00
samuele3hu a9a1e7cb2f Remove hard codes 2014-04-16 16:08:26 +08:00
samuele3hu 4c9fb311da Remove hard codes 2014-04-16 16:04:33 +08:00
samuele3hu b4585fa2e2 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix 2014-04-16 15:35:13 +08:00
samuele3hu edc4dde15f fix the bug that `EditBox` can’t response that ‘changed’,`ended` and ‘return’ event for lua 2014-04-16 15:31:44 +08:00
James Chen 1d64d4038a Merge pull request #6294 from lmskater/fix-ftp-home 
[Jenkins][ci skip] Fix ftp home in upload_apk.sh
 2014-04-16 14:26:37 +08:00
lm b78c89d39b [Jenkins][ci skip] Fix ftp home in upload_apk.sh 2014-04-16 14:19:13 +08:00
Huabing.Xu d14d3007d0 remove kazmath include file 2014-04-16 14:08:58 +08:00
lm 3cbe02771d [Jenkins][ci skip] Fix ftp home in upload_apk.sh 2014-04-16 13:47:40 +08:00
Huabing.Xu d4ddd7550b Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-16 11:22:47 +08:00
Huabing.Xu 346d42f723 remove warning message---finished 2014-04-16 11:20:45 +08:00
Huabing.Xu 6fd7197d96 remove warning message---continue 2014-04-16 11:18:23 +08:00