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

2550 Commits

Author SHA1 Message Date
pandamicro 54330576e6 Fix JS binding issues for skeleton animation 2015-07-24 20:16:01 +08:00
pandamicro 6e8edc401c Revert changes to lua ini 2015-07-24 17:19:40 +08:00
pandamicro 29b9ed685f Add BoneNode/SkeletonNode/SkinNode JS bindings 2015-07-24 15:48:34 +08:00
Vincent Yang e4a8aeee45 Fixed #12962 : Scene can't have std::vector member. 2015-07-24 11:16:45 +08:00
zhangcheng ef6ada5bf4 Fix cocos2dx_studio.ini format error. 2015-07-24 09:28:55 +08:00
zhangcheng 3945ce7a4e Add ComExtensionData to luabinding. 2015-07-23 18:27:19 +08:00
zhangcheng 6a1bf83fce Merge branch 'OptimizationExtensionData' of https://github.com/chengstory/cocos2d-x into OptimizationExtensionData 2015-07-23 18:11:57 +08:00
zhangcheng 19e078da19 Add ComExtensionData lua binding. 2015-07-23 18:11:47 +08:00
pandamicro ae2a966458 Fix jsb issue for refactor ObjectExtensionData to ComExtensionData 2015-07-23 17:49:32 +08:00
pandamicro 739befdc08 Add audio engine bindings in JSB 2015-07-23 14:43:01 +08:00
Bin Zhang 0a6186d68f Solve the error in Xcode project of simulator. 2015-07-22 13:44:34 +08:00
Vincent Yang 3addf38134 Fixed #12906 : Can't add custom member to cocos2d::Scene subclass. 2015-07-22 12:01:34 +08:00
pandamicro 85d4ce0d5a Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp
	docs/RELEASE_NOTES.md
	tools/cocos2d-console
	tools/tojs/cocos2dx.ini
 2015-07-21 11:39:24 +08:00
yangxiao e5ac3ee090 ignore Animate getKeyFrameUserInfo 2015-07-20 14:54:11 +08:00
yangxiao 583d82c1e8 ignore Animate getKeyFrameUserInfo 2015-07-20 11:49:30 +08:00
andyque 042a3dc2ec add xcpretty to framework mac build 2015-07-17 10:48:05 +08:00
Bin Zhang a5e3267c98 Update the reference of submodule cocos2d-console. 2015-07-17 10:08:35 +08:00
pandamicro 490d5a3747 Remove cleanup from auto bindings add made it support override in JS 2015-07-16 14:09:26 +08:00
pandamicro 436564f922 Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	docs/RELEASE_NOTES.md
	web
 2015-07-15 14:39:40 +08:00
pandamicro 3c08b497ba Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-07-15 14:26:19 +08:00
pandamicro 7f7cf92da3 Update bindings-generator 2015-07-15 14:21:47 +08:00
andyque 15b0fea530 fix win32&win8.1 template compile 2015-07-15 10:00:35 +08:00
Bin Zhang 55890f6206 Update the JS templates to keep the directory structure is same with before. 2015-07-14 18:07:17 +08:00
andyque 97168fa139 add cocos framework build on linux platform. 2015-07-14 16:25:54 +08:00
andyque ac1bf36208 update submodule 2015-07-14 10:10:20 +08:00
Bin Zhang 569695d844 Update the reference of submodule cocos2d-console. 2015-07-14 09:40:42 +08:00
andyque fc673ee502 Merge branch 'v3.7-release' into v3 2015-07-13 22:44:54 +08:00
Bin Zhang 75920b8e11 Update the reference of submodule cocos2d-console. 2015-07-13 12:05:17 +08:00
pandamicro 15bb633adb Revert "add lua-binding of EventDispacher::dispatchCustomEvent()" 2015-07-12 20:19:52 +08:00
pandamicro 0d9da2f500 Merge pull request #12773 from minggo/bind-missing-function 
add lua-binding of EventDispacher::dispatchCustomEvent()
 2015-07-11 17:17:32 +08:00
Bin Zhang 8ca9e10a22 Use msbuild to generating engine prebuilt libs on win32. 2015-07-10 17:01:08 +08:00
pandamicro 2d27091398 Merge pull request #12717 from jianglong0156/FileUtilsWriteFunctionMerge 
add write api in FileUtils
 2015-07-10 15:13:21 +08:00
minggo 3911e1d696 add lua-binding of EventDispacher::dispatchCustomEvent() 2015-07-10 10:29:21 +08:00
andyque 9857a4acc4 fix template daily build 2015-07-09 14:17:49 +08:00
andyque 6cf38586c2 fix template daily build 2015-07-09 13:50:58 +08:00
andyque 32171c491a fix slave scripts path 2015-07-09 11:34:37 +08:00
andyque 0d0787b212 fix pr build scripts 2015-07-09 11:26:55 +08:00
andyque c83a398381 fix win32 and winrt build error 2015-07-09 10:27:13 +08:00
andyque 4bdbca829b fix scripts path error 2015-07-09 10:15:27 +08:00
andyque 7098261523 unassigned shouldn't trigger jenkins rebuild 2015-07-09 10:10:37 +08:00
andyque 3f07b0c67a refactor daily build into one 2015-07-09 09:53:20 +08:00
andyque 2df9ce8909 fix runtime ios build error 2015-07-08 18:05:12 +08:00
pandamicro 30c79fea02 Add auto bindings for Frame::g|setTweenType 2015-07-08 17:19:30 +08:00
andyque dda07bebf5 fix ios/mac/win32/win8.1 compile error 2015-07-08 07:36:26 +08:00
andyque a18116aaa4 minor improvements 2015-07-07 16:56:38 +08:00
andyque 0ca645f744 add runtime daily build script 2015-07-07 16:54:03 +08:00
andyque 47bae38168 finish template daily build 2015-07-07 16:27:38 +08:00
andyque 04ade7c16e remove xcode scheme 2015-07-07 14:57:25 +08:00
jianglong0156 13d00d129d fix the jsb and lua ini error, ignore writeDataToFile 2015-07-07 14:54:31 +08:00
andyque a5115bd739 improve 2015-07-07 14:34:02 +08:00
andyque 494036be1a fix linux build 2015-07-07 14:34:02 +08:00
andyque d8bf9c8a2a improve template daily build scripts 2015-07-07 14:34:02 +08:00
andyque 6238ddebf3 Merge remote-tracking branch 'upstream/v3.7-release' into v3 2015-07-07 10:18:43 +08:00
pandamicro a9f98aefea [Simulator JSB] Fix issue caused by video and web view binding 2015-07-07 09:38:38 +08:00
andyque 92585d3a8e fix python syntax error 2015-07-06 17:09:55 +08:00
andyque 881a388892 add framework daily build scripts 2015-07-06 16:43:37 +08:00
Bin Zhang 0bcdf898bf Solve the error in simulator. 2015-07-04 10:17:40 +08:00
pandamicro aeeb6eb683 Merge pull request #12661 from pandamicro/v3.7-release 
Fixed #12652 Add retain/release for XMLHTTPReqest in JSB
 2015-07-04 08:40:55 +08:00
