fusijie
|
17c7848e62
|
fix FastTiledMap auto-culling bug.
|
2015-07-30 15:07:03 +08:00 |
jianglong0156
|
52ed2e8d4e
|
add conversion function declare, use to the physics3d auto conversion the data
|
2015-07-30 14:56:24 +08:00 |
jianglong0156
|
b16ee0e45d
|
add file in project file with android, linux wp8.1 (reverted from commit 948628b800 )
|
2015-07-30 14:46:10 +08:00 |
jianglong0156
|
73125f46d2
|
add file in project file with android, linux wp8.1 (reverted from commit 948628b800 )
|
2015-07-30 14:38:20 +08:00 |
jianglong0156
|
a1a9e281a3
|
add conversion cpp file into iOS project (reverted from commit 439bc8a99f )
|
2015-07-30 14:37:58 +08:00 |
fusijie
|
f91a58c8ff
|
fix Label auto-culling bug.
|
2015-07-30 13:59:50 +08:00 |
CocosRobot
|
7a73c65208
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-30 05:53:20 +00:00 |
子龙山人
|
cd4d8b7880
|
Merge pull request #13101 from WenhaiLin/v3.8-label-code-style
Improve coding style
|
2015-07-30 13:44:53 +08:00 |
pandamicro
|
a011fa4c8a
|
Merge pull request #12852 from super626/issue10242
fix #10242, reload shader when light number changed
|
2015-07-30 12:57:32 +08:00 |
fusijie
|
ee5e64825a
|
fix Sprite auto-culling bug.
|
2015-07-30 12:00:57 +08:00 |
CocosRobot
|
f1adc2ffd2
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-30 03:39:17 +00:00 |
WenhaiLin
|
964e7103b5
|
Improve coding style
|
2015-07-30 11:33:18 +08:00 |
子龙山人
|
c039c7a9bd
|
Merge pull request #13084 from WenhaiLin/v3.8-label-df-contentsize-fix
Fixed the content size of Label is incorrect with GLOW effect.
|
2015-07-30 11:29:48 +08:00 |
CocosRobot
|
bd867311f1
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-29 20:42:46 +00:00 |
Ricardo Quesada
|
642ccac5dc
|
Merge pull request #12927 from ricardoquesada/spine-2.3
Adds support for Spine runtime 2.3
|
2015-07-29 13:33:15 -07:00 |
pandamicro
|
f53ba42b3b
|
Fix test issues and Add audio engine to js templates
|
2015-07-29 21:22:44 +08:00 |
pandamicro
|
9972bfb98c
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into audioengine
# Conflicts:
# tests/js-tests/src/NativeTest/NativeTest.js
|
2015-07-29 21:01:56 +08:00 |
pandamicro
|
da4e062614
|
Add js wrapper for audio engine
|
2015-07-29 20:47:28 +08:00 |
VisualSJ
|
179266240f
|
Update js parser (timelineParser-2.x.js)
|
2015-07-29 19:49:54 +08:00 |
Vincent Yang
|
e1d4d22353
|
Fixed #12692 : UILayout viewing area cutting position calculation error
|
2015-07-29 18:43:11 +08:00 |
Liam
|
c93d40869c
|
fix simulator crash when sprite3d resource is error
|
2015-07-29 16:52:40 +08:00 |
WenhaiLin
|
a9f27865d3
|
Fixed the content size of Label is incorrect with GLOW effect.
|
2015-07-29 16:30:07 +08:00 |
WenhaiLin
|
20d445ad1a
|
Label:The texture of system font should be cropped if the height of label is not enough to show the entire string on Mac.
|
2015-07-29 16:11:27 +08:00 |
CocosRobot
|
8c642d966f
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-29 07:45:19 +00:00 |
pandamicro
|
16b03f0ebe
|
Merge pull request #13065 from pandamicro/widget_onEnter
Ensure C++ classes onEnter, onExit can be safely override in JS
|
2015-07-29 15:36:12 +08:00 |
andyque
|
6de387b3ac
|
fix Mac system font crash issue
|
2015-07-29 15:20:31 +08:00 |
子龙山人
|
96d44e1078
|
Merge pull request #13076 from WenhaiLin/v3.8-label-gb2312
Label:support font that contains GB2312 char map.
|
2015-07-29 14:51:17 +08:00 |
子龙山人
|
a46c4be912
|
Merge pull request #13039 from WenhaiLin/v3.8-audioengine-preload
AudioEngine:support callback for preload feature.
|
2015-07-29 14:15:05 +08:00 |
pandamicro
|
3089ac302e
|
Refine ui bindings and JS constants
|
2015-07-29 13:06:49 +08:00 |
pandamicro
|
c81ba3c148
|
Merge pull request #12648 from stari4ek/v3-12645-depthstencil-attributes-ios
Fixed: #12645 iOS: depth/stencil buffers attributes are ignored
|
2015-07-29 11:09:56 +08:00 |
pandamicro
|
4cd0ced683
|
Merge pull request #12805 from super626/animate3d
fix #11487 animate3d bugs
|
2015-07-29 11:09:03 +08:00 |
yangxiao
|
5d677d49bb
|
clamp sin value to -1, 1
|
2015-07-29 10:35:01 +08:00 |
pandamicro
|
81842417c4
|
Merge pull request #13032 from xiaofeng11/v3
Fix issue https://github.com/cocos2d/cocos2d-x/issues/12968
|
2015-07-29 09:54:43 +08:00 |
pandamicro
|
cca95c3c51
|
Merge pull request #13041 from yangws/issue_10386
Fixed #10386 : ui::TextField hitTest not working as expected.
|
2015-07-29 09:52:06 +08:00 |
pandamicro
|
dc931db932
|
Merge pull request #13069 from dmurtagh/debug_draw_patch
Fixed a compile error when CC_SPRITE_DEBUG_DRAW is on
|
2015-07-29 09:51:43 +08:00 |
geron-cn
|
fa5d70fc04
|
add SkeletonNode Nest test case
|
2015-07-28 23:49:25 +08:00 |
geron-cn
|
d2de5b1c85
|
add test case for bug: #13060 and #13005
|
2015-07-28 19:18:58 +08:00 |
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 |
pandamicro
|
9fea134de1
|
Use sendNodeEventToJSExtended instead of sendNodeEventToJS in sub classes
|
2015-07-28 18:24:03 +08:00 |
XiaoFeng
|
faee3e7807
|
Fix parser compatible for layer project file
|
2015-07-28 18:11:07 +08:00 |
geron-cn
|
0275e3b773
|
fix set visible
|
2015-07-28 17:25:40 +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 |
Wenhai Lin
|
c4112e1ce5
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8-label-gb2312
|
2015-07-28 17:02:30 +08:00 |
jianglong0156
|
f71f9b2b15
|
improve the code
|
2015-07-28 16:32:56 +08:00 |
geron-cn
|
c9991aea81
|
fix bug: BoneNode 's debugdraw can not be controlled by ancestor's visible
|
2015-07-28 16:31:06 +08:00 |
WenhaiLin
|
9edd66d4a7
|
Label:support font that contains GB2312 char map.
|
2015-07-28 16:28:32 +08:00 |
pandamicro
|
89c722ed4b
|
Add script invocation for onEnter, onExit etc in other classes
|
2015-07-28 16:07:14 +08:00 |
pandamicro
|
0d7f1e3672
|
Reorder the logic of script invocation for onEnter, onExit etc to the beginning of the function
|
2015-07-28 16:05:47 +08:00 |
pandamicro
|
0a31199a5b
|
Fix widget onEnter override in JS may cause infinite recursion
|
2015-07-28 16:04:28 +08:00 |
WenhaiLin
|
102020d831
|
1.AudioEngine:support callback for preload feature.
2.AudioEngineThreadPool:Make the number of thread be a fixed number.
|
2015-07-28 15:27:07 +08:00 |
pandamicro
|
3fa9463ec7
|
Fix manual bindings for changed API in spine
|
2015-07-28 15:11:20 +08:00 |
Vincent Yang
|
c6fc51a2d9
|
Fixed #10082 : Label and Text have different types for fontSize
|
2015-07-28 14:48:01 +08:00 |
XiaoFeng
|
bca6934786
|
Normalization function names
|
2015-07-28 14:05:56 +08:00 |
pandamicro
|
ca54340982
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2015-07-28 13:00:10 +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 |
Vincent Yang
|
14145e29a8
|
Fixed #9400 : Widget::setHighlighted does not work after setBright
|
2015-07-28 11:09:21 +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 |
Damien
|
7fb4dabcb7
|
Fixed a compile error when CC_SPRITE_DEBUG_DRAW is on
|
2015-07-27 14:46:15 -07: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 |
Vincent Yang
|
19b3822d87
|
Fixed #9507 : logic error in isMaxLengthEnabled handling in UITextField::setString
|
2015-07-27 17:25:48 +08:00 |
Vincent Yang
|
2f996b24ef
|
Fixed #10386 : ui::TextField hitTest not working as expected.
|
2015-07-27 16:59:35 +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 |
XiaoFeng
|
f410fcd737
|
Fix issue https://github.com/cocos2d/cocos2d-x/issues/12968
|
2015-07-27 11:55:18 +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 |
CocosRobot
|
e986aac617
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-27 03:14:03 +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 |
dualface
|
bd39247192
|
Add Luabinding conversions for std::map<std::string, std::string>
|
2015-07-26 07:40:34 +08:00 |
pandamicro
|
5be905c181
|
Merge pull request #13017 from pandamicro/v3.7.1
[ci skip] Release docs for v3.7.1
|
2015-07-25 15:17:52 +08:00 |
pandamicro
|
a2a32ef58c
|
Release docs for v3.7.1
|
2015-07-25 15:16:39 +08:00 |
pandamicro
|
33007e832f
|
Merge pull request #13014 from CocosRobot/update_lua_bindings_1437802542
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-25 13:40:55 +08:00 |
CocosRobot
|
f7fced7b70
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-25 05:40:05 +00:00 |
pandamicro
|
fba892f4aa
|
Merge pull request #13002 from VisualSJ/v3.7.1-12940
[ci skip]Issue #12940: Fixed a bug that is removing SimpleAudio play
|
2015-07-25 13:20:27 +08:00 |
pandamicro
|
4fdfbd05c4
|
Merge pull request #13005 from geron-cn/3.7.1
fix bug:use wrong _modelviewTransform in director to draw bone
|
2015-07-25 09:53:38 +08:00 |
pandamicro
|
fa46a0abb4
|
Merge pull request #12992 from yangws/v3.7.1
Fixed #12962 : Scene can't have std::vector member.
|
2015-07-25 09:52:00 +08:00 |
Ricardo Quesada
|
76982dac89
|
updates cocos2d version
|
2015-07-24 15:53:18 -07:00 |
pandamicro
|
09d8b8829e
|
Merge pull request #13006 from MSOpenTech/v3.7.1-winrt
v3.7.1: added missing cocostudio files to Win10 libcocos2d project
|
2015-07-24 23:43:21 +08:00 |
pandamicro
|
a666658764
|
Merge pull request #12998 from pandamicro/v3.7.1
Add BoneNode/SkeletonNode/SkinNode JS bindings
|
2015-07-24 23:42:38 +08: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 |
pandamicro
|
05bb775438
|
Sync timelineParser and fix issue
|
2015-07-24 20:16:56 +08:00 |
pandamicro
|
54330576e6
|
Fix JS binding issues for skeleton animation
|
2015-07-24 20:16:01 +08:00 |
geron-cn
|
a4b6f4d103
|
Merge branch 'v3.7.1' of github.com:cocos2d/cocos2d-x into 3.7.1
|
2015-07-24 19:51:45 +08:00 |
Dale Stammen
|
8940eb829f
|
added missing cocostudio files
|
2015-07-24 04:48:14 -07:00 |
geron-cn
|
a5d41aac0d
|
fix bug:use wrong _modelviewTransform in director to draw bone
|
2015-07-24 19:48:05 +08:00 |
WenhaiLin
|
37a174ee4a
|
Label:refine the implementation about text layout and support debug draw
|
2015-07-24 18:38:45 +08:00 |
VisualSj
|
cf70cb9c40
|
Issue #12940: Fixed a bug that is removing SimpleAudio play
|
2015-07-24 17:41:01 +08:00 |
VisualSj
|
2b05ca731c
|
Issue #12941: Fixed a bug that is ccs.Skin ctor error in jsb
|
2015-07-24 17:34:04 +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 |
yangxiao
|
92ec9ab5f2
|
add config loaded event
|
2015-07-24 16:38:30 +08:00 |
pandamicro
|
29b9ed685f
|
Add BoneNode/SkeletonNode/SkinNode JS bindings
|
2015-07-24 15:48:34 +08:00 |