Commit Graph

12 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 73125f46d2 add file in project file with android, linux wp8.1 (reverted from commit 948628b800) 2015-07-30 14:38:20 +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
jianglong0156 948628b800 add file in project file with android, linux wp8.1 2015-07-28 10:26:45 +08:00
pandamicro 739befdc08 Add audio engine bindings in JSB 2015-07-23 14:43:01 +08:00
pandamicro f405d00336 Fix linux compilation 2015-06-19 01:14:16 +08:00
江龙 8fc5835dee modify linux file 2015-06-18 23:29:04 +08:00
pandamicro e4d5db30eb Remove jsb_cocos2dx_experimental in projects to fix compilation issue 2015-06-16 15:09:06 +08:00
pandamicro 852b9b42b9 Remove jsb_cocos2dx_experimental_manual 2015-06-15 10:46:57 +08:00
joshuastray 83237b8dbd add physics3d js manual binding and tests 2015-05-21 18:05:49 +08:00
joshuastray 7a4ca3fe6a add new files to project 2015-05-12 10:40:51 +08:00
zhangbin b4f2d94109 Update js bindings & js tests. 2015-05-05 10:50:19 +08:00