pandamicro 6f3fc302e6 Fix web view and video player in simulator 2015-07-04 08:39:49 +08:00
andyque 4704d38c13 add v3 to travis build 2015-07-03 18:27:42 +08:00
andyque 698f70f5b6 fix runtime template compilation 2015-07-03 15:38:53 +08:00
andyque f37d4d226b fix templates daily build issue 2015-07-03 15:18:33 +08:00
Bin Zhang f27b370b94 Add argument --ios to compile Mac & iOS platforms separately. 2015-07-03 11:31:40 +08:00
pandamicro 1b22438792 Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7 
Conflicts:
	cocos/ui/UICheckBox.cpp
 2015-07-03 10:23:49 +08:00
Bin Zhang 558e9c3d61 Solve the error when generating simulator on win32. 2015-07-03 10:14:20 +08:00
Bin Zhang c713708e4d Not compile the scripts when generating simulator. 2015-07-02 17:13:35 +08:00
子龙山人 5b971ee93d Merge pull request #12607 from neokim/add_radio_button_and_group 
Add RadioButton and RadioButtonGroup widgets
 2015-07-02 17:12:59 +08:00
Bin Zhang 7ffb5edc27 Update the bundle version when generating simulator. 2015-07-02 14:37:42 +08:00
Bin Zhang e24975f0fe Add python script for generate cocos simulator. 2015-07-02 13:43:52 +08:00
andyque dce583db93 fix jsb bindings error 2015-07-01 18:28:22 +08:00
子龙山人 8f7098e2c8 Merge pull request #12611 from andyque/add-project-template-to-jenkins 
finish template daily build.
 2015-07-01 17:26:12 +08:00
Bin Zhang 8d928e60c8 Update the version displayed in simulator about dialog. 2015-07-01 17:23:34 +08:00
Bin Zhang d0fc1e9d34 Add link libs config in simulator project for framework. 2015-07-01 15:31:03 +08:00
andyque 53817618b7 finish template daily build. 
1. daily build doesn't clean when build finished.
2. add options to template daily build
 2015-07-01 11:24:46 +08:00
子龙山人 077241eecf Merge pull request #12599 from jianglong0156/jsbProjectMerge 
merge the jsb project into cocos2d project
 2015-06-30 17:04:12 +08:00
Bin Zhang 0726b2be9c Generate prebuilt Android.mk when compiling prebuilt libs for android. 2015-06-30 16:53:11 +08:00
Bin Zhang 78c5f2e77e Build simulator project when generating prebuilt libs for android. 2015-06-30 16:45:55 +08:00
Bin Zhang bb77101f0b Solve the error when building simulator for android. 2015-06-30 16:45:13 +08:00
andyque a6451c6c5e update daily build and pr build 2015-06-30 16:24:03 +08:00
Bin Zhang 9b45a9ee6f Add preprocessor CC_ENABLE_BULLET_INTEGRATION=1 in simulator. 2015-06-30 16:14:25 +08:00
pandamicro d07b8643df Merge pull request #12591 from pandamicro/v3.7-release 
[ci skip] Add video player and web view to template and simulator
 2015-06-29 20:58:27 +08:00
pandamicro 1f93fcfc2a Remove duplicated code 2015-06-29 20:00:49 +08:00
pandamicro f67ad0352c Fix simulator js modules 2015-06-29 19:57:12 +08:00
Bin Zhang 06dec2be87 Remove unused configuration. 2015-06-29 16:24:15 +08:00
Bin Zhang d3e9403f20 Generating prebuilt Android.mk when generating prebuilt libs. 2015-06-29 16:00:35 +08:00
Bin Zhang a680638de2 Optimize the implementation of generating binary templates. 2015-06-29 15:42:32 +08:00
Bin Zhang e21634f618 Update the reference of submodule cocos2d-console. 2015-06-29 15:18:00 +08:00
Bin Zhang 02500976f7 Solve the error in framework-compile tools. 2015-06-27 17:42:15 +08:00
子龙山人 a05cc97d08 Merge pull request #12569 from natural-law/v3.7-release 
Solve the error in framework-compile tools.
 2015-06-27 15:55:59 +08:00
Bin Zhang 652aaf3bcd Solve the error in framework-compile tools. 2015-06-27 14:44:10 +08:00
Bin Zhang 0ac3da1636 Solve the error in framework-compile tools. 2015-06-26 21:00:32 +08:00
pandamicro 1fd45d6f30 Update submodules 2015-06-26 13:45:28 +08:00
pandamicro b113580bdf Merge pull request #12558 from natural-law/v3.7-release 
[ci skip] Optimize the implementation of framework-compile.
 2015-06-26 12:50:30 +08:00
Bin Zhang cc6f02584b Solve the error in framework-compile on Mac. 2015-06-26 12:01:45 +08:00
Bin Zhang d508d2ecdd Solve the error when generating binary templates. 2015-06-25 19:57:49 +08:00
Bin Zhang 7ca8542d75 Optimize the implementation of auto-generating prebuilt mk files. 2015-06-25 19:47:55 +08:00
pandamicro 081869b4f0 Merge pull request #12538 from samuele3hu/v3_7_test 
[ci skip]Update the branches info to v3.7-release
 2015-06-25 17:11:19 +08:00
