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

31156 Commits

Author SHA1 Message Date
andyque 47bae38168 finish template daily build 2015-07-07 16:27:38 +08:00
pandamicro f42a76b438 Merge pull request #12720 from VisualSJ/v3.7-release-update 
[ci skip] Update the web index
 2015-07-07 15:46:33 +08:00
VisualSj 3ccfb2f364 Update the web index 2015-07-07 15:44:42 +08:00
WenhaiLin 581f1ab42b Add test case 2015-07-07 15:41:54 +08:00
andyque 04ade7c16e remove xcode scheme 2015-07-07 14:57:25 +08:00
pandamicro 8f0cf8c3e6 Merge pull request #12575 from ywxzm/v3 
fix onTouch begin don't return value
 2015-07-07 14:57:13 +08:00
jianglong0156 13d00d129d fix the jsb and lua ini error, ignore writeDataToFile 2015-07-07 14:54:31 +08:00
andyque a5115bd739 improve 2015-07-07 14:34:02 +08:00
andyque 494036be1a fix linux build 2015-07-07 14:34:02 +08:00
andyque d8bf9c8a2a improve template daily build scripts 2015-07-07 14:34:02 +08:00
子龙山人 1b9b741068 Merge pull request #12719 from andyque/add-scheme-to-templates 
[ci skip]add shared scheme to iOS & Mac project.
 2015-07-07 14:27:09 +08:00
andyque 302976b603 add shared scheme to iOS & Mac project. 2015-07-07 14:24:17 +08:00
WenhaiLin 158d96046e Label:Support add child nodes. 2015-07-07 14:20:23 +08:00
pandamicro 71ca511c81 Merge pull request #12716 from CocosRobot/update_lua_bindings_1436248841 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-07 14:14:58 +08:00
pandamicro e717155930 Merge pull request #12715 from VisualSJ/v3.7-release2 
[ci skip] Constant value error (ccui.Layout.BACKGROUND_IMAGE_ZORDER )
 2015-07-07 14:13:31 +08:00
jianglong0156 abee4a376a add write api in FileUtils 
bool writeStringToFile(std::string dataStr, const std::string& fullPath);
bool writeDataToFile(Data retData, const std::string& fullPath);
bool writeValueMapToFile(ValueMap& dict, const std::string& fullPath);
bool writeValueVectorToFile(ValueVector vecData, const std::string& fullPath);
and
formate the FileUtils code
 2015-07-07 14:06:59 +08:00
CocosRobot 4a486077c0 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-07 06:05:39 +00:00
pandamicro 701df24301 Merge pull request #12698 from VisualSJ/v3.7-release 
[ci skip] Fixed a bug that action texture address error
 2015-07-07 13:57:30 +08:00
子龙山人 f28fbdd0c4 Merge pull request #12683 from neokim/add_scroll_bar_into_scroll_view 
Add scroll bar feature into ScrollView
 2015-07-07 13:56:09 +08:00
pandamicro 5970f56e1f Merge pull request #12714 from VisualSJ/v3.7-release2 
[ci skip] Constant value error (ccui.Layout.BACKGROUND_IMAGE_ZORDER )
 2015-07-07 13:55:12 +08:00
子龙山人 a41d3847d5 Merge pull request #12709 from WenhaiLin/v3-37-crash-winfix 
Fixed crash cause by the case of file name on WIN32.
 2015-07-07 13:42:01 +08:00
VisualSj dd0edac171 Constant value error (ccui.Layout.BACKGROUND_IMAGE_ZORDER ) 2015-07-07 13:36:47 +08:00
子龙山人 cdaa994b84 Merge pull request #12711 from yangws/issue_12626 
Fix bug taken from pr12602: scroll view can't scroll if pressed the b…
 2015-07-07 13:33:24 +08:00
子龙山人 01d388c16a Merge pull request #12710 from andyque/v3 
merge v3.7 back to v3
 2015-07-07 13:33:06 +08:00
肖峰 37674c3689 Add bug test to Mac & iOS cpp-test project 2015-07-07 11:17:08 +08:00
XiaoFeng a9dfd8012c Add new bug test to Android, Win 10, Win Universal, Linux project file 2015-07-07 11:02:00 +08:00
Vincent Yang b4559a005b Fix bug taken from pr12602: scroll view can't scroll if pressed the button on it. 2015-07-07 10:42:04 +08:00
andyque 6238ddebf3 Merge remote-tracking branch 'upstream/v3.7-release' into v3 2015-07-07 10:18:43 +08:00
WenhaiLin 4bd1fa7d37 Fixed crash cause by the case of file name on WIN32. 2015-07-07 10:08:47 +08:00
XiaoFeng 9a6ffd8904 Add bug test for PageView layout & CCNodeDraw::onDrawGLLine 2015-07-07 09:54:42 +08:00
子龙山人 a6b29666c9 Merge pull request #12674 from WenhaiLin/v3-38-issue12673 
Label:Fixed the characters are displayed incorrect with "dark roast.ttf"
 2015-07-07 09:50:00 +08:00
pandamicro e73906a119 Merge pull request #12707 from pandamicro/v3.7-release 
[ci skip][Simulator JSB] Fix issue caused by video and web view binding
 2015-07-07 09:48:42 +08:00
子龙山人 de64dbfbb1 Merge pull request #12703 from CocosRobot/update_lua_bindings_1436229517 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-07 09:43:45 +08:00
pandamicro a9f98aefea [Simulator JSB] Fix issue caused by video and web view binding 2015-07-07 09:38:38 +08:00
CocosRobot 4c88db3fb2 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-07 00:44:47 +00:00
Ricardo Quesada ed7a841dec Merge pull request #12702 from ricardoquesada/xcode_7_bug_fixes 
compiles on Xcode 7
 2015-07-06 17:30:40 -07:00
Ricardo Quesada ad1fc88fa8 compiles on Xcode 7 2015-07-06 16:30:29 -07:00
Ricardo Quesada df3aa84481 Merge pull request #12701 from ricardoquesada/cmake-no-exceptions 
removes -fno-excpetion and -fexception from cmake
 2015-07-06 13:28:14 -07:00
Ricardo Quesada 4c88be9520 removes -fno-excpetion and -fexception from cmake 2015-07-06 12:09:50 -07:00
子龙山人 6005c42892 Merge pull request #12700 from CocosRobot/update_lua_bindings_1436178667 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-06 21:25:34 +08:00
CocosRobot a4bce56cca [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-06 10:37:24 +00:00
子龙山人 89d40c164e Merge pull request #12697 from jianglong0156/add-remove-key-api 
add UserDefault api deleteValueForKey
 2015-07-06 18:27:04 +08:00
VisualSj 3b69a1726f Fixed a bug that action texture address error 2015-07-06 17:17:20 +08:00
子龙山人 06ea3dce20 Merge pull request #12696 from andyque/improve-template-dialy-build 
[ci skip]fix python syntax error
 2015-07-06 17:10:28 +08:00
andyque 92585d3a8e fix python syntax error 2015-07-06 17:09:55 +08:00
jianglong0156 6f3b977c1e add UserDefault api deleteValueForKey 2015-07-06 17:01:17 +08:00
子龙山人 b2c83b6038 Merge pull request #12695 from andyque/improve-template-dialy-build 
add framework daily build scripts
 2015-07-06 17:00:10 +08:00
XiaoFeng 214684b3be Fix 2015-07-06 16:45:04 +08:00
andyque 881a388892 add framework daily build scripts 2015-07-06 16:43:37 +08:00
XiaoFeng 9fab1e7702 Change to use auto & for each to enum sub items 2015-07-06 16:39:00 +08:00