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

24587 Commits

Author SHA1 Message Date
minggo 41d2929060 [ci skip] Update CHANGELOG 2014-10-15 15:33:20 +08:00
minggo 16ad1977b0 Merge pull request #8706 from SunLightJuly/add_ClippingRectangleNode 
Add clipping rectangle node
 2014-10-15 15:09:29 +08:00
SunLightJuly 74952d7258 added CCClippingRectangleNode.cpp to CMakeList 2014-10-15 14:17:04 +08:00
SunLightJuly 3352fb7bf3 reset wp8 project files 2014-10-15 14:14:02 +08:00
minggo b4ed060ffd Merge pull request #8707 from CocosRobot/update_cocosfiles_1413352609 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-10-15 13:58:08 +08:00
CocosRobot 65aefcd5a3 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-15 05:56:51 +00:00
minggo 622a79c9d7 Merge pull request #8704 from samuele3hu/v3_adjust 
Update project configures for the related test cases
 2014-10-15 13:55:20 +08:00
SunLightJuly f1ce16b463 added ClippingRectangleNode Test 2014-10-15 13:41:47 +08:00
SunLightJuly f2286eaf94 added ClippingRectangleNode 2014-10-15 13:38:14 +08:00
samuele3hu a95e391756 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_adjust 2014-10-15 11:24:27 +08:00
samuele3hu 83d210ce7d Update the Xcode project setting for related test cases 2014-10-15 11:18:22 +08:00
minggo ae621a2a79 Merge pull request #8703 from CocosRobot/update_cocosfiles_1413340661 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-10-15 10:38:25 +08:00
CocosRobot da3f7ebe23 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-15 02:37:42 +00:00
minggo 30d09bef04 Merge pull request #8701 from joshuastray/v3 
ignore CMakeLists.txt.user generated by QtCreator
 2014-10-15 10:33:39 +08:00
minggo f0c3713672 Merge pull request #8699 from CocosRobot/update_lua_bindings_1413309490 
[AUTO]: updating luabinding automatically
 2014-10-15 10:32:11 +08:00
joshuastray 256e505dc7 ignore CMakeLists.txt.user generated by QtCreator 2014-10-15 10:26:19 +08:00
samuele3hu 70aa62a365 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_adjust 
Conflicts:
	build/cocos2d_tests.xcodeproj/project.pbxproj
 2014-10-15 02:09:12 +08:00
CocosRobot 64a7ef9173 [AUTO]: updating luabinding automatically 2014-10-14 18:01:12 +00:00
minggo 0787124710 Merge pull request #8697 from andyque/fixJenkinsSql 
add back
 2014-10-15 01:53:34 +08:00
andyque 49b974ae42 add back 2014-10-15 01:45:44 +08:00
minggo 73ea855a79 Merge pull request #8696 from andyque/fixJenkinsSql 
fix sql syntax error
 2014-10-15 01:45:02 +08:00
andyque 05c204622e add backslash 2014-10-15 01:37:13 +08:00
minggo 99cd2e415f Merge pull request #8694 from samuele3hu/v3_CSLoader_bindings 
Update CSLoader lua-bindings config and adjust project config
 2014-10-15 01:29:06 +08:00
andyque bd37d62026 fix sql syntax error 2014-10-15 01:04:00 +08:00
samuele3hu e0c4ff060a Update iOS and Mac project setting 2014-10-15 00:44:44 +08:00
minggo fe4c45061e Merge pull request #8695 from cocoscodeide/v3 
Windows runtime response uncorrect
 2014-10-15 00:25:48 +08:00
samuele3hu 5b4e81aa3a Update Android.mk for libluacocos2d 2014-10-15 00:25:12 +08:00
honghui 718b5a3cf8 Windows runtime response uncorrect 2014-10-15 00:20:18 +08:00
samuele3hu 3e9900c40d Update win32 project config 2014-10-15 00:08:52 +08:00
samuele3hu 5e2ea91eb8 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_CSLoader_bindings 2014-10-14 23:39:56 +08:00
samuele3hu 4a67963420 Update CSLoader lua-bindings and adjust project config 2014-10-14 23:37:00 +08:00
minggo 3fae476cd2 Merge pull request #8693 from cocoscodeide/v3 
copy dll files to win32 runtime
 2014-10-14 23:35:04 +08:00
honghui 445c9dcde4 copy dll files to win32 runtime 2014-10-14 23:32:25 +08:00
minggo 6bb58bfc44 Merge pull request #8692 from dualface/update-lua-template-runtime 
Update lua template runtime
 2014-10-14 23:19:04 +08:00
dualface f45d9de8f2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into update-lua-template-runtime 2014-10-14 23:11:12 +08:00
dualface 963474e43c update lua-template-runtime 2014-10-14 23:08:42 +08:00
minggo dc3997d41c Merge pull request #8691 from minggo/fix-runtime 
[ci skip]fix runtime error
 2014-10-14 21:38:33 +08:00
minggo 39bce5c22f fix runtime error 2014-10-14 21:37:04 +08:00
samuele3hu 735e86788e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_adjust 2014-10-14 21:36:44 +08:00
samuele3hu 3b4fbd8fff Update project setting for lua-tests、lua-empty-test and lua-game-controller-test on the different platform and related test codes 2014-10-14 21:34:55 +08:00
minggo 19d408748c Merge pull request #8687 from andyque/fixJenkinSqlTableName 
fix jenkins sql table name
 2014-10-14 20:09:30 +08:00
minggo 515424975f Merge pull request #8689 from dualface/fix_codeide_debugger_support 
Fix Code IDE debugger support
 2014-10-14 18:38:32 +08:00
dualface cc554fcb0a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_codeide_debugger_support 2014-10-14 18:27:46 +08:00
dualface 23781f7b92 fix coded debugger support 2014-10-14 18:26:56 +08:00
minggo 9aa50acc07 [ci skip]update config.json 2014-10-14 18:23:18 +08:00
minggo 94757e7adb Merge pull request #8688 from minggo/remove-duplicated-codes 
[ci skip]remove duplicated codes
 2014-10-14 18:02:58 +08:00
minggo 7f3a480fa7 remove duplicated codes 2014-10-14 18:01:41 +08:00
andyque 9e538fce48 fix jenkins sql table name 2014-10-14 17:31:53 +08:00
minggo 1560ce6fea Merge pull request #8685 from CocosRobot/update_cocosfiles_1413277837 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-10-14 17:15:00 +08:00
CocosRobot c816ea443d [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-14 09:10:38 +00:00