samuele3hu b963b63701 Update the branches info for the related travis scripts to v3.7 2015-06-25 17:07:15 +08:00
Bin Zhang 444bddccca Solve the error in framework-compile tools. 2015-06-25 13:36:42 +08:00
Bin Zhang 6a61f1de40 Solve the error in git-archive-all tools. 2015-06-25 11:23:27 +08:00
Bin Zhang c9c212d0e1 Solve the error when run tests projects with `cocos run`. 2015-06-24 15:33:13 +08:00
Bin Zhang e253237e62 Support package engine code on windows (for framework). 2015-06-23 18:18:02 +08:00
Bin Zhang 53ca264eff Solve the error in the scripts of modify templates for framework. 2015-06-19 17:43:06 +08:00
Bin Zhang 146b99fda8 Support build VS project with VS2013 & VS2015. 2015-06-19 13:42:48 +08:00
Bin Zhang b01ef05797 Add parameter --app-abi to set the APP_ABI value of ndk-build. 2015-06-19 13:42:48 +08:00
Bin Zhang cd159bd12c Add a config file for generating prebuilt libs. 2015-06-19 13:42:48 +08:00
pandamicro 1bf8292e06 Merge pull request #12442 from natural-law/update-templates 
Update the VS projects of templates.
 2015-06-19 10:38:02 +08:00
江龙 91bc19fb29 Merge branch 'v3_origin' into navmesh 
Conflicts:
	tests/js-tests/src/Physics3DTest/Physics3DTest.js
 2015-06-18 23:50:19 +08:00
pandamicro deaa048521 Improve auto bindings for navmesh 2015-06-18 22:48:47 +08:00
Bin Zhang 35842e1d2a Update the reference of submodule cocos2d-console. 2015-06-18 22:00:56 +08:00
pandamicro 4073d0397b Update bindings generator 2015-06-18 22:00:56 +08:00
samuele3hu 0806e58255 Fix the error skip function error for Sprite. 2015-06-18 22:00:55 +08:00
pandamicro 10a8adad53 Change physics3d api to jsb namespace 2015-06-18 20:39:40 +08:00
pandamicro aa566a3722 Merge pull request #12424 from pandamicro/physics3d 
Fix Physics3D test and js bindings
 2015-06-18 16:09:49 +08:00
pandamicro 5f025031a1 Merge pull request #12425 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2015-06-18 15:39:59 +08:00
Bin Zhang 38ad8ca938 Update the reference of submodule cocos2d-console. 2015-06-18 15:38:17 +08:00
pandamicro cf3b49f4fd Update bindings generator 2015-06-18 15:08:39 +08:00
jianglong0156 85c40b6580 Merge pull request #8 from pandamicro/physics3d 
Physics3d
 2015-06-18 14:54:32 +08:00
samuele3hu ef1bccd926 Fix the error skip function error for Sprite. 2015-06-18 12:03:30 +08:00
pandamicro 3ffc0e6be6 Merge branch 'v3_navigation' of https://github.com/samuele3hu/cocos2d-x into physics3d 2015-06-18 09:20:37 +08:00
pandamicro a94b49bdef Add nav mesh bindings 2015-06-17 23:41:12 +08:00
pandamicro 85e8a407b1 Merge branch 'navmesh' of https://github.com/jianglong0156/cocos2d-x into v3 
# Conflicts:
#	tests/js-tests/project/Classes/AppDelegate.cpp
#	tools/tojs/genbindings.py
 2015-06-17 19:58:24 +08:00
samuele3hu 683812d817 Update Physics3D test for js. 2015-06-17 18:50:55 +08:00
jianglong0156 897b5fd0e9 add navmesh test project file and binding file 2015-06-17 18:37:19 +08:00
Bin Zhang 264a4d104f Merge branch 'v3' of github.com:cocos2d/cocos2d-x into framework 2015-06-17 18:14:33 +08:00
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
Bin Zhang 98577b0fe4 Merge branch 'v3' into framework 2015-06-17 13:53:21 +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 b0b40cb4d6 Solve the error usage of print in python script. 2015-06-17 10:00:37 +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
Bin Zhang 3298145eb5 Support build & run Android Studio project in console. 2015-05-25 16:53:36 +08:00
andyque c7d698362f add JSB to jenkins 2015-05-25 16:37:08 +08:00
andyque a6a5318e13 add js win32 test 2015-05-25 16:22:43 +08:00
minggo 203203a92d Merge pull request #12001 from andyque/upgrade-rapidjson-to-1.0.2 
upgrade rapidjson to 1.0.2
 2015-05-25 15:18:15 +08:00
andyque 81d562803b upgrade rapidjson to 1.0.2 2015-05-25 11:43:03 +08:00
samuele3hu 0492323ec8 Update the Lua template 2015-05-24 23:14:23 +08:00
samuele3hu 074216bef9 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d 
Conflicts:
	templates/lua-template-default/frameworks/runtime-src/Classes/lua_module_register.h
	tests/lua-tests/src/mainMenu.lua
 2015-05-24 22:46:05 +08:00
子龙山人 49c0b44252 Merge pull request #11988 from andyque/add-vs2015-to-simulator 
fix simulator vs2015 support
 2015-05-23 09:48:32 +08:00
hugo 9a9fa7957f [A] add generate libs and binary template 2015-05-22 19:47:16 +08:00
andyque 73902a4063 fix simulator vs2015 support 2015-05-22 17:47:48 +08:00
minggo 698428e0a1 Merge pull request #11971 from joshuastray/physics 
Physics3d js binding
 2015-05-22 14:42:34 +08:00
joshuastray b1169c7d56 win32 and universal compile 2015-05-22 11:58:28 +08:00
joshuastray 1366f615dd mac && ios works 2015-05-22 10:43:37 +08:00
joshuastray 342734e3b5 Merge remote-tracking branch 'upstream/v3' into physics 2015-05-21 21:15:42 +08:00
WenhaiLin 158181d4eb Console:Fixed crash 2015-05-21 18:14:21 +08:00
joshuastray 83237b8dbd add physics3d js manual binding and tests 2015-05-21 18:05:49 +08:00
minggo 69b6c9a3e5 Merge pull request #11906 from samuele3hu/v3_check 
Give more detailed tips by adding function name for luaval_to_object and update the bindings-generator submodule
 2015-05-21 10:35:38 +08:00
minggo 1812660c7b Merge pull request #11915 from WenhaiLin/v3-37 
Rename visual studio solution files
 2015-05-20 14:26:20 +08:00
WenhaiLin c26ae4a972 Rename solution file for Win32 project. 2015-05-20 13:55:23 +08:00
minggo dbf1b415a5 Merge pull request #11898 from WenhaiLin/v3-console-crash 
Console:Fixed crash
 2015-05-20 11:19:38 +08:00
