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

31278 Commits

Author SHA1 Message Date
子龙山人 5621ce08ba Merge pull request #12730 from CocosRobot/update_lua_bindings_1436334238 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-08 13:55:46 +08:00
CocosRobot 9638ae628a [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-08 05:48:55 +00:00
yangxiao 40b33604d8 adjust objloader to cocos 2015-07-08 13:44:15 +08:00
yangxiao fdd78ef73f update objloader to latest 2015-07-08 13:42:14 +08:00
子龙山人 0475f50f45 Merge pull request #12723 from neokim/add_setter_for_line_width 
Add a setter for line width in DrawNode
 2015-07-08 13:40:22 +08:00
WenhaiLin b395ef06d8 AudioEngine:support preload for audio[WIN32/WINRT 8.1/WP8.1] 2015-07-08 10:48:20 +08:00
Jacky 06c06a1f03 fix polygon sprite bug. 2015-07-08 10:07:35 +08:00
XiaoFeng 8429cc1d90 Update CCDrawNode bug test 2015-07-08 09:35:29 +08:00
子龙山人 e162edd867 Merge pull request #12727 from andyque/improve-template-dialy-build 
[ci skip]fix ios/mac/win32/win8.1 compile error
 2015-07-08 07:37:41 +08:00
andyque dda07bebf5 fix ios/mac/win32/win8.1 compile error 2015-07-08 07:36:26 +08:00
xpol 8179fe04f0 And more warnings. 2015-07-07 23:10:04 +08:00
xpol 29dcbe6685 Fixes some warnings and a related bug in CCSprite. 
This story tells us that we should not just ignore warnings.
 2015-07-07 23:01:24 +08:00
子龙山人 d02da9d2f2 Merge pull request #12725 from andyque/improve-template-dialy-build 
[ci skip]change sign team to none.
 2015-07-07 22:03:22 +08:00
andyque 451bedbaad change sign team to none. 2015-07-07 22:02:35 +08:00
XiaoFeng 707b4d8b90 Fix windows universal project file 2015-07-07 19:44:18 +08:00
子龙山人 a567b7b795 Update Authors 2015-07-07 17:52:58 +08:00
Neo Kim 160bff8e13 Add a setter for line width in DrawNode 2015-07-07 18:48:02 +09:00
XiaoFeng 1b1af798bc Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3.7-release 2015-07-07 17:35:41 +08:00
子龙山人 26db4c38ab Merge pull request #12722 from andyque/improve-template-dialy-build 
[ci skip]minor improvements of template daily build
 2015-07-07 16:57:40 +08:00
andyque a18116aaa4 minor improvements 2015-07-07 16:56:38 +08:00
子龙山人 71158eba44 Merge pull request #12721 from andyque/improve-template-dialy-build 
[ci skip]Improve template dialy build
 2015-07-07 16:54:54 +08:00
andyque 0ca645f744 add runtime daily build script 2015-07-07 16:54:03 +08:00
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