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

27708 Commits

Author SHA1 Message Date
Huabing.Xu c3aea9f6c0 update version string and releaseNotes for 3.5 2015-03-13 11:51:32 +08:00
minggo 773eedcaa5 [ci skip]update CHANGELOG 2015-03-11 15:52:01 +08:00
minggo d0e468b05c Merge pull request #10813 from CocosRobot/update_cocosfiles_1426059178 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-03-11 15:40:51 +08:00
CocosRobot 54ac9ef67f [AUTO][ci skip]: updating cocos2dx_files.json 2015-03-11 07:32:59 +00:00
minggo 44b1f77fa3 Merge pull request #10799 from SunLightJuly/v3_remove_simu 
V3 remove simulator
 2015-03-11 15:31:17 +08:00
minggo a1e6aa23c9 Merge pull request #10811 from andyque/remove-download-deps 
remove backup 3rd party libs
 2015-03-11 15:03:15 +08:00
andyque f3763bde3d remove backup 3rd party libs 2015-03-11 14:59:34 +08:00
SunLightJuly ad63fc35c7 fixed download-reps.py: not to download lua runtime binaries 2015-03-11 14:50:39 +08:00
minggo d2be2290a3 Merge pull request #10796 from Mazyod/http-client-mac 
Http client mac
 2015-03-11 14:26:08 +08:00
minggo cb82c1af9b Merge pull request #10810 from andyque/fix-jenkins-template 
remove template config.json check
 2015-03-11 14:02:38 +08:00
andyque e76cc8c99d remove template config.json check 2015-03-11 14:00:28 +08:00
minggo edad2d8066 Merge pull request #10806 from andyque/v3 
cleanup Jenkins scripts
 2015-03-11 11:19:17 +08:00
minggo 32eadde568 Merge pull request #10805 from CocosRobot/update_lua_bindings_1426041793 
[AUTO]: updating luabinding automatically
 2015-03-11 10:51:57 +08:00
andyque 1c483b27fd update github remote 2015-03-11 10:49:39 +08:00
CocosRobot e079216248 [AUTO]: updating luabinding automatically 2015-03-11 02:45:36 +00:00
minggo 04393854e8 Merge pull request #10789 from fusijie/fix-moveto-reverse 
disable MoveTo::reverse()
 2015-03-11 10:39:45 +08:00
minggo c4ac2b5f47 Merge pull request #10795 from pipu/optimize_ButtonReader 
To optimize ButtonReader for source path and source.
 2015-03-11 10:05:48 +08:00
minggo c701f89329 Merge pull request #10683 from Mazyod/mac-editbox-fix 
Fix editbox on Mac
 2015-03-11 10:00:50 +08:00
pipu 90da84a663 To modify that check whether or not string is not empty. 2015-03-11 09:59:07 +08:00
Jacky 605ce58293 disable MoveTo::reverse() 2015-03-11 09:55:32 +08:00
andyque 98d57551d1 remove exceptions code 2015-03-11 00:59:21 +08:00
andyque 0991ce5002 update master jenkins scripts 2015-03-11 00:08:52 +08:00
SunLightJuly 608ed24180 Synchronization with V3 2015-03-11 00:02:50 +08:00
SunLightJuly 6c2eb01213 cleanup proj.android 2015-03-10 23:33:09 +08:00
SunLightJuly b77801a99b cleanup proj.win32 2015-03-10 22:56:03 +08:00
andyque 34619fc125 add git --version 2015-03-10 19:07:55 +08:00
Mazyad Alabduljaleel 1dee334f29 added security framework to the tests project 2015-03-10 15:04:29 +04:00
andyque ffa01950ac use subprocess.call 2015-03-10 19:00:07 +08:00
Mazyad Alabduljaleel 52524ae453 add security framework to Mac template project 2015-03-10 14:57:21 +04:00
Mazyad Alabduljaleel 983ffd96c7 Now, mac uses ObjC HTTP client 2015-03-10 14:48:57 +04:00
andyque 9457ed5fbd fix subprocess.check_output error 2015-03-10 18:47:35 +08:00
andyque 7f4bfc395f change os.system to subprocess 2015-03-10 18:42:26 +08:00
SunLightJuly ba55f14fbf removed runtime in libsimulator 2015-03-10 18:28:59 +08:00
andyque 5bd5c62a91 change git merge method 2015-03-10 18:24:38 +08:00
andyque d7972e8b0a Merge remote-tracking branch 'refs/remotes/upstream/v3' into v3 2015-03-10 18:08:50 +08:00
minggo 858178ad8e Merge pull request #10772 from super626/v3 
refactor init method
 2015-03-10 17:50:06 +08:00
pipu 00bf9f5bfb To optimize the situation that source path is existed, but source is not existed. 2015-03-10 17:48:48 +08:00
andyque 3cd4018cca change scripts 2015-03-10 17:47:00 +08:00
andyque d09f678579 modify remote build environment variable 2015-03-10 17:42:09 +08:00
子龙山人 d42ce3e764 Merge pull request #14 from andyque/clean-v3-jenkins 
Clean v3 jenkins
 2015-03-10 17:28:18 +08:00
andyque 7d7ee03c5b fix jenkins scripts 2015-03-10 17:03:03 +08:00
andyque 28ed1d0cae use exceptions to report unwanted behaviors 2015-03-10 16:08:57 +08:00
andyque a48c8c840c cleanup pull request scripts 2015-03-10 15:44:02 +08:00
andyque fbc6804b3f improving jenkins pull request scripts 2015-03-10 14:40:04 +08:00
andyque 48482907b8 refactoring jenkins scripts 2015-03-10 14:08:03 +08:00
minggo afb06b5c42 Merge pull request #10770 from m2q1n9/patch-1 
fix cocostudio anchor point bug
 2015-03-10 13:40:44 +08:00
yangxiao 1e240e92f9 empty mesh check 2015-03-10 13:31:04 +08:00
minggo 8e6d9d5dd2 Merge pull request #10740 from newnon/v3_windows_network_path 
Windows network path fix
 2015-03-10 11:25:53 +08:00
minggo f3567ba1af Merge pull request #10780 from ryule/fix_CCDevice-ios_font_stroke_alpha 
Fix CCDevice-ios.mm to have the right alpha color for a stroke effect.
 2015-03-10 11:19:29 +08:00
SunLightJuly aac4d6f846 removed CodeIDESupport.h 2015-03-10 11:12:42 +08:00