Bin Zhang c4349d9441 Update the reference of submodule cocos2d-console. 2015-05-20 10:54:40 +08:00
joshuastray 712ba4f64c add physics3d auto binding 2015-05-20 10:36:26 +08:00
samuele3hu dec9acfd87 Give more detailed tips by adding function name for luaval_to_object and update the bindings-generator submodule 2015-05-20 10:26:54 +08:00
WenhaiLin 80367e978d Console:Fixed crash 2015-05-19 18:33:06 +08:00
samuele3hu 7e07fed0c9 Upate cocos2dx_physics3d.ini and bindings-generator submodule 2015-05-18 16:18:04 +08:00
minggo ff3d28e6d7 Merge pull request #11870 from joshuastray/matierial 
add material system tests for js
 2015-05-18 13:33:30 +08:00
joshuastray 00dd854578 add material system tests for js 2015-05-18 10:44:15 +08:00
samuele3hu 71595898ed Update the Lua binding for Physics3D ,related test cases and the template project 2015-05-15 16:25:07 +08:00
Bin Zhang 815120d95c Update the reference of submodule cocos2d-console. 2015-05-15 16:06:11 +08:00
yinjimmy 06bd26cb63 Fixed: app crash when console ui trace nil string on mac platform #11211 2015-05-15 15:08:42 +08:00
samuele3hu fa63471c0a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d 
Conflicts:
	tests/cpp-tests/Classes/Physics3DTest/Physics3DTest.cpp
 2015-05-15 09:31:53 +08:00
samuele3hu 8db62c82f8 Add Lua bindings for Physics3D and related test cases 2015-05-15 09:28:03 +08:00
Bin Zhang 65ef7cea88 Update the reference of submodule cocos2d-console. 2015-05-14 18:00:47 +08:00
yinjimmy 5cfa5ad8b8 add simulator 2015-05-14 14:11:40 +08:00
yinjimmy d78d8b2c1f move menu bar to system menu 2015-05-14 13:43:17 +08:00
zhangbin e901918115 Update the reference of submodule cocos2d-console. 2015-05-13 14:07:10 +08:00
joshuastray 7a4ca3fe6a add new files to project 2015-05-12 10:40:51 +08:00
jianglong0156 80326aa40e add webiew jsb code 2015-05-12 10:30:51 +08:00
joshuastray 234f4db8a0 add SpritePolygon binding && js tests 2015-05-11 17:04:23 +08:00
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
samuele3hu 092eed12a2 Update cocos2d-console submodule 2015-04-14 16:43:03 +08:00
samuele3hu b2c3628aee Remove useless classes configuration for Lua binding 2015-04-14 15:02:25 +08:00
zhangbin ea86978ce2 Add js-bindings generator tools. 2015-04-14 11:01:07 +08:00
minggo bc34554bd9 Merge pull request #11407 from samuele3hu/v3_studio2 
Synchronize the related ActionTimeline test cases of Lua refer to the cpp-tests
 2015-04-13 18:22:18 +08:00
samuele3hu 24654a4847 synchronize the related ActionTimeline test cases of Lua refer to the cpp-tests 2015-04-13 16:29:44 +08:00
andyque f664efe889 fix gen scripting binding 2015-04-13 16:17:17 +08:00
andyque d45f66cdb9 fix the scripts 2015-04-13 16:11:09 +08:00
andyque 205c4efd9f add a wrapper for jenkins pull request build 2015-04-13 15:57:41 +08:00
minggo 07df23ed85 Merge pull request #11401 from andyque/fix-pull-requester-build 
print more infor about scripting binding
 2015-04-13 13:39:23 +08:00
andyque 6783754f3e fix typo 2015-04-13 12:00:09 +08:00
andyque 2176881dbe print more infor about jsb 2015-04-13 11:27:54 +08:00
minggo a2de59bac3 Merge pull request #11397 from andyque/fix-pull-requester-build 
fix PR requester builder prompt message position.
 2015-04-13 11:23:39 +08:00
minggo da69dbd133 Merge pull request #11388 from xiaofeng11/v3 
Reader update
 2015-04-13 11:20:53 +08:00
andyque 163cee699d fix PR requester builder promption. 2015-04-13 11:20:47 +08:00
andyque 72691a6aac fix PR builder doesn't work for tizen 2015-04-13 11:18:08 +08:00
samuele3hu 8896190d9b Fix the bindings-generator error and add related Action Timeline test case. 2015-04-12 22:20:53 +08:00
zhangbin 4929b584e2 Update the reference of submodule cocos2d-console. 2015-04-09 13:39:01 +08:00
minggo f1429d21f8 Merge pull request #11321 from SunLightJuly/v3_fix 
updated submodule
 2015-04-08 11:46:14 +08:00
minggo 4bcfcb1d09 Merge pull request #11320 from samuele3hu/v3_terrain 
#issue 10819:Add lua bindings for Terrain and two test cases about it.
 2015-04-08 11:45:46 +08:00
SunLightJuly 5847325e2d updated submodule 2015-04-08 11:37:33 +08:00
samuele3hu 3a2601a1f8 Add lua bindings for Terrain and two test cases about it. 2015-04-08 10:03:50 +08:00
andyque 32b2e4c20e android slave only build cpp-tests and lua-tests for PR 2015-04-07 11:58:04 +08:00
yinjimmy 587ee21e4b revert lua runtime 2015-04-02 18:27:53 +08:00
samuele3hu 6c528c4a42 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_5_test 2015-03-30 15:51:01 +08:00
samuele3hu 79c0258449 Remove useless configure for bindings-generator of Lua 2015-03-30 15:48:47 +08:00
minggo d437ce3e59 Merge pull request #11208 from samuele3hu/v3_5_comment 
Update Sprite3DCubeMap  lua test case and the related bindings-generator submodule
 2015-03-30 10:48:36 +08:00
samuele3hu 1a9cf6f6a3 Update the bindings-generator submodule 2015-03-28 15:00:12 +08:00
samuele3hu 921981833e Update Sprite3DCubeMap test case 2015-03-28 14:59:47 +08:00
yangxiao a45f0d1a76 merge cocos 2015-03-27 16:50:40 +08:00
yangxiao 1d08c514ee do not export getBoneCurves 2015-03-27 09:15:45 +08:00
zhangbin 30819193a4 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-03-25 11:45:41 +08:00
zhangbin 7aaf122a41 Support compile & run test projects with cocos2d-console on wp8. 2015-03-25 11:42:55 +08:00
andyque 29b97ad235 use release build in windows slaves 2015-03-25 09:51:39 +08:00
andyque 1b053a6eb2 add wp8 build node 2015-03-24 14:54:08 +08:00
andyque 920e30386e do cleanup 2015-03-24 11:13:23 +08:00
andyque b8bc7ce3f3 add daily build 2015-03-24 11:10:51 +08:00
minggo 47b7bcf01f Merge pull request #11072 from andyque/fix-doxygen-release-tool 
[ci skip]fix doxygen document generate tool restore doxygen.config file
 2015-03-23 16:24:48 +08:00
