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

19913 Commits

Author SHA1 Message Date
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
Ricardo Quesada 25213c81f6 linux cmake improvements 
Added cocos/CMakeLists.txt
which controls all the rest of the Cmake files
 2014-05-01 13:01:51 -07:00
Ricardo Quesada 94b3fa50f6 Merge pull request #6538 from ricardoquesada/tmx_fixed 
fixes tmx maps
 2014-05-01 11:51:44 -07:00
Ricardo Quesada 1cfd133555 fixes tmx maps 2014-05-01 11:51:11 -07:00
James Chen 19c1dcb1da Merge pull request #6534 from CocosRobot/update_lua_bindings_1398911075 
[AUTO]: updating luabinding automatically
 2014-05-01 12:36:29 +08:00
CocosRobot 7cb5f4c418 [AUTO]: updating luabinding automatically 2014-05-01 02:25:38 +00:00
Ricardo Quesada 096d479a7a Merge pull request #6533 from ricardoquesada/fixes_builder 
Fixes builder
 2014-04-30 19:21:52 -07:00
Ricardo Quesada 9bd6ace582 compiles on iOS 2014-04-30 19:21:10 -07:00
Ricardo Quesada b8eba4e1c1 oops 2014-04-30 19:13:58 -07:00
Ricardo Quesada 7b2e558bb0 Merge pull request #6531 from ricardoquesada/fix_builder_squash 
Fixes linux build
 2014-04-30 19:10:12 -07:00
Ricardo Quesada 40fe815ab9 Squashed commit of the following: 
commit c16dcfaaea0922039aad05bce1f4efed18e04871
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 19:05:18 2014 -0700

    more linux fixes

commit 1553795976c9090a1b46deb53d12910fe0676008
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 19:04:04 2014 -0700

    more linux fixes

commit 1e43a8cabff33cbf25aa5eb5412f53a878222d83
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 19:02:07 2014 -0700

    fixes linux isuses

commit 723a445dd6411f91846da2b801248ad8298174f1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:58:50 2014 -0700

    more linux fixes

commit 533c8025e794fc76cef02f396b3a93b3d7f4cfc8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:57:33 2014 -0700

    more linux fixes

commit 4ba1e84959670bcbf044f18d1c0d4b3cb3be4090
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:53:43 2014 -0700

    more linux fixes

commit 1f8e011f306a47ed4134224e5e349929201f0539
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:49:28 2014 -0700

    more linux fixes

commit 3e2033100822ff6d532a1b4f012337491dc11920
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:47:43 2014 -0700

    more linux fixes

commit 2e708863c75fd032f1b2396dfdf1d31f7a62b713
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:46:00 2014 -0700

    more linux fixes

commit 861b5b92a6efd4de7b926c20d636ce9d749b293f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:43:15 2014 -0700

    more linux fixes

commit 2a43365a0c1755e9b9cada53301be1a20adb31cf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:36:06 2014 -0700

    more fixes for linux

commit 7d332bf911892f87c7824d2a5da7bf73ce7ec411
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:35:29 2014 -0700

    more fixes for linux

commit f1becc17d3316dfe3678c23c9dcedb7a447d9235
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:34:44 2014 -0700

    more fixes for linux

commit d2e5959bb0dde921dd5e73be1d8acc3b3f50e51d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:33:45 2014 -0700

    fixes for linux

commit ad9b633c352107cf0e8b060a0e23d6e6a3f5e80f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:16:48 2014 -0700

    compiles on Windows

commit 4425ee8e5de8f42a2d6050e4470109600dce8b5d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 30 18:07:20 2014 -0700

    fix builder
 2014-04-30 19:09:13 -07:00
James Chen 35505aa63f Merge pull request #6528 from CocosRobot/update_lua_bindings_1398905829 
[AUTO]: updating luabinding automatically
 2014-05-01 09:33:33 +08:00
James Chen 25e15b6fec Merge pull request #6526 from CocosRobot/update_cocosfiles_1398905726 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-05-01 09:32:46 +08:00
CocosRobot 94e01a2e81 [AUTO]: updating luabinding automatically 2014-05-01 00:58:35 +00:00
Ricardo Quesada 0bf58d4a2e Merge pull request #6527 from ricardoquesada/properties 
you should be 10
 2014-04-30 17:56:39 -07:00