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

1973 Commits

Author SHA1 Message Date
pandamicro 4fa1cdc302 Update submodules 2015-06-17 15:43:35 +08:00
子龙山人 9deaa9bcc9 Merge pull request #12374 from natural-law/framework 
Optimize framework-compile.
 2015-06-17 14:49:43 +08:00
Jacky 3c5ab4f518 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon2 
# Conflicts:
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
 2015-06-17 13:04:24 +08:00
Bin Zhang 13e8cbf6d7 Add ignore for files generated by framework-compile. 2015-06-17 09:53:32 +08:00
Bin Zhang 088cc76b9f Replace tab with spaces. 2015-06-17 09:53:03 +08:00
samuele3hu 2da760b655 Update the NavMesh test case 2015-06-17 09:49:31 +08:00
samuele3hu e20a35508a Update the bindings-generator 2015-06-16 11:38:16 +08:00
samuele3hu a547d6aa33 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_navigation 
Conflicts:
	tools/bindings-generator
 2015-06-16 11:36:11 +08:00
WuHao aeeed0f4ab Merge remote-tracking branch 'origin' into fix_spritepolygon 
# Conflicts:
#	external/config.json
 2015-06-16 11:19:20 +08:00
子龙山人 b182f66329 Merge pull request #12346 from natural-law/v3 
Add scripts for framework compiling.
 2015-06-16 10:04:09 +08:00
Bin Zhang fb920acccf Add scripts for framework compiling. 2015-06-15 16:33:24 +08:00
WuHao 27d0f51e9b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	build/cocos2d_tests.xcodeproj/project.pbxproj
	cocos/2d/libcocos2d.vcxproj.filters
	tools/cocos2d-console
	web
 2015-06-15 16:13:36 +08:00
pandamicro 0216d05eee Merge pull request #12102 from super626/navigation2 
3D Navigation
 2015-06-15 13:39:05 +08:00
pandamicro 032f231ed4 Add bindings for AutoPolygon and PolygonInfo 2015-06-13 11:14:57 +08:00
pandamicro 68649b9f57 Merge pull request #12318 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2015-06-12 21:11:03 +08:00
Bin Zhang 2827e9fa6a Update the reference of submodule cocos2d-console. 2015-06-12 18:32:23 +08:00
pandamicro e9d648f151 Fix physics 3d macro include issue 2015-06-12 15:41:46 +08:00
pandamicro c3aba0392d Update auto conversion for sprite polygon 2015-06-12 13:00:49 +08:00
samuele3hu 1b20e463d8 Update the Lua binding about the Polygon and update the test case. 2015-06-11 14:38:38 +08:00
pandamicro 25a25776ce Add macro_judgement to physics3d auto bindings 2015-06-10 19:39:29 +08:00
WuHao 0808b6aff9 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon 
Conflicts:
	cocos/2d/MarchingSquare.cpp
 2015-06-08 13:59:26 +08:00
yangxiao d50c1823d4 merge cocos 2015-06-05 14:25:37 +08:00
pandamicro e473da38cb Skip C++ invocation functions of Component 2015-06-04 20:05:30 +08:00
Bin Zhang 825c89299a Update the reference of submodule cocos2d-console. 2015-06-04 15:30:45 +08:00
yangxiao 8b5333a5c9 Merge branch 'newcode' into navigation2 2015-06-04 12:44:39 +08:00
samuele3hu 3bae5620d6 Merge branch 'navigation2' of https://github.com/super626/cocos2d-x into v3_navigation 2015-06-04 09:40:54 +08:00
yinjimmy b1e40a98b0 fix simulator compile error 2015-06-03 22:58:25 +08:00
samuele3hu a20681aa21 Add Lua-bindings for NavMesh 2015-06-02 18:37:57 +08:00
pandamicro 613e0f73b7 Merge pull request #12095 from jianglong0156/videoplayer 
add videoplayer jsb
 2015-06-02 17:35:56 +08:00
yangxiao 3d4606921b merge cocos 2015-06-02 14:27:31 +08:00
子龙山人 9ec7b06045 Merge pull request #12073 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2015-06-02 10:10:47 +08:00
andyque dea0387f1a skip ci build for v3-doc 2015-06-01 11:14:43 +08:00
samuele3hu c3ea65e66b Merge branch 'navigation2' of https://github.com/super626/cocos2d-x into v3_navigation 2015-05-29 18:25:15 +08:00
yangxiao c782d63bef add 3d navigation 2015-05-29 16:45:33 +08:00
andyque ff26903ddf add ci skip to travis 2015-05-29 13:47:28 +08:00
子龙山人 a968bc2d15 Merge pull request #12062 from jianglong0156/jsWebviewTest 
Js webview test
 2015-05-29 11:35:30 +08:00
jianglong0156 8b52563a8a add videoplayer config ini and fix the url bug 2015-05-29 11:10:39 +08:00
jianglong0156 9a62d06091 add video player test and auto bindings 2015-05-28 18:10:07 +08:00
Bin Zhang 74496b4c7d Update the reference of submodule cocos2d-console. 2015-05-28 15:51:59 +08:00
Bin Zhang 3fcc5ccc48 Update the reference of submodule cocos2d-console. 2015-05-28 11:41:28 +08:00
hugo 11ffb6545c [M] remove duplicate file of framework 2015-05-28 09:52:11 +08:00
jianglong0156 50fc2de39d remove 3d ext ini 2015-05-27 18:36:00 +08:00
jianglong0156 bdbb15530b improve commit and web submodule 2015-05-27 18:30:28 +08:00
samuele3hu 9934d73548 issue #12046: Add Lua bindings for material systems and related test cases. 2015-05-27 15:37:59 +08:00
jianglong0156 521ce15cb6 add webview autobindings. modify webtest. adapt the web interface 2015-05-27 11:46:26 +08:00
andyque 20ba131612 add jsb to daily build script 2015-05-26 18:25:49 +08:00
jianglong0156 7820610f13 Merge branch 'modifyTestResource' into jsWebviewTest 
Conflicts:
	cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj
	tests/js-tests/project.json
	tests/js-tests/src/GUITest/UIWebViewTest/UIWebViewTest.js
	tools/tojs/genbindings.py
 2015-05-26 17:49:17 +08:00
子龙山人 8c259fddf0 Merge pull request #12004 from andyque/add-jsb-to-jenkins-v3 
Add JSB to CI
 2015-05-26 14:27:53 +08:00
andyque a651deb93c remove dos2unix tools in js genbindings 2015-05-25 18:11:19 +08:00
Bin Zhang c491b6a5c1 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-05-25 17:01:29 +08:00