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

2213 Commits

Author SHA1 Message Date
jianglong0156 cb2b427eed add Physics3DRigidBodyDes support new , add new file jsb_cocos2dx_3d_conversions.h and jsb_cocos2dx_3d_conversions.cpp 2015-07-27 18:19:10 +08:00
XiaoFeng e0aef73306 Fix lua binding 2015-07-27 17:31:09 +08:00
XiaoFeng 63f8b941c9 Fix setting file 2015-07-27 16:03:05 +08:00
XiaoFeng 8421ff7149 Disable new function bind to lua to avoid compile error 2015-07-27 15:09:34 +08:00
dualface 6d16d1674d Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3.7.1 2015-07-27 11:50:14 +08:00
zhangbin e73fc94345 Remove the unused files in tools/gen-prebuilt. 2015-07-27 11:38:41 +08:00
pandamicro 632b36fa43 Fix bindings generator for Lua 2015-07-27 10:21:18 +08:00
pandamicro 08e3d8d533 Gen bindings for BoneNode and SkeletonNode 2015-07-27 09:56:55 +08:00
dualface 4c7e4c654a update cocos2dx.ini for luabinding 2015-07-26 17:16:50 +08:00
pandamicro a2a32ef58c Release docs for v3.7.1 2015-07-25 15:16:39 +08:00
pandamicro 93c1cb70c4 Gen bindings and cocos2dx_files for v3.7.1 2015-07-25 13:31:52 +08:00
pandamicro c1bc03b342 Gen bindings for v3.7.1 2015-07-25 13:28:02 +08:00
pandamicro fa46a0abb4 Merge pull request #12992 from yangws/v3.7.1 
Fixed #12962 : Scene can't have std::vector member.
 2015-07-25 09:52:00 +08:00
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