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

1544 Commits

Author SHA1 Message Date
heliclei 4fd2d2082a [ci skip][jenkins]Add script to track android built libs size 2014-08-08 17:28:44 +08:00
minggo 213f2f5a6c Merge pull request #7702 from super626/v3_merge 
Camera and Camera test
 2014-08-08 15:56:38 +08:00
yangxiao1 61eaa082a2 fix windows 2014-08-08 15:33:30 +08:00
yangxiao 97edd303b5 remove DrawNode3D 2014-08-08 15:06:45 +08:00
yangxiao 1eeb4fa105 not export getCameras 2014-08-08 13:31:05 +08:00
minggo ace0e3d989 Merge pull request #7709 from darkdukey/fixJenkins 
[ci skip]Fix Jenins pull request build script
 2014-08-08 09:43:07 +08:00
Nite Luo 5b626822e6 Fix Jenins pull request build script 2014-08-07 11:22:41 -07:00
heliclei 70841cf240 [jenkins][ci skip]fix ci skip mal-function 2014-08-07 18:24:11 +08:00
heliclei 3276c10b31 [jenkins]Tracking lib size for pull request build 2014-08-07 18:03:41 +08:00
heliclei b19dacd400 [jenkins]Tracking lib size for pull request build 2014-08-07 17:50:56 +08:00
yangxiao 579ae882e3 add to cocos2d.h 2014-08-07 15:33:23 +08:00
minggo 9eff58b0a5 Merge pull request #7690 from heliclei/jenkins-job-trigger 
use github access token to retrive commits
 2014-08-07 09:54:48 +08:00
minggo 2cab8657b2 Merge pull request #7689 from heliclei/ci-dailybuild 
[ci skip][jenkins]Avoid connect to database repeatly
 2014-08-07 09:54:22 +08:00
heliclei a04d3e1b2b [ci skip][jenkins]Avoid connect to database repeatly 2014-08-06 18:18:59 +08:00
minggo d5db4c2b84 Merge pull request #7687 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-08-06 17:50:22 +08:00
zhangbin 1ced935ea2 Update the reference of submodule cocos2d-console. 2014-08-06 17:44:00 +08:00
minggo 7a833d66d1 Merge pull request #7676 from samuele3hu/v3_module 
Split luabindings into serval modules and adjust project settings of test cases
 2014-08-06 17:09:12 +08:00
minggo 7b3e1b7a73 rename file name 2014-08-06 15:01:18 +08:00
heliclei a06873bff7 [ci skip][jenkins]add script to check pull request status, if not set, rebuild it automatically 2014-08-06 10:29:26 +08:00
samuele3hu 0daa30419b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 
Conflicts:
	cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.hpp
	tools/tolua/cocos2dx.ini
 2014-08-06 00:37:19 +08:00
Wu-Hao ac8e5d3d57 Create missing tools?.txt 2014-08-05 18:08:50 +08:00
heliclei 5bd0e14b17 refine code 2014-08-05 18:01:09 +08:00
heliclei da3e7d80db [jenkins][ci skip]use github access token to retrive commits 2014-08-05 16:22:01 +08:00
yangxiao 11a13ce9e2 Merge branch 'newcode' into v3 2014-08-04 15:41:21 +08:00
minggo 60df3ddf31 Merge pull request #7636 from samuele3hu/v3_console 
Update cocos2d-console submodule
 2014-08-04 15:38:19 +08:00
yangxiao 4452d9579a merge cocos2d, fix lua 2014-08-04 12:07:27 +08:00
samuele3hu 6f4cafcc1b Add module register functions and adjust iOS and Mac test cases 2014-08-04 09:39:42 +08:00
huangshiwu 575c9787c0 Merge branch 'v3' into v3_pr 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
 2014-08-01 15:11:34 +08:00
samuele3hu 6bb21c0f4d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	tools/tolua/cocos2dx.ini
 2014-07-31 17:52:22 +08:00
samuele3hu 27b98ee237 Update cocos2d-console submodule 2014-07-31 17:31:59 +08:00
samuele3hu ee4e479ce1 Remove CCProtectedNode.h/.cpp from ui/base to 2d and modify the related project setting 2014-07-31 16:38:55 +08:00
samuele3hu a47e52b5bc Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 
Conflicts:
	build/cocos2d_tests.xcodeproj/project.pbxproj
 2014-07-31 15:22:46 +08:00
samuele3hu 9666f1ad7f Split luabindings module to some independent modules 2014-07-31 15:20:23 +08:00
huangshiwu ef69faf3ba GLView Hook 2014-07-31 00:53:04 +08:00
heliclei 26cf4321d2 fix ios build code sign 2014-07-30 23:59:19 +08:00
minggo 7bd68c35d0 Merge pull request #7626 from heliclei/jenkins-pull-request-builder 
fix a typo:V3->v3
 2014-07-30 16:11:39 +08:00
heliclei add9e3a63e fix typo:V3->v3 2014-07-30 16:11:07 +08:00
zhangbin 5ea318a7df Merge branch 'v3' into gen-prebuilt-script 2014-07-30 15:46:14 +08:00
zhangbin f8a7e70000 Add tools to generate prebuilt engine for Cocos Engine. 2014-07-30 15:44:15 +08:00
heliclei 77a8d96f37 remove xcode shared scheme from code base 2014-07-29 18:39:16 +08:00
heliclei 5b4ca604c2 [ci skip]send email to report build result 2014-07-28 14:26:49 +08:00
minggo 568698a1be Merge pull request #7593 from heliclei/pull-request-builder 
[ci skip][jenkins]merge pull request to latest baseline before build
 2014-07-25 22:58:01 +08:00
heliclei aba0a12413 [ci skip][jenkins]merge pull request to latest baseline before build 2014-07-25 16:38:22 +08:00
heliclei 97aa3b5239 [ci skip][jenkins]add android dailybuild script, records all built libs(*.a) size to database 2014-07-24 16:48:42 +08:00
samuele3hu 6d678ce443 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_conversion 2014-07-23 11:57:56 +08:00
samuele3hu 386b4a2f42 Update bindings-generator submodule 2014-07-22 11:16:40 +08:00
zhangbin 6c8cd00a53 Update the reference of submodule cocos2d-console. 2014-07-21 17:04:40 +08:00
minggo 02b18be552 Merge pull request #7522 from Dhilan007/v3-fbx-conv 
Update download-deps.py for download fbx-conv
 2014-07-21 15:38:33 +08:00
Dhilan007 612a3e9691 Add fbx-conv in 3rd-party-libs-bin's management. 
Add fbx-conv for creates archive.
 2014-07-18 18:38:57 +08:00
samuele3hu 059ecffd9c Update bindings-generator submodule 2014-07-17 21:43:10 +08:00