minggo
|
b1e7d66294
|
[ci skip] Update CHANGELOG
|
2015-01-21 15:09:06 +08:00 |
minggo
|
97f29adf84
|
Merge pull request #10138 from dabingnn/v3_fixcrashForTextureAtlas
fix crash for textureAtlas
|
2015-01-21 15:02:06 +08:00 |
andyque
|
d3241cae9c
|
update 3rd party libraries to v3-deps-33
|
2015-01-21 15:00:27 +08:00 |
minggo
|
82bb5e6f69
|
Merge pull request #10142 from CocosRobot/update_lua_bindings_1421822695
[AUTO]: updating luabinding automatically
|
2015-01-21 14:58:52 +08:00 |
andyque
|
d58426db99
|
fix button pressAction scale issue
|
2015-01-21 14:54:37 +08:00 |
CocosRobot
|
4f7b6608c4
|
[AUTO]: updating luabinding automatically
|
2015-01-21 06:46:49 +00:00 |
minggo
|
26bdd8b532
|
Merge pull request #10140 from minggo/crash-fix
check if plist file exist
|
2015-01-21 14:41:44 +08:00 |
minggo
|
097d4f3266
|
check if plist file exist
|
2015-01-21 14:36:49 +08:00 |
Huabing.Xu
|
0ca47ab40f
|
fix crash for textureAtlas
|
2015-01-21 14:14:53 +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
|
607ae4c2ca
|
Merge pull request #10136 from andyque/fixSliderProgressBarRender
fix progress bar render issue when switch scale9
|
2015-01-21 14:10:18 +08:00 |
minggo
|
060c7b6721
|
Merge pull request #10137 from CocosRobot/update_lua_bindings_1421818960
[AUTO]: updating luabinding automatically
|
2015-01-21 14:09:57 +08:00 |
Huabing.Xu
|
14e9ff4ba4
|
Merge pull request #10134 from CocosRobot/update_cocosfiles_1421818870
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-01-21 13:46:46 +08:00 |
CocosRobot
|
b31b22491d
|
[AUTO]: updating luabinding automatically
|
2015-01-21 05:44:30 +00:00 |
andyque
|
7f7506fb99
|
fix progress bar render issue when switch scale9
|
2015-01-21 13:41:40 +08:00 |
CocosRobot
|
8a78a7e8fd
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-01-21 05:41:12 +00:00 |
minggo
|
08d392dd5f
|
Merge pull request #10132 from samuele3hu/v3_4_issue9537
Rename lua-coco-studio-conversions.cpp/h to lua-cocos-studio-conversions.cpp/h
|
2015-01-21 13:39:29 +08:00 |
samuele3hu
|
205ead5b63
|
Rename lua-coco-studio-conversions.cpp/h to lua-cocos-studio-conversions.cpp/h
|
2015-01-21 11:48:34 +08:00 |
minggo
|
4f982693b2
|
[ci skip] Update CHANGELOG
|
2015-01-21 11:20:38 +08:00 |
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 |