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

2113 Commits

Author SHA1 Message Date
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 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
pandamicro f48dae09db Bind UIScrollViewBar 2015-07-29 00:11:52 +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
zhangbin e73fc94345 Remove the unused files in tools/gen-prebuilt. 2015-07-27 11:38:41 +08:00
pandamicro 739befdc08 Add audio engine bindings in JSB 2015-07-23 14:43:01 +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
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