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

27124 Commits

Author SHA1 Message Date
minggo 342d12201b Merge pull request #10131 from CocosRobot/update_lua_bindings_1421809643 
[AUTO]: updating luabinding automatically
 2015-01-21 11:12:42 +08:00
minggo dbee383247 Merge pull request #10130 from CocosRobot/update_cocosfiles_1421809616 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-01-21 11:12:14 +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
CocosRobot 8f099c7f0d [AUTO]: updating luabinding automatically 2015-01-21 03:09:35 +00: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 6426f31a03 [ci skip] Update CHANGELOG 2015-01-21 11:08:14 +08:00
CocosRobot e221424a64 [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-21 03:06:58 +00:00
minggo abc6511ceb Merge pull request #10125 from samuele3hu/v3_4_issue9537 
issue #10107: Binding AnimationInfo to lua
 2015-01-21 11:02:11 +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
minggo 05a1510d53 Merge pull request #10126 from CocosRobot/update_cocosfiles_1421807736 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-01-21 10:36:30 +08:00
CocosRobot ef9fabbc51 [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-21 02:35:37 +00:00
minggo 372b11422d Merge pull request #10115 from dabingnn/FixCrashOnWin32 
Fix crash on win32
 2015-01-21 10:34:22 +08:00
Liam 776f40ea6b reset cpp-test project option 2015-01-21 10:19:05 +08:00
minggo 0d95e6595a Merge pull request #10124 from CocosRobot/update_lua_bindings_1421806130 
[AUTO]: updating luabinding automatically
 2015-01-21 10:13:05 +08:00
minggo 6109a075f5 [ci skip] Update CHANGELOG 2015-01-21 10:12:17 +08:00
CocosRobot 2f75d56c9b [AUTO]: updating luabinding automatically 2015-01-21 02:10:47 +00:00
minggo fd824a4f60 [ci skip] Update CHANGELOG 2015-01-21 10:10:42 +08:00
samuele3hu a3fbe04c10 issue #10107: Update the bindings-generator submodule 2015-01-21 10:07:21 +08:00
samuele3hu 666af29681 issue #10107: Binding AnimationInfo to lua 2015-01-21 10:06:48 +08:00
minggo 56e4ad8e6d [ci skip] Update CHANGELOG 2015-01-21 10:03:44 +08:00
minggo 5f37ba8096 Merge pull request #10095 from super626/fixnode 
fix anchor point bug
 2015-01-21 09:58:00 +08:00
minggo af489e998a Merge pull request #10114 from Dhilan007/v3-UIEditBoxTest-fix 
Fixed UIEditBoxTest display error font size
 2015-01-21 09:45:10 +08:00
minggo e8b6705d29 Merge pull request #10071 from liamcindy/Text_2.4 
fix uitext size error
 2015-01-21 09:40:34 +08:00
minggo f65e2690f3 Merge pull request #10122 from CocosRobot/update_lua_bindings_1421804049 
[AUTO]: updating luabinding automatically
 2015-01-21 09:37:28 +08:00
minggo eb2ca9eef5 Merge pull request #10069 from liamcindy/Button_2.4 
add function for ui button
 2015-01-21 09:36:35 +08:00
CocosRobot dae3e365ed [AUTO]: updating luabinding automatically 2015-01-21 01:36:21 +00:00
minggo 6870692cfe Merge pull request #10072 from liamcindy/TextBMFont 
BMFont need to refresh size by refresh the string
 2015-01-21 09:32:54 +08:00
minggo 38fbe91a5f Merge pull request #10097 from doomsdayer/v3_version_1 
Flatbuffer generation updated
 2015-01-21 09:25:11 +08:00
minggo b61a28633e Merge pull request #10102 from andyque/addListViewReuseCell 
Refactoring bad coding style
 2015-01-21 09:24:56 +08:00
minggo 8979f53058 Merge pull request #10118 from htlxyz/fixed_show_dialog_on_android_without_runtime 
fixed show open wifi dialog on android without runtime
 2015-01-21 09:24:16 +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
yusheng.lu bfe767cf58 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_layout_test 2015-01-20 19:16:13 +08:00
htl 52b03039fa fixed show open wifi dialog on android without runtime 2015-01-20 19:15:44 +08:00
Liam a72e65b4de add function for uiText and uiTextField 2015-01-20 18:40:25 +08:00
Huabing.Xu 65b6500491 Merge branch 'v3' into FixCrashOnWin32 
Conflicts:
	cocos/2d/CCDrawNode.cpp
	cocos/renderer/ccShaders.cpp
 2015-01-20 18:09:11 +08:00
WenhaiLin ef55ccdbeb Fixed UIEditBoxTest display error font size 2015-01-20 18:08:17 +08:00
Wenhai Lin b20d59c596 Fixed the alpha channel of text color of system font not take effect[android] 2015-01-20 17:34:13 +08:00
Liam a42d213d16 update for ui object scale9 state refresh 2015-01-20 17:24:04 +08:00
minggo e849243894 Merge pull request #10109 from CocosRobot/update_lua_bindings_1421741688 
[AUTO]: updating luabinding automatically
 2015-01-20 16:51:40 +08:00
Huabing.Xu 79eee9b145 fix crash on windows 2015-01-20 16:50:51 +08:00
Wenhai Lin 3263289680 Add test case for testing text color of system font 2015-01-20 16:50:50 +08:00
CocosRobot 9a15610983 [AUTO]: updating luabinding automatically 2015-01-20 08:17:36 +00:00
minggo 4ff7a95d5a Merge pull request #10106 from samuele3hu/v3_4_issue9537 
issue #9537:Make parameters more sense
 2015-01-20 16:11:08 +08:00
minggo 151146deff Merge pull request #10103 from damorton/v3 
Update CCRef.cpp
 2015-01-20 16:09:35 +08:00
WenhaiLin 415bbeba21 Fixed the alpha channel of text color of system font not take effect 2015-01-20 16:04:14 +08:00
yangxiao 0df14763a4 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2015-01-20 15:48:43 +08:00
samuele3hu d4db54dc64 issue #9537:Make parameters more sense 2015-01-20 15:41:59 +08:00