zhangbin e457cb47d7 Update the reference of submodule cocos2d-console. 2015-03-23 16:09:43 +08:00
andyque 360098c2cf fix doxygen document generate tool restore doxygen.config file unexpectly 2015-03-23 14:35:38 +08:00
zhangbin 5e86152b15 Update the reference of submodule cocos2d-console. 2015-03-23 12:04:14 +08:00
zhangbin eb95bbce02 Update the reference of submodule cocos2d-console. 2015-03-23 10:10:35 +08:00
andyque a535d2f5d4 use msbuild in windows slaves 2015-03-20 09:37:06 +08:00
Vincent Yang 6bbb89a098 Add doxygen config for white book and cocos/doxygen_modules.h for doc mudules. 2015-03-17 11:26:33 +08:00
zhangbin 1b92859c61 Update the reference of submodule cocos2d-console. 2015-03-16 16:29:07 +08:00
Nite Luo 18d716cfd2 Use xcode for jenkins build 2015-03-14 02:08:52 -07:00
Nite Luo 860c108f86 revert changes in mac build script 2015-03-14 01:30:11 -07:00
Nite Luo 1d96876699 Test if reduce log size will fix the build 2015-03-14 01:09:42 -07:00
Nite Luo 99bc7e2a2b Fix multithread compiling 2015-03-13 19:53:22 -07:00
Huabing.Xu 6b00b65824 [ci skip]fix make package for lua runtime is removed 2015-03-13 15:29:05 +08:00
Wenhai Lin 0356f9daca Fixed git-archive-all 2015-03-13 12:07:33 +08:00
minggo 44b1f77fa3 Merge pull request #10799 from SunLightJuly/v3_remove_simu 
V3 remove simulator
 2015-03-11 15:31:17 +08:00
andyque f3763bde3d remove backup 3rd party libs 2015-03-11 14:59:34 +08:00
andyque e76cc8c99d remove template config.json check 2015-03-11 14:00:28 +08:00
andyque 1c483b27fd update github remote 2015-03-11 10:49:39 +08:00
andyque 98d57551d1 remove exceptions code 2015-03-11 00:59:21 +08:00
andyque 0991ce5002 update master jenkins scripts 2015-03-11 00:08:52 +08:00
SunLightJuly 6c2eb01213 cleanup proj.android 2015-03-10 23:33:09 +08:00
SunLightJuly b77801a99b cleanup proj.win32 2015-03-10 22:56:03 +08:00
andyque 34619fc125 add git --version 2015-03-10 19:07:55 +08:00
andyque ffa01950ac use subprocess.call 2015-03-10 19:00:07 +08:00
andyque 9457ed5fbd fix subprocess.check_output error 2015-03-10 18:47:35 +08:00
andyque 7f4bfc395f change os.system to subprocess 2015-03-10 18:42:26 +08:00
SunLightJuly ba55f14fbf removed runtime in libsimulator 2015-03-10 18:28:59 +08:00
andyque 5bd5c62a91 change git merge method 2015-03-10 18:24:38 +08:00
andyque 3cd4018cca change scripts 2015-03-10 17:47:00 +08:00
andyque d09f678579 modify remote build environment variable 2015-03-10 17:42:09 +08:00
andyque 7d7ee03c5b fix jenkins scripts 2015-03-10 17:03:03 +08:00
andyque 28ed1d0cae use exceptions to report unwanted behaviors 2015-03-10 16:08:57 +08:00
andyque a48c8c840c cleanup pull request scripts 2015-03-10 15:44:02 +08:00
andyque fbc6804b3f improving jenkins pull request scripts 2015-03-10 14:40:04 +08:00
andyque 48482907b8 refactoring jenkins scripts 2015-03-10 14:08:03 +08:00
SunLightJuly 81aebdda29 cleanup files of simulator 2015-03-10 10:54:14 +08:00
SunLightJuly ff8c0dac2b removed framework of simulator 2015-03-10 10:51:16 +08:00
SunLightJuly 69cdc3e47c removed win32 project of simulator 2015-03-10 02:39:42 +08:00
SunLightJuly 10a60bb9da removed pbxproj of simulator 2015-03-10 02:28:27 +08:00
SunLightJuly 03f99b38d0 removed proj.android of simulator 2015-03-10 02:21:32 +08:00
samuele3hu d72a0c3985 Add more include files in config.gitingore for generating templates/cocos2dx_files.json 2015-03-09 17:39:57 +08:00
yangxiao 8137b01f23 merge cocos 2015-03-06 18:31:57 +08:00
minggo 065102ae7c Merge pull request #10753 from natural-law/v3 
[ci skip] Update the reference of submodule cocos2d-console.
 2015-03-06 14:53:31 +08:00
zhangbin 8c57edbad5 Update the reference of submodule cocos2d-console. 2015-03-06 14:51:29 +08:00
andyque 942ceccd99 fix android and win32 compile error 2015-03-04 14:12:11 +08:00
yangxiao b938872621 lua binding 2015-03-04 12:58:51 +08:00
andyque 92fb735611 fix jenkins compile erorr 2015-03-04 12:09:12 +08:00
andyque 2e2fb122e6 fix v3 win32 build issue 2015-03-03 18:35:43 +08:00
andyque 23e49fe2b7 modify building slaves name lists in each slave 2015-03-03 16:42:48 +08:00
andyque 7b183a13ad sync jenkins script with v4-develop 2015-03-03 16:36:42 +08:00
andyque 992cc52a02 fix new windows jenkins slave compile error 2015-03-02 19:43:27 +08:00
yinjimmy 2042633294 update runtime to 2.0 2015-02-27 14:49:04 +08:00
zhangbin 6ada496b57 Update the reference of submodule cocos2d-console. 2015-02-25 18:03:05 +08:00
SunLightJuly 2b269aab53 update sub-module "cocos2d-console" 2015-02-25 10:45:36 +08:00
minggo c8eaa4aeba Merge pull request #10447 from super626/particle_merge 
add 3d particle (Particle Universe)
 2015-02-15 19:48:18 +08:00
