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
andyque
91dfb07a8c
add more descriptive message to ASSET macro.
2015-07-14 15:28:36 +08:00
VisualSj
a9deb6dda5
Remove getRes (parser)
2015-07-14 15:26:13 +08:00
Jacky
ea773cac20
Fixed setAnimationInterval JNI bug.
2015-07-14 15:11:35 +08:00
pandamicro
09775d6f2a
Ensure backward compatibility
2015-07-14 14:14:36 +08:00
WenhaiLin
b701fd9e73
Fixed compile error
2015-07-14 13:47:35 +08:00
WenhaiLin
964713355b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-label-createfail
2015-07-14 13:43:43 +08:00
CocosRobot
6b9a5b8264
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-14 05:41:48 +00:00
pandamicro
43a5b6f020
Fix jsb loaders issues
2015-07-14 13:40:09 +08:00
子龙山人
616efbf0c3
Merge pull request #12812 from neokim/refactor_scroll_view_bar
...
Refactor scroll view bar
2015-07-14 13:34:07 +08:00
子龙山人
e1ae3631fc
Merge pull request #12818 from zilongshanren/v3
...
merge v3.7 back to v3
2015-07-14 13:32:56 +08:00
pandamicro
69a70010cf
Merge pull request #12827 from yangws/issue_12668
...
Fixed #12668 : Lua-bindings-manual-network--LuaMinXmlHttpRequest have…
2015-07-14 12:05:29 +08:00
WenhaiLin
d4f62a8063
Label:improving the code readability.
2015-07-14 11:30:56 +08:00
andyque
ef5d4ddf86
Merge remote-tracking branch 'upstream/v3' into v3
...
# Conflicts:
# tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters
2015-07-14 11:24:38 +08:00
Neo Kim
7882a534c1
Correct the wrong boolean statement and make it easy to read
2015-07-14 11:58:44 +09:00
Vincent Yang
0a6933cc8c
Fixed #12668 : Lua-bindings-manual-network--LuaMinXmlHttpRequest have a memory leak.
2015-07-14 10:46:17 +08:00
Vincent Yang
0589c14302
Restructure CCFileUtils class, move platform related functions to CCFileUtilsXXX.
...
Add TestIsDirectoryExist and TestUnicodePath in cpp-tests FileUtil test.
2015-07-14 09:44:36 +08:00
Vincent Yang
06bf6ffa90
Merge pr11866: FileUtilsWin32 correct use all unicode version winapi.
2015-07-14 09:35:01 +08:00
Neo Kim
863c3a0a2a
Correct a typo
2015-07-14 10:17:05 +09:00
andyque
fc673ee502
Merge branch 'v3.7-release' into v3
2015-07-13 22:44:54 +08:00
Vincent Yang
74227eaf16
Add TestIsDirectoryExist and TestUnicodePath in cpp-tests FileUtil test.
2015-07-13 22:44:40 +08:00
CocosRobot
9e60713322
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-13 14:41:58 +00:00
子龙山人
3d06ca297f
Merge pull request #10255 from WenhaiLin/v3-activitylife-fix
...
Fixed game awaked by the clock on Android
2015-07-13 22:34:22 +08:00
子龙山人
cdc7e5205b
Merge pull request #11995 from MAUSMAUSgames/v3
...
using Action::_tag as flag field
2015-07-13 22:19:03 +08:00
子龙山人
22b4f5a11e
Merge pull request #12238 from lite3/patch-3
...
remove old path When added existing new searchPath
2015-07-13 22:16:50 +08:00
子龙山人
d1bef4db8d
Merge pull request #12369 from Dimon4eg/Fix_crash_cocos2d_log
...
Fix crash on Windows if pass string more than 16kb to cocos2d::log
2015-07-13 22:16:04 +08:00
子龙山人
c151ba89e5
Merge pull request #12774 from WenhaiLin/v3-label-createfail
...
Label:Fixed create fail if the font(TTF) not contain a Unicode charmap.
2015-07-13 21:58:39 +08:00
CocosRobot
300da3e3fc
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-13 12:57:03 +00:00
pandamicro
8944e932a1
Merge pull request #12786 from WenhaiLin/v3-animation-getCurrentFrame
...
Add Animate:getCurrentFrameIndex
2015-07-13 20:48:01 +08:00
Neo Kim
9757ee4ea8
Refine scroll event dispatching. And add an event to track every move including jump and so on.
2015-07-13 21:28:17 +09:00
Neo Kim
22ea504af8
Add methods to manipulate scroll bar's opacity
2015-07-13 21:28:16 +09:00
Neo Kim
f558158667
Use addProtectedChild() instead of addChild() in ScrollViewBar
2015-07-13 21:28:16 +09:00
CocosRobot
8b50c307e5
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-13 09:35:35 +00:00
pandamicro
d559971379
Merge pull request #12808 from pandamicro/v3
...
Fix CCSprite ; missing
2015-07-13 17:27:27 +08:00
子龙山人
db71e073dd
Merge pull request #12742 from WenhaiLin/v3-audioengine-preload
...
AudioEngine:support preload for audio
2015-07-13 17:06:17 +08:00
Vincent Yang
e65b01bdc0
Merge pr11866: FileUtilsWin32 correct use all unicode version winapi.
2015-07-13 17:06:01 +08:00
pandamicro
36e1f26570
Fix CCSprite ; missing
2015-07-13 16:44:33 +08:00
yangxiao
8598c5037e
fix #11487 animate3d bugs
2015-07-13 16:10:48 +08:00
XiaoFeng
a68835733f
Add Skybox parser to js
2015-07-13 16:02:19 +08:00
WenhaiLin
c95283f563
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-animation-getCurrentFrame
2015-07-13 12:54:02 +08:00
songchengjiang
5a16748273
optimize Animate3DCallback
...
add Animate3DCallbackTest
2015-07-13 11:43:13 +08:00
WenhaiLin
80dff7f1c4
Rollback pr12299
2015-07-13 11:32:25 +08:00
pandamicro
89927c7073
Merge pull request #12782 from xiaofeng11/v3.7-release
...
UISliderReader and component update
2015-07-13 11:05:59 +08:00
pandamicro
8ab1dce2a0
Merge pull request #12778 from yangws/issue_9586
...
Fix bug: FileUtils::isDirectoryExist not correct on Android when using relative path in 'assets'
2015-07-13 11:03:24 +08:00
Vincent Yang
8bc68395de
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into issue_9586
2015-07-13 11:00:18 +08:00
WenhaiLin
dee13756ec
Add Animate:getCurrentFrameIndex
2015-07-13 10:40:43 +08:00
Liam
c61e09a9e7
update for reader
2015-07-13 10:29:22 +08:00
pandamicro
c167e249cd
Merge pull request #12790 from pandamicro/shaderNormal
...
Use shader with normal while creating mesh with normals
2015-07-12 21:47:05 +08:00
WenhaiLin
142d354485
[ci skip]Replace tab with spaces.
2015-07-10 21:03:43 +08:00
WenhaiLin
b459940bb8
[ci skip]Replace tab with spaces.
2015-07-10 20:47:21 +08:00
WenhaiLin
c68469a611
Update Nibiru SDK.
2015-07-10 20:42:05 +08:00
CocosRobot
0e8a3f14f0
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-10 09:11:50 +00:00
子龙山人
3adecedcee
Merge pull request #12776 from fusijie/refine_capture
...
CaptureScreen save in thread.
2015-07-10 17:03:18 +08:00
XiaoFeng
92d78efce0
Fix percentage setting won't effect when UISlider's background resource set to null
2015-07-10 17:00:16 +08:00
Vincent Yang
34aa7a0bb1
Remove unused variable.
2015-07-10 16:40:02 +08:00
Vincent Yang
1711a70869
Merge v3 branch.
2015-07-10 16:39:36 +08:00
Vincent Yang
187c72e2b9
[ci skip] replace tab with 4 space.
2015-07-10 16:17:34 +08:00
songchengjiang
a1dd466588
modify Animate3D keyFrameCallback
2015-07-10 15:50:09 +08:00
pandamicro
c30ce38cb5
Merge pull request #12766 from super626/v3.7-release
...
Set default 3d animation quality to low
2015-07-10 15:35:22 +08:00
pandamicro
2d27091398
Merge pull request #12717 from jianglong0156/FileUtilsWriteFunctionMerge
...
add write api in FileUtils
2015-07-10 15:13:21 +08:00
WenhaiLin
eca192f7a6
Fixed compile error
2015-07-10 14:43:28 +08:00
WenhaiLin
81bc0b09da
Label:Fixed create fail if the font(TTF) not contain a Unicode charmap.
2015-07-10 14:39:21 +08:00
Vincent Yang
52293ad451
Fixed #9586 : FileUtils::isDirectoryExist not correct on Android when using relative path in 'assets'.
2015-07-10 14:37:42 +08:00
pandamicro
07fd337052
Merge pull request #12763 from folgerhu/v3.7-release
...
CCTMXXMLParser code negligence
2015-07-10 11:49:30 +08:00
yangxiao
c4587ecda1
if has normal use the shader with normal
2015-07-10 11:44:20 +08:00
Jacky
9eb5a1833b
fix malloc failed need to call afterCaptured callback.
2015-07-10 11:21:03 +08:00
pandamicro
69cdaca306
Auto add extend to jsb need to extend classes
2015-07-10 09:49:39 +08:00
pandamicro
bd5ae151d9
Merge pull request #12735 from yangws/issue_11887
...
Fix bug: Need to replace thread unsafe code from TextureCache::addImageAsync
2015-07-10 09:47:01 +08:00
Vincent Yang
8ff0ac6951
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into issue_9586
2015-07-10 09:35:41 +08:00
songchengjiang
a1956e2210
fix issue#9310 issue#10151 issue#12551
2015-07-09 18:05:47 +08:00
yangxiao
10fe728eee
animation quality default to low, do not interpolation
2015-07-09 17:54:21 +08:00
Liam
e50fc4f184
merge code
2015-07-09 17:12:48 +08:00
Vincent Yang
d9bc8b7c1b
fix bug: don't decrease _asyncRefCount correct in addImageAsyncCallback.
2015-07-09 17:06:55 +08:00
folgerhu@sina.com
a79586c052
CCTMXXMLParser code negligence
2015-07-09 17:02:12 +08:00
Vincent Yang
02226c6a26
Fix bug: Clipping node doesn't work on Android 5.0.
2015-07-09 16:49:26 +08:00
CocosRobot
2065e5b4a7
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-09 07:45:43 +00:00
子龙山人
8e256dcd09
Merge pull request #12718 from WenhaiLin/v3-label-addchild
...
Label:Support add child nodes.
2015-07-09 15:37:49 +08:00
pandamicro
a2da5d5f9d
Merge pull request #12738 from super626/v3.7-release
...
Update tiny obj loader and fix empty textrue
2015-07-09 14:57:10 +08:00
pandamicro
cab670f0ff
Merge pull request #12748 from fusijie/refineSetTexture
...
refine setTexture.
2015-07-09 14:56:06 +08:00
WenhaiLin
86a68f5a09
AudioEngine:refine thread pool
2015-07-09 14:31:03 +08:00
VisualSj
9f52b1e6fb
Fixed a bug that is SingleNode setColor is null
2015-07-09 11:49:11 +08:00
andyque
7243f2cff5
add const & to string arguments
2015-07-09 11:23:20 +08:00
WenhaiLin
41bc3a1900
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8
...
Conflicts:
AUTHORS
2015-07-09 11:11:34 +08:00
pandamicro
893d39c543
Merge pull request #12737 from chengstory/FixReaderBug
...
Fix cocos reader bug.
2015-07-09 10:33:45 +08:00
Liam
c6ebaa19ec
add scene 3d test
2015-07-09 10:19:07 +08:00
Jacky
1dbb2ab17a
refine setTexture.
2015-07-09 10:11:15 +08:00
CocosRobot
bfe6db174e
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-09 01:07:59 +00:00
Jacky
02597eb369
Completed test case and comment.
2015-07-08 22:34:33 +08:00
Wenhai Lin
5d50663c35
AudioEngine:support preload for audio[MAC/iOS]
2015-07-08 18:04:43 +08:00
WenhaiLin
6a33702c80
Refine Label::onDraw
2015-07-08 17:59:24 +08:00
Jacky
a59828605b
Support TileGrid rectangle.
2015-07-08 17:47:04 +08:00
Jacky
4a9e9f3744
completed api.
2015-07-08 17:26:29 +08:00
andyque
d4066a5ff8
improve coding style of Socket.IO
2015-07-08 17:23:48 +08:00
yangxiao
97a17cdc8a
program created dummy texture instead of empty texture
2015-07-08 17:00:01 +08:00
zhangcheng
0862d313b2
Fix cocos reader bug.
...
Fixes child nodes can't be rendered when particle and TiledMap as parent and their resource have been removed from disk.
2015-07-08 16:13:38 +08:00
子龙山人
155ac8c07e
Merge pull request #11583 from hannon235/v3-update-sio
...
Updates socket.io network extension to correctly detect and manage connection to socket.io server versions 0.9.x - 1.x
2015-07-08 16:11:05 +08:00
Jacky
260ce177d7
refine GridNode with rect.
2015-07-08 15:57:27 +08:00
yangxiao
f7cdd7162b
adapter according to latest objloader
2015-07-08 15:33:43 +08:00
WenhaiLin
8cf27b9174
Update comments.
2015-07-08 15:30:34 +08:00
jianglong0156
d55c0c64c5
add std::nothrow
2015-07-08 15:19:17 +08:00
Vincent Yang
7f9028b20c
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into issue_11887
2015-07-08 15:14:08 +08:00
Vincent Yang
1f8b46e911
Fixbug: Need to replace thread unsafe code from TextureCache::addImageAsync.
2015-07-08 15:13:48 +08:00
子龙山人
3f550ef331
Merge pull request #12663 from xiaofeng11/v3.7-release
...
Fix drawLine & drawPoints won't use blendFunc bug
2015-07-08 14:38:10 +08:00
jianglong0156
7e26c381c6
remove invalid code
2015-07-08 14:36:37 +08:00
子龙山人
2bcd70f681
Merge pull request #12726 from xpol/fixes-warnings-and-related-bug-in-CCSprite
...
Fixes some warnings and a related bug in CCSprite.
2015-07-08 14:12:40 +08:00
yangxiao
dac84ade0d
index to short
2015-07-08 14:03:53 +08:00
CocosRobot
9638ae628a
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-08 05:48:55 +00:00
yangxiao
40b33604d8
adjust objloader to cocos
2015-07-08 13:44:15 +08:00
yangxiao
fdd78ef73f
update objloader to latest
2015-07-08 13:42:14 +08:00
WenhaiLin
b395ef06d8
AudioEngine:support preload for audio[WIN32/WINRT 8.1/WP8.1]
2015-07-08 10:48:20 +08:00
Jacky
06c06a1f03
fix polygon sprite bug.
2015-07-08 10:07:35 +08:00
xpol
8179fe04f0
And more warnings.
2015-07-07 23:10:04 +08:00
xpol
29dcbe6685
Fixes some warnings and a related bug in CCSprite.
...
This story tells us that we should not just ignore warnings.
2015-07-07 23:01:24 +08:00
Neo Kim
160bff8e13
Add a setter for line width in DrawNode
2015-07-07 18:48:02 +09:00
XiaoFeng
1b1af798bc
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3.7-release
2015-07-07 17:35:41 +08:00
WenhaiLin
581f1ab42b
Add test case
2015-07-07 15:41:54 +08:00
pandamicro
8f0cf8c3e6
Merge pull request #12575 from ywxzm/v3
...
fix onTouch begin don't return value
2015-07-07 14:57:13 +08:00
WenhaiLin
158d96046e
Label:Support add child nodes.
2015-07-07 14:20:23 +08:00
pandamicro
e717155930
Merge pull request #12715 from VisualSJ/v3.7-release2
...
[ci skip] Constant value error (ccui.Layout.BACKGROUND_IMAGE_ZORDER )
2015-07-07 14:13:31 +08:00
jianglong0156
abee4a376a
add write api in FileUtils
...
bool writeStringToFile(std::string dataStr, const std::string& fullPath);
bool writeDataToFile(Data retData, const std::string& fullPath);
bool writeValueMapToFile(ValueMap& dict, const std::string& fullPath);
bool writeValueVectorToFile(ValueVector vecData, const std::string& fullPath);
and
formate the FileUtils code
2015-07-07 14:06:59 +08:00
CocosRobot
4a486077c0
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-07 06:05:39 +00:00
pandamicro
701df24301
Merge pull request #12698 from VisualSJ/v3.7-release
...
[ci skip] Fixed a bug that action texture address error
2015-07-07 13:57:30 +08:00
子龙山人
f28fbdd0c4
Merge pull request #12683 from neokim/add_scroll_bar_into_scroll_view
...
Add scroll bar feature into ScrollView
2015-07-07 13:56:09 +08:00
pandamicro
5970f56e1f
Merge pull request #12714 from VisualSJ/v3.7-release2
...
[ci skip] Constant value error (ccui.Layout.BACKGROUND_IMAGE_ZORDER )
2015-07-07 13:55:12 +08:00
子龙山人
a41d3847d5
Merge pull request #12709 from WenhaiLin/v3-37-crash-winfix
...
Fixed crash cause by the case of file name on WIN32.
2015-07-07 13:42:01 +08:00
VisualSj
dd0edac171
Constant value error (ccui.Layout.BACKGROUND_IMAGE_ZORDER )
2015-07-07 13:36:47 +08:00
子龙山人
cdaa994b84
Merge pull request #12711 from yangws/issue_12626
...
Fix bug taken from pr12602: scroll view can't scroll if pressed the b…
2015-07-07 13:33:24 +08:00
Vincent Yang
b4559a005b
Fix bug taken from pr12602: scroll view can't scroll if pressed the button on it.
2015-07-07 10:42:04 +08:00
andyque
6238ddebf3
Merge remote-tracking branch 'upstream/v3.7-release' into v3
2015-07-07 10:18:43 +08:00
WenhaiLin
4bd1fa7d37
Fixed crash cause by the case of file name on WIN32.
2015-07-07 10:08:47 +08:00
XiaoFeng
9a6ffd8904
Add bug test for PageView layout & CCNodeDraw::onDrawGLLine
2015-07-07 09:54:42 +08:00
子龙山人
a6b29666c9
Merge pull request #12674 from WenhaiLin/v3-38-issue12673
...
Label:Fixed the characters are displayed incorrect with "dark roast.ttf"
2015-07-07 09:50:00 +08:00
CocosRobot
4c88db3fb2
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-07 00:44:47 +00:00
Ricardo Quesada
ad1fc88fa8
compiles on Xcode 7
2015-07-06 16:30:29 -07:00
Ricardo Quesada
4c88be9520
removes -fno-excpetion and -fexception from cmake
2015-07-06 12:09:50 -07:00
CocosRobot
a4bce56cca
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-06 10:37:24 +00:00
VisualSj
3b69a1726f
Fixed a bug that action texture address error
2015-07-06 17:17:20 +08:00
jianglong0156
6f3b977c1e
add UserDefault api deleteValueForKey
2015-07-06 17:01:17 +08:00
XiaoFeng
214684b3be
Fix
2015-07-06 16:45:04 +08:00
XiaoFeng
9fab1e7702
Change to use auto & for each to enum sub items
2015-07-06 16:39:00 +08:00
CocosRobot
ae860bd6ee
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-06 08:29:03 +00:00
子龙山人
17207f14e5
Merge pull request #12689 from fusijie/refine_setAnimationInterval
...
Refine setAnimationInterval from double to float.
2015-07-06 16:18:45 +08:00
Liam
51993d5733
update for reader
2015-07-06 16:14:41 +08:00
XiaoFeng
d6fc8ecc94
Fix when use percentage size & position to a UIWidget which parent is a layout component, when change simulator screen size, layout won't effect correctly.
2015-07-06 16:02:19 +08:00
Jacky
4499b60446
Refine setAnimationInterval from double to float.
2015-07-06 14:57:42 +08:00
Neo Kim
a01f31c75c
Change NULL to nullptr
2015-07-06 15:54:28 +09:00
Liam
fff4e2f34c
update for reader
2015-07-06 14:05:06 +08:00
Neo Kim
c4dc9b04fd
Add a guard filtering tries to set same value.
2015-07-06 14:54:28 +09:00
XiaoFeng
df2a2d253d
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3.7-release
2015-07-06 10:31:09 +08:00
Neo Kim
0ff7aaef95
Modify loop iteration codes
2015-07-06 11:30:24 +09:00
Neo Kim
43308e258a
Fix an issue of not releasing Texture instance in ScrollViewBar
2015-07-06 11:29:39 +09:00
Neo Kim
a4803c6713
Remove unnecessary commented out code.
2015-07-05 21:30:13 +09:00
Neo Kim
3ab4285960
Refactor code
2015-07-04 16:06:05 +09:00
Neo Kim
6264f7fefb
Correct include-related build errors in some platforms
2015-07-04 15:03:05 +09:00
Neo Kim
ceeca575f3
Replace 'margin' of scroll bar with 'positionFromCorner'
2015-07-04 14:05:47 +09:00
Neo Kim
f667b085b8
Change not to show scroll bar when the scroll view is initiated.
2015-07-04 09:59:22 +09:00
Neo Kim
9548d85f08
Fix radio button group clear issue
2015-07-04 09:57:54 +09:00
Neo Kim
3b6cd4dffc
Modify indentation to comply with the convention
2015-07-04 09:56:53 +09:00
Neo Kim
86cbd59bfd
Add UIScrollViewBar.cpp into CMake and Windows project configuration.
2015-07-04 09:56:53 +09:00
Neo Kim
60c32f6fb5
Refactor some codes
2015-07-04 09:56:53 +09:00
Neo Kim
ec45be699d
Add UIScrollViewBar class documentation
2015-07-04 09:56:52 +09:00
Neo Kim
c093bb18e2
Add scroll bar manipulation methods into ScrollView
2015-07-04 09:56:52 +09:00
Neo Kim
9a11cfd496
Add a way of changing scroll bar width
2015-07-04 09:56:52 +09:00
Neo Kim
2cae17b462
Add scroll bar feature into ScrollView
2015-07-04 09:56:52 +09:00
CocosRobot
fbf98adc7a
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-03 14:48:11 +00:00
pandamicro
38ded61568
Merge pull request #12670 from yangws/issue_8256
...
Fixbug: CCTargetedAction executes callback twice.
2015-07-03 22:34:54 +08:00
CocosRobot
91dc2d22de
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-03 10:37:33 +00:00
WenhaiLin
c11e91e215
Label:Fixed the characters are displayed incorrect with "dark roast.ttf"
2015-07-03 18:08:32 +08:00
Liam
64b8660873
update for skybox reader
2015-07-03 17:52:42 +08:00
Vincent Yang
ca02f167c6
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2015-07-03 15:43:58 +08:00
Vincent Yang
1abeb8bf1e
Fixbug: CCTargetedAction executes callback twice.
2015-07-03 15:42:49 +08:00
pandamicro
f126eb3267
Merge pull request #12644 from WenhaiLin/v3-38-backevent-fix
...
Fixed EventListenerKeyboard.onKeyPressed not firing for back button on Android.
2015-07-03 15:42:45 +08:00
WenhaiLin
91bc8f2e2d
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8
2015-07-03 14:59:12 +08:00
pandamicro
1f48beee1e
Reorganize code
2015-07-03 12:55:55 +08:00
XiaoFeng
993e420ce4
Fix drawLine & drawPoints won't use blendFunc bug
2015-07-03 11:30:38 +08:00
pandamicro
155b9b918c
Add retain/release for XMLHTTPReqest in JSB
2015-07-03 11:01:43 +08:00
pandamicro
1b22438792
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7
...
Conflicts:
cocos/ui/UICheckBox.cpp
2015-07-03 10:23:49 +08:00
pandamicro
e7aeb335a3
Merge pull request #12609 from alexpeak/fixCCLabelPurgeResetOrder
...
Ensure CCLabel atlases are purged before resetting
2015-07-02 19:01:50 +08:00
pandamicro
ecf7148f85
Merge pull request #12624 from WenhaiLin/v3.8
...
AudioEngine:Fixed play audio may fail when switch to new scene on iOS.
2015-07-02 18:47:44 +08:00
pandamicro
e7c6ae7b13
Merge pull request #12637 from super626/skybox
...
Set Texturecube tex parameter to clamp to edge
2015-07-02 18:34:38 +08:00
子龙山人
91a8872cbd
Merge pull request #12647 from xiaofeng11/v3.7-release
...
UISlider update
2015-07-02 18:01:38 +08:00
pandamicro
dbd72d0123
Merge pull request #12646 from VisualSJ/v3.7-release
...
[ci skip] Fixed a bug that is don't analytical frame
2015-07-02 17:22:13 +08:00
子龙山人
5b971ee93d
Merge pull request #12607 from neokim/add_radio_button_and_group
...
Add RadioButton and RadioButtonGroup widgets
2015-07-02 17:12:59 +08:00
Michael Sotnikov
363da2beab
Fixed : #12645 iOS: depth/stencil buffers attributes are ignored
2015-07-02 12:07:24 +03:00
XiaoFeng
668dc50e07
Fix when slider set to disable mode then clean slider ball disable texture, normal texture won't show
2015-07-02 16:45:17 +08:00
WenhaiLin
a28ad6939d
Fixed EventListenerKeyboard.onKeyPressed not firing for back button on Android.
2015-07-02 16:19:33 +08:00
pandamicro
d155d42c0e
Merge pull request #12617 from yangws/issue_8194
...
Fixbug :EventDispatcher wrong dispatch order
2015-07-02 14:42:30 +08:00
Sijie.Wang
7818bfcc7a
Fixed a bug that is don't analytical frame
2015-07-02 14:30:44 +08:00
Neo Kim
61df7bc827
Add class documentation
2015-07-02 15:20:06 +09:00
Neo Kim
ec589c8d6f
Correct the wrong comment for lua
2015-07-02 15:19:50 +09:00
Neo Kim
0e35ee597a
Add logic for not belonging radio button checking.
2015-07-02 15:01:24 +09:00
pandamicro
079ccbb0e2
Merge pull request #12639 from VisualSJ/v3.7-release
...
Fixed a bug that is LayoutComponent position error
2015-07-02 13:58:15 +08:00
VisualSJ
a475caf35a
Fixed a bug that is LayoutComponent position error
2015-07-02 11:52:31 +08:00
Neo Kim
c4aa5a6274
Remove the code related to becoming parent node of radio buttons. Radio button group is not a parent node of radio buttons anymore.
2015-07-02 11:50:50 +09:00
Neo Kim
6550a9ccc2
Replace all tabs to 4 spaces to comply with the convention
2015-07-02 11:30:14 +09:00
XiaoFeng
9a905ede56
Fix check box front cross texture expand to normal size when change status between normal and disable frequency
2015-07-02 10:29:53 +08:00
Neo Kim
4b2bff4674
Change RadioButtonGroup not to be a node-parent of radio buttons but just a grouping node. And add one more test case.
2015-07-02 11:28:14 +09:00
CocosRobot
bf3c970534
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-01 14:12:18 +00:00
pandamicro
3b9fd5502e
Fix cc.isArray for JSB
2015-07-01 21:57:39 +08:00
zhang
48c3466774
Update LayerEx.lua
2015-07-01 20:25:45 +08:00
pandamicro
a95edbfb65
Merge pull request #12618 from super626/clippingnode2
...
Sprite3D Clipping
2015-07-01 18:56:16 +08:00
pandamicro
6b730b5fbd
Merge pull request #12619 from WenhaiLin/v3-37-labelfix
...
Label:Fixed the top of character's texture may be tailored if enable outline effect.
2015-07-01 18:55:04 +08:00
songchengjiang
da5e077b55
texture set GL_CLAMP_TO_EDGE
2015-07-01 18:06:17 +08:00
Wenhai Lin
c06b5c5570
AudioEngine:Fixed play audio may fail when switch to new scene on iOS.
2015-07-01 17:19:28 +08:00
Vincent Yang
cb0e93fc08
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_scene3dtest
2015-07-01 14:58:06 +08:00
WenhaiLin
322bd30d7b
Label:Fixed the top of character's texture may be tailored if enable outline effect.
2015-07-01 14:57:01 +08:00
Vincent Yang
d26c08de46
Merge branch 'v3_scene3d_fixvisitingcamera' into v3_scene3dtest
2015-07-01 14:47:42 +08:00
pandamicro
2774d6ff1d
Merge pull request #12602 from yangws/v3_scene3dtest
...
Fixed bug: UI component can't click correctly by moving UI and camera far away of origin.
2015-07-01 14:46:35 +08:00
Vincent Yang
276ed46c01
Fixbug : issue 8194.
2015-07-01 14:39:35 +08:00
yangxiao
52daa2234c
add setForce2DQueue
2015-07-01 14:24:22 +08:00
yangxiao
269feeb1f9
remove stencil from Renderstate
2015-07-01 14:06:37 +08:00
pandamicro
4d95c8778b
Merge pull request #12598 from shinhirota/v3
...
Fixed iOS/JS-Bind callStaticMethod() with bool arg
2015-07-01 11:34:03 +08:00
Neo Kim
a64e50688e
Add the new files into CMake and Windows project configurations.
2015-07-01 12:21:42 +09:00
Vincent Yang
96b49277cc
[ci skip] add comment for UIWidget::_hittedByCamera.
2015-07-01 11:03:09 +08:00
Alex Peak
5328996a18
Fix event listener cleanup in destructor
...
Event listeners should always be removed at destroy (move out of
if-block)
2015-06-30 18:59:33 -07:00
Alex Peak
7cea464a11
Ensure CCLabel atlases are purged before resetting
...
The current purge->reset behavior occurs per label according to scene
graph priority. This has two disadvanages; firstly, any labels that are
initialized but not part of the scene graph will not be reset.
Secondly, any labels which share atlases in the FontAtlasCache may not
be reset since each label will call releaseFontAtlas individually before
resetting its fontConfig. This means that any shared atlases may not be
released all the way to a reference count of 0 and the invalid atlas
will not be deleted and reset from scratch.
By putting a fixed priority on both the purge and reset steps we can
ensure that firstly: all labels will be reset regardless of whether they
have been added to the scene-graph. Secondly, ALL labels with the same
atlas must call releaseFontAtlas before any others are allowed to
rebuild their textures. This will prevent any old atlases from sticking
around after a new GL context is created.
This is a fix for Github issue #8305
https://github.com/cocos2d/cocos2d-x/issues/8305
2015-06-30 13:16:25 -07:00
Neo Kim
3f05ad2b98
Replace all tabs to 4 spaces to comply with the convention
2015-06-30 20:31:31 +09:00
Neo Kim
f5e7184f0b
Add new cpp files into Android.mk
2015-06-30 18:50:13 +09:00
Neo Kim
bed90606d3
Add RadioButton feature and a test case for it.
2015-06-30 18:50:13 +09:00
Neo Kim
a37015d083
To create radio button feature which uses almost same logic with CheckBox, extract the common logic from CheckBox and make it as AbstractCheckButton class.
2015-06-30 18:50:13 +09:00
子龙山人
40521ad1c4
Merge pull request #12600 from fusijie/fix_spritebatchnode_sort_error
...
Fix SpriteBatchNode sort error.
2015-06-30 17:29:59 +08:00
Bin Zhang
d0db3aee98
Remove the plugin-x related files from the Xcode project of js-bindings .
2015-06-30 17:28:47 +08:00
子龙山人
077241eecf
Merge pull request #12599 from jianglong0156/jsbProjectMerge
...
merge the jsb project into cocos2d project
2015-06-30 17:04:12 +08:00
Bin Zhang
bb77101f0b
Solve the error when building simulator for android.
2015-06-30 16:45:13 +08:00
子龙山人
d5d68223f1
Merge pull request #12604 from WenhaiLin/v3.8-audio-iosfix
...
AudioEngine:Fixed play audio may fail(error code:-1) on iOS
2015-06-30 16:30:05 +08:00
子龙山人
3b4d134050
Merge pull request #12603 from jianglong0156/autoPolygonFileEncode
...
change the file encoding,
2015-06-30 16:29:44 +08:00
Wenhai Lin
e124593a5c
AudioEngine:Fixed play audio may fail(error code:-1) on iOS
2015-06-30 15:38:24 +08:00
jianglong0156
bc341edf1f
change the file encoding,
...
It display a coded warning in current encoding, leading to incredbuild unusable
2015-06-30 15:33:54 +08:00
Vincent Yang
2ba6f266ad
Fixed bug: UI component can't click correctly by moving UI and camera far away of origin.
2015-06-30 14:32:14 +08:00
yangxiao
2ed5ee123e
improve collider
2015-06-30 14:16:05 +08:00
Jacky
25bac2f6a9
Fix SpriteBatchNode sort error.
2015-06-30 14:12:18 +08:00
jianglong0156
185b4419be
merge job project into cocos2d-x project
2015-06-30 13:49:24 +08:00
Shin Hirota
221d33a431
Fixed iOS/JS-Bind callStaticMethod() with bool arg
2015-06-30 14:00:28 +09:00
子龙山人
29cccf631e
Merge pull request #12550 from kompjoefriek/v3-vibrate
...
Vibrate support in v3
2015-06-30 10:28:59 +08:00
子龙山人
950cb840c2
Merge pull request #12582 from super626/listview
...
fix camera mask of listview
2015-06-30 10:25:57 +08:00
pandamicro
92c869f408
Merge pull request #12594 from MSOpenTech/v3-winrt-js-keyboard
...
V3 winrt js keyboard support
2015-06-30 07:24:17 +08:00
Dale Stammen
38b687f8d8
enable support for keyboard on winrt platforms to fix back button
2015-06-29 09:13:19 -07:00
Dale Stammen
7684c208e0
unsupported cocos2d-x image formats removed or updated
2015-06-29 08:41:44 -07:00
Dale Stammen
eb668f63ce
unsupported cocos2d-x image formats removed or updated
2015-06-29 08:39:31 -07:00
pandamicro
15c763d84a
Update engine version
2015-06-29 18:21:06 +08:00
songchengjiang
7733f0fe19
add interfaces
2015-06-29 17:20:28 +08:00
子龙山人
c997284825
Merge pull request #12352 from andyque/add-two-events-to-ui-slider
...
Improve ui::Slider
2015-06-29 17:01:27 +08:00
yangxiao
a56a5d24b6
fix camera mask of listview
2015-06-29 14:41:03 +08:00
andyque
60834e6f0c
Merge branch 'v3' into v3-finish-android-9-patch-image-format
...
Conflicts:
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
2015-06-29 12:05:52 +08:00
andyque
30d2129f0c
improve indent and getTime function
2015-06-29 11:52:53 +08:00
songchengjiang
070705949b
tab format
2015-06-29 11:48:43 +08:00
songchengjiang
7befab0f7b
add Physics3DCollider
2015-06-29 10:26:09 +08:00
zhang
43ea04da3c
fix onTouch begin don't return value
...
fix only receive "begin" envent,can't receive "moved" "ended"
2015-06-28 13:18:33 +08:00
pandamicro
c055028485
Merge pull request #12566 from jianglong0156/winrtMouse
...
Winrt mouse
2015-06-26 18:43:33 +08:00
pandamicro
88aeaa36f4
Merge pull request #12534 from super626/skybox
...
Skybox improvement
2015-06-26 17:05:17 +08:00
子龙山人
260d5035bb
Merge pull request #12555 from WenhaiLin/v3-simpleaudio-AndroidL-Fix
...
Fixed SimpleAudioEngine may cause application to crash on Android L(5.0.x)
2015-06-26 11:05:40 +08:00
Wenhai Lin
1875829ab4
[CppTests:ExtensionsTest-->CocoStudioComponentsTest]Fixed crash on Android 5.0.x
2015-06-26 10:16:52 +08:00
pandamicro
e9ee303445
Merge pull request #12547 from MSOpenTech/v3.7-winrt-audio
...
V3.7 winrt audio fix
2015-06-26 09:47:11 +08:00
pandamicro
4b34963329
Merge pull request #12537 from andyque/fix-v3.7-scrollView-dpi
...
use inch for childFocusCancelOffset in UIScrollView
2015-06-26 08:11:00 +08:00
kompjoefriek
6eca03fdd2
Merged changes from "Vibrate support in v4" into v3 branch.
2015-06-26 01:02:44 +02:00
Dale Stammen
61f4e280b4
Merge branch 'v3.7-release' into v3.7-winrt-audio
2015-06-25 12:46:20 -07:00
pandamicro
1ab369a70b
Merge pull request #12542 from andyque/fix-v3.7-stuio-percent-mode
...
Fix v3.7 cocosStudio percent position bug
2015-06-25 21:37:12 +08:00
pandamicro
3136bef9e3
Fix convertDistanceFromPointToInch logic (add x, y)
2015-06-25 21:34:00 +08:00
pandamicro
e29284374b
Fix convertDistanceFromPointToInch logic
2015-06-25 20:57:23 +08:00
pandamicro
0275b54b63
Merge pull request #12540 from samuele3hu/v3_7_test
...
Fix the compile error of js-template by using android-studio compile param.
2015-06-25 18:49:43 +08:00
samuele3hu
3a654b4615
Fix the compile error of js-template by using android-studio compile param.
2015-06-25 17:44:51 +08:00
jianglong0156
11ac928f59
winrt use touch event replace mouse event
2015-06-25 17:44:03 +08:00
jianglong0156
c60e9dfc9e
winrt not suppot mouse
2015-06-25 17:25:27 +08:00
andyque
d83f528327
use inch for childFocusCancelOffset in UIScrollView
2015-06-25 16:57:00 +08:00
andyque
0c1ee8b26a
fix studio json reader percentage mode bug
2015-06-25 16:14:22 +08:00
yangxiao
f4a81f0e53
optimize draw
2015-06-25 15:14:44 +08:00
yangxiao
13dbd44250
remove unused variable
2015-06-25 15:05:21 +08:00
yangxiao
63f948c822
modify skybox to projection space
2015-06-25 15:01:39 +08:00
pandamicro
ac3f2f235b
Merge pull request #12523 from andyque/fix-linux-audio-engine-crash
...
add guard to audio engine pointer
2015-06-25 11:48:23 +08:00
子龙山人
f545794b56
Merge pull request #12525 from WenhaiLin/v3-37-warnfix
...
[ci skip]Fixed warns
2015-06-25 11:02:02 +08:00
WenhaiLin
3cb29bbc65
[ci skip]Fixed warns
2015-06-25 10:53:41 +08:00
andyque
2bb7b96839
add guard to audio engine pointer
2015-06-25 10:17:31 +08:00
anniruddh
e89a6c1651
fixed issue #160
2015-06-24 17:50:11 -07:00
pandamicro
19c57daf92
Merge pull request #12511 from samuele3hu/v3_7_test
...
Fix crash of the some Texture2D test case about s3tc on the nexus9(android 5.0.1)
2015-06-24 21:46:38 +08:00
pandamicro
f9db471026
Merge pull request #12495 from super626/v3
...
Fix terrain getIntersectionPoint
2015-06-24 18:36:52 +08:00
samuele3hu
63eb0d34f3
Fix crash of the some Texture2D test case about s3tc on the nexus9(android 5.0.1)
2015-06-24 16:11:36 +08:00
pandamicro
49e783820e
Merge pull request #12507 from dabingnn/v3_fixClearColor
...
fix clearcolor bug which has no effect
2015-06-24 15:58:53 +08:00
yangxiao
77f1af91f9
opt getIntersectionPoint
2015-06-24 15:49:09 +08:00
yangxiao
086b01321c
code simplify
2015-06-24 14:10:38 +08:00
Huabing.Xu
ecfe35489c
fix clearcolor bug which has no effect
2015-06-24 11:40:23 +08:00
yangxiao
7546bfe9af
make getChunkByIndex protected
2015-06-24 10:56:46 +08:00
yangxiao
d1baacdf8a
fix terrain ray trace
2015-06-24 10:49:18 +08:00
pandamicro
04af5dfbe3
#12494 Upgrade platform constants for WP8 & WINRT
2015-06-23 23:23:25 +08:00
pandamicro
e574c38a6b
Merge pull request #12496 from WenhaiLin/v3-tagetplatform-fix
...
Fixed cannot differentiate between Windows Phone Application and Windows Store Application by `Application::getTargetPlatform`
2015-06-23 22:26:54 +08:00
Namezero
dec49a8b11
Circle shape debug draw bug
...
Circle shape debug draw didn't draw properly when rotated
2015-06-23 15:50:42 +02:00
pandamicro
72fde7efb8
Merge pull request #12500 from jianglong0156/webviewHide
...
fix the bug:webview can not display
2015-06-23 21:11:33 +08:00
pandamicro
cc00cbedbe
Merge pull request #12482 from yangws/fixbug_20214
...
fixbug: cpp-test -> NewRenderer (drag the layer to test the result of…
2015-06-23 21:09:59 +08:00
江龙
7ff383e4d2
add the return value
2015-06-23 20:27:30 +08:00
pandamicro
29840df88e
Fix indent of Audio.cpp
2015-06-23 20:08:00 +08:00
pandamicro
1d4a496aaa
Merge pull request #12472 from MSOpenTech/v3-winrt-audio
...
V3: WinRT Fix for issue 12448 cpp-tests[ win8.1-universal--window 8.1]:Audio - CocosDenshion:Crash
2015-06-23 20:01:18 +08:00
pandamicro
32accbf21b
Merge pull request #12488 from WenhaiLin/v3-37-androidApplicationFix
...
Fixed Application may be created more than once on Android.
2015-06-23 19:43:39 +08:00
WenhaiLin
ed029d264f
Fixed cannot differentiate between Windows Phone Application and Windows Store Application by `Application::getTargetPlatform`
2015-06-23 18:40:39 +08:00
yangxiao
bfdb06e31b
add empty line
2015-06-23 18:31:20 +08:00
yangxiao
c3593c9d64
merge cocos
2015-06-23 18:29:39 +08:00
pandamicro
60372056ce
Merge pull request #12484 from andyque/fix-nine-patch-image-error
...
fix nine patch image parser error on Windows.
2015-06-23 18:26:16 +08:00
yangxiao
251c81d7be
Merge branch 'newcode' into v3
2015-06-23 18:25:41 +08:00
pandamicro
2a0c2b6e32
Merge pull request #12250 from hawkwood/patch-10
...
Fails if file does not exist
2015-06-23 17:32:47 +08:00
WenhaiLin
f95245312a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-37alpha0
2015-06-23 17:08:25 +08:00
pandamicro
4c7f33e66f
Merge pull request #12481 from jianglong0156/restartGameBug
...
fix Restart game bug
2015-06-23 17:02:09 +08:00
WenhaiLin
cbb073e905
Fixed Application may be created more than once on Android.
2015-06-23 16:58:38 +08:00
XiaoYang
59e6b6fdc2
Merge pull request #352 from tangziwen/v3
...
Using ray-triangle intersect test instead of the newton method
2015-06-23 16:30:18 +08:00
pandamicro
ac138a3287
Merge pull request #12474 from xiaofeng11/v3_xiaofeng
...
Update 3d reader for compatible with cocosstudio 3.1.2 version csd file
2015-06-23 16:27:32 +08:00
XiaoFeng
befe97a78b
Update js parser for compatible with CocosStudio 2.3.2 json format export
2015-06-23 16:24:53 +08:00
tangziwen
5b857f7d66
fix some bug
2015-06-23 16:11:00 +08:00
andyque
7fff2bd3c4
fix nine patch image parser error on Windows.
2015-06-23 15:42:58 +08:00
子龙山人
fca9b89a4c
Merge pull request #12480 from andyque/fix-rapidjson-assert-error
...
fix rapidjson assert error
2015-06-23 15:34:47 +08:00
pandamicro
f617d6f1aa
Merge pull request #12478 from WenhaiLin/v3-37-label-sfFix
...
Label:Fixed IllegalArgumentException on Android 2.3.x
2015-06-23 15:27:43 +08:00
Vincent Yang
4b768c5fd8
fixbug: cpp-test -> NewRenderer (drag the layer to test the result of culling), some object will be culling before out of screen.
2015-06-23 15:22:27 +08:00
jianglong0156
90f9bf37cd
fix redmine issue #20277 RestartGameTest only used in native will crash
2015-06-23 14:41:41 +08:00
tangziwen
1e016dc6d8
Always get the minimum distance intersect point.
2015-06-23 14:41:20 +08:00
tangziwen
f71ca4f179
Using ray-triangle intersect test instead of the newton method
2015-06-23 14:27:19 +08:00
andyque
70b709f4a8
fix rapidjson assert error
2015-06-23 13:54:11 +08:00
WenhaiLin
79aa300448
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-37alpha0
2015-06-23 13:42:32 +08:00
WenhaiLin
b275ce2283
Label:Fixed IllegalArgumentException on Android 2.3.x
2015-06-23 13:38:06 +08:00
pandamicro
9445aeacb7
Merge pull request #12456 from super626/camera
...
quaternion instead of euler angle
2015-06-23 13:16:39 +08:00
XiaoFeng
375e80bd70
Update 3d reader for compatible with cocosstudio 3.1.2 version csd file
...
Update easing default speed
2015-06-23 11:31:16 +08:00
子龙山人
6bd61a3a5f
Merge pull request #12469 from WenhaiLin/v3-37-label-lineheightfix
...
Label should be invisible when the line height is set to zero.
2015-06-23 11:02:48 +08:00
WenhaiLin
fbe1bd8253
Label should be invisible when the line height is set to zero.
2015-06-23 09:42:48 +08:00
Zhou Yuntao
507f221483
fix a problem where WebSocket messages will pile up if server sends them faster than client's frame rate
2015-06-22 20:58:37 +08:00
Neo Kim
9757be0f81
Remove debugging logs
2015-06-22 14:49:30 +09:00
Neo Kim
71c98da2aa
Apply ease out action on inertia scroll
2015-06-22 14:30:45 +09:00
Neo Kim
c4fa99444c
Simplify the inertia scroll implementation
2015-06-22 14:30:36 +09:00
Neo Kim
c70c923674
Separate the inertia scroll from auto scroll. And implement auto scroll and bounce back as one logic. The bounce back movement is one of auto scroll feature.
2015-06-22 14:30:30 +09:00
Neo Kim
7422b20da9
Refactor some functions
2015-06-22 14:27:19 +09:00
Neo Kim
85fc5b3f89
Change to comply to Cocos2d-x convention
2015-06-22 14:27:11 +09:00
Neo Kim
6c212a7ddb
Replace the existing bounce back feature with another one like iOS bounce-back. The inner container moves smoother when bouncing back.
...
It does what the existing code did including scroll event dispatching and attenuating.
2015-06-22 14:27:00 +09:00
Neo Kim
1058ab9172
Add necessary member variables and methods
2015-06-22 14:26:51 +09:00
Neo Kim
a8f77710f5
Refactor some functions and remove redundant codes
2015-06-22 14:10:25 +09:00
Neo Kim
876c94f352
Remove the boundary of bouncing and apply half-movement when out of boundary like iOS bounce back.
2015-06-22 14:05:53 +09:00
Neo Kim
ff3f990142
Add isOutOfBoundary() functions
2015-06-22 14:05:53 +09:00
Neo Kim
c3c6eeb6c1
Refactor some functions
2015-06-22 14:05:52 +09:00
Neo Kim
a3ff9573b0
Remove duplicated logic in bounceScrollChildren()
2015-06-22 14:05:51 +09:00
Neo Kim
1971b01280
Make the event dispatch functions into one function after removing duplicated logic.
2015-06-22 14:05:50 +09:00
Neo Kim
31bf9f714d
Merge bouncing and non-bouncing logics as one.
2015-06-22 14:05:50 +09:00
Neo Kim
6a0609a687
Merge the logics for bouncing of VERTICAL, HORIZONTAL and BOTH in one function. VERTICAL and HORIZONTAL can be processed as BOTH.
2015-06-22 14:05:49 +09:00
Neo Kim
368b5e8f12
Remove duplicated logics in scrollChildrenBoth(), and extract meaningful logic into separate functions.
2015-06-22 14:05:49 +09:00
Anniruddh
4a15d57093
Fixed issue #168
2015-06-20 00:20:15 -07:00
yangxiao
d252250968
quaternion instead of euler angle
2015-06-19 18:46:14 +08:00
andyque
55b86b2e14
add more docs for samsung enhanced API
2015-06-19 18:09:42 +08:00
子龙山人
8ca0f18575
Merge pull request #12446 from pandamicro/v3
...
Add auto bindings for navmesh
2015-06-19 17:21:00 +08:00
子龙山人
869e3c5243
Merge pull request #12444 from WenhaiLin/v3-37-label-linewrapfix
...
Label:Fixed line wrap error without space.
2015-06-19 15:08:13 +08:00
pandamicro
7b1694bfeb
Merge pull request #12443 from VisualSJ/v3-aa
...
[ci skip]Studio parser: Code for defense
2015-06-19 14:24:39 +08:00
WenhaiLin
d32a317ea0
Label:Fixed line wrap error without space.
2015-06-19 13:39:19 +08:00
VisualSJ
8fa755d0e4
Studio parser: Code for defense
2015-06-19 13:15:10 +08:00
VisualSJ
ea0ab5c738
Studio parser: Code for defense
2015-06-19 11:13:07 +08:00
pandamicro
8e9fed936c
Add auto bindings
2015-06-19 10:36:36 +08:00
pandamicro
276ce3a0a7
Update versions
2015-06-19 09:56:19 +08:00
pandamicro
c6d4f283bb
Fix compilation issue in navmesh conversion
2015-06-19 08:11:45 +08:00
pandamicro
f405d00336
Fix linux compilation
2015-06-19 01:14:16 +08:00
江龙
91bc19fb29
Merge branch 'v3_origin' into navmesh
...
Conflicts:
tests/js-tests/src/Physics3DTest/Physics3DTest.js
2015-06-18 23:50:19 +08:00
江龙
8fc5835dee
modify linux file
2015-06-18 23:29:04 +08:00
江龙
61db9ef103
modify cocos2d_specifics , add navmesh head file。 modify template。add navmesh head file and register code
2015-06-18 23:21:53 +08:00
江龙
8c97fec5af
add navmesh project file path
2015-06-18 23:17:49 +08:00
jianglong0156
618d8f01e8
Merge pull request #9 from pandamicro/navmesh
...
Improve bindings for navmesh
2015-06-18 23:15:05 +08:00
pandamicro
b757837239
Move NavMesh to jsb namespace
2015-06-18 22:57:41 +08:00
jianglong0156
56382aae37
winphone project
2015-06-18 22:50:24 +08:00
CocosRobot
ea2ec582f0
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-18 14:05:05 +00:00
Bin Zhang
a4ecfdb7e2
Build engine with LOCAL_ARM_MODE=arm when building JS projects for android.
2015-06-18 22:00:57 +08:00
CocosRobot
e2268bb16f
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-18 22:00:57 +08:00
WenhaiLin
e2f834e96b
Fixed warn
2015-06-18 22:00:56 +08:00
CocosRobot
c069da629e
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-18 22:00:56 +08:00
Huabing.Xu
b17702e6f1
fix compile error for linux
2015-06-18 22:00:55 +08:00
pandamicro
cd7252014a
Merge pull request #12432 from pandamicro/v3
...
Change physics3d api to jsb namespace
2015-06-18 21:53:39 +08:00
pandamicro
e09ba8080f
Fix create Sprite with PolygonInfo issue
2015-06-18 21:48:57 +08:00
jianglong0156
05c40b13f9
fix the win32 head error
2015-06-18 21:30:30 +08:00
pandamicro
10a8adad53
Change physics3d api to jsb namespace
2015-06-18 20:39:40 +08:00
pandamicro
491d89baec
Merge pull request #12429 from natural-law/v3
...
Build engine with LOCAL_ARM_MODE=arm when building JS projects for android.
2015-06-18 20:28:52 +08:00
jianglong0156
e0b66707f9
add nerviest android file
2015-06-18 19:30:05 +08:00
jianglong0156
4fe1542d17
add navmesh tests
2015-06-18 19:22:27 +08:00
Bin Zhang
d288b13957
Build engine with LOCAL_ARM_MODE=arm when building JS projects for android.
2015-06-18 17:22:30 +08:00
CocosRobot
6e849a158d
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-18 08:18:00 +00:00
pandamicro
aa566a3722
Merge pull request #12424 from pandamicro/physics3d
...
Fix Physics3D test and js bindings
2015-06-18 16:09:49 +08:00
pandamicro
4d588c7837
Merge pull request #12423 from WenhaiLin/v3-37alpha0-warnfix
...
Fixed warn
2015-06-18 15:09:36 +08:00
jianglong0156
85c40b6580
Merge pull request #8 from pandamicro/physics3d
...
Physics3d
2015-06-18 14:54:32 +08:00
XiaoYang
96bb244d69
Merge pull request #351 from tangziwen/v3
...
fix terraintest and Terrain::getInstersectionPoint()
2015-06-18 14:47:49 +08:00
pandamicro
811173ea3b
Fix Physics3D test and js bindings
2015-06-18 14:33:16 +08:00
WenhaiLin
05522afaa1
Fixed warn
2015-06-18 14:24:52 +08:00
CocosRobot
b76db94725
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-18 05:43:02 +00:00
tangziwen
1989de7a04
fix terraintest and Terrain::getInstersectionPoint()
2015-06-18 12:20:44 +08:00
pandamicro
7952477469
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into physics3d
2015-06-18 12:05:01 +08:00
Huabing.Xu
92824537ac
fix compile error for linux
2015-06-18 11:15:45 +08:00
Vincent Yang
187437068f
Fixed bug: wrong usage of isVisitableByVisitingCamera, which should only effect draw call.
2015-06-18 10:32:30 +08:00
Vincent Yang
f8a5b1e18c
Fixed bug: UI component can't click correctly by moving UI and camera far away of origin.
2015-06-18 10:23:52 +08:00
pandamicro
3ffc0e6be6
Merge branch 'v3_navigation' of https://github.com/samuele3hu/cocos2d-x into physics3d
2015-06-18 09:20:37 +08:00
Dale Stammen
fd0605416e
moved clipper files to external/clipper filter in VS solution
2015-06-17 11:48:56 -07:00
Dale Stammen
9ef92b71dd
added missing external/clipper files. Removed obsolete files
2015-06-17 11:40:38 -07:00
pandamicro
a94b49bdef
Add nav mesh bindings
2015-06-17 23:41:12 +08:00
pandamicro
85e8a407b1
Merge branch 'navmesh' of https://github.com/jianglong0156/cocos2d-x into v3
...
# Conflicts:
# tests/js-tests/project/Classes/AppDelegate.cpp
# tools/tojs/genbindings.py
2015-06-17 19:58:24 +08:00
samuele3hu
683812d817
Update Physics3D test for js.
2015-06-17 18:50:55 +08:00
jianglong0156
b265033a41
add testcase and manual bindings
2015-06-17 18:38:18 +08:00
jianglong0156
897b5fd0e9
add navmesh test project file and binding file
2015-06-17 18:37:19 +08:00
pandamicro
bb275351f0
Merge pull request #12363 from super626/v3
...
Fix terrain lod computing bugs
2015-06-17 17:49:39 +08:00
yangxiao
12a352a1db
add comment
2015-06-17 16:32:08 +08:00
XiaoYang
5dd2aa2884
Merge pull request #349 from tangziwen/v3
...
fix camera position
2015-06-17 16:01:02 +08:00
tangziwen
e9c95229e0
fix camera position
2015-06-17 15:58:17 +08:00
pandamicro
b534f85679
Merge pull request #12394 from CocosRobot/update_lua_bindings_1434525200
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-17 15:38:17 +08:00
CocosRobot
22f04da582
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-17 07:18:18 +00:00
pandamicro
6f6c317f87
Merge pull request #12386 from WenhaiLin/v3-label-spacefix
...
Label:Fixed wrong letter spacing with outline enabled
2015-06-17 15:16:49 +08:00
pandamicro
5ee22c4142
Merge pull request #12174 from pajeroquan/v3
...
Fix JNI object memory leak!
2015-06-17 15:14:36 +08:00
pandamicro
b1831ea5fb
Merge pull request #12384 from chengstory/GBKToUTF8_v3
...
GBKToUTF8
2015-06-17 15:09:15 +08:00
CocosRobot
55c7de75e9
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-17 06:48:41 +00:00
Wenhai Lin
cbd428f6ac
Label:Fixed wrong letter spacing with outline enabled
2015-06-17 13:57:23 +08:00
zhangcheng
1c983f1f39
GBKToUTF8
2015-06-17 13:16:06 +08:00
Jacky
3c5ab4f518
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon2
...
# Conflicts:
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
2015-06-17 13:04:24 +08:00
CocosRobot
6bed988354
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-17 03:47:36 +00:00
子龙山人
0915565b8d
Merge pull request #12373 from samuele3hu/v3_navigation
...
Add the Lua bindings for NavMesh and the related test case.
2015-06-17 11:36:52 +08:00
Jacky
13e0fb22f5
fix compile on linux platform.
2015-06-17 11:34:19 +08:00
songchengjiang
c08a355a06
fix the bug of light
...
replace atanf with atan2f
2015-06-17 11:17:46 +08:00
pandamicro
a2deddcf59
Merge pull request #12361 from dabingnn/v3_androidBugForVertexAttrib
...
fix android background and foreground bug with VertexAttributeBinding
2015-06-17 09:34:47 +08:00
Dale Stammen
eb2bc78970
Merge branch 'v3' into v3-winrt-librecast
2015-06-16 07:13:53 -07:00
dkorchinskiy
5d4e8aa275
Fix crash on Windows if pass string more than 16kb to cocos2d::log
2015-06-16 16:56:06 +03:00
tangziwen
60115b1ce1
update
2015-06-16 17:46:21 +08:00
tangziwen
0eaf9b5acc
Fix camera's incorrect position in chunks' LOD calculating.
2015-06-16 17:29:43 +08:00
WuHao
6e138e7b9b
add clipper to cmakelist
2015-06-16 17:09:27 +08:00
WuHao
d3e0439972
Merge branch 'fix_spritepolygon2' of https://github.com/Wu-Hao/cocos2d-x into fix_spritepolygon
2015-06-16 16:15:57 +08:00
WuHao
3b56d2a66f
fix cmake for cmake platforms
2015-06-16 16:15:19 +08:00
Hao Wu
2ddad84c73
Merge pull request #17 from pandamicro/spritepolygon
...
Remove jsb_cocos2dx_experimental in projects to fix compilation issue
2015-06-16 15:11:36 +08:00
pandamicro
e4d5db30eb
Remove jsb_cocos2dx_experimental in projects to fix compilation issue
2015-06-16 15:09:06 +08:00
pandamicro
3f8923648b
Merge pull request #12359 from super626/opt_navigation
...
remove unused code, and use nullptr for pointer
2015-06-16 14:58:58 +08:00
Justin Hawkwood
90db6fe5d6
Added check that callback is set
2015-06-15 23:36:04 -07:00
Justin Hawkwood
9378b6704c
Moved file check to alternate location
2015-06-15 23:31:52 -07:00
Huabing.Xu
19982aae00
fix android background and foreground bug with VertexAttributeBinding
2015-06-16 14:04:50 +08:00
pandamicro
0866180918
Merge pull request #12162 from namezero111111/patch-4
...
JumpTo::clone() results in incorrect end position
2015-06-16 13:37:04 +08:00
samuele3hu
a547d6aa33
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_navigation
...
Conflicts:
tools/bindings-generator
2015-06-16 11:36:11 +08:00
WuHao
aeeed0f4ab
Merge remote-tracking branch 'origin' into fix_spritepolygon
...
# Conflicts:
# external/config.json
2015-06-16 11:19:20 +08:00
yangxiao
4d1aa56193
remove unused code, and use nullptr for pointer
2015-06-16 11:15:39 +08:00
Dale Stammen
8d8e7d6cb9
Merge branch 'v3' into v3-winrt-librecast
2015-06-15 19:27:40 -07:00
子龙山人
0b5c7d74b7
Merge pull request #12160 from namezero111111/patch-3
...
Blink::stop() access violation
2015-06-16 10:27:38 +08:00
子龙山人
271e3295eb
Merge pull request #12349 from WenhaiLin/v3-37-NotificationNode-crashfix
...
Fixed NotificationNode might crash program when the program exits.
2015-06-16 09:53:39 +08:00
Dale Stammen
0781978788
added librecast. Updated build properties
2015-06-15 18:44:14 -07:00
andyque
b8826d9de4
improve the enum naming
2015-06-16 09:42:06 +08:00
Dale Stammen
03fc2eca5e
added missing navmesh files
2015-06-15 18:19:28 -07:00
Ricardo Quesada
b167ab3e78
StateBlock() is public
2015-06-15 17:43:37 -07:00
Ricardo Quesada
ca3da86da7
StateBlock::restore() is public
...
It is possible to restore to default state
2015-06-15 14:12:44 -07:00
Dale Stammen
9262cc95bf
fixed project filters broken by recent additions of files
2015-06-15 11:38:52 -07:00
Ricardo Quesada
c17da7e90d
Removes not-needed draws
2015-06-15 10:40:47 -07:00
lite3
c249f7cb69
keep old behavior
2015-06-15 19:48:12 +08:00
andyque
a880dc86e9
improve comments
2015-06-15 19:36:20 +08:00
andyque
c1108db31e
Improve ui::Slider
...
1. Add two APIs to gain big precision
2. Add three type events in Slider's callback.
2015-06-15 18:31:21 +08:00
WenhaiLin
3c8d15f6f8
Fixed NotificationNode might crash program when the program exits.
2015-06-15 17:55:00 +08:00
WuHao
27d0f51e9b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
build/cocos2d_tests.xcodeproj/project.pbxproj
cocos/2d/libcocos2d.vcxproj.filters
tools/cocos2d-console
web
2015-06-15 16:13:36 +08:00
Hao Wu
b4ca8c1489
Merge pull request #15 from pandamicro/spritepolygon
...
Add SpritePolygon JSB bindingsJSB bindings
2015-06-15 15:47:02 +08:00
子龙山人
86b6ea702a
Merge pull request #12342 from WenhaiLin/v3-37-android-studio-fix
...
[ci skip]Android Studio projects:Fixed compile error.
2015-06-15 14:48:42 +08:00
WenhaiLin
518de1ff57
[ci skip]Android Studio projects:Fixed compile error.
2015-06-15 14:42:45 +08:00
CocosRobot
8ec924c206
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-15 05:46:51 +00:00
pandamicro
0216d05eee
Merge pull request #12102 from super626/navigation2
...
3D Navigation
2015-06-15 13:39:05 +08:00
pandamicro
c9c05ff982
Merge pull request #12314 from xiaofeng11/v3_xiaofeng
...
Fix when button reader bug
2015-06-15 13:13:39 +08:00
yangxiao
16a0ddc74e
rename CCNavMeshTool to CCNavMeshUtils
2015-06-15 12:52:55 +08:00
pandamicro
d0db40c4a6
Merge pull request #12080 from linshun/v3
...
issue #12078 added audio, network, physics, platform and storage group.
2015-06-15 12:45:11 +08:00
pandamicro
852b9b42b9
Remove jsb_cocos2dx_experimental_manual
2015-06-15 10:46:57 +08:00
linshun
efed0da8bc
issue #12078 : added subgroup of physics 2d.
2015-06-15 10:28:37 +08:00
pandamicro
707e9d4d7b
Merge pull request #12205 from ffskyfan/v3
...
Update extension.h, amend a really dangerous macros that may cause memory allocation error
2015-06-14 20:09:57 +08:00
Ricardo Quesada
5c419ff7bc
compiles on windows
2015-06-12 20:49:20 -07:00
pandamicro
032f231ed4
Add bindings for AutoPolygon and PolygonInfo
2015-06-13 11:14:57 +08:00
Ricardo Quesada
9b7c12aa38
updates invalidate documentation
2015-06-12 17:44:48 -07:00
Ricardo Quesada
a8cf72dc43
pass bits to invalidate
2015-06-12 17:14:09 -07:00
Ricardo Quesada
4278bf51b1
Adds RenderState::StateBlock::invalidate();
...
handy function to restore the GL state to the default one.
Only use it if calling GL calls directly
2015-06-12 16:47:08 -07:00
Ricardo Quesada
32aae46343
fixes
2015-06-12 15:37:29 -07:00
Ricardo Quesada
2a3347dd49
RenderState: default state fixes
...
parts of cocos2d code calls GL directly.
This should be avoided since v3.7 since the
`RenderState::StateBlock::_defaultState` won't know that
and the state will be invalid.
In order to fix this issue, after calling GL directly, you should
update the `_defaultState` manually.
2015-06-12 15:03:48 -07:00
子龙山人
38cd74933d
Merge pull request #12320 from CocosRobot/update_lua_bindings_1434115258
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-12 22:42:40 +08:00
pandamicro
9806c09b0e
Merge pull request #12299 from WenhaiLin/v3-label-cropped
...
Label:the texture of character have not cropped if character cross the axis-aligned bounding-box.
2015-06-12 21:33:09 +08:00
CocosRobot
60d68ab4de
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-12 13:27:20 +00:00
pandamicro
f9057b3f32
Merge pull request #12284 from pandamicro/v3
...
Fix template android compilation issue on physics3d
2015-06-12 21:10:40 +08:00
子龙山人
c01d1fe00a
Merge pull request #12310 from WenhaiLin/v3-particlefile-key
...
Fixed ParticleSystem may using wrong texture if the particle PLIST file created via ParticleDesigner.
2015-06-12 16:44:12 +08:00
Jacky
29c108bdef
Merge remote-tracking branch 'origin' into fix_spritepolygon2
...
# Conflicts:
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
2015-06-12 16:28:41 +08:00
XiaoFeng
8d19ea7320
Fix when button set to disabled mode and won't have a disable texture will cause simulator won't show button in disabled gray mode
2015-06-12 15:47:34 +08:00
pandamicro
e9d648f151
Fix physics 3d macro include issue
2015-06-12 15:41:46 +08:00
pandamicro
19ef0e0983
Fix indent
2015-06-12 13:01:13 +08:00
pandamicro
df1219c92d
Update manual conversion for sprite polygon
2015-06-12 12:56:37 +08:00
WenhaiLin
9f5a36b817
Fixed ParticleSystem may using wrong texture if the particle PLIST file created via ParticleDesigner.
2015-06-12 11:03:32 +08:00
子龙山人
7a9b48bd83
Merge pull request #12214 from andyque/optimize-ui-memory-usage
...
Optimize ui memory usage
2015-06-12 10:11:21 +08:00
子龙山人
463198b3ad
Merge pull request #12307 from MSOpenTech/v3-winrt-viewport
...
V3: Removed obsolete winrt override of setViewPortInPoints
2015-06-12 09:53:59 +08:00
pandamicro
b1b9c808eb
Merge pull request #12074 from samuele3hu/v3_material
...
Issue #10570 : Make getItemForTouch of Menu virtual.
2015-06-12 08:21:18 +08:00
pandamicro
9acc51a5eb
Merge pull request #12301 from jianglong0156/webviewCrash
...
fix webview crash in android
2015-06-12 08:12:14 +08:00
Dale Stammen
0f64a2d192
removed obsolete override of setViewPortInPoints
2015-06-11 07:59:52 -07:00
pandamicro
12de53726d
Merge pull request #12182 from VisualSJ/v3-jsb
...
[ci skip] Synchronization studio parser
2015-06-11 17:35:15 +08:00
jianglong0156
c317eb428a
fix webview crash in android
2015-06-11 17:28:02 +08:00
WenhaiLin
5aa31ea83a
Label:the texture of character have not cropped if character cross the axis-aligned bounding-box.
2015-06-11 17:16:44 +08:00
yangxiao
44c2b0d5ad
merge cocos
2015-06-11 15:54:42 +08:00
samuele3hu
17b1dee363
Merge branch 'fix_spritepolygon2' of https://github.com/Wu-Hao/cocos2d-x into v3_update_spritepolygon
2015-06-11 14:39:35 +08:00
samuele3hu
1b20e463d8
Update the Lua binding about the Polygon and update the test case.
2015-06-11 14:38:38 +08:00
pandamicro
8e3e928efd
Merge pull request #12040 from geron-cn/v3
...
fix bug: fix actiontimeline can not step to last frame when loop play
2015-06-11 14:36:08 +08:00
子龙山人
03814a569d
Merge pull request #12256 from WenhaiLin/v3-simpleaudio-fix
...
SimpleAudioEngine:Fixed thread safety problem on android.
2015-06-11 14:30:36 +08:00
CocosRobot
94a47fabcf
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-11 06:16:36 +00:00
pandamicro
6dfe937cae
Merge pull request #11892 from dabingnn/v3FrameBufferObject
...
V3 frame buffer object
2015-06-11 14:04:30 +08:00
Vincent Yang
097bf455c2
Rename CCRenderBufferObject to CCRenderBuffer in windows projects.
2015-06-11 11:45:10 +08:00
VisualSJ
2d12d6a295
Plist file parsing (action-2.x.js)
2015-06-11 11:14:10 +08:00
Jacky
a32fec8471
change clipper version to 6.1.3.
2015-06-11 10:45:37 +08:00
pandamicro
70606caa14
Fix template android compilation issue on physics3d
2015-06-10 19:37:52 +08:00
Jacky
4b5bcc06a1
remove draw points and add expand precision.
2015-06-10 18:54:53 +08:00
lijinlong
370845a738
luabinding enumerateChildren bug
...
第一次调用enumerateChildren的回调时将lua handler释放了,下次再进入回调时报错,将handler释放提到enumerateChildren调用完成后
2015-06-10 17:15:01 +08:00
samuele3hu
8935ad0226
Merge branch 'fix_spritepolygon2' of https://github.com/Wu-Hao/cocos2d-x into v3_update_spritepolygon
2015-06-10 13:54:32 +08:00
子龙山人
b666b373c7
Merge pull request #12261 from iris-wy/v3
...
fix bug #12200
2015-06-10 11:39:22 +08:00
Jacky
b41c60dbdb
Merge remote-tracking branch 'origin/v3' into fix_spritepolygon2
...
# Conflicts:
# external/config.json
2015-06-10 10:23:43 +08:00
Huabing.Xu
10352c40b2
Merge branch 'v3' into v3FrameBufferObject
...
# Conflicts:
# cocos/2d/CCCamera.h
2015-06-10 10:16:42 +08:00
anniruddh.koppal
3f4d1c4ed3
Fixed merge conflict issue
2015-06-09 14:06:24 -07:00
yangxiao
7f26ccb9ba
code style
2015-06-09 14:06:09 -07:00
tangziwen
fc34881ab9
fix Terrain::getIntersectionPoint
2015-06-09 13:23:33 -07:00
Justin Hawkwood
852639cfe7
Added empty string check
2015-06-09 09:19:04 -07:00
Dale Stammen
0cb2f87d3e
Merge branch 'v3' into v3-winrt-ogg
2015-06-09 08:21:09 -07:00
子龙山人
a202387800
Merge pull request #12247 from stari4ek/v3-outline-inner-holes
...
improve rendering of letter's inner shapes when outline is used
2015-06-09 23:11:39 +08:00
Jacky
88b3fc3c7e
fix memory leakage about operation=
2015-06-09 18:45:55 +08:00
iris-wy
79b3d70b60
fix bug #12200
...
solve warning ""Service Intent must be explicit: Intent {
act=com.enhance.gameservice.IGameTuningService }""
2015-06-09 18:43:46 +08:00
Huabing.Xu
67a94c4485
compiles on android and linux
2015-06-09 17:57:07 +08:00
XiaoFeng
20a6151f4c
Fix indent
2015-06-09 17:40:42 +08:00
Huabing.Xu
b79eec0b20
fix grid bug for viewport
2015-06-09 17:24:30 +08:00
Huabing.Xu
ef4978f0cd
move viewport to experimental namespace
2015-06-09 16:21:50 +08:00
Jacky
d8369dda94
fix on the wp8 universal.
2015-06-09 16:00:51 +08:00
Huabing.Xu
3e331128c6
file rename CCFrameBufferObject->CCFrameBuffer
2015-06-09 15:32:12 +08:00
WenhaiLin
6fec9c40b0
SimpleAudioEngine:Fixed thread safety problem on android.
2015-06-09 15:07:35 +08:00
XiaoFeng
f6083f3490
Fix issue 10258 & 10408
2015-06-09 14:38:48 +08:00
Huabing.Xu
97b387560b
revert some accidental changes
2015-06-09 14:06:11 +08:00
yangxiao
e433ad305b
decopule physics and navmesh from Director
2015-06-09 13:49:07 +08:00
Jacky
74aed5ae85
fix on the android.
2015-06-09 13:47:29 +08:00
Jacky
562d4b9a78
fix on the windows.
2015-06-09 11:23:37 +08:00
Huabing.Xu
9acab65e4f
rename FrameBufferObject->FrameBuffer
...
Move FrameBufferObject related class to experimental namespace
2015-06-09 10:59:43 +08:00
Justin Hawkwood
eca488b85a
Fails if file does not exist
...
This adds a callback with nullptr if the file does not exists. Checking this before checking cache means that if a file is cached then deleted, the async call will fail. To allow a cached but deleted file to return the texture, move the isFileExist check to ALTERNATIVE.
If leaving check where it is, on failure should it also check if the file was cached and remove it?
2015-06-08 17:14:15 -07:00
Dale Stammen
a2b677d300
Merge branch 'v3' into v3-winrt-ogg
2015-06-08 08:22:46 -07:00
Michael Sotnikov
dae8f788c1
improve rendering of inner shapes when outline is used
2015-06-08 12:56:43 +03:00
子龙山人
57e92df8ee
Merge pull request #12099 from stari4ek/v3-12097-video-android-search-path
...
Fixed : #12097 VideoPlayer on Android ignores search paths
2015-06-08 17:22:14 +08:00
子龙山人
54e23f15e6
Merge pull request #12179 from WenhaiLin/v3-37-physics-ap
...
Node:Fixed the anchor point can only be Vec2::ANCHOR_MIDDLE after setting physics body.
2015-06-08 16:12:56 +08:00
VisualSJ
3306c7b072
Fixed control LayoutComponent positioning bug
2015-06-08 15:41:33 +08:00
WuHao
a67e570ef7
deleted more leftover comments, placed polygon test further down the tests
2015-06-08 15:40:18 +08:00
WuHao
e175815c70
deleted some leftover comments in sprite
2015-06-08 15:17:46 +08:00
WuHao
2650de030c
modified tests to show current epsilon
2015-06-08 15:08:16 +08:00
子龙山人
272f40a3cf
Merge pull request #12242 from CocosRobot/update_lua_bindings_1433744214
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-08 14:27:50 +08:00
pandamicro
1b75d4a192
Merge pull request #12212 from super626/sprite3d
...
call setTransparent
2015-06-08 14:21:40 +08:00
CocosRobot
4fc0366e4d
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-08 06:21:14 +00:00
子龙山人
03892caed5
Merge pull request #12206 from super626/fixphysics3d2
...
3D Physics: remove addChildToPhysics
2015-06-08 14:13:38 +08:00
WuHao
a555b2fb52
added documentation for auto polygon
2015-06-08 13:59:44 +08:00
WuHao
0808b6aff9
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon
...
Conflicts:
cocos/2d/MarchingSquare.cpp
2015-06-08 13:59:26 +08:00
VisualSJ
060ab85f22
Fixed UIText color settings bug
2015-06-08 13:58:08 +08:00
lite3
f1d879f7ed
remove old path When added existing new searchPath
2015-06-08 13:34:45 +08:00
yangxiao
3fa17c28df
add comment
2015-06-07 22:02:23 -07:00
yangxiao
f9cc7fec0e
code style
2015-06-07 22:02:15 -07:00
yangxiao
076c3a8d90
get set gravity
2015-06-07 22:02:06 -07:00
tangziwen
87dab42255
fix Terrain::getIntersectionPoint
2015-06-07 22:01:38 -07:00
子龙山人
c5ba7eef8b
Merge pull request #12019 from super626/v3
...
getIntersectionPoint failed when there is no intersection on the terrain
2015-06-08 11:26:19 +08:00
Dale Stammen
2002054463
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-winrt-ogg
2015-06-07 20:19:52 -07:00
Huabing.Xu
133ef90c09
Merge branch 'v3Viewport' into v3FrameBufferObject
...
# Conflicts:
# cocos/renderer/CCFrameBufferObject.h
2015-06-06 18:16:22 +08:00
Jacky
3e62dd0473
remove unused file and code.
2015-06-06 13:31:25 +08:00
CocosRobot
835e56e80a
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-05 23:13:03 +00:00
Dale Stammen
d4c9a81908
Merge branch 'v3' into v3-winrt-ogg
2015-06-05 16:03:54 -07:00
Ricardo Quesada
453a3d93bc
samplers are treated as uniforms
2015-06-05 14:55:33 -07:00
Dale Stammen
47b5085ade
Merge branch 'v3' into v3-winrt-ogg
2015-06-05 05:36:15 -07:00
andyque
1954f6c55c
fix enum class wrong indentation
2015-06-05 17:23:32 +08:00
andyque
56b7037c5f
optimize uislider memory usage
2015-06-05 17:16:10 +08:00
yangxiao
8e558db3d6
call setTransparent
2015-06-05 16:25:09 +08:00
CocosRobot
9178eeca73
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-05 08:11:21 +00:00
pandamicro
399ecfcb9f
Merge pull request #12176 from super626/fixphysics3d
...
rename syncToNode and syncToPhysics
2015-06-05 16:02:45 +08:00
andyque
6390f063fe
optimize UILoadingBar memory usage
2015-06-05 15:57:39 +08:00
子龙山人
c5c96042ef
Merge pull request #12181 from namezero111111/patch-5
...
TintBy::clone() incorrect cast
2015-06-05 15:27:43 +08:00
yangxiao
d50c1823d4
merge cocos
2015-06-05 14:25:37 +08:00
andyque
a7141bab38
improve imageView memory usage
2015-06-05 14:19:05 +08:00
yangxiao
761944f507
remove addChildToPhysicsWorld for 3d object
2015-06-05 13:54:09 +08:00
pandamicro
fa71a6e352
Merge pull request #12204 from jianglong0156/issue1756
...
default support curl gzip. and add the gzip test in xmlhttprequest Issue1756
2015-06-05 13:17:53 +08:00