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

31953 Commits

Author SHA1 Message Date
Vincent Yang 57943b41b1 Fixed #12145 : formarRenderers in RichText doesn’t update container size. 2015-07-23 14:59:24 +08:00
pandamicro 739befdc08 Add audio engine bindings in JSB 2015-07-23 14:43:01 +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 3c3a5a6057 Merge pull request #12971 from yangws/issue_12918 
[ci skip] Fixed #12918 : TMXXMLParser.cpp -- In the function getRectForGID have…
 2015-07-23 11:22:57 +08:00
Vincent Yang 19c8f337da Fixed #12918 : TMXXMLParser.cpp -- In the function getRectForGID have small errors 2015-07-23 11:01:51 +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
Ricardo Quesada d6dc1e3e7a Merge pull request #12964 from ricardoquesada/bug12847_improved 
improves the test to reproduce bug 12847
 2015-07-22 16:26:08 -07:00
Ricardo Quesada d0ec24679b Merge branch 'v3' into spine-2.3 2015-07-22 15:10:39 -07:00
Ricardo Quesada b2b9bad83d improves the test to reproduce bug 12847 2015-07-22 15:08:36 -07:00
pandamicro 50fb53fbbc Merge pull request #12956 from liamcindy/SkyBox_3.7.1 
update resource index
 2015-07-22 22:24:41 +08:00
pandamicro eb7d991fad Merge pull request #12957 from CocosRobot/update_cocosfiles_1437553156 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-07-22 22:24:23 +08:00
Martell Malone 9d7598dad2 fix building with system prebuilt libs 2015-07-22 14:19:22 +01: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
CocosRobot ac9d65f3f7 [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-22 08:19:17 +00:00
pandamicro 6029ca3edd Merge pull request #12949 from yangws/issue_12906 
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
 2015-07-22 16:17:14 +08:00
Liam 99c1c33c61 update resource 2015-07-22 15:56:35 +08:00
pandamicro 741163db40 Merge pull request #12938 from WenhaiLin/v3.8-deps70 
Update deps for support FullType.
 2015-07-22 15:42:13 +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
子龙山人 bb9500769f Merge pull request #12885 from zilongshanren/add-jumpToPage-api 
Fix PageView scrollToPage bug and the curPageIndex bug
 2015-07-22 15:01:57 +08:00
pandamicro dbaf00bca6 Merge pull request #12950 from fusijie/add_texturecoord_bug_test 
add sprite frame flash line bug test case.
 2015-07-22 14:32:26 +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
fusijie 92e68cd9dc add sprite frame flash line bug test case. 2015-07-22 13:42:10 +08:00
pandamicro e5b4d80911 Merge pull request #12937 from ZhangMenghe/setClearColor 
[ci skip]Re-pull setClearColor Testcase #12797
 2015-07-22 12:39:29 +08:00
Vincent Yang 3addf38134 Fixed #12906 : Can't add custom member to cocos2d::Scene subclass. 2015-07-22 12:01:34 +08:00
ZhangMenghe 8689025c5d Modify background in index of js-template-runtime 2015-07-22 11:44:22 +08:00
ZhangMenghe b6c566d87e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into setClearColor 2015-07-22 11:40:30 +08:00
子龙山人 8a8a089ad6 Merge pull request #12947 from zilongshanren/updateCcs-res-submodule 
[ci skip]update ccs-res submodule
 2015-07-22 10:46:02 +08:00
pandamicro f0962669a9 Merge pull request #12946 from pandamicro/v3 
[ci skip] Gen bindings for v3.7.1 branch
 2015-07-22 10:45:23 +08:00
andyque fbfb3a9dac update ccs-res submodule 2015-07-22 10:45:18 +08:00
pandamicro 9b11e32252 Gen bindings for v3.7.1 branch 2015-07-22 10:41:04 +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 c260783fd0 [JS] Revert const to var to avoid issues on web compilation 2015-07-21 18:23:57 +08:00
WenhaiLin 979a9be1f5 Add test case for test font supported by FullType. 2015-07-21 17:09:27 +08:00
WenhaiLin d0d481fd67 updated version to v3-deps-70 2015-07-21 16:43:47 +08:00
pandamicro 4153806c26 Merge pull request #12934 from CocosRobot/update_lua_bindings_1437453283 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-21 16:22:36 +08:00
ZhangMenghe 2e72179b91 Remove a space 2015-07-21 15:22:03 +08:00
ZhangMenghe 94aa382669 Add testCase for setClearColor 2015-07-21 15:18:19 +08:00
ZhangMenghe 61e36463cc Modify a space 2015-07-21 14:00:59 +08:00
ZhangMenghe 3c2d68e25c Modify the testcase with coding standards 2015-07-21 13:48:08 +08:00
pandamicro d478c5f8a8 Merge pull request #12923 from ZhangMenghe/ModifytestCase 
Modify testCase for UITextFieldTest
 2015-07-21 12:53:26 +08:00
CocosRobot 6630157377 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-21 04:40:43 +00:00
pandamicro 8412d19a8b Merge pull request #12933 from pandamicro/v3 
Sync Cocos2d-x v3.7
 2015-07-21 12:31:03 +08:00