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

2948 Commits

Author SHA1 Message Date
minggo 4ac50f2c26 Merge pull request #10200 from Dhilan007/v3-webview-baseurlfix 
Fixed sets the page's base URL for WebView doesn't work.
 2015-01-26 13:51:08 +08:00
Wenhai Lin 81198583f1 Fixed sets the page's base URL for WebView doesn't work. 2015-01-23 18:30:12 +08:00
samuele3hu 6e055ba41f Fix some lua test cases bug 2015-01-23 15:35:15 +08:00
samuele3hu d74fb0e8b5 Update LayoutComponent Test case of UIEditTest 2015-01-22 10:21:38 +08:00
samuele3hu 01bfe09c05 Add checked lua codes for issue #10107 2015-01-21 19:33:42 +08:00
yusheng.lu bec9b0e6b3 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-01-21 17:14:16 +08:00
yusheng.lu 304f28a58a Update the csb resources for current Cocos2d-x 2015-01-21 17:08:16 +08:00
minggo 72fb059aeb Merge pull request #10144 from andyque/fixButtonPressActionIssue 
fix button pressAction scale issue
 2015-01-21 16:37:59 +08:00
andyque d58426db99 fix button pressAction scale issue 2015-01-21 14:54:37 +08:00
minggo 335f69d95d Merge pull request #10110 from super626/v3 
Fix Animate3D speed bug and add parameter to Ray::intersects
 2015-01-21 14:11:11 +08:00
minggo 11ff48416f Merge pull request #10060 from doomsdayer/v3_layout_test 
Updated the Layout Component demo
 2015-01-21 11:11:44 +08:00
minggo fde86c7fd2 Merge pull request #10127 from Dhilan007/v3-systemfont-alphafix 
Fixed the alpha channel of text color of system font not take effect
 2015-01-21 11:09:27 +08:00
minggo dca1edccd7 Merge pull request #10113 from liamcindy/Scale9Error 
update for ui object scale9 state refresh
 2015-01-21 10:51:55 +08:00
minggo 9f24b9a350 Merge pull request #10090 from Dhilan007/v3-issue10089 
Fixed lose the precision of label's dimensions
 2015-01-21 10:51:27 +08:00
Liam 776f40ea6b reset cpp-test project option 2015-01-21 10:19:05 +08:00
Liam 902fba0638 fix slider and loadingbar scale9 error 2015-01-20 20:57:54 +08:00
yusheng.lu 858bafdae9 Removed the unused variable to make XCode compile pass. 2015-01-20 19:56:00 +08:00
yusheng.lu a35be8977a Submodule ccs-res go forward. 2015-01-20 19:18:23 +08:00
WenhaiLin ef55ccdbeb Fixed UIEditBoxTest display error font size 2015-01-20 18:08:17 +08:00
Liam a42d213d16 update for ui object scale9 state refresh 2015-01-20 17:24:04 +08:00
Wenhai Lin 3263289680 Add test case for testing text color of system font 2015-01-20 16:50:50 +08:00
WenhaiLin e5fc236ec4 Add test case for issue#10089 2015-01-20 12:01:51 +08:00
yusheng.lu bba8d6481f Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_layout_test 2015-01-19 10:05:39 +08:00
Nite Luo 0bddeb88c8 Disable 3D rendering support for commands that needs to execute in order 2015-01-15 14:57:51 -08:00
Nite Luo 4a440e66c9 Refactor draw command 2015-01-15 14:00:49 -08:00
songmiao 147506f662 change camera position 2015-01-15 15:53:19 +08:00
minggo 45c4c16f93 Merge pull request #10010 from andyque/fixErrorFontName 
fix font name typo in tests
 2015-01-15 10:24:02 +08:00
minggo 905ccb11b9 Merge pull request #10009 from Dhilan007/v3-34rc0 
Fixed warns:truncation from double to float
 2015-01-15 10:14:41 +08:00
andyque f8200347cd fix font name typo in tests 2015-01-15 10:10:53 +08:00
WenhaiLin 13b049a543 Fixed warns:truncation from double to float 2015-01-15 10:07:23 +08:00
minggo 62d416eb01 Merge pull request #10008 from samuele3hu/v3_4_rc1_check 
[ci skip]Fix some lua test cases bugs
 2015-01-15 10:07:19 +08:00
samuele3hu 1325ba0eaf Fix some lua test cases bug 2015-01-15 10:01:16 +08:00
minggo 1fa0fb584b Merge pull request #10004 from MSOpenTech/wp8-fix 
WP8/WinRT fixes
 2015-01-15 09:33:38 +08:00
Nite Luo 15660926d9 Fix Sprite3D not cascading 3D flag 2015-01-14 16:23:35 -08:00
Dale Stammen 32c14710e7 allow custom shaders for WinRT Universal App 2015-01-14 10:37:04 -08:00
minggo 825f90564c Merge pull request #9992 from samuele3hu/v3_4_issue9986 
issue #9986:Add lua bindings for Component and related test cases
 2015-01-14 17:05:51 +08:00
samuele3hu 77912270f9 issue #9986:Add lua bindings for Component and related test cases 2015-01-14 16:58:35 +08:00
minggo 1641c92721 Merge pull request #9983 from samuele3hu/v3_4_issue9820 
issue #9820:Inconsistent :setBlendFunc(...) function binding for Sprite and LabelBMFont classes
 2015-01-14 16:11:43 +08:00
samuele3hu c026aa82f9 Add CC_DEPRECATED_ATTRIBUTE flag 2015-01-14 15:09:37 +08:00
yangxiao 42c40d895f enable disable culling using macro 2015-01-14 14:41:10 +08:00
samuele3hu 951324a230 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_4_issue9820 
Conflicts:
	cocos/scripting/lua-bindings/manual/3d/lua_cocos2dx_3d_manual.cpp
 2015-01-14 13:58:12 +08:00
samuele3hu 1d94ae4302 issue #9820:Inconsistent :setBlendFunc(...) function binding for Sprite and LabelBMFont classes 2015-01-14 13:51:09 +08:00
Huabing.Xu 34582ba268 Merge branch 'v3' into v3_AddOptionsForCulling 
Conflicts:
	cocos/2d/CCLabel.cpp
 2015-01-14 12:44:24 +08:00
minggo 301cb558ec Merge pull request #9970 from super626/v3 
correct wrong word
 2015-01-14 11:45:48 +08:00
minggo 5459149279 Merge pull request #9969 from huangshiwu/pointSize 
DrawNode enable draw different size points
 2015-01-14 11:38:31 +08:00
yusheng.lu eb106d57a6 layout component test 2015-01-14 11:34:43 +08:00
minggo 0207c22cb6 Merge pull request #9953 from darkdukey/renderFix 
Render fix
 2015-01-14 11:06:33 +08:00
minggo d320941ca1 Merge pull request #9963 from Dhilan007/v3-issue9898-fix 
Fixed crash if dispatch event after remove event listener in callback
 2015-01-14 10:59:42 +08:00
Huabing.Xu f3d8798d39 add macro to enable to disable culling 2015-01-14 10:56:51 +08:00
yangxiao 772813e810 modify wrong word 2015-01-14 09:36:22 +08:00