CocosRobot
|
ac7729332a
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-28 10:39:16 +00:00 |
pandamicro
|
8e883f9956
|
Merge pull request #13049 from jianglong0156/constructedWith3D#12404
Some 3d classes can't be constructed with new in JS
|
2015-07-28 18:31:04 +08:00 |
CocosRobot
|
c8f2514758
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-28 09:21:06 +00:00 |
pandamicro
|
66b21fb2a8
|
Merge pull request #12972 from yangws/issue_12145
Fixed #12145 : formarRenderers in RichText doesn’t update container s…
|
2015-07-28 17:13:26 +08:00 |
jianglong0156
|
f71f9b2b15
|
improve the code
|
2015-07-28 16:32:56 +08:00 |
Vincent Yang
|
b92733c402
|
Add items as protected children.
|
2015-07-28 11:38:21 +08:00 |
子龙山人
|
3a58668d71
|
Merge pull request #12744 from fusijie/fix_pageturndown
Fix PageTurn3D
|
2015-07-28 11:35:15 +08:00 |
jianglong0156
|
439bc8a99f
|
add conversion cpp file into iOS project
|
2015-07-28 10:48:18 +08:00 |
jianglong0156
|
948628b800
|
add file in project file with android, linux wp8.1
|
2015-07-28 10:26:45 +08:00 |
jianglong0156
|
ec4d53fcf7
|
add 3d conversion
|
2015-07-28 10:08:58 +08:00 |
jianglong0156
|
d5a6522a37
|
Merge branch 'v3' into constructedWith3D#12404
|
2015-07-28 09:59:35 +08:00 |
jianglong0156
|
6d83a3cea4
|
add Physics3DWorld support new
|
2015-07-27 18:22:56 +08:00 |
jianglong0156
|
cb2b427eed
|
add Physics3DRigidBodyDes support new , add new file jsb_cocos2dx_3d_conversions.h and jsb_cocos2dx_3d_conversions.cpp
|
2015-07-27 18:19:10 +08:00 |
fusijie
|
651d877e28
|
set minimum display length to 1.
|
2015-07-27 17:55:32 +08:00 |
jianglong0156
|
9c6b5730d0
|
add Physics3DPointToPointConstraint support new
|
2015-07-27 16:02:13 +08:00 |
jianglong0156
|
1be5981d6a
|
add Physics3DComponent support new
|
2015-07-27 14:26:50 +08:00 |
jianglong0156
|
4005ef6588
|
add skybox support new
|
2015-07-27 11:19:17 +08:00 |
CocosRobot
|
d9b5ce8d28
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-27 03:17:29 +00:00 |
子龙山人
|
bd0bdae530
|
Merge pull request #12993 from WenhaiLin/v3.8-label-layout-refine
Label:refine the implementation about text layout and support debug draw.
|
2015-07-27 11:10:31 +08:00 |
jianglong0156
|
48147ff08a
|
add the Animate3D and Animation3D js implements
|
2015-07-27 10:53:34 +08:00 |
Ricardo Quesada
|
76982dac89
|
updates cocos2d version
|
2015-07-24 15:53:18 -07:00 |
WenhaiLin
|
b1bd8338aa
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8-label-gb2312
|
2015-07-24 21:30:28 +08:00 |
WenhaiLin
|
37a174ee4a
|
Label:refine the implementation about text layout and support debug draw
|
2015-07-24 18:38:45 +08:00 |
Vincent Yang
|
20fe1fb1a8
|
Fix bug: app will crash if move mouse over window when launching.
|
2015-07-24 16:41:03 +08:00 |
Ricardo Quesada
|
1ea690893a
|
Merge pull request #12990 from ricardoquesada/xcode7_compiles_and_run
compiles and runs on Xcode 7
|
2015-07-23 16:04:48 -07:00 |
Ricardo Quesada
|
2deb492d36
|
compiles and runs on Xcode 7
|
2015-07-23 14:28:23 -07:00 |
Dale Stammen
|
72427a0a64
|
updated version to 3.8
|
2015-07-23 12:46:47 -07:00 |
Dale Stammen
|
f91e812924
|
updated version to 3.8
|
2015-07-23 12:40:36 -07:00 |
pandamicro
|
6110700615
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into autoExtend
|
2015-07-23 15:25:33 +08:00 |
Vincent Yang
|
57943b41b1
|
Fixed #12145 : formarRenderers in RichText doesn’t update container size.
|
2015-07-23 14:59:24 +08:00 |
Vincent Yang
|
19c8f337da
|
Fixed #12918 : TMXXMLParser.cpp -- In the function getRectForGID have small errors
|
2015-07-23 11:01:51 +08:00 |
pandamicro
|
6029ca3edd
|
Merge pull request #12949 from yangws/issue_12906
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
|
2015-07-22 16:17:14 +08:00 |
pandamicro
|
741163db40
|
Merge pull request #12938 from WenhaiLin/v3.8-deps70
Update deps for support FullType.
|
2015-07-22 15:42:13 +08:00 |
子龙山人
|
bb9500769f
|
Merge pull request #12885 from zilongshanren/add-jumpToPage-api
Fix PageView scrollToPage bug and the curPageIndex bug
|
2015-07-22 15:01:57 +08:00 |
Vincent Yang
|
3addf38134
|
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
|
2015-07-22 12:01:34 +08:00 |
WenhaiLin
|
d0d481fd67
|
updated version to v3-deps-70
|
2015-07-21 16:43:47 +08:00 |
CocosRobot
|
6630157377
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-21 04:40:43 +00: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
|
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 |
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 |
子龙山人
|
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 |