pandamicro
aed6b0719e
Merge pull request #13089 from yangws/issue_12692
...
Fixed #12692 : UILayout viewing area cutting position calculation error
2015-07-31 12:02:00 +08:00
CocosRobot
0851363532
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-31 02:06:41 +00:00
pandamicro
ede9195d14
Merge pull request #13073 from super626/fixtest
...
Bug Fix
2015-07-31 09:58:14 +08:00
yangxiao
fc14efa034
update comment
2015-07-31 09:55:57 +08:00
pandamicro
c9d23805e7
Merge pull request #12978 from yangws/issue_12249
...
Fixed #12249 : Button touch doesn't work with setScale9Enabled.
2015-07-31 09:54:38 +08:00
pandamicro
6b9ca70e02
Merge pull request #13051 from yangws/issue_9400
...
Fixed #9400 : Widget::setHighlighted does not work after setBright
2015-07-31 09:50:20 +08:00
pandamicro
16eb88bf57
Merge pull request #13055 from yangws/issue_10082
...
Fixed #10082 : Label and Text have different types for fontSize
2015-07-31 09:49:48 +08:00
pandamicro
94023ebfc5
Merge pull request #13126 from takaken1994/bugfix/remove-using-namespace-from-header
...
remove "using namespace cocos2d;" from header file
2015-07-31 09:28:58 +08:00
CocosRobot
c0d6ec1946
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-30 16:30:01 +00:00
pandamicro
34724e41b2
Merge pull request #13092 from pandamicro/audioengine
...
Add AudioEngine js bindings
2015-07-31 00:22:04 +08:00
pandamicro
3fa016a280
Fix win32 project and add winrt support
2015-07-30 23:39:52 +08:00
takaken1994
93c47390c8
Fix : remove using namespace cocos2d from header file
2015-07-31 00:02:57 +09:00
pandamicro
3524af1ad6
Merge pull request #13059 from geron-cn/3.7.1
...
fix bug: BoneNode 's debugdraw can not be controlled by ancestor's vi…
2015-07-30 20:31:34 +08:00
pandamicro
c0066f9afd
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into audioengine
2015-07-30 20:25:57 +08:00
geron-cn
0955b0f9de
fix comment by pandamicro
2015-07-30 19:28:00 +08:00
CocosRobot
56b58a5839
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-30 10:50:00 +00:00
pandamicro
5aa8647309
Merge pull request #13117 from CocosRobot/update_lua_bindings_1438251761
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-30 18:45:15 +08:00
pandamicro
8542f8a7a9
Merge pull request #13067 from pandamicro/scrollviewbar
...
Bind UIScrollViewBar
2015-07-30 18:42:08 +08:00
CocosRobot
b167d29a80
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-30 10:27:28 +00:00
pandamicro
9b5c8d5d12
Merge pull request #12601 from super626/physics3d
...
3d physics collider
2015-07-30 18:19:23 +08:00
yangxiao
8eac67b806
IsTrigger to isTrigger
2015-07-30 18:18:02 +08:00
yangxiao
99a869b588
IsTrigger to isTrigger
2015-07-30 18:14:46 +08:00
jianglong0156
113233b8df
add Camera support constructor
2015-07-30 18:00:51 +08:00
pandamicro
507a094653
Merge pull request #13108 from jianglong0156/constructedWith3D#12404
...
improve jsval_to_physics3DRigidBodyDes
2015-07-30 17:58:16 +08:00
CocosRobot
ef7318cf00
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-30 09:23:06 +00:00
jianglong0156
b016b642ce
add Terrain support constructor
2015-07-30 17:17:57 +08:00
pandamicro
39721c6eb6
Merge pull request #13105 from fusijie/fix_10487
...
fix Sprite/Label/FastTMX auto-culling bug.
2015-07-30 17:12:37 +08:00
Wenhai Lin
bce279c52e
Label:Fixed the edge of character may be cropped.
2015-07-30 16:24:47 +08:00
jianglong0156
0f9483a0e3
add SpotLight support constructor
2015-07-30 15:21:35 +08:00
jianglong0156
8d3ceb7ac2
add PointLight support constructor
2015-07-30 15:11:37 +08:00
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
tangziwen
cee43ccebb
update terrain again
2015-07-29 14:32:36 +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
tangziwen
e4cf89e1c4
terrain update: can set Light direction manually, set light map, fix a bug which height map is not exist cause crash when destructing.
2015-07-29 13:24:12 +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
geron-cn
4327e4a532
remove include SkinNode.h in cpp
2015-07-24 12:31:45 +08:00
geron-cn
0b09fd5bcb
Merge branch 'v3.7.1' of github.com:cocos2d/cocos2d-x into 3.7.1
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.h
2015-07-24 11:38:09 +08:00
Vincent Yang
e4a8aeee45
Fixed #12962 : Scene can't have std::vector member.
2015-07-24 11:16:45 +08:00
pandamicro
5ffa8efee6
Merge pull request #12977 from chengstory/OptimizationExtensionData
...
Optimization extension data
2015-07-24 11:01:56 +08:00
geron-cn
3341fa0f85
fix the vars' initialize in construct func, and remove using namespace
2015-07-24 10:28:10 +08:00
zhangcheng
be08de6780
Update libcocos2d_8.1 vs project.
2015-07-24 09:32:39 +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
13149a0bc5
updated version to 3.7.1
2015-07-23 13:26:32 -07:00
Dale Stammen
c3935b921c
updated version to 3.7.1
2015-07-23 13:02:42 -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
geron-cn
1389fc3d31
some doxygen comments and copyright
2015-07-24 01:30:34 +08:00
pandamicro
a15212dc76
Fix indent
2015-07-23 18:00:23 +08:00
gero
2037616a2d
Merge pull request #4 from fusijie/3.7.1
...
fix compile on iOS/Android/Linux/Win8Universal.
2015-07-23 17:46:28 +08:00
geron-cn
4d58aa2668
remove setcontentsize in skeletonnode
2015-07-23 17:41:37 +08:00
fusijie
e9cbb6b084
fix compile on iOS/Android/Linux/Win8Universal.
2015-07-23 17:32:52 +08:00
Vincent Yang
35040e7bb1
Fixed #12249 : Button touch doesn't work with setScale9Enabled.
2015-07-23 17:27:04 +08:00
zhangcheng
4b8248c015
Optimization of Custom Data.
...
replace ComExtensionData to ObjectExtensionData.
2015-07-23 16:30:23 +08:00
pandamicro
6110700615
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into autoExtend
2015-07-23 15:25:33 +08:00
geron-cn
7255b5308b
config for mac
2015-07-23 15:13:14 +08:00
Vincent Yang
57943b41b1
Fixed #12145 : formarRenderers in RichText doesn’t update container size.
2015-07-23 14:59:24 +08:00
pandamicro
739befdc08
Add audio engine bindings in JSB
2015-07-23 14:43:01 +08:00
geron-cn
16ee74b845
add bonenode to CocoStudio.h
2015-07-23 13:34:11 +08:00
geron-cn
915cefa208
bone node
2015-07-23 11:51:49 +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
5b8371aaa2
Merge pull request #12958 from VisualSJ/v3.7.1-bindCallback
...
[ci skip] Parse Touch/Click callback in JS Studio parser
2015-07-23 09:30:40 +08:00
Ricardo Quesada
d0ec24679b
Merge branch 'v3' into spine-2.3
2015-07-22 15:10:39 -07:00
VisualSj
d4900493e2
JS Studio parser (Modify callback method)
2015-07-22 17:56:35 +08:00
VisualSj
b282d75346
Parse Touch/Click callback in JS Studio parser
2015-07-22 16:51:44 +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
pandamicro
e0e5ae9d99
Merge pull request #12924 from liamcindy/SkyBox_3.7.1
...
update for Game3DNodeReader & UserCameraReader
2015-07-22 15:34:18 +08:00
VisualSj
1496224c6d
Add cc.affineTransformConcatIn
2015-07-22 15:21: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
Liam
d8155a20ae
update for code format
2015-07-22 14:11:20 +08:00
Vincent Yang
3addf38134
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
2015-07-22 12:01:34 +08:00
XiaoFeng
fcd7388936
Synchronize skybox parser with C++ version
2015-07-22 09:45:35 +08:00
pandamicro
25dff88ff4
Merge pull request #12922 from xiaofeng11/v3.7-release
...
[ci skip]Add Skybox parser to js
2015-07-22 09:12:38 +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
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
Vincent Yang
cb5e2d59c3
Fixed #9382 : ui::ListView->getCurSelectedIndex() is out of range.
2015-07-20 17:50:02 +08:00
CocosRobot
0a23e4a305
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-20 07:08:12 +00: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
andyque
c4d8ebc780
add Two APIs to Node.
...
1. add getNodeToParentTransform(Node* ancestor)
2. add getNodeToParentAffineTransform(Node* ancestor)
2015-07-20 13:49:23 +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
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
yangxiao
beda48124c
merge cocos
2015-07-17 17:54:00 +08:00
WenhaiLin
731de26795
Label:Fixed system font may be invisible when there are multiple cameras.
2015-07-17 17:45:11 +08:00
yangxiao
ef49e5a169
merge cocos
2015-07-17 17:43:32 +08:00
子龙山人
0ea8dca299
Merge pull request #12881 from WenhaiLin/v3.7-label-gb2312
...
Label:support font that contains GB2312 char map.
2015-07-17 17:33:52 +08:00
Wenhai Lin
66dadea0cd
Rollback log level
2015-07-17 15:56:51 +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
fusijie
2c5e2db6b4
refine NSLog in HttpAsynConnection in release mode.
2015-07-17 14:23:51 +08:00
fusijie
d828c030cb
remove CCClippingRectangleNode transform error support.
2015-07-17 11:56:23 +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
yangxiao
bf20145e35
animate3d callback and test
2015-07-17 11:08:27 +08:00
andyque
c9ca8d9ce8
fix PageView cur index issue
2015-07-17 10:39:01 +08:00
子龙山人
0b0b25c517
Merge pull request #12872 from zilongshanren/remove-emscript-code
...
remove EMSCRIPTEN related code
2015-07-17 10:08:34 +08:00
WenhaiLin
f0b29814c3
Label:support font that contains GB2312 char map.[android]
2015-07-16 21:35:10 +08:00
WenhaiLin
a6f8031af9
Label:support font that contains GB2312 char map.[except android]
2015-07-16 17:10:05 +08:00
pandamicro
65f647ce00
Merge pull request #12879 from pandamicro/v3.7-release
...
[ci skip] Update versions and docs for v3.7
2015-07-16 16:55:24 +08:00
pandamicro
e2068ab84a
Update versions and docs for v3.7
2015-07-16 16:53:43 +08:00
andyque
96f6c44281
fix auto scrolling and curPageIdx issue
2015-07-16 16:50:47 +08:00
CocosRobot
f2567f498c
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-16 08:22:58 +00:00
pandamicro
b094367c94
Merge pull request #12874 from pandamicro/v3.7-release
...
Remove cleanup from auto bindings add made it support override in JS
2015-07-16 16:15:26 +08:00
子龙山人
a72ea73e60
Merge pull request #12863 from fusijie/fix_polygonsprite_setColor
...
fix polygon sprite setColor, setOpacity, setTexture, setTextureRect.
2015-07-16 14:51:06 +08:00
pandamicro
949eca2846
Improve some manual binding code
2015-07-16 14:34:14 +08:00
andyque
7c665e6447
remove EMSCRIPTEN related code
2015-07-16 14:15:41 +08:00
pandamicro
490d5a3747
Remove cleanup from auto bindings add made it support override in JS
2015-07-16 14:09:26 +08:00
WenhaiLin
d5d5af5ac3
change ‘auto’ to ‘auto&&’
2015-07-16 14:08:59 +08:00
CocosRobot
8442fe5f89
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-16 06:04:17 +00:00
子龙山人
40f4e0b27b
Merge pull request #12864 from zilongshanren/add-jumpToPage-api
...
add setCurPageIndex API to PageView.
2015-07-16 13:56:05 +08:00
pandamicro
0b1d105803
Merge pull request #12870 from VisualSJ/v3.7-release-parser
...
[ci skip] Fixed parser's bug
2015-07-16 13:04:06 +08:00
VisualSj
0bb385f37c
Check texture for existence
2015-07-16 11:54:45 +08:00
andyque
517221a0df
add jumpToPage API to PageView.
...
1. This commit also fix the default font size issue in ui::Button.
2015-07-16 11:33:57 +08:00
VisualSj
ef70e1f996
Fixed a bug that is Armature parser
2015-07-16 10:30:22 +08:00
WenhaiLin
1c9a181c35
Label:Fixed the color of letter will be overridden by fade action.
2015-07-15 20:17:05 +08:00
songchengjiang
282dc23bb2
modify interfaces of Animate3DCallback
2015-07-15 17:34:14 +08:00
pandamicro
bcd20b1bf0
Merge pull request #12861 from pandamicro/v3
...
Sync Cocos2d-x v3.7 RC1
2015-07-15 17:16:44 +08:00
Jacky
e4b392d4c8
fix polygon sprite setColor, setOpacity, setTexture, setTextureRect.
2015-07-15 16:27:29 +08:00
CocosRobot
be71b6d563
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-15 08:23:23 +00:00
pandamicro
99e504e668
Merge pull request #12854 from yangws/issue_11310
...
fixed #11310 : multiple camera case utils::captureScreen bug.
2015-07-15 15:00:29 +08:00
pandamicro
436564f922
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
docs/RELEASE_NOTES.md
web
2015-07-15 14:39:40 +08:00
andyque
2f31f6baa6
fixed Scale9Sprite gray state issue.
...
When call `setCapInsets`, the Scale9Sprite's inner sprite will be
rebuild and it's state will be lose.
This commit reset the shader state.
2015-07-15 14:35:13 +08:00
子龙山人
d291afe295
Merge pull request #12856 from fusijie/fix_rendertexture_backtofront
...
fixed renderTexture switch foreground to background issue.
2015-07-15 14:32:40 +08:00
Jacky
a204b02668
fixed renderTexture switch foreground to background issue.
2015-07-15 13:47:10 +08:00
CocosRobot
4b418fe823
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-15 05:46:42 +00:00
Vincent Yang
7a105ce1e1
fixed #11310 : multiple camera case utils::captureScreen bug.
2015-07-15 12:09:08 +08:00
andyque
e4cad50c2f
fix tons of warnings
2015-07-15 12:04:48 +08:00
yangxiao
69e79ed164
fix #10242 , reload shader when light number changed
2015-07-15 11:36:53 +08:00
songchengjiang
6c83e8d81c
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
...
Conflicts:
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
2015-07-15 11:13:27 +08:00
pandamicro
c126aac35f
v3.7 rc1 release doc
2015-07-14 23:21:34 +08:00
Mazyad Alabduljaleel
008a5ef89c
replaced tabs with whitespace
2015-07-14 16:34:11 +03:00
Mazyad Alabduljaleel
6f8bc04934
First commit for improving iOS EditBox
...
+ Moved internal stuff to the implementation file
+ Added pragma and organized methods
+ cleanup synthesize, instance variables, and overall code style for ObjC
2015-07-14 16:18:03 +03:00
pandamicro
eb56ad6d60
Merge pull request #12836 from pandamicro/v3.7-release
...
Fixed #12834 Invoke cleanup function when override in JS
2015-07-14 17:37:00 +08:00
pandamicro
a90a8b12c6
Merge pull request #12840 from pandamicro/path
...
[ci skip] Add cc.path.mainFileName
2015-07-14 16:41:16 +08:00
子龙山人
49b47f576d
Merge pull request #12828 from WenhaiLin/v3-label-readability
...
Label:improving the code readability.
2015-07-14 16:38:53 +08:00
子龙山人
7e4e82da2c
Merge pull request #12835 from zilongshanren/improve-coding-style
...
add more descriptive message to ASSET macro.
2015-07-14 16:36:59 +08:00
子龙山人
af4442d0d6
Merge pull request #12833 from fusijie/v3
...
Fixed setAnimationInterval JNI bug.
2015-07-14 16:33:39 +08:00
pandamicro
41778f35fb
Add cc.path.mainFileName
2015-07-14 16:33:38 +08:00
pandamicro
658fe74141
Merge pull request #12838 from VisualSJ/v3.7-release-parser
...
[ci skip] Remove getRes (parser)
2015-07-14 16:20:42 +08:00
pandamicro
efffea5b91
Fixed #12834 Invoke cleanup function when override in JS
2015-07-14 15:35:29 +08:00