ZhangMenghe
|
3c2d68e25c
|
Modify the testcase with coding standards
|
2015-07-21 13:48:08 +08:00 |
pandamicro
|
d478c5f8a8
|
Merge pull request #12923 from ZhangMenghe/ModifytestCase
Modify testCase for UITextFieldTest
|
2015-07-21 12:53:26 +08:00 |
CocosRobot
|
6630157377
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-21 04:40:43 +00:00 |
pandamicro
|
8412d19a8b
|
Merge pull request #12933 from pandamicro/v3
Sync Cocos2d-x v3.7
|
2015-07-21 12:31:03 +08:00 |
pandamicro
|
85d4ce0d5a
|
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp
docs/RELEASE_NOTES.md
tools/cocos2d-console
tools/tojs/cocos2dx.ini
|
2015-07-21 11:39:24 +08:00 |
pandamicro
|
31bd25a5e9
|
Merge pull request #12762 from yangws/issue_10759
Fix bug: Clipping node doesn't work on Android 5.0.
|
2015-07-21 10:47:55 +08:00 |
子龙山人
|
241dd54424
|
Merge pull request #12921 from yangws/issue_9382
Fixed #9382 : ui::ListView->getCurSelectedIndex() is out of range.
|
2015-07-21 10:27:39 +08:00 |
pandamicro
|
55840b4561
|
Merge pull request #12930 from pandamicro/v3.7-release
[ci skip] Update release docs for v3.7
|
2015-07-21 09:50:32 +08:00 |
pandamicro
|
f98e9495fe
|
Update release docs for v3.7
|
2015-07-21 09:49:41 +08:00 |
pandamicro
|
273ce6270c
|
Merge pull request #12929 from pandamicro/v3.7-release
Update html5 engine ref
|
2015-07-21 09:25:08 +08:00 |
pandamicro
|
ed6d759145
|
Update html5 engine ref
|
2015-07-21 09:24:31 +08:00 |
Ricardo Quesada
|
301b55c686
|
Adds support for Spine runtime 2.3
|
2015-07-20 10:39:34 -07:00 |
pandamicro
|
641ff2abf4
|
Merge pull request #12914 from WenhaiLin/v3.8-label-bmfont-opacity
Label:Fixed opacity setting is invalid with bitmap font.
|
2015-07-20 18:02:49 +08:00 |
ZhangMenghe
|
14c1862f7e
|
Modify testCase for UITextFieldTest
|
2015-07-20 18:01:41 +08:00 |
Vincent Yang
|
cb5e2d59c3
|
Fixed #9382 : ui::ListView->getCurSelectedIndex() is out of range.
|
2015-07-20 17:50:02 +08:00 |
pandamicro
|
371053305e
|
Merge pull request #12915 from yangws/issue_12887
Fixed #12887 : [Android] Cocos2dxHelper will not be initialized after…
|
2015-07-20 14:01:21 +08:00 |
Vincent Yang
|
14a419d725
|
Fixed #12887 : [Android] Cocos2dxHelper will not be initialized after activity recreate.
|
2015-07-20 11:14:06 +08:00 |
WenhaiLin
|
63326c2826
|
Label:Fixed opacity setting is invalid with bitmap font.
|
2015-07-20 11:10:17 +08:00 |
子龙山人
|
87fd0d55ad
|
Merge pull request #12898 from WenhaiLin/v3.8-systemfont-invisible-fix
Label:Fixed system font may be invisible when there are multiple cameras.
|
2015-07-20 10:24:21 +08:00 |
Bin Zhang
|
abd8a563dc
|
Support new portrait project from js templates.
|
2015-07-20 09:58:40 +08:00 |
Bin Zhang
|
a8b22f6886
|
Support new portrait project from lua templates.
|
2015-07-20 09:58:40 +08:00 |
Bin Zhang
|
18882f12cb
|
Support new portrait project from cpp template.
|
2015-07-20 09:58:40 +08:00 |
子龙山人
|
b6aa3960d2
|
Merge pull request #12848 from Mazyod/v3
Improving iOS EditBox Implementation
|
2015-07-18 23:21:27 +08:00 |
子龙山人
|
c4fa3ac6c6
|
Merge pull request #12901 from Mazyod/mac-editbox-cleanup
Mac EditBox cleanup:
|
2015-07-18 23:14:05 +08:00 |
Mazyad Alabduljaleel
|
fa284bc2db
|
headers and whitespace
|
2015-07-17 18:05:42 +03:00 |
子龙山人
|
45cd7cf681
|
Merge pull request #12501 from namezero111111/patch-6
Circle shape debug draw bug
|
2015-07-17 22:53:53 +08:00 |
Mazyad Alabduljaleel
|
2bb26e31d0
|
simplify CGRect math
|
2015-07-17 17:38:16 +03:00 |
Mazyad Alabduljaleel
|
54f52dac80
|
reduce header exposure
this is important, so we know that this class is only used in one place
|
2015-07-17 17:37:15 +03:00 |
Mazyad Alabduljaleel
|
32c5be84b8
|
weird, how did this slip
|
2015-07-17 17:15:41 +03:00 |
Mazyad Alabduljaleel
|
d8b7b1d565
|
Mac EditBox cleanup:
+ Reduce header clutter
+ consistent property access and overall code style
+ cleanup extra code
|
2015-07-17 17:12:09 +03:00 |
Mazyad Alabduljaleel
|
7861bfd403
|
Final touch ups:
- group textfield delegate methods
- remove unused code
|
2015-07-17 16:25:45 +03:00 |
WenhaiLin
|
731de26795
|
Label:Fixed system font may be invisible when there are multiple cameras.
|
2015-07-17 17:45:11 +08:00 |
子龙山人
|
22ef262295
|
Merge pull request #12894 from zilongshanren/fixXcode5Warning
fix xcode 5.1.1 warnings
|
2015-07-17 17:33:13 +08:00 |
子龙山人
|
309b563c5b
|
Merge pull request #12896 from yangws/v3
[ci skip] Fix bug: the Back button in Node: UI->UIEditBoxTests click area has p…
|
2015-07-17 15:57:19 +08:00 |
Vincent Yang
|
f9e90f31f6
|
Fix bug: the Back button in Node: UI->UIEditBoxTests click area has positoin offset.
|
2015-07-17 15:52:58 +08:00 |
子龙山人
|
c82cf5ecd4
|
Merge pull request #12891 from fusijie/refine_HttpAsynConnection
refine NSLog in HttpAsynConnection in release mode.
|
2015-07-17 15:29:55 +08:00 |
andyque
|
8c31d70211
|
fix xcode 5.1.1 warnings
|
2015-07-17 15:20:49 +08:00 |
fusijie
|
2c5e2db6b4
|
refine NSLog in HttpAsynConnection in release mode.
|
2015-07-17 14:23:51 +08:00 |
jianglong0156
|
7f0167785d
|
add back label
|
2015-07-17 13:46:00 +08:00 |
jianglong0156
|
c844a77786
|
add fileUtils writeString,writeValueMap,writeValueVector
|
2015-07-17 12:04:47 +08:00 |
子龙山人
|
89e5307f0c
|
Merge pull request #12867 from WenhaiLin/v3.8-label-letter-color
Label:Fixed the color of letter will be overridden by fade action.
|
2015-07-17 11:29:58 +08:00 |
子龙山人
|
a59d17243e
|
Merge pull request #12886 from zilongshanren/fix-framework-mac-compile-issue
[ci skip]add xcpretty to framework mac build
|
2015-07-17 10:49:19 +08:00 |
andyque
|
042a3dc2ec
|
add xcpretty to framework mac build
|
2015-07-17 10:48:05 +08:00 |
andyque
|
c9ca8d9ce8
|
fix PageView cur index issue
|
2015-07-17 10:39:01 +08:00 |
子龙山人
|
3167029929
|
Merge pull request #12884 from natural-law/v3.7-release
[ci skip] Update the reference of submodule cocos2d-console.
|
2015-07-17 10:10:37 +08:00 |
Bin Zhang
|
a5e3267c98
|
Update the reference of submodule cocos2d-console.
|
2015-07-17 10:08:35 +08:00 |
子龙山人
|
0b0b25c517
|
Merge pull request #12872 from zilongshanren/remove-emscript-code
remove EMSCRIPTEN related code
|
2015-07-17 10:08:34 +08:00 |
pandamicro
|
edebcd92c5
|
Merge pull request #12883 from pandamicro/v3.7-release
[ci skip] Fix download section in readme
|
2015-07-17 01:27:08 +08:00 |
pandamicro
|
2507673c5a
|
Fix download section in readme
|
2015-07-16 23:32:18 +08:00 |
子龙山人
|
c928976e96
|
Merge pull request #12880 from CocosRobot/update_lua_bindings_1437037100
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-16 17:19:06 +08:00 |