andyque
68a90743c7
Sync PR: https://github.com/cocos2d/cocos2d-x/pull/13303
2015-08-12 18:09:32 +08:00
pandamicro
cb143963ce
Upgrade Spine runtime
2015-08-12 18:07:28 +08:00
子龙山人
a84553ae17
Merge pull request #13311 from WenhaiLin/v3-audio-crashfix
...
AudioEngine:Fixed possible crash on iOS/Mac.
2015-08-12 18:02:00 +08:00
andyque
82f597ce98
Merge branch 'v3.7.1' into v3
...
# Conflicts:
# cocos/scripting/lua-bindings/auto/api/CheckBox.lua
# cocos/ui/UICheckBox.cpp
# cocos/ui/UICheckBox.h
2015-08-12 17:59:50 +08:00
子龙山人
86d674030e
Merge pull request #13307 from fusijie/fix_cocostudio_skin_flip
...
fix cocostudio skin setfliped.
2015-08-12 14:34:46 +08:00
子龙山人
be1d3ccc67
Merge pull request #13324 from zilongshanren/fix-editbox-soft-keyboard-backissue
...
fix ui::TextField status error.
2015-08-12 13:57:10 +08:00
andyque
763976d50c
fix ui::TextField status error.
...
1. Refactoring Cocos2dxEditText to reuse Cocos2dxEditBox.
2. Reorder the event handling in ui::TextField.
2015-08-12 11:05:07 +08:00
pandamicro
dbd0b6dd86
Merge pull request #13272 from yangws/bug_21800
...
fixed bug #21800 [CppTest]Node: Scene3D when player outof terrain app…
2015-08-12 10:25:30 +08:00
Wenhai Lin
b46000287e
AudioEngine:Fixed crash cause by multiple threads access into a shared unsynchronized data.[iOS/Mac]
2015-08-11 18:11:59 +08:00
CocosRobot
ef41cb27ca
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-11 08:02:58 +00:00
子龙山人
f3f67a10f9
Merge pull request #13232 from perminovVS/v3-dev-get-file-extension
...
Add getFileExtension to FileUtils
2015-08-11 15:54:55 +08:00
子龙山人
65c4261cc6
Merge pull request #13301 from yangws/bug_21906
...
fix bug: #21906 Pause/Resume 's result not correct.
2015-08-11 15:54:02 +08:00
Vincent Yang
bb0a7a8533
fix bug: #21906 Pause/Resume 's result not correct.
2015-08-11 14:28:52 +08:00
Vincent Yang
47ecb246b8
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into bug_21906
2015-08-11 14:24:02 +08:00
andyque
b2bf8469f0
Fix EditBox turning black when soft keyboard hide.
...
I disable a optimization when users start to type, the resize layout's
doLayout event should be stoped.
But it has bugs. If we could find reliable soft keyboard show/hide
event detection method, we could enable this optimization again.
2015-08-11 11:42:37 +08:00
子龙山人
271ab08b59
Merge pull request #13306 from WenhaiLin/v3.8-label-letter-flipped
...
Label:Fixed letter can be flipped.
2015-08-11 11:05:12 +08:00
子龙山人
f1c252a1a8
Merge pull request #13302 from WenhaiLin/v3.8-CocosBuilderTest-crash
...
CppTests-->Extension-->CocosBuilderTest:Fixed crash on Android 5.0.x.
2015-08-11 11:04:54 +08:00
fusijie
aa1b1831e9
fix cocostudio skin setfliped.
2015-08-11 10:34:22 +08:00
WenhaiLin
eeb4a38715
Label:Fixed letter can be flipped.
2015-08-11 10:06:14 +08:00
CocosRobot
aa6ac72405
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-11 01:58:29 +00:00
WenhaiLin
2deeee70d2
CppTests-->Extension-->CocosBuilderTest:Fixed crash on Android 5.0.x.
2015-08-10 22:41:18 +08:00
pandamicro
6bcea5baee
Fix issue described in #13284 by reorder state setting and event dispatching
...
The real reason of #13284 is that the `_selected` state is set after touch events dispatching.
So I decided to override `onTouchEnded` function to set the `_selected` state.
2015-08-10 22:27:59 +08:00
Vincent Yang
d0a5c02399
fix bug: #21906 Pause/Resume 's result not correct.
2015-08-10 17:58:49 +08:00
Wenhai Lin
2983aed0a9
Label:Fixed crash cause by access an invalid address
2015-08-10 16:50:59 +08:00
pandamicro
1471936c2f
Merge pull request #13249 from pandamicro/v3
...
Made SocketIO events correctly fired when compile in release mode
2015-08-10 13:32:09 +08:00
pandamicro
3cc06d3f9b
Merge pull request #13267 from yangws/bug_21796
...
Fix bug: #21796 [Android 5.0][Cpp-Tests] Node::Scene3D menu unusable.
2015-08-10 12:40:32 +08:00
pandamicro
f4440f5613
Merge pull request #13229 from fusijie/fix_13228
...
Fixed SpriteBatchNode setFlipped bug.
2015-08-10 11:53:30 +08:00
pandamicro
c54a204bad
Synchronize enable state and bright state for Widget
...
Fix issue: https://github.com/cocos2d/cocos2d-x/issues/8137
2015-08-10 07:42:35 +08:00
pandamicro
1f52f0971a
Fix CheckBox cross renderer state not updated correctly
...
Issue description: When checkbox checked, its renderer adaptation may not be updated.
Reported http://punchbox.info:3000/issues/21630
2015-08-09 20:57:37 +08:00
CocosRobot
8c76a194fa
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-09 02:32:59 +00:00
子龙山人
f6569f24f4
Merge pull request #13273 from zilongshanren/android-editbox-reimplement-fix
...
Re-implement Editbox on Android platform.
2015-08-09 10:25:19 +08:00
pandamicro
99e1e00a5b
Merge pull request #13268 from dabingnn/v3_fixCrashOnAndroid
...
fix engine crash because of wrong initialisation on some android device
2015-08-08 19:43:10 +08:00
CocosRobot
eb9d1ea205
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-07 22:55:48 +00:00
Ricardo Quesada
789da4edd8
compiles on xcode7
2015-08-07 14:00:18 -07:00
geron-cn
744fd74b3b
make skeleton's debugdraw contorls all subbone's debug draw
2015-08-08 00:39:01 +08:00
pandamicro
a8c729fb42
Merge pull request #13270 from jianglong0156/fixlabelColordisplay
...
[ci skip]fix the node color property can not use
2015-08-07 17:50:27 +08:00
Vincent Yang
354f64ec51
fixed bug #21800 [CppTest]Node: Scene3D when player outof terrain app will no response.
2015-08-07 17:36:35 +08:00
andyque
a35e89225e
Re-implement Editbox on Android platform.
...
This PR also fixed issue:
https://github.com/cocos2d/cocos2d-x/issues/9572
For the new EditBox:
1. Added a ResizeLayout for updating layout when soft keyboard is shown.
This is because some Android devices won't refresh the view and when
the view is panned, the native EditText will turn black. This is really
a hack, but it works for many Android devices from 2.3 to 5.0.
When keyboard is beginning to show, the ResizeLayout's doLayout
method will be called 24 frames per second. Once the keyboard is closed,
or the user begins to input, the doLayout method will be disabled.
2. EditText is working in a different UI thread, so all the data
are passed to GL thread via callbacks in UI thead.
3. It also overrides onKeyDown method in Cocos2dxEditBox.
When the EditText got the focus, users could press back key to exit
the game. This behavior is not allowed. We give developer the choice to
handle back key event manually.
2015-08-07 17:27:15 +08:00
jianglong0156
2c3b9009cb
fix the node color property can not use
...
code example:
````
node.color = xxxx // fix it
````
2015-08-07 17:26:35 +08:00
Huabing.Xu
ba02d9df1d
fix engine crash because of wrong initialisation on some android device
2015-08-07 16:37:41 +08:00
Vincent Yang
56204dbef9
Fix bug: #21796 [Android 5.0][Cpp-Tests] Node::Scene3D menu unusable.
2015-08-07 16:30:22 +08:00
geron-cn
e1108c594c
Merge branch 'v3.7.1' of github.com:cocos2d/cocos2d-x into 3.7.1
...
Conflicts:
cocos/editor-support/cocostudio/ActionTimeline/CCBoneNode.cpp
2015-08-07 15:48:33 +08:00
geron-cn
c7bc84e19b
fix crash when BoneNode destruct after skeleton destructed.
2015-08-07 15:41:31 +08:00
geron-cn
c6bc81d420
add destruct
2015-08-07 13:13:48 +08:00
geron-cn
c569e70aea
fix BoneNode::visit for visit other node that is not a BoneNode or SkinNode
2015-08-07 11:44:06 +08:00
geron-cn
7b572bed9d
Fix crash when call removeChild from a bone which is already removed.
2015-08-07 09:37:18 +08:00
andyque
211dde38e9
Fix improper touch intercept event propagation.
...
When the container widget is disabled, it shouldn't intercept touch.
https://github.com/cocos2d/cocos2d-x/issues/8316
2015-08-06 22:50:53 +08:00
pandamicro
934764af83
Merge pull request #13250 from xiaofeng11/v3.7.1
...
Synchronize js parser with https://github.com/cocos2d/cocos2d-x/pull/13247
2015-08-06 22:23:40 +08:00
geron-cn
3ae3020d61
fix crash when fore call remove child bone from a bone which already removed from a skeleton.
2015-08-06 19:43:11 +08:00
XiaoFeng
91c88ec535
Synchronize js parser with https://github.com/cocos2d/cocos2d-x/pull/13247
2015-08-06 18:12:08 +08:00
pandamicro
0d778386f4
Merge pull request #13208 from dabingnn/v3_fixViewportCompile
...
Make viewport constructor more compile friendly
2015-08-06 17:45:23 +08:00
pandamicro
a170b1caf1
Made SocketIO events correctly fired when compile in release mode
...
Fixed https://github.com/cocos2d/cocos2d-x/issues/13248
Reason: `ScriptingCore::executeJSFunctionWithThisObj` is somehow broken in release mode.
Solution: Use `JSFunctionWrapper` to manage callbacks instead of managing JS values manually.
I also did the following in this commit:
- Correct the coding style in jsb_socketio.cpp
- Remove android.mk in the Xcode project
2015-08-06 17:20:04 +08:00
Liam
34000f4bde
fix particle3d crash with error file
2015-08-06 15:13:54 +08:00
子龙山人
41afa9695c
Merge pull request #13230 from WenhaiLin/v3.8-label-space-lost
...
Spaces should not be lost if label created with Fingerpop.ttf
2015-08-06 11:01:35 +08:00
fusijie
9b148b08cd
Fixed SpriteBatchNode setFlipped bug.
2015-08-06 10:53:22 +08:00
Vladimir Perminov
7cacdaeaf1
Add getFileExtension to FileUtils
...
Gets filename extension is a suffix (separated from the base filename by
a dot) in lower case.
More code need get filename extension, everyone does it differently.
use check UPPER and lower case, use . and no(example ".csb", ".CSB",
"csb" )
And bag in AudioEngineImpl: find point from left( ext =
strchr(filePath.c_str(), '.'); )
If file path contains point. always unsupported media type
2015-08-05 22:21:16 +03:00
WenhaiLin
e81d5af12d
Spaces should not be lost if label created with Fingerpop.ttf
2015-08-05 23:46:41 +08:00
geron-cn
ee6253319a
delete useless code
2015-08-05 23:07:42 +08:00
pandamicro
881adf6f36
Merge pull request #13217 from jianglong0156/fixTextFieldBug
...
fix textfield and editbox can not input emoticon
2015-08-05 17:41:19 +08:00
子龙山人
47fe470647
Merge pull request #13213 from jianglong0156/improUtfFunction
...
add api getStringUTFCharsJNI newStringUTFJNI
2015-08-05 17:26:52 +08:00
jianglong0156
42ed314463
fix textfield and editbox can not input emoticon
...
fix textfield and editbox can not input emoticon and improve the api comments
2015-08-05 17:03:06 +08:00
pandamicro
dae4385b61
Merge pull request #13214 from pandamicro/skeleton-fix
...
Make BoneNodes ordered in Skeleton
2015-08-05 16:36:18 +08:00
geron-cn
9980397081
Make BoneNodes ordered in Skeleton
...
1. Order skins differently than bones and draw them with unified local z order
2. Check children has been remove when its ansester remove
3. Checkout cocos2d::map exists iter before remove
Squashed from https://github.com/cocos2d/cocos2d-x/pull/13191
2015-08-05 16:33:32 +08:00
jianglong0156
9a257d8136
fix lua pai error
2015-08-05 16:15:22 +08:00
jianglong0156
fac7a78fc8
improve getUTFCharsFromJavaEnv api to getStringUTFCharsJNI and add newStringUTFJNI
...
getUTFCharsFromJavaEnv:
getUTFCharsFromJavaEnv:change jstring to utf8 std string
newStringUTFJNI:change utf8 std string to jstring
2015-08-05 16:10:14 +08:00
WenhaiLin
2c220092e6
Fixed FontAtlasCache::purgeCachedData might cause crash.
2015-08-05 14:12:02 +08:00
Huabing.Xu
5f9a3b97fb
fix viewport constructor error in old compiler to make it more compatible.
2015-08-05 10:57:27 +08:00
pandamicro
8cdcade07a
Merge pull request #13186 from jianglong0156/addEmotionTest
...
fix getStringUTFChars bug
2015-08-05 10:19:19 +08:00
WenhaiLin
b9edd6fc29
Fixed transform
2015-08-05 00:21:06 +08:00
WenhaiLin
2363622a67
Label:support auto batch with bitmap font or char map.
2015-08-04 21:49:14 +08:00
jianglong0156
3230ca154d
improve the code. fix network error
2015-08-04 16:42:16 +08:00
jianglong0156
00b7e98c89
improve the getUTFCharsFromJavaEnv logic and fix the httpclient response message memery leak.
2015-08-04 16:24:08 +08:00
VisualSj
b9b565e64a
Update JSON parser
2015-08-04 16:04:35 +08:00
pandamicro
744fa0b565
Merge pull request #13194 from VisualSJ/v3-boneTest
...
[ci skip] Update JSON parser
2015-08-04 15:35:27 +08:00
VisualSj
04465ac4f4
Update JSON parser
2015-08-04 15:15:46 +08:00
pandamicro
b9602127a4
Merge pull request #13187 from xiaofeng11/v3.7.1
...
Remove file error notice label from TextBMFontReader
2015-08-04 13:38:17 +08:00
XiaoFeng
0f90999419
Remove file error notice label from TextBMFontReader to keep consistency with other components
2015-08-04 11:45:29 +08:00
jianglong0156
979700e343
there is a bug for getStringUTFChars function. it can't translate the emotion utf8 code. so change the getStringUTFChars to getStringChars. and translate unicode to utf8 in c++ program
2015-08-04 11:30:30 +08:00
pandamicro
d20052cc22
Fix line wrapper in CCDevice
2015-08-04 11:07:04 +08:00
pandamicro
f9249f0e49
Merge pull request #13180 from sridher/mac_dpi_fix
...
getDPI for Mac Implemented
2015-08-04 10:49:14 +08:00
fusijie
8d2da20e5f
fix spelling mistake.
2015-08-04 09:36:33 +08:00
pandamicro
25cb0d2896
Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3
...
# Conflicts:
# web
2015-08-03 19:47:56 +08:00
pandamicro
6d3a00ad67
Merge pull request #13173 from geron-cn/3.7.1
...
fix bug: crash when use bone after erase it form Vector.
2015-08-03 19:45:54 +08:00
Sridher Jakku
f48a9fb9f0
getDPI for Mac Implemented
2015-08-03 17:12:52 +05:30
CocosRobot
3e71ce33c8
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-03 10:09:10 +00:00
pandamicro
4b7b85f113
Merge pull request #12889 from fusijie/fix_clippingRectangle_bug
...
remove CCClippingRectangleNode transform error support.
2015-08-03 18:01:01 +08:00
geron-cn
e4c47c811f
remove EMSCRIPTEN draw
2015-08-03 16:53:08 +08:00
geron-cn
cfc8da579f
fix bug: crash when use bone after erase it form Vector. move the operation after erase, make sure bone ref* is not realeaed
2015-08-03 16:47:54 +08:00
pandamicro
f10994c20b
Merge pull request #12467 from MagicTavern/v3_fix_websocket
...
fix a problem where WebSocket messages may pile up
2015-08-03 16:25:56 +08:00
CocosRobot
dbb8792630
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-03 07:46:25 +00:00
pandamicro
b13fddb18e
Merge pull request #13162 from super626/v3
...
Terrain: Add light map support
2015-08-03 15:37:42 +08:00
yangxiao
fc4c25c51e
add comment
2015-08-03 13:30:30 +08:00
CocosRobot
167f9adca8
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-03 05:09:11 +00:00
pandamicro
702e667143
Merge pull request #13152 from zilongshanren/addVerticalPageView
...
add PageView vertical scroll support
2015-08-03 13:00:48 +08:00
andyque
2427c15b60
modify vertical scroll direction
2015-08-03 11:38:23 +08:00
pandamicro
330eaf5239
Merge pull request #13161 from xiaofeng11/v3.7.1
...
Fix 3d particle can not show in simulator
2015-08-03 11:11:39 +08:00
fusijie
aaa5793b86
add IF-CASE to fix debug draw under SpriteBatchNode.
2015-08-03 10:47:58 +08:00
yangxiao
b6774a5f44
fix warning
2015-08-03 10:27:57 +08:00
yangxiao
929cd4fbfe
set default value for _lightDir
2015-08-03 10:12:04 +08:00
yangxiao
8a6c49b5a3
merge cocos
2015-08-03 09:54:29 +08:00