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

31374 Commits

Author SHA1 Message Date
pandamicro 9615545e11 Merge pull request #12890 from jianglong0156/FileUtilsJSB 
[ci skip]add fileUtils writeString,writeValueMap,writeValueVector in jsb
 2015-07-25 14:16:14 +08:00
jianglong0156 c14ca98203 set file name to label.change the file dir 2015-07-25 14:04:41 +08:00
pandamicro 7ae3dd12a1 Merge pull request #12995 from fusijie/fix_12505 
fix blur shader compliant on win8 universal.
 2015-07-25 12:42:35 +08:00
Ricardo Quesada 2d04e995d7 Merge pull request #13007 from ricardoquesada/cocos2d_version 
updates cocos2d version
 2015-07-24 15:53:51 -07:00
Ricardo Quesada 76982dac89 updates cocos2d version 2015-07-24 15:53:18 -07:00
WenhaiLin a1e682ca65 Improves the test to reproduce issue 12996 2015-07-24 21:34:59 +08:00
WenhaiLin b1bd8338aa Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8-label-gb2312 2015-07-24 21:30:28 +08:00
fusijie 647848e843 fix blur sprite shader on win8 universal. 2015-07-24 21:04:44 +08:00
pandamicro a256df68c1 Merge pull request #13000 from yangws/v3 
Fix bug: app will crash if move mouse over window when launching.
 2015-07-24 20:11:25 +08:00
WenhaiLin 37a174ee4a Label:refine the implementation about text layout and support debug draw 2015-07-24 18:38:45 +08:00
Vincent Yang 20fe1fb1a8 Fix bug: app will crash if move mouse over window when launching. 2015-07-24 16:41:03 +08:00
yangxiao 92ec9ab5f2 add config loaded event 2015-07-24 16:38:30 +08:00
fusijie bd0a57242b refine blur shader test case. 2015-07-24 13:52:40 +08:00
fusijie d550dace35 fix blur shader compliant on win8 universal. 2015-07-24 12:47:38 +08:00
Ricardo Quesada 1ea690893a Merge pull request #12990 from ricardoquesada/xcode7_compiles_and_run 
compiles and runs on Xcode 7
 2015-07-23 16:04:48 -07:00
Ricardo Quesada 2deb492d36 compiles and runs on Xcode 7 2015-07-23 14:28:23 -07:00
Ricardo Quesada 292987d393 Merge pull request #12987 from MSOpenTech/v3-win10-fix 
V3 win10 fix
 2015-07-23 13:54:03 -07:00
Dale Stammen 72427a0a64 updated version to 3.8 2015-07-23 12:46:47 -07:00
Dale Stammen f91e812924 updated version to 3.8 2015-07-23 12:40:36 -07:00
Dale Stammen 6669fec648 added missing bug test 2015-07-23 12:34:37 -07:00
pandamicro a78d55a897 Merge pull request #12980 from CocosRobot/update_cocosfiles_1437646359 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-07-23 18:48:42 +08:00
CocosRobot cbf830196b [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-23 10:12:40 +00:00
pandamicro 5f57fa942f Merge pull request #12802 from ZhangMenghe/pageTurnDown 
Page turn down
 2015-07-23 18:10:53 +08:00
pandamicro 8be726211c Merge pull request #12974 from pandamicro/autoExtend 
Auto add extend to jsb need to extend classes
 2015-07-23 18:04:03 +08:00
pandamicro f96d26c46a Merge pull request #12975 from CocosRobot/update_cocosfiles_1437636951 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-07-23 15:39:34 +08:00
pandamicro bd1f5b4a39 Merge pull request #12911 from natural-law/portrait-support 
Fixed #12252 : Support new portrait projects from templates.
 2015-07-23 15:38:32 +08:00
CocosRobot 7241f72f47 [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-23 07:35:52 +00:00
pandamicro 88df2137a5 Merge pull request #12959 from martell/makepkg 
fix building with system prebuilt libs
 2015-07-23 15:33:58 +08:00
pandamicro 6110700615 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into autoExtend 2015-07-23 15:25:33 +08:00
Vincent Yang 57943b41b1 Fixed #12145 : formarRenderers in RichText doesn’t update container size. 2015-07-23 14:59:24 +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
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 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
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
pandamicro 741163db40 Merge pull request #12938 from WenhaiLin/v3.8-deps70 
Update deps for support FullType.
 2015-07-22 15:42: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
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