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

19227 Commits

Author SHA1 Message Date
James Chen 417b8e8e5a Merge pull request #6568 from CocosRobot/update_cocosfiles_1399225034 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-05-05 01:38:25 +08:00
CocosRobot e32647ec88 [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-04 17:37:16 +00:00
James Chen b624fe5afb Merge pull request #6567 from dumganhar/v3 
Adds download progress for download-deps.py  and adds some missing files
 2014-05-05 01:34:56 +08:00
James Chen 530efbca7e Reverts files for winrt project 2014-05-05 01:33:22 +08:00
James Chen daf37b733a Re-adds missing luajit sources. 2014-05-05 01:31:52 +08:00
James Chen ca873a1dd1 Adds download progress for download-deps.py 2014-05-05 01:06:33 +08:00
James Chen 363b588c18 Merge pull request #6565 from dumganhar/v3 
Small bug fix in download-deps.py
 2014-05-05 00:18:32 +08:00
James Chen ac2ff7bd28 Updates .gitignore 2014-05-05 00:16:06 +08:00
James Chen 82580298b6 Don't remove .zip file, if it exists, don't download it. 2014-05-05 00:15:22 +08:00
James Chen 2527a5c63a Small bug fix in download-deps.py 2014-05-05 00:04:57 +08:00
James Chen 81ced0fc9f Merge pull request #6564 from dumganhar/v3 
Updates download-dep.py, linux, mac  and windows work ok
 2014-05-04 23:51:31 +08:00
James Chen 75231764f9 Uncomment a line in download-deps.py 2014-05-04 23:50:17 +08:00
James Chen 2c4c2e16d0 Removed pkg_resources dependence 2014-05-04 23:46:22 +08:00
James Chen d011030f52 Updates download-dep.py, linux and mac works ok 2014-05-04 23:35:59 +08:00
James Chen c29c0554e0 Update download-deps.py 2014-05-04 21:49:55 +08:00
James Chen 6bc0550c70 Merge pull request #6563 from dumganhar/v3 
Updates download-deps.py, write file with permission information while unziping.
 2014-05-04 21:24:16 +08:00
James Chen 9bd7115988 Updates download-deps.py, write file with permission information while unziping. 2014-05-04 21:17:07 +08:00
James Chen 906e782590 Merge pull request #6561 from dumganhar/v3 
Uses 'download-deps.py' to download Cocos2D-X dependence files
 2014-05-04 19:11:17 +08:00
James Chen 53488092a4 Updates before-install.sh 2014-05-04 19:09:51 +08:00
James Chen 20d3c6d538 Updates download-deps.py 2014-05-04 19:08:43 +08:00
James Chen a160412fb5 Updates download-deps.py 2014-05-04 19:05:01 +08:00
James Chen 3e80663a47 Updates download-deps.py 2014-05-04 19:02:51 +08:00
James Chen fbb9ad2f64 Removed download-deps.sh 2014-05-04 18:52:51 +08:00
James Chen 01fce5ca4f Adds download-deps.py 2014-05-04 18:51:00 +08:00
shujunqiao 6d2542efb5 fixed one-hang-bug in cocos-console-test.py 2014-05-04 17:33:00 +08:00
James Chen 7fca2c05e2 Update travis script 2014-05-04 15:42:50 +08:00
James Chen 188d843767 Update travis script 2014-05-04 15:38:42 +08:00
James Chen 2732d294e2 issue #4674: Added download-deps.sh 2014-05-04 14:38:15 +08:00
James Chen 8cbcf17163 issue #4674: Re-added deleted source files. 2014-05-04 14:37:55 +08:00
James Chen 3b3c1c4dbb issue #4674: Removed large files and updated .gitignore 2014-05-04 14:36:16 +08:00
Ricardo Quesada 0ab9509405 Merge pull request #6550 from CocosRobot/update_lua_bindings_1398993078 
[AUTO]: updating luabinding automatically
 2014-05-01 18:13:33 -07:00
CocosRobot cdd04ee11f [AUTO]: updating luabinding automatically 2014-05-02 01:12:32 +00:00
Ricardo Quesada a77e8cc72e Merge pull request #6549 from ricardoquesada/rollback_physics_lua 
Lua compiles again
 2014-05-01 18:08:02 -07:00
Ricardo Quesada b67f3008a5 Lua compiles again 2014-05-01 18:07:25 -07:00
Ricardo Quesada 49045d81cc Merge pull request #6548 from CocosRobot/update_lua_bindings_1398990974 
[AUTO]: updating luabinding automatically
 2014-05-01 17:52:17 -07:00
CocosRobot d75a7c51a3 [AUTO]: updating luabinding automatically 2014-05-02 00:37:21 +00:00
Ricardo Quesada 5a2fe9361e Merge pull request #6547 from ricardoquesada/changelog 
Updated changelog
 2014-05-01 17:32:31 -07:00
Ricardo Quesada ee9731b03a Updated changelog 2014-05-01 17:31:43 -07:00
Ricardo Quesada ff626f6825 Merge pull request #6545 from ricardoquesada/physics_rollback 
Physics rollback
 2014-05-01 17:19:32 -07:00
Ricardo Quesada 207e67318d rolling back tests 2014-05-01 16:55:28 -07:00
Ricardo Quesada 462338879e rolling back physics in layer 2014-05-01 16:42:35 -07:00
Ricardo Quesada 9bfd153bb0 Merge pull request #6544 from ricardoquesada/changelog 
updates changelog
 2014-05-01 15:48:29 -07:00
Ricardo Quesada c0568f75d4 updates changelog 2014-05-01 15:47:37 -07:00
Ricardo Quesada 8521d6667b Merge pull request #6543 from ricardoquesada/template_fixes 
Lua and C++ compiles for linux
 2014-05-01 15:37:58 -07:00
Ricardo Quesada db68b9ca31 Lua and C++ compiles for linux 2014-05-01 15:23:20 -07:00
Ricardo Quesada f28967a9b8 Merge pull request #6542 from CocosRobot/update_cocosfiles_1398978892 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-05-01 15:06:04 -07:00
CocosRobot 74d377eb70 [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-01 21:14:53 +00:00
Ricardo Quesada ca80239fad Merge pull request #6541 from ricardoquesada/android_mk_fixes 
Moves cocos/2d/Android.mk to  cocos/Android.mk
 2014-05-01 14:11:06 -07:00
Ricardo Quesada 32f3fedb37 Moves cocos/2d/Android.mk to cocos/Android.mk 
Easier to find Android.mk
 2014-05-01 14:09:26 -07:00
Ricardo Quesada aa51fbd8db Merge pull request #6539 from ricardoquesada/cmake_improvements 
linux cmake improvements
 2014-05-01 13:02:50 -07:00