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

965 Commits

Author SHA1 Message Date
Dhilan007 e071e5c896 Fix Label may display incomplete for multiline text with outline feature enabled. 2014-11-12 17:24:35 +08:00
andyque 16d0419136 fix compile error 2014-11-10 16:02:06 +08:00
andyque 5483bc834d fix scale9sprite flip issue 2014-11-07 11:09:22 +08:00
minggo 25053b80bc Merge pull request #8930 from super626/fixsprite 
add Sprite3D::getMeshArrayByName and refactor re-skin test
 2014-11-05 18:11:51 +08:00
Ricardo Quesada 3a34d6eb9d Performance improvements 
`Director::getMatrix()` returns `const Mat4`
 2014-11-04 16:46:14 -08:00
Ricardo Quesada 2ec1170943 treat warnings as errors in samples 2014-11-04 15:42:29 -08:00
Dale Stammen fa70e066a1 enabled FastTileMap test for WP8 2014-10-29 09:17:31 -07:00
minggo baff367c94 Merge pull request #8918 from dumganhar/iss8843-drawpoint 
closed #8843: Fixes DrawNode::drawPoint crash and uses VAO if it's available when draw points.
 2014-10-27 11:38:11 +08:00
yangxiao 20decd5a39 refact reskin code 2014-10-25 14:11:32 +08:00
James Chen 13b51f7c73 Small fixes in Sprite3DTest 2014-10-24 12:03:42 +08:00
James Chen 603700179e closed #8843: Fixes DrawNode::drawPoint crash and uses VAO if it's available when draw points. 2014-10-24 12:03:11 +08:00
Dale Stammen f2d9fd2746 enabled tests for winrt 2014-10-23 07:23:13 -07:00
Dale Stammen 75d37a9cc4 no mp3 for winrt 2014-10-23 07:22:05 -07:00
minggo b3288f7c27 Merge pull request #8893 from dabingnn/v3_fixTypo 
[ci skip] fix typo
 2014-10-22 14:16:07 +08:00
Huabing.Xu ff27c3539d [ci skip] fix typo 2014-10-21 17:37:00 +08:00
Dhilan007 4e7d03f0e5 Replace CCLOG with log in ConfigurationTest 2014-10-21 15:56:52 +08:00
minggo f3e4c705eb more warnings fixed 2014-10-21 11:47:28 +08:00
minggo b2d1549686 Merge pull request #8869 from Dhilan007/v3-movefile 
Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d
 2014-10-20 18:10:52 +08:00
minggo 0dd8e89bb2 Merge pull request #8863 from Dhilan007/v3-labelfix 
Fix wrong text color for system font on Linux/Window
 2014-10-20 16:38:32 +08:00
Dhilan007 a5f838496c Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d 2014-10-20 16:25:24 +08:00
minggo f224f275ec Merge pull request #8851 from pipu/#8838 
Fixed #8838
 2014-10-20 15:14:07 +08:00
Dhilan007 ae997f52ee update test case of LabelTTF 2014-10-20 14:58:15 +08:00
pipu 8072328ca6 Modify that record path of .csb file 2014-10-20 11:56:48 +08:00
Huabing.Xu 86fedffd56 change asset manager to use a new resource, which will not affect other test cases 2014-10-20 11:03:13 +08:00
andyque 0dc7bbe861 fix long file path on WP8 2014-10-18 14:48:27 +08:00
Dhilan007 b5f91d17da Fix [Node:clipping -> Clipping to RenderTexture] crash 2014-10-17 18:48:18 +08:00
minggo 6367727e18 Merge pull request #8784 from pipu/v3_Modify_Bug_#8770 
Fixed #8770
 2014-10-17 15:47:30 +08:00
pipu 778701595c Fixed #8770 2014-10-17 14:11:15 +08:00
andyque 952e52365b fix scrollView rotate issue 2014-10-17 14:02:49 +08:00
andyque 8161d2ad34 fix scrollView rotate issue 2014-10-17 11:31:00 +08:00
andyque 812c2ecd0c fix winRT macro 2014-10-17 10:09:05 +08:00
Dale Stammen 7ccc380e3f enabled networking tests for winrt 2014-10-16 11:14:18 -07:00
Dale Stammen a931f8c192 enabled console for winrt 2014-10-16 11:13:32 -07:00
Dale Stammen ae7008fdd9 enabled console for winrt 2014-10-16 11:13:08 -07:00
Dale Stammen 3ab8292b5a enabled console for WinRT 2014-10-16 11:12:37 -07:00
minggo 07253cfb60 Merge pull request #8743 from andyque/removeWebView 
remove UIWebView.cpp in win32
 2014-10-16 21:06:53 +08:00
minggo 883230d9d8 Merge pull request #8758 from dabingnn/v3_fixVBOFullTest 
change vbo full test
 2014-10-16 19:36:01 +08:00
minggo 34cfcb0b54 Merge pull request #8690 from dabingnn/v3_spriteLamp 
sprite lamp
 2014-10-16 19:33:57 +08:00
minggo 8bf00bd4e6 Merge pull request #8748 from super626/cameraoperation 
Modify camera operation
 2014-10-16 19:29:55 +08:00
Huabing.Xu a655a883f1 change vbo full test 2014-10-16 18:30:01 +08:00
yangxiao 1ed38334d9 remove unused variables 2014-10-16 17:44:04 +08:00
yangxiao f13fdb5162 adjust 2014-10-16 17:40:41 +08:00
yangxiao f5400b74a5 adjust 2014-10-16 17:38:42 +08:00
yangxiao e5dedf062a adjust 2014-10-16 17:37:05 +08:00
yangxiao 8e6728d8c0 change camera operation 2014-10-16 17:31:18 +08:00
Huabing.Xu 644aa19b2d Merge branch 'v3' into v3_updateSpine 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-10-16 16:48:16 +08:00
andyque f3f15c58fe remove UIWebView.cpp in win32 2014-10-16 16:46:49 +08:00
minggo fef079aee6 Merge pull request #8682 from super626/fixbillboard 
Fixbillboard
 2014-10-16 12:04:50 +08:00
samuele3hu d997f72be2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager 
nter
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2014-10-16 10:59:58 +08:00
Huabing.Xu 8135b09c98 Merge branch 'v3' into v3_updateSpine 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-10-15 15:55:17 +08:00