samuele3hu 3a7cbe9d67 Add Particle3DTest for Lua and update related configure files 2015-02-15 15:56:20 +08:00
yangxiao 9153dd5cc3 add particle to lua binding 2015-02-13 18:27:32 +08:00
minggo f77cafb7ce Merge pull request #10267 from kompjoefriek/indent-consistency 
fixed indentation of Python files
 2015-02-13 15:36:20 +08:00
SunLightJuly aaf6ad03c8 called initGLContextAttrs() before create glview 2015-02-13 13:45:15 +08:00
kompjoefriek c6ab07ea02 fixed indentation of Python files 
- Changed tabs to spaces
- Changed 2 spaces to 4 spaces
 2015-02-12 21:22:19 +01:00
minggo e017511c65 disable travis notification 2015-02-12 18:39:42 +08:00
minggo 49489ba3ad update console 2015-01-30 20:06:43 +08:00
minggo f4266c9ae3 update console submodule 2015-01-30 14:58:20 +08:00
samuele3hu 80c2e0c153 Add AsyncLoadSprite3D test case and update the related lua binding 2015-01-28 21:47:52 +08:00
samuele3hu 6208e9cba5 Add more test cases about 3D 2015-01-28 09:40:20 +08:00
samuele3hu d74fb0e8b5 Update LayoutComponent Test case of UIEditTest 2015-01-22 10:21:38 +08:00
samuele3hu 3dd590cf9d Update bindings-generator submodule 2015-01-21 17:18:54 +08:00
minggo 08d392dd5f Merge pull request #10132 from samuele3hu/v3_4_issue9537 
Rename lua-coco-studio-conversions.cpp/h to lua-cocos-studio-conversions.cpp/h
 2015-01-21 13:39:29 +08:00
samuele3hu 205ead5b63 Rename lua-coco-studio-conversions.cpp/h to lua-cocos-studio-conversions.cpp/h 2015-01-21 11:48:34 +08:00
minggo abc6511ceb Merge pull request #10125 from samuele3hu/v3_4_issue9537 
issue #10107: Binding AnimationInfo to lua
 2015-01-21 11:02:11 +08:00
samuele3hu a3fbe04c10 issue #10107: Update the bindings-generator submodule 2015-01-21 10:07:21 +08:00
samuele3hu 666af29681 issue #10107: Binding AnimationInfo to lua 2015-01-21 10:06:48 +08:00
yusheng.lu 7fde1d0e0d When reading csd/csb and the simulator's resolution is changed, change the root node's size to fit the simulator windows size. It will make sure the layout component feature works. 2015-01-19 18:10:30 +08:00
dualface bc75849ac7 update template/runtime version 2015-01-16 23:22:03 +08:00
dualface 63fba4f86f fix compile win32 2015-01-16 23:19:00 +08:00
zhangbin b1f9fb4b8e Rename the Xcode target of libsimulator. 2015-01-16 14:29:48 +08:00
yinjimmy ccdf723d20 Optimize OutDir and IntDir for libsimulator 2015-01-15 14:39:56 +08:00
yinjimmy f652e1359a 1. Compatible vs2012 for libsimulator 
2. Adjust output directory for simulator
 2015-01-15 11:10:32 +08:00
minggo 825f90564c Merge pull request #9992 from samuele3hu/v3_4_issue9986 
issue #9986:Add lua bindings for Component and related test cases
 2015-01-14 17:05:51 +08:00
samuele3hu 77912270f9 issue #9986:Add lua bindings for Component and related test cases 2015-01-14 16:58:35 +08:00
yinjimmy f2ab171fab Merge branch 'v3' into combine 2015-01-14 16:38:06 +08:00
samuele3hu 951324a230 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_4_issue9820 
Conflicts:
	cocos/scripting/lua-bindings/manual/3d/lua_cocos2dx_3d_manual.cpp
 2015-01-14 13:58:12 +08:00
samuele3hu 1d5350e648 Update bindings-generator submodule 2015-01-14 13:51:33 +08:00
samuele3hu 1d94ae4302 issue #9820:Inconsistent :setBlendFunc(...) function binding for Sprite and LabelBMFont classes 2015-01-14 13:51:09 +08:00
yinjimmy 532be9fb20 Fix compile error on windows 2015-01-13 19:22:11 +08:00
yinjimmy dc019defc1 Merge branch 'v3' into combine 2015-01-13 18:32:32 +08:00
zhangbin 9766e9f748 Update the reference of submodule cocos2d-console. 2015-01-13 11:16:54 +08:00
yinjimmy cf331c3abd update lua-template-default 2015-01-12 23:42:37 +08:00
yinjimmy 43c4f563d8 enable debug for iOS / Android platform 2015-01-12 22:59:46 +08:00
yinjimmy e700d47dbd Fix compile error on Windows 2015-01-12 20:55:36 +08:00
yinjimmy 0978a88b7f Merge branch 'v3' into combine 
Conflicts:
	templates/lua-template-default/frameworks/runtime-src/proj.android/jni/Android.mk
	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
	templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj
	templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp
	templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
	tools/simulator/frameworks/runtime-src/proj.android/jni/Android.mk
	tools/simulator/frameworks/runtime-src/proj.win32/simulator.vcxproj
 2015-01-12 17:54:58 +08:00
yinjimmy 53cc07a2f6 Add setEventTrackingEnable for event tracking 2015-01-12 15:18:30 +08:00
yinjimmy dea3cf9863 move runtime source to libsimulator project 2015-01-12 12:52:44 +08:00
zhangbin 489dc2da16 Update the reference of submodule cocos2d-console. 2015-01-12 10:27:14 +08:00
yinjimmy e309dd69b1 add missing files 2015-01-09 11:33:24 +08:00
yinjimmy d2a3a6a8c0 merge lua-template-default with lua-template-runtime 2015-01-09 04:08:41 +08:00
yinjimmy 650b398419 move files 2015-01-08 21:12:44 +08:00
yinjimmy 82f37fcf72 add libsimulator 2015-01-08 14:10:28 +08:00
yinjimmy dee536def2 support win32 2015-01-08 13:36:59 +08:00
yinjimmy 197ab05a99 cleanup 2015-01-08 08:56:31 +08:00
yinjimmy f1f4e5f3c2 support android 2015-01-07 22:19:46 +08:00
yinjimmy 4fee8a5926 support iOS 2015-01-07 22:18:27 +08:00
yinjimmy 9122e15f2c move simulator 2015-01-07 17:50:15 +08:00
zhangbin d80830c264 Update the reference of submodule cocos2d-console. 2015-01-07 17:48:10 +08:00
minggo fbf565fd59 Merge pull request #9798 from samuele3hu/v3_4_packagesize 
issue #9796: Extract related physical auto-binding codes to manual-binding to add `CC_USE_PHYSICS` limit
 2015-01-07 11:14:22 +08:00
