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

21383 Commits

Author SHA1 Message Date
Mircea Rila b66b4c6f1d upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found). 
remove C4005 warnings after upgrading projects
 2014-05-07 17:41:04 +03:00
James Chen 357b07d532 Updates comments in download-deps.py and updates .gitignore 2014-05-07 21:36:51 +08:00
cw 919a780e2a add suport ios screen orientation set 2014-05-07 20:50:29 +08:00
James Chen d65d9cae21 Merge pull request #6609 from lmskater/fix_adds-download-deps.py-for-prb 
[Jenkins][ci skip] Fix copy logic of current_3rd_libs
 2014-05-07 20:37:46 +08:00
lm 15c3a0eb8c [Jenkins][ci skip] Fix copy logic of current_3rd_libs 2014-05-07 20:34:06 +08:00
James Chen 1a7ae40fac Merge pull request #6607 from lmskater/adds-download-deps.py-for-prb 
[Jenkins][ci skip] Check external file to support build
 2014-05-07 19:11:56 +08:00
James Chen 3e8f2e41f5 Merge pull request #6603 from CocosRobot/update_cocosfiles_1399455250 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-05-07 19:10:55 +08:00
lm 05af9e5bed [Jenkins][ci skip] Check external file to support build 2014-05-07 19:01:46 +08:00
andyque 05b7d274c8 issue #4861. fix distance calculation 2014-05-07 18:27:05 +08:00
James Chen a0572e94f8 Merge pull request #6605 from Dhilan007/v3_labelhotfixed 
fixed compilation fail on Android.
 2014-05-07 18:23:20 +08:00
Dhilan007 72709c30d5 fixed compilation fail on Android. 2014-05-07 18:20:40 +08:00
James Chen cb1b32366e Merge pull request #6604 from CocosRobot/update_cocosfiles_1399455808 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-05-07 17:44:45 +08:00
CocosRobot 7fb79c2a52 [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-07 09:43:30 +00:00
CocosRobot 8642d35fbd [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-07 09:34:10 +00:00
James Chen 4e59949d33 Merge pull request #6601 from natural-law/v3 
Update the reference of submodule plugin-x.
 2014-05-07 17:32:50 +08:00
James Chen 3fee1c3f23 Merge pull request #6597 from dumganhar/v3 
Re-adds download-deps.py, unzip works ok and output more detail informations
 2014-05-07 17:31:29 +08:00
James Chen e44fb8141e Updates zip_file_size in external/config.json 2014-05-07 17:30:38 +08:00
James Chen c3bf87b5c7 Updates download-deps.py 2014-05-07 17:26:41 +08:00
James Chen 7d2aed773d Adds 'zip_file_size' section in 'external/config.json' 2014-05-07 17:25:42 +08:00
samuele3hu 8615e13c91 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-05-07 17:16:40 +08:00
zhangbin ab4063a393 Update the reference of submodule plugin-x. 2014-05-07 17:04:08 +08:00
James Chen 385c62d5c4 updates repo_name to `cocos2d-x-3rd-party-libs-bin` 2014-05-07 16:49:55 +08:00
minggo 1cbe29071b remove unneeded codes 2014-05-07 16:49:32 +08:00
James Chen edcef656cc Merge pull request #6599 from CocosRobot/update_lua_bindings_1399451378 
[AUTO]: updating luabinding automatically
 2014-05-07 16:39:41 +08:00
James Chen 56883e5e25 Merge pull request #6600 from dumganhar/objc-comments-fix 
Comments fix in CCRenderTexture.h
 2014-05-07 16:38:59 +08:00
James Chen 9862fab58f Comments fix in CCRenderTexture.h 2014-05-07 16:37:21 +08:00
CocosRobot 36843196c5 [AUTO]: updating luabinding automatically 2014-05-07 08:30:46 +00:00
James Chen c6fd98d5f1 Update CHANGELOG [ci skip] 2014-05-07 16:27:35 +08:00
James Chen 9fb38cb332 Merge pull request #6595 from samuele3hu/v3_lua_fix 
close #5032: A potential crash bug of Lua binding for sp.SkeletonAnimation.setAnimation
 2014-05-07 16:26:13 +08:00
James Chen dc015df920 Delete external/version.txt, use external/version.json instead 2014-05-07 15:56:25 +08:00
James Chen b57384080f download-deps.py reads configuration from 'external/config.json' 2014-05-07 15:52:24 +08:00
James Chen 55555f64d1 Adds external/config.json for download-deps.py 2014-05-07 15:51:53 +08:00
yinkaile ba5544b63d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-05-07 15:47:37 +08:00
James Chen e4ad1f58f4 Removed external submodule in .gitmodules 2014-05-07 15:21:23 +08:00
James Chen 909b7569d8 download-deps.py supports to check 'external/version.json' 2014-05-07 15:08:10 +08:00
James Chen a617680cae Updates travis script 2014-05-07 15:06:20 +08:00
James Chen 87d8653343 Updates .gitignore, ignore version.json 2014-05-07 15:05:59 +08:00
minggo 564d81017f Merge pull request #6598 from minggo/android-makefile 
add some comment for dependences module in Android.mk to make it simple ...
 2014-05-07 14:36:41 +08:00
minggo 21aa7058e3 := -> += 2014-05-07 14:35:43 +08:00
minggo 976ef3e2a4 add some comment for dependences module in Android.mk to make it simple to use other module 2014-05-07 14:31:05 +08:00
andyque def0505ba7 closed #4861, refactor 2014-05-07 14:26:41 +08:00
andyque 1282252c25 closed #4861, refactor 2014-05-07 14:06:44 +08:00
James Chen b76a6a5dda updates travis-script. 2014-05-07 13:48:39 +08:00
James Chen 59051d2393 Updates .gitignore. 2014-05-07 13:48:35 +08:00
James Chen 7fbcf5cc67 Adds external/version.txt 2014-05-07 13:46:18 +08:00
James Chen 32b2b20a32 Re-adds box2d and chipmuck sources, we need to use prebuilt libraries for them too. 2014-05-07 13:40:39 +08:00
James Chen 014e515b8b Delete external submodule, please use 'download-deps.py' instead. 2014-05-07 13:38:17 +08:00
James Chen b49b9d673c download-deps.py will unzip the download zip file. 
Output more detail informations
 2014-05-07 13:36:08 +08:00
andyque 8baa88e2e1 closed #4861, fixed temparory variable issue 2014-05-07 11:55:00 +08:00
andyque 657720e509 Merge remote-tracking branch 'upstream/v3' into focus3861 2014-05-07 11:42:09 +08:00