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

23 Commits

Author SHA1 Message Date
pandamicro c0066f9afd Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into audioengine 2015-07-30 20:25:57 +08:00
jianglong0156 a1a9e281a3 add conversion cpp file into iOS project (reverted from commit 439bc8a99f) 2015-07-30 14:37:58 +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 ca54340982 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-07-28 13:00:10 +08:00
jianglong0156 439bc8a99f add conversion cpp file into iOS project 2015-07-28 10:48:18 +08:00
Ricardo Quesada 2deb492d36 compiles and runs on Xcode 7 2015-07-23 14:28:23 -07: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 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 d0db3aee98 Remove the plugin-x related files from the Xcode project of js-bindings . 2015-06-30 17:28:47 +08:00
jianglong0156 185b4419be merge job project into cocos2d-x project 2015-06-30 13:49:24 +08:00
pandamicro a94b49bdef Add nav mesh bindings 2015-06-17 23:41:12 +08:00
pandamicro 852b9b42b9 Remove jsb_cocos2dx_experimental_manual 2015-06-15 10:46:57 +08:00
pandamicro df1219c92d Update manual conversion for sprite polygon 2015-06-12 12:56:37 +08:00
江龙 a8b640f751 add videoplayer project 2015-06-02 09:04:15 +08:00
jianglong0156 ab124978aa web view can not run in mac, remove it from project file 2015-05-28 14:46:29 +08:00
jianglong0156 2dd7b9575b iOS project add web view project 2015-05-27 17:53:50 +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
joshuastray 1366f615dd mac && ios works 2015-05-22 10:43:37 +08:00
joshuastray ead74ac89e add CC_ENABLE_BULLET_INTEGRATION=1 to js project 2015-05-17 23:11:17 +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
zhangbin b4f2d94109 Update js bindings & js tests. 2015-05-05 10:50:19 +08:00