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

1884 Commits

Author SHA1 Message Date
minggo 50dc2a3e49 Merge pull request #11758 from super626/physics3d2 
add physics3d support using bullet 2.82
 2015-05-08 16:58:28 +08:00
yangxiao 2391558c96 add physics3d support 2015-05-08 15:49:33 +08:00
andyque 2575130b33 improve jenkins workflow 2015-05-08 14:44:43 +08:00
samuele3hu 23e4e0d4e3 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_remove_vs2012 2015-05-07 16:21:03 +08:00
minggo 775236b531 Merge pull request #11729 from samuele3hu/v3_7_js 
Update the configure of js-tests and js-template on the win32 platform
 2015-05-07 15:48:35 +08:00
samuele3hu 2385e68f72 Update the ini files for js binding 2015-05-07 13:00:57 +08:00
samuele3hu 243da71082 Update the project configure of js-tests and js-template on the win32 platform 2015-05-07 11:38:43 +08:00
andyque bedd62296f fix binding generator 2015-05-07 07:05:23 +08:00
samuele3hu f1b5729183 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_remove_vs2012 2015-05-05 16:14:57 +08:00
samuele3hu 037c17fe5d Remove vs2012 support in v3 2015-05-05 16:11:26 +08:00
zhangbin 0a65ad433a Update the travis script for auto generate lua-binding & js-binding. 2015-05-05 11:52:52 +08:00
zhangbin 23ed3dbe4c Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-05-05 10:53:04 +08:00
zhangbin b4f2d94109 Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
minggo e75936b778 Merge pull request #11669 from samuele3hu/v3.7 
Update cocos2dx_3d.ini and cocos2dx.ini for generating Lua bindings code to support CC_CONSTRUCTOR_ACCESS  equal to public
 2015-05-05 09:37:56 +08:00
minggo 254a4b0b0c Merge pull request #11660 from natural-law/v3 
Rename the target name of Xcode project in templates.
 2015-04-30 18:13:41 +08:00
samuele3hu f4b57511b0 Update cocos2dx_3d.ini and cocos2dx.ini for generating Lua bindings code to support CC_CONSTRUCTOR_ACCESS equal to public 2015-04-30 17:18:12 +08:00
zhangbin fc9e5609c8 Rename the target name of Xcode project in templates. 2015-04-30 15:20:47 +08:00
minggo 521b311f59 change to use v3 branch 2015-04-30 13:59:58 +08:00
minggo 4acd231f89 merge v3.6 2015-04-30 13:46:08 +08:00
andyque 46c22fbe21 fix xcode preject jenkins return value 2015-04-29 13:58:35 +08:00
andyque 1613237460 fix jenkins pull request builder return value 2015-04-29 09:53:40 +08:00
samuele3hu 5819159889 Add Lua-bindings for SpritePolygon and related test case 2015-04-28 18:19:57 +08:00
andyque 293fb37fdd fix cmake generate error 2015-04-28 11:13:20 +08:00
andyque 422fde5d2a fix return value 2015-04-28 11:08:47 +08:00
samuele3hu 95381ab975 Update the generate-cocosfiles.sh 2015-04-27 15:41:26 +08:00
samuele3hu 99bdfeb468 Update the configure about travis 2015-04-27 15:38:35 +08:00
Danut Chereches 5f692962b9 fixed 'seperate' typo 
issue #8408
 2015-04-25 00:02:39 +03:00
zhangbin 61cf0ad28b Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb 2015-04-23 15:46:19 +08:00
minggo 8ab03a62d1 Merge pull request #11543 from yinjimmy/runtime 
Add lua runtime template
 2015-04-23 10:25:00 +08:00
zhangbin dd022dd7b2 Update the reference of submodule cocos2d-console. 2015-04-21 17:28:53 +08:00
zhangbin bbb94985a0 Update the reference of submodule cocos2d-console. 2015-04-21 17:17:58 +08:00
zhangbin fca642e88e Update the reference of submodule cocos2d-console. 2015-04-21 16:55:46 +08:00
yinjimmy 2c0f1c1a50 add lua runtime template 2015-04-21 01:25:44 +08:00
samuele3hu 9477e89723 Fix the compile error on the win32 2015-04-20 11:46:48 +08:00
samuele3hu 067ad6ad60 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_studio2 
Conflicts:
	cocos/scripting/lua-bindings/proj.android/Android.mk
	cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj
 2015-04-20 10:05:02 +08:00
Jimmy Yin 185435a388 Add missing file for win32 2015-04-19 00:09:52 +08:00
Jimmy Yin a9542813f4 Add missing file for android 2015-04-18 23:20:41 +08:00
yinjimmy 1e32322350 revert runtime files 2015-04-17 18:26:47 +08:00
zhangbin e5672b6e1f Update js bindings. 2015-04-17 17:27:47 +08:00
yinjimmy 5589796029 Merge branch 'v3' into lua_runtime 2015-04-17 15:27:04 +08:00
samuele3hu b72034a3f6 Add Lua bindings for WebView and related test case 2015-04-17 14:08:47 +08:00
Wenhai Lin 03ef9b962a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-jsb-merge 2015-04-17 11:47:09 +08:00
minggo 814cb9224b Merge pull request #11462 from andyque/disable-v2-build-trigger 
Disable v2 build trigger
 2015-04-16 18:01:26 +08:00
zhangbin 1f491cf656 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb 
Conflicts:
	build/cocos2d-wp8.sln
 2015-04-16 17:04:07 +08:00
andyque df1703375c fix wrong indentation 2015-04-16 15:51:08 +08:00
andyque 68f86adab1 disable comment job trigger for v2 branch 2015-04-16 15:28:09 +08:00
andyque fdb03f150d don't trigger for v2 build 2015-04-16 15:28:08 +08:00
Dale Stammen eb07142427 removed WP8 jenkins slave script 2015-04-15 07:18:13 -07:00
zhangbin 2c7bd7ec35 Update cocos2dx files. 2015-04-15 15:12:04 +08:00
zhangbin 3641451c47 Update the submodule js-bindings & update solution files for js-bindings. 2015-04-15 13:58:41 +08:00