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

2150 Commits

Author SHA1 Message Date
zhangbin f91908d651 Add copy resources config of js-tests for web platform. 2015-08-10 12:00:53 +08:00
zhangbin cf3f5ab26c Update the reference of submodule cocos2d-console. 2015-08-07 15:56:52 +08:00
zhangbin 91b2191988 Move the framework-compile tools into cocos2d-console. 2015-08-05 17:54:32 +08:00
pandamicro a06421b753 Merge pull request #13196 from chengstory/UpdateSimulator 
Node, Skeleton needs to show at the middle of the simulator.
 2015-08-04 17:00:25 +08:00
zhangcheng 613a6f48a9 Node, Skeleton needs to show at the middle of the simulator. 2015-08-04 15:41:12 +08:00
zhangbin d11605aa37 Update the reference of submodule cocos2d-console. 2015-08-04 14:35:56 +08:00
pandamicro 3c2e66e425 Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3 
# Conflicts:
#	.travis.yml
#	build/cocos2d_js_tests.xcodeproj/project.pbxproj
#	build/cocos2d_tests.xcodeproj/project.pbxproj
#	cocos/2d/CCFont.h
#	cocos/2d/CCFontAtlas.cpp
#	cocos/2d/CCFontAtlas.h
#	cocos/2d/CCFontFreeType.cpp
#	cocos/2d/CCFontFreeType.h
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
#	cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
#	cocos/cocos2d.cpp
#	cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
#	templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
#	templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
#	templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
#	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
#	tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
#	tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
#	tools/bindings-generator
#	tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
#	tools/travis-scripts/generate-bindings.sh
#	tools/travis-scripts/generate-cocosfiles.sh
#	tools/travis-scripts/travis_mac.yml
 2015-08-02 22:28:27 +08:00
pandamicro 46bb4f8aae Merge pull request #13149 from jianglong0156/constructedWith3D_3#12404 
Constructed with3d
 2015-08-01 21:15:08 +08:00
jianglong0156 09c3da3247 skip init funciton in lua physics3d.ini 2015-08-01 18:30:06 +08:00
pandamicro 00a3d572d1 Merge pull request #12899 from super626/v3 
Animate3D Callback and Bug fix
 2015-08-01 18:24:05 +08:00
jianglong0156 bcec599993 Merge branch 'v3' into constructedWith3D_3#12404 2015-08-01 15:38:26 +08:00
pandamicro d52a5da1d8 Merge pull request #13114 from jianglong0156/constructedWith3D_2#12404 
Constructed with3d
 2015-08-01 10:09:08 +08:00
jianglong0156 80e812e5a0 add Physics3DShape support constructor 2015-07-31 18:17:35 +08:00
pandamicro 3fa016a280 Fix win32 project and add winrt support 2015-07-30 23:39:52 +08:00
pandamicro 537927c34b Tiny improvement for bindings generator 2015-07-30 20:52:21 +08:00
pandamicro c0066f9afd Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into audioengine 2015-07-30 20:25:57 +08:00
pandamicro cf806913e3 Auto bind public members of AudioProfil 2015-07-30 20:19:53 +08:00
pandamicro 8542f8a7a9 Merge pull request #13067 from pandamicro/scrollviewbar 
Bind UIScrollViewBar
 2015-07-30 18:42:08 +08:00
zhangbin 77b3facd7c Support generate prebuilt libs of engine with debug mode. 2015-07-30 18:27:20 +08:00
pandamicro 507a094653 Merge pull request #13108 from jianglong0156/constructedWith3D#12404 
improve jsval_to_physics3DRigidBodyDes
 2015-07-30 17:58:16 +08:00
jianglong0156 b016b642ce add Terrain support constructor 2015-07-30 17:17:57 +08:00
jianglong0156 3496fe896d improve the rigidbody conversion function 2015-07-30 14:26:28 +08:00
pandamicro 89b266d8b5 Auto binding for ctor function support parameter 2015-07-30 12:46:12 +08:00
pandamicro f53ba42b3b Fix test issues and Add audio engine to js templates 2015-07-29 21:22:44 +08:00
pandamicro 9972bfb98c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into audioengine 
# Conflicts:
#	tests/js-tests/src/NativeTest/NativeTest.js
 2015-07-29 21:01:56 +08:00
pandamicro da4e062614 Add js wrapper for audio engine 2015-07-29 20:47:28 +08:00
zhangbin c8ff43133f Move web folder from js template folder to engine folder in Cocos Framework. 2015-07-29 17:22:26 +08:00
子龙山人 96d44e1078 Merge pull request #13076 from WenhaiLin/v3.8-label-gb2312 
Label:support font that contains GB2312 char map.
 2015-07-29 14:51:17 +08:00
Wenhai Lin 70628c9dec Fixed link errors on iOS/Mac 2015-07-29 13:59:58 +08:00
pandamicro 3089ac302e Refine ui bindings and JS constants 2015-07-29 13:06:49 +08:00
pandamicro 81842417c4 Merge pull request #13032 from xiaofeng11/v3 
Fix issue https://github.com/cocos2d/cocos2d-x/issues/12968
 2015-07-29 09:54:43 +08:00
dualface d9c5600f41 Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3.7.1 2015-07-29 09:17:53 +08:00
pandamicro f48dae09db Bind UIScrollViewBar 2015-07-29 00:11:52 +08:00
zhangbin 8bc96a10b4 Update the reference of submodule cocos2d-console. 2015-07-28 15:06:28 +08:00
pandamicro ca54340982 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-07-28 13:00:10 +08:00
jianglong0156 d5a6522a37 Merge branch 'v3' into constructedWith3D#12404 2015-07-28 09:59:35 +08:00
XiaoFeng 09d9fcf4d6 Fix lua binding 2015-07-27 21:24:52 +08:00
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