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

30956 Commits

Author SHA1 Message Date
pandamicro 29b9ed685f Add BoneNode/SkeletonNode/SkinNode JS bindings 2015-07-24 15:48:34 +08:00
VisualSj 64d247d91b Issue #12997: Add JS test case (ccs.BoneNode) 2015-07-24 15:45:19 +08:00
pandamicro 46faaa1ad9 Merge pull request #12973 from geron-cn/3.7.1 
bonenode for actiontimeline
 2015-07-24 14:54:24 +08:00
geron-cn 4327e4a532 remove include SkinNode.h in cpp 2015-07-24 12:31:45 +08:00
geron-cn 0b09fd5bcb Merge branch 'v3.7.1' of github.com:cocos2d/cocos2d-x into 3.7.1 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.h
 2015-07-24 11:38:09 +08:00
Vincent Yang e4a8aeee45 Fixed #12962 : Scene can't have std::vector member. 2015-07-24 11:16:45 +08:00
pandamicro 5ffa8efee6 Merge pull request #12977 from chengstory/OptimizationExtensionData 
Optimization extension data
 2015-07-24 11:01:56 +08:00
geron-cn 3341fa0f85 fix the vars' initialize in construct func, and remove using namespace 2015-07-24 10:28:10 +08:00
zhangcheng be08de6780 Update libcocos2d_8.1 vs project. 2015-07-24 09:32:39 +08:00
zhangcheng ef6ada5bf4 Fix cocos2dx_studio.ini format error. 2015-07-24 09:28:55 +08:00
pandamicro 4c47dc4022 Merge pull request #12989 from MSOpenTech/v3.7.1-win10-fix 
V3.7.1 win10 fix
 2015-07-24 09:19:54 +08:00
Dale Stammen 13149a0bc5 updated version to 3.7.1 2015-07-23 13:26:32 -07:00
Dale Stammen c3935b921c updated version to 3.7.1 2015-07-23 13:02:42 -07:00
geron-cn 1389fc3d31 some doxygen comments and copyright 2015-07-24 01:30:34 +08:00
pandamicro 88de73b12d Merge pull request #12976 from martell/v3.7.1 
fix building with system prebuilt libs
 2015-07-23 21:15:41 +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
cheng.zhang fca771955f Merge pull request #157 from pandamicro/test_chen 
Fix jsb issue for refactor ObjectExtensionData to ComExtensionData
 2015-07-23 18:02:26 +08:00
pandamicro a15212dc76 Fix indent 2015-07-23 18:00:23 +08:00
pandamicro ae2a966458 Fix jsb issue for refactor ObjectExtensionData to ComExtensionData 2015-07-23 17:49:32 +08:00
gero 2037616a2d Merge pull request #4 from fusijie/3.7.1 
fix compile on iOS/Android/Linux/Win8Universal.
 2015-07-23 17:46:28 +08:00
geron-cn 4d58aa2668 remove setcontentsize in skeletonnode 2015-07-23 17:41:37 +08:00
fusijie e9cbb6b084 fix compile on iOS/Android/Linux/Win8Universal. 2015-07-23 17:32:52 +08:00
zhangcheng caf27c4bc0 Merge branch 'OptimizationExtensionData' of https://github.com/chengstory/cocos2d-x into OptimizationExtensionData 2015-07-23 17:06:31 +08:00
zhangcheng 012053e163 replace space to tab. 2015-07-23 17:04:08 +08:00
zhangcheng 16825a0ad3 1， add CCComExtensionData.h CCComExtensionData.cpp to project.pbxproj 2015-07-23 16:39:37 +08:00
zhangcheng 4b8248c015 Optimization of Custom Data. 
replace ComExtensionData to ObjectExtensionData.
 2015-07-23 16:30:23 +08:00
Martell Malone 3e0ada4c84 fix building with system prebuilt libs 2015-07-23 09:12:00 +01:00
geron-cn 7255b5308b config for mac 2015-07-23 15:13:14 +08:00
geron-cn d46c8c6802 add lack file 2015-07-23 15:12:09 +08:00
geron-cn 16ee74b845 add bonenode to CocoStudio.h 2015-07-23 13:34:11 +08:00
geron-cn 915cefa208 bone node 2015-07-23 11:51:49 +08:00
pandamicro 5b8371aaa2 Merge pull request #12958 from VisualSJ/v3.7.1-bindCallback 
[ci skip] Parse Touch/Click callback in JS Studio parser
 2015-07-23 09:30:40 +08:00
pandamicro 50fb53fbbc Merge pull request #12956 from liamcindy/SkyBox_3.7.1 
update resource index
 2015-07-22 22:24:41 +08:00
VisualSj d4900493e2 JS Studio parser (Modify callback method) 2015-07-22 17:56:35 +08:00
VisualSj b282d75346 Parse Touch/Click callback in JS Studio parser 2015-07-22 16:51:44 +08:00
Liam 99c1c33c61 update resource 2015-07-22 15:56:35 +08:00
pandamicro e0e5ae9d99 Merge pull request #12924 from liamcindy/SkyBox_3.7.1 
update for Game3DNodeReader & UserCameraReader
 2015-07-22 15:34:18 +08:00
pandamicro e097dca997 Merge pull request #12954 from VisualSJ/v3.7.1-transform-2 
[ci skip] Add cc.affineTransformConcatIn
 2015-07-22 15:33:31 +08:00
VisualSj 1496224c6d Add cc.affineTransformConcatIn 2015-07-22 15:21:13 +08:00
Liam d8155a20ae update for code format 2015-07-22 14:11:20 +08:00
pandamicro 4873995867 Merge pull request #12951 from natural-law/v3.7.1 
[ci skip] Solve the error in Xcode project of simulator.
 2015-07-22 13:47:00 +08:00
Bin Zhang 0a6186d68f Solve the error in Xcode project of simulator. 2015-07-22 13:44:34 +08:00
pandamicro 78314eca35 Merge pull request #12945 from xiaofeng11/v3.7.1 
Synchronize skybox parser with C++ version
 2015-07-22 10:36:07 +08:00
XiaoFeng fcd7388936 Synchronize skybox parser with C++ version 2015-07-22 09:45:35 +08:00
pandamicro 25dff88ff4 Merge pull request #12922 from xiaofeng11/v3.7-release 
[ci skip]Add Skybox parser to js
 2015-07-22 09:12:38 +08:00
pandamicro 00e3641700 Merge pull request #12932 from cocos2d/v3.7-release 
Merge v3.7 release
 2015-07-21 11:08:32 +08:00
pandamicro 55840b4561 Merge pull request #12930 from pandamicro/v3.7-release 
[ci skip] Update release docs for v3.7
 2015-07-21 09:50:32 +08:00
pandamicro f98e9495fe Update release docs for v3.7 2015-07-21 09:49:41 +08:00