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

18800 Commits

Author SHA1 Message Date
James Chen 5a81ed6521 Update AUTHORS [ci skip] 2014-04-21 11:20:52 +08:00
James Chen 8da373f358 Update AUTHORS [ci skip] 2014-04-21 11:20:16 +08:00
James Chen c39a69895d Update CHANGELOG [ci skip] 2014-04-21 11:19:39 +08:00
James Chen a75432ec35 Merge pull request #6262 from Mazyod/develop-editbox-mac-enhancements 
Mac Editbox Text Font and Placeholder features
 2014-04-21 11:18:07 +08:00
minggo 9166b6430f [ci skip] 2014-04-21 11:11:39 +08:00
minggo 1bde8a3e07 [ci skip] 2014-04-21 11:09:42 +08:00
minggo 65ffb5bb65 Merge pull request #6324 from kicktheken/develop 
Fix lua project template crash on iOS5.1 device
 2014-04-21 11:07:59 +08:00
chuanweizhang2013 1fe52b1557 translate 2014-04-21 11:07:14 +08:00
minggo e3d7119716 Merge pull request #6326 from chuanweizhang2013/luaruntime 
update android runtime
 2014-04-21 11:06:30 +08:00
minggo b43a051ef2 Merge pull request #6328 from natural-law/develop 
Update the reference of submodule cocos2d-console.
 2014-04-21 11:04:24 +08:00
minggo fffef663a0 [ci skip] 2014-04-21 11:03:57 +08:00
minggo 1c44dbe385 Merge pull request #6327 from boyu0/bug4904_Image_safeToFile_crashes_ios 
closed #4904: fix ios Image::saveToFile crashes when save jpg file.
 2014-04-21 11:02:11 +08:00
zhangbin 00910216b1 Update the reference of submodule cocos2d-console. 2014-04-21 11:01:39 +08:00
boyu0 4acba7bdfa closed #4904: use new Xcode command line tools to compile i386 arch libjpeg.a file, and shrink the lib file. 2014-04-21 10:28:21 +08:00
boyu0 a1024353f1 issue #4904: fix iOS Image::safeToFile crashes when save jpg file. 2014-04-21 10:25:34 +08:00
Kenneth Chan a2fa6ef2d5 Fix lua project template crash on iOS5.1 device 2014-04-18 18:02:40 -07:00
minggo 618e49cf86 [ci skip] 2014-04-18 17:12:32 +08:00
minggo d8d847bd65 Merge pull request #6319 from boyu0/bug4903_build_libcurl_with_openssl 
closed #4903: Build libcurl.a with openssl
 2014-04-18 17:10:53 +08:00
boyu0 9756709473 closed #4903: change HttpClientTest get test 3 to https protocol. 2014-04-18 17:03:06 +08:00
James Chen 482fa3ece0 Update CHANGELOG [ci skip] 2014-04-18 16:53:18 +08:00
James Chen 0a1c926d10 Update CHANGELOG [ci skip] 2014-04-18 16:52:41 +08:00
James Chen 3b708f4e82 Merge pull request #6295 from samuele3hu/develop_fix 
fix the bug that `EditBox` can’t response that ‘changed’,`ended` and ‘return’ event for lua
 2014-04-18 16:50:57 +08:00
minggo 2aea2540b6 [ci skip] 2014-04-18 14:22:21 +08:00
minggo 5b4a65ea3a [ci skip] 2014-04-18 14:21:06 +08:00
minggo 8e83cd7900 Merge pull request #6261 from iSevenDays/patch-9 
Fix memory leak
 2014-04-18 14:19:17 +08:00
cw 0f61481c40 add android runtime 2014-04-18 14:12:34 +08:00
minggo 051d4cf62d [ci skip] 2014-04-18 14:02:26 +08:00
minggo 0e7280b1ca Merge pull request #6304 from dumganhar/iss4568-crash 
closed #4568: Application crashes on closing if CC_ENABLE_CACHE_TEXTURE_DATA is enabled.
 2014-04-18 14:00:40 +08:00
minggo b7e5306275 Merge pull request #6313 from chuanweizhang2013/luaruntime 
update android runtime
 2014-04-18 13:59:32 +08:00
minggo 5fe9ab992e [ci skip] 2014-04-18 13:58:56 +08:00
minggo 541f0b0a19 Merge pull request #6315 from natural-law/issue4863 
Update the reference of submodule "cocos2d-console".
 2014-04-18 13:57:52 +08:00
minggo ef52c91849 [ci skip] 2014-04-18 13:56:49 +08:00
minggo 14ed6e9f5a Merge pull request #6321 from samuele3hu/devRichText 
fix the compile error about luabindings in release version and add the `RichText` test cases
 2014-04-18 13:55:05 +08:00
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