zhangbin 1837b083f7 Update the reference of submodule cocos2d-console. 2015-01-06 18:13:48 +08:00
samuele3hu 58d946b578 issue #9796: Extract related physical auto-binding codes to manual-binding to add `CC_USE_PHYSICS` limit 2015-01-05 17:10:25 +08:00
zhangbin 6adedee781 Update the reference of submodule cocos2d-console. 2014-12-31 14:55:14 +08:00
zhangbin 98e24b1cdc Update the reference of submodule cocos2d-console. 2014-12-30 16:28:23 +08:00
minggo 3c1978fcc3 Merge pull request #9611 from super626/quaternion 
Rotation With Quaternion
 2014-12-30 10:09:08 +08:00
yangxiao de7b70f63e skip Node::set/getRotationQuat 2014-12-25 14:55:43 +08:00
minggo 6487cebead [ci skip]Don't notify because we don't use travis now. 2014-12-25 14:28:27 +08:00
youyou f678d1027c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
 2014-12-25 12:09:31 +08:00
andyque 78e3f92d5c add generate_docs.sh to tools 2014-12-24 16:40:14 +08:00
kaile.yin 9ef5d8213e update submodule 2014-12-22 14:07:00 +08:00
zhangbin f7a6472748 Update the reference of submodule cocos2d-console. 2014-12-16 17:19:06 +08:00
kaile.yin cb509aa69f Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-12-09 13:33:39 +08:00
zhangbin 72f88a9790 Update the reference of submodule cocos2d-console. 2014-12-08 16:43:44 +08:00
kaile.yin 17bd5bf31e update submodule 2014-12-05 20:27:10 +08:00
kaile.yin 1db2bf89e0 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-12-05 14:42:25 +08:00
minggo c217040f61 Merge pull request #9326 from samuele3hu/v3_fi_bindings 
Add support to clang3.4 because of using the ndk-r10c and update bindings-generator submodule
 2014-12-04 15:14:02 +08:00
zhangbin 79a7ca6516 Update the reference of submodule cocos2d-console. 2014-12-03 16:40:42 +08:00
kaile.yin 9d49f82eb9 Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3 
Conflicts:
	tools/tolua/cocos2dx.ini
 2014-12-03 16:00:32 +08:00
zhangbin 16df08679c Update the reference of submodule cocos2d-console. 2014-12-03 11:54:59 +08:00
samuele3hu ef16a460e6 Update bindings-generator submodule 2014-12-01 11:16:40 +08:00
samuele3hu 9900ccba4d Add support to clang3.4 because of using the ndk-r10c 2014-12-01 11:15:56 +08:00
Dhilan007 6603d7183a Update the reference of submodule cocos2d-console 2014-11-28 13:41:52 +08:00
Ricardo Quesada 2362ea372c new console version 2014-11-27 11:34:43 -08:00
Ricardo Quesada ab8838f0c0 New cocos2d-console version 2014-11-27 10:48:19 -08:00
zhangbin fade3dc61f Update the reference of submodule cocos2d-console. 2014-11-27 20:37:18 +08:00
samuele3hu 6cf092b855 Add cocos2dx_csloader.ini to generate the related lua bindings 2014-11-27 10:22:39 +08:00
samuele3hu 222f2cbd51 Decrease the package size of lua_empty_test 2014-11-26 21:54:18 +08:00
samuele3hu aa4277ed72 Update the bindings-generator submodule 2014-11-26 18:20:22 +08:00
youyou 07457a34b5 update lua ini files 2014-11-26 15:56:51 +08:00
andyque b70ddc7a14 add exception guard to db operation 2014-11-26 09:52:27 +08:00
samuele3hu a62fa8de58 Skip binding nodeWithFlatBuffers of CSLoader for lua 2014-11-24 23:36:44 +08:00
Ricardo Quesada 59461439ad Updates console 2014-11-20 17:55:59 -08:00
James Chen d6ee9525bd Merge pull request #9139 from nilium/v3-plugin-libjars-unignore 
Unignore libs dir and fix Travis script to descend into included directories. (follows #9108)
 2014-11-21 09:35:01 +08:00
Ricardo Quesada 04510c39fa Uses new version of cocos2d-console 2014-11-19 12:25:50 -08:00
zhangbin 5aff5640b5 Solve the error when building android for sample projects of engine. 
1. Update the project config.
2. Update the submodule cocos2d-console.
 2014-11-18 18:39:53 +08:00
Noel Cower 41027463c9 Descend into included directories to check for file inclusion. 
Only applies to directories that are marked as unignored, since the
travis script has the odd problem of not descending into those
directories and, as a result, not recording the files in them.

I'm assuming the failure to descend into included directories is
unintended.
 2014-11-17 08:45:30 -08:00
Noel Cower 590975d08d Also un-ignore libs dir under plugins. 
The configure script isn't smart enough to check if there are
un-ignored files in a directory, so this fixes that.
 2014-11-17 08:26:23 -08:00
zhangbin 365e09e5db Merge branch 'v3' into support-wp8 2014-11-17 16:01:12 +08:00
zhangbin 534570075b Update the reference of submodule cocos2d-console. 2014-11-17 15:57:49 +08:00
Noel Cower fbdf0201c6 Permit plugin-x plugins to ship third-party libraries. 
Ignoring the libs directory's .jar files is strange. I'm not sure
whoever put the total block over libs/ knew that this is the standard
Android library directory and not just for NDK-compiled assets.

More granular ignores over libs/ contents would be better in the
future, but this fixes the odd sdk/ directory hack plugins currently
use and lets the Android build system auto-link libraries that're
shipped with plugins instead of forcing Cocos developers to manually
sift through a plugin's Android dependencies and include them by hand.
 2014-11-13 09:20:09 -08:00
yangxiao 4d74e7f19f skip getMeshArrayByName 2014-10-29 10:38:13 +08:00
samuele3hu 042969ce35 Remove some useless rename functions in the cocos2dx.ini and cocos2dx_studio.ini 2014-10-20 16:14:24 +08:00
minggo 8218804c52 Merge pull request #8820 from Dhilan007/v3-audioengine-lua 
[LUA]Add New AudioEngine on window
 2014-10-18 15:11:29 +08:00
samuele3hu 3348f8300e Add lua-bindings for AmbientLight,BaseLight,DirectionLight,PointLight,SpotLight and related test case 2014-10-18 00:13:22 +08:00
Dhilan007 81a8e80496 [LUA]Add New AudioEngine on window 2014-10-17 17:53:33 +08:00
samuele3hu 936510411b Rename addSpriteFramesWithFile->addSpriteFrames for SpriteFrameCache 2014-10-17 15:04:16 +08:00
samuele3hu 4593b55e1a Update bindings-generator submodule 2014-10-17 14:32:24 +08:00
samuele3hu dd2ad66e41 Update bindings-generator submodule 2014-10-17 14:23:58 +08:00
samuele3hu 7198ae509c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-10-16 20:35:43 +08:00
samuele3hu 079df20541 Update lua bindings for Spine and related test case 2014-10-16 20:23:58 +08:00
Huabing.Xu 644aa19b2d Merge branch 'v3' into v3_updateSpine 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-10-16 16:48:16 +08:00
samuele3hu 8b5f6ae52a Merge branch 'v3_updateSpine' of https://github.com/dabingnn/cocos2d-x into v3_new_spine 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-10-16 16:04:09 +08:00
samuele3hu b4c91f0712 Update the related cocosstudio lua test cases 2014-10-16 15:51:01 +08:00
samuele3hu 3f667fac85 Update the related AssetsManagerEx files and related project configure 2014-10-16 10:28:52 +08:00
Huabing.Xu c12f88d63c lua compiles ok－need to make it works later 2014-10-15 17:33:58 +08:00
samuele3hu a0c8ffb943 Modify Xcode project’s configure 2014-10-15 14:32:11 +08:00
samuele3hu 064e159c70 Merge branch 'v3_testMerge' of https://github.com/pandamicro/cocos2d-x into v3_assetsmanager 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/platform/CCFileUtils.cpp
	tests/lua-tests/project/CMakeLists.txt
	tests/lua-tests/project/Classes/AppDelegate.cpp
	tests/lua-tests/project/proj.android/jni/Android.mk
	tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj
 2014-10-15 13:41:27 +08: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
andyque bd37d62026 fix sql syntax error 2014-10-15 01:04:00 +08:00
samuele3hu 4a67963420 Update CSLoader lua-bindings and adjust project config 2014-10-14 23:37:00 +08:00
minggo 19d408748c Merge pull request #8687 from andyque/fixJenkinSqlTableName 
fix jenkins sql table name
 2014-10-14 20:09:30 +08:00
andyque 9e538fce48 fix jenkins sql table name 2014-10-14 17:31:53 +08:00
zhangbin 131c60fd20 Update the reference of submodule cocos2d-console. 2014-10-14 16:29:49 +08:00
andyque 8a6b78c510 fix lua bindings 2014-10-14 11:24:45 +08:00
pipu b732ce378e Merge branch 'v3_pipu_protocol_buffers' into merge_test 
Conflicts:
	cocos/ui/UIScale9Sprite.cpp
 2014-10-11 11:08:46 +08:00
minggo d5658a69d5 Merge pull request #8621 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-10-10 16:31:01 +08:00
zhangbin 72ebd715b3 Update the reference of submodule cocos2d-console. 2014-10-10 16:28:03 +08:00
pipu d699b5809b Modifying libprotocolbuf.a as protocolbuffer.a 2014-10-10 12:52:42 +08:00
samuele3hu f97a7ae52d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D 2014-10-10 09:52:29 +08:00
samuele3hu 115d81574c Add CameraTest、OBBTest and related lua bindings 2014-10-10 09:49:25 +08:00
pandamicro a26e91f839 no message 2014-10-09 18:30:39 +08:00
zhangbin bce62aef82 Update the reference of submodule cocos2d-console. 2014-10-08 15:53:01 +08:00
yangxiao d680e58f80 merge cocos resolve conflict 2014-09-30 08:32:37 +08:00
samuele3hu 6ea43a60b0 Update cocos2dx.ini to skip Node::setAdditionalTransform 2014-09-29 10:19:32 +08:00
samuele3hu f00187d3bb Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D 
Conflicts:
	tools/tolua/cocos2dx.ini
 2014-09-29 09:48:35 +08:00
samuele3hu 99e1c6640e Add BillBoardTest and update related bindings files 2014-09-29 09:43:22 +08:00
samuele3hu 6b2acf88fc Modify CameraTest and update related lua-bindings files 2014-09-28 16:47:06 +08:00
samuele3hu e50eaf684f Add CameraTest and update related lua-bindings files 2014-09-28 14:31:58 +08:00
yangxiao 75e5ca30ee merge cocos 2014-09-28 09:55:31 +08:00
samuele3hu 2ac96ed06e Fix the lua-tests compile error and some bugs in the NewAudioEngineTest and update cocos2dx_audioengine.ini to support macro_judgement 2014-09-26 16:39:54 +08:00
samuele3hu 691074eb7c Add Camra3DTest and update sprite3DTest 2014-09-26 16:00:57 +08:00
yangxiao 98d9cea774 merge cocos 2014-09-26 15:14:57 +08:00
yangxiao d69b6558c4 lua 2014-09-26 15:07:23 +08:00
Hong Liang 1c71234921 export lua function "cc.Device::getDPI()" 2014-09-26 11:52:52 +08:00
samuele3hu 2cc48d1f81 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D 2014-09-25 10:40:31 +08:00
andyque a158b79fb6 add more prompt to debug 2014-09-24 12:57:47 +08:00
andyque d066d02be5 add downloading prompt 2014-09-24 12:53:30 +08:00
andyque f8a05c9e1e recheck download.py 2014-09-24 12:42:53 +08:00
andyque 0267712531 uncomment 3rd part bins check 2014-09-23 10:55:34 +08:00
samuele3hu f0608a6d70 Update lua bindings for Mesh and add a Sprite3DHitTest 2014-09-22 15:29:38 +08:00