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
XiaoFeng
17a5d07183
Fix 3d particle can not show in simulator
2015-08-03 09:53:16 +08:00
CocosRobot
c281630fa6
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-03 00:13:29 +00:00
pandamicro
3c2e66e425
Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3
...
# Conflicts:
# .travis.yml
# build/cocos2d_js_tests.xcodeproj/project.pbxproj
# build/cocos2d_tests.xcodeproj/project.pbxproj
# cocos/2d/CCFont.h
# cocos/2d/CCFontAtlas.cpp
# cocos/2d/CCFontAtlas.h
# cocos/2d/CCFontFreeType.cpp
# cocos/2d/CCFontFreeType.h
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
# cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
# cocos/cocos2d.cpp
# cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
# templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
# templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
# tools/bindings-generator
# tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
# tools/travis-scripts/generate-bindings.sh
# tools/travis-scripts/generate-cocosfiles.sh
# tools/travis-scripts/travis_mac.yml
2015-08-02 22:28:27 +08:00
andyque
63822566d2
refactor PageView implementation
2015-08-01 23:33:25 +08:00
CocosRobot
29208156d9
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-01 13:23:21 +00:00
pandamicro
46bb4f8aae
Merge pull request #13149 from jianglong0156/constructedWith3D_3#12404
...
Constructed with3d
2015-08-01 21:15:08 +08:00
jianglong0156
5d281d45ef
recover the physics3DShape initHeightfield api
2015-08-01 18:29:48 +08:00
pandamicro
00a3d572d1
Merge pull request #12899 from super626/v3
...
Animate3D Callback and Bug fix
2015-08-01 18:24:05 +08:00
andyque
5f34c1f072
add PageView vertical scroll support
2015-08-01 18:18:46 +08:00
jianglong0156
69040ef472
add Physics3DHingeConstraint support constructor
...
add Physics3DSliderConstraint support constructor
add Physics3DConeTwistConstraint support constructor
add Physics3D6DofConstraint support constructor
add PhysicsSprite3D support constructor
2015-08-01 16:18:00 +08:00
jianglong0156
bcec599993
Merge branch 'v3' into constructedWith3D_3#12404
2015-08-01 15:38:26 +08:00
pandamicro
0ca48a32f5
Merge pull request #13110 from WenhaiLin/v3.8-label-cropped-fix
...
Label:Fixed the edge of character may be cropped.
2015-08-01 15:36:47 +08:00
pandamicro
f995ed8634
Merge pull request #13079 from zilongshanren/v3.7.1
...
fix Mac system font crash issue
2015-08-01 15:27:36 +08:00
CocosRobot
90d578c6e5
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-01 02:16:33 +00:00
pandamicro
d52a5da1d8
Merge pull request #13114 from jianglong0156/constructedWith3D_2#12404
...
Constructed with3d
2015-08-01 10:09:08 +08:00
pandamicro
3bdc7e4e1e
Merge pull request #13138 from fusijie/fix_spritepolygon_setflip
...
fix polygon sprite setFlipped bug.
2015-08-01 09:59:25 +08:00
pandamicro
f74438372c
Merge pull request #11293 from perminovVS/v3-dev-screen-size-bug
...
GLViewImpl initWithRect bug size
2015-07-31 18:43:23 +08:00
jianglong0156
dcda083efa
rename the initTerrain to initWithTerrainData
2015-07-31 18:35:47 +08:00
jianglong0156
80e812e5a0
add Physics3DShape support constructor
2015-07-31 18:17:35 +08:00
fusijie
dcef1e9d31
fix polygon sprite setflipped bug.
2015-07-31 15:49:44 +08:00
pandamicro
aa1a3bb6b7
Merge pull request #13137 from yangws/issue_9507
...
Fixed #9507 : logic error in isMaxLengthEnabled handling in UITextFie…
2015-07-31 15:43:46 +08:00
jianglong0156
4439b02a84
rename the init function name
2015-07-31 15:21:54 +08:00
pandamicro
aed6b0719e
Merge pull request #13089 from yangws/issue_12692
...
Fixed #12692 : UILayout viewing area cutting position calculation error
2015-07-31 12:02:00 +08:00
CocosRobot
0851363532
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-31 02:06:41 +00:00
pandamicro
ede9195d14
Merge pull request #13073 from super626/fixtest
...
Bug Fix
2015-07-31 09:58:14 +08:00
yangxiao
fc14efa034
update comment
2015-07-31 09:55:57 +08:00
pandamicro
c9d23805e7
Merge pull request #12978 from yangws/issue_12249
...
Fixed #12249 : Button touch doesn't work with setScale9Enabled.
2015-07-31 09:54:38 +08:00
pandamicro
6b9ca70e02
Merge pull request #13051 from yangws/issue_9400
...
Fixed #9400 : Widget::setHighlighted does not work after setBright
2015-07-31 09:50:20 +08:00
pandamicro
16eb88bf57
Merge pull request #13055 from yangws/issue_10082
...
Fixed #10082 : Label and Text have different types for fontSize
2015-07-31 09:49:48 +08:00
pandamicro
94023ebfc5
Merge pull request #13126 from takaken1994/bugfix/remove-using-namespace-from-header
...
remove "using namespace cocos2d;" from header file
2015-07-31 09:28:58 +08:00
CocosRobot
c0d6ec1946
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-30 16:30:01 +00:00
pandamicro
34724e41b2
Merge pull request #13092 from pandamicro/audioengine
...
Add AudioEngine js bindings
2015-07-31 00:22:04 +08:00
pandamicro
3fa016a280
Fix win32 project and add winrt support
2015-07-30 23:39:52 +08:00
takaken1994
93c47390c8
Fix : remove using namespace cocos2d from header file
2015-07-31 00:02:57 +09:00
pandamicro
3524af1ad6
Merge pull request #13059 from geron-cn/3.7.1
...
fix bug: BoneNode 's debugdraw can not be controlled by ancestor's vi…
2015-07-30 20:31:34 +08:00
pandamicro
c0066f9afd
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into audioengine
2015-07-30 20:25:57 +08:00
geron-cn
0955b0f9de
fix comment by pandamicro
2015-07-30 19:28:00 +08:00
CocosRobot
56b58a5839
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-30 10:50:00 +00:00
pandamicro
5aa8647309
Merge pull request #13117 from CocosRobot/update_lua_bindings_1438251761
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-30 18:45:15 +08:00
pandamicro
8542f8a7a9
Merge pull request #13067 from pandamicro/scrollviewbar
...
Bind UIScrollViewBar
2015-07-30 18:42:08 +08:00
CocosRobot
b167d29a80
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-30 10:27:28 +00:00
pandamicro
9b5c8d5d12
Merge pull request #12601 from super626/physics3d
...
3d physics collider
2015-07-30 18:19:23 +08:00
yangxiao
8eac67b806
IsTrigger to isTrigger
2015-07-30 18:18:02 +08:00
yangxiao
99a869b588
IsTrigger to isTrigger
2015-07-30 18:14:46 +08:00
jianglong0156
113233b8df
add Camera support constructor
2015-07-30 18:00:51 +08:00
pandamicro
507a094653
Merge pull request #13108 from jianglong0156/constructedWith3D#12404
...
improve jsval_to_physics3DRigidBodyDes
2015-07-30 17:58:16 +08:00
CocosRobot
ef7318cf00
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-30 09:23:06 +00:00
jianglong0156
b016b642ce
add Terrain support constructor
2015-07-30 17:17:57 +08:00
pandamicro
39721c6eb6
Merge pull request #13105 from fusijie/fix_10487
...
fix Sprite/Label/FastTMX auto-culling bug.
2015-07-30 17:12:37 +08:00
Wenhai Lin
bce279c52e
Label:Fixed the edge of character may be cropped.
2015-07-30 16:24:47 +08:00
jianglong0156
0f9483a0e3
add SpotLight support constructor
2015-07-30 15:21:35 +08:00
jianglong0156
8d3ceb7ac2
add PointLight support constructor
2015-07-30 15:11:37 +08:00
fusijie
17c7848e62
fix FastTiledMap auto-culling bug.
2015-07-30 15:07:03 +08:00
jianglong0156
52ed2e8d4e
add conversion function declare, use to the physics3d auto conversion the data
2015-07-30 14:56:24 +08:00
jianglong0156
b16ee0e45d
add file in project file with android, linux wp8.1 (reverted from commit 948628b800
)
2015-07-30 14:46:10 +08:00
jianglong0156
73125f46d2
add file in project file with android, linux wp8.1 (reverted from commit 948628b800
)
2015-07-30 14:38:20 +08:00
jianglong0156
a1a9e281a3
add conversion cpp file into iOS project (reverted from commit 439bc8a99f
)
2015-07-30 14:37:58 +08:00
fusijie
f91a58c8ff
fix Label auto-culling bug.
2015-07-30 13:59:50 +08:00
CocosRobot
7a73c65208
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-30 05:53:20 +00:00
子龙山人
cd4d8b7880
Merge pull request #13101 from WenhaiLin/v3.8-label-code-style
...
Improve coding style
2015-07-30 13:44:53 +08:00
pandamicro
a011fa4c8a
Merge pull request #12852 from super626/issue10242
...
fix #10242 , reload shader when light number changed
2015-07-30 12:57:32 +08:00
fusijie
ee5e64825a
fix Sprite auto-culling bug.
2015-07-30 12:00:57 +08:00
CocosRobot
f1adc2ffd2
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-30 03:39:17 +00:00
WenhaiLin
964e7103b5
Improve coding style
2015-07-30 11:33:18 +08:00
子龙山人
c039c7a9bd
Merge pull request #13084 from WenhaiLin/v3.8-label-df-contentsize-fix
...
Fixed the content size of Label is incorrect with GLOW effect.
2015-07-30 11:29:48 +08:00
CocosRobot
bd867311f1
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-29 20:42:46 +00:00
Ricardo Quesada
642ccac5dc
Merge pull request #12927 from ricardoquesada/spine-2.3
...
Adds support for Spine runtime 2.3
2015-07-29 13:33:15 -07:00
pandamicro
f53ba42b3b
Fix test issues and Add audio engine to js templates
2015-07-29 21:22:44 +08:00
pandamicro
9972bfb98c
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into audioengine
...
# Conflicts:
# tests/js-tests/src/NativeTest/NativeTest.js
2015-07-29 21:01:56 +08:00
pandamicro
da4e062614
Add js wrapper for audio engine
2015-07-29 20:47:28 +08:00
VisualSJ
179266240f
Update js parser (timelineParser-2.x.js)
2015-07-29 19:49:54 +08:00
Vincent Yang
e1d4d22353
Fixed #12692 : UILayout viewing area cutting position calculation error
2015-07-29 18:43:11 +08:00
Liam
c93d40869c
fix simulator crash when sprite3d resource is error
2015-07-29 16:52:40 +08:00
WenhaiLin
a9f27865d3
Fixed the content size of Label is incorrect with GLOW effect.
2015-07-29 16:30:07 +08:00
WenhaiLin
20d445ad1a
Label:The texture of system font should be cropped if the height of label is not enough to show the entire string on Mac.
2015-07-29 16:11:27 +08:00
CocosRobot
8c642d966f
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-29 07:45:19 +00:00
pandamicro
16b03f0ebe
Merge pull request #13065 from pandamicro/widget_onEnter
...
Ensure C++ classes onEnter, onExit can be safely override in JS
2015-07-29 15:36:12 +08:00
andyque
6de387b3ac
fix Mac system font crash issue
2015-07-29 15:20:31 +08:00
子龙山人
96d44e1078
Merge pull request #13076 from WenhaiLin/v3.8-label-gb2312
...
Label:support font that contains GB2312 char map.
2015-07-29 14:51:17 +08:00
tangziwen
cee43ccebb
update terrain again
2015-07-29 14:32:36 +08:00
子龙山人
a46c4be912
Merge pull request #13039 from WenhaiLin/v3.8-audioengine-preload
...
AudioEngine:support callback for preload feature.
2015-07-29 14:15:05 +08:00
tangziwen
e4cf89e1c4
terrain update: can set Light direction manually, set light map, fix a bug which height map is not exist cause crash when destructing.
2015-07-29 13:24:12 +08:00
pandamicro
3089ac302e
Refine ui bindings and JS constants
2015-07-29 13:06:49 +08:00
pandamicro
c81ba3c148
Merge pull request #12648 from stari4ek/v3-12645-depthstencil-attributes-ios
...
Fixed : #12645 iOS: depth/stencil buffers attributes are ignored
2015-07-29 11:09:56 +08:00
pandamicro
4cd0ced683
Merge pull request #12805 from super626/animate3d
...
fix #11487 animate3d bugs
2015-07-29 11:09:03 +08:00
yangxiao
5d677d49bb
clamp sin value to -1, 1
2015-07-29 10:35:01 +08:00
pandamicro
81842417c4
Merge pull request #13032 from xiaofeng11/v3
...
Fix issue https://github.com/cocos2d/cocos2d-x/issues/12968
2015-07-29 09:54:43 +08:00
pandamicro
cca95c3c51
Merge pull request #13041 from yangws/issue_10386
...
Fixed #10386 : ui::TextField hitTest not working as expected.
2015-07-29 09:52:06 +08:00
pandamicro
dc931db932
Merge pull request #13069 from dmurtagh/debug_draw_patch
...
Fixed a compile error when CC_SPRITE_DEBUG_DRAW is on
2015-07-29 09:51:43 +08:00
geron-cn
fa5d70fc04
add SkeletonNode Nest test case
2015-07-28 23:49:25 +08:00
geron-cn
d2de5b1c85
add test case for bug: #13060 and #13005
2015-07-28 19:18:58 +08:00
CocosRobot
ac7729332a
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-28 10:39:16 +00:00
pandamicro
8e883f9956
Merge pull request #13049 from jianglong0156/constructedWith3D#12404
...
Some 3d classes can't be constructed with new in JS
2015-07-28 18:31:04 +08:00
pandamicro
9fea134de1
Use sendNodeEventToJSExtended instead of sendNodeEventToJS in sub classes
2015-07-28 18:24:03 +08:00
XiaoFeng
faee3e7807
Fix parser compatible for layer project file
2015-07-28 18:11:07 +08:00
geron-cn
0275e3b773
fix set visible
2015-07-28 17:25:40 +08:00
CocosRobot
c8f2514758
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-28 09:21:06 +00:00
pandamicro
66b21fb2a8
Merge pull request #12972 from yangws/issue_12145
...
Fixed #12145 : formarRenderers in RichText doesn’t update container s…
2015-07-28 17:13:26 +08:00
Wenhai Lin
c4112e1ce5
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8-label-gb2312
2015-07-28 17:02:30 +08:00
jianglong0156
f71f9b2b15
improve the code
2015-07-28 16:32:56 +08:00
geron-cn
c9991aea81
fix bug: BoneNode 's debugdraw can not be controlled by ancestor's visible
2015-07-28 16:31:06 +08:00
WenhaiLin
9edd66d4a7
Label:support font that contains GB2312 char map.
2015-07-28 16:28:32 +08:00
pandamicro
89c722ed4b
Add script invocation for onEnter, onExit etc in other classes
2015-07-28 16:07:14 +08:00
pandamicro
0d7f1e3672
Reorder the logic of script invocation for onEnter, onExit etc to the beginning of the function
2015-07-28 16:05:47 +08:00
pandamicro
0a31199a5b
Fix widget onEnter override in JS may cause infinite recursion
2015-07-28 16:04:28 +08:00
WenhaiLin
102020d831
1.AudioEngine:support callback for preload feature.
...
2.AudioEngineThreadPool:Make the number of thread be a fixed number.
2015-07-28 15:27:07 +08:00
pandamicro
3fa9463ec7
Fix manual bindings for changed API in spine
2015-07-28 15:11:20 +08:00
Vincent Yang
c6fc51a2d9
Fixed #10082 : Label and Text have different types for fontSize
2015-07-28 14:48:01 +08:00
XiaoFeng
bca6934786
Normalization function names
2015-07-28 14:05:56 +08:00
pandamicro
ca54340982
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2015-07-28 13:00:10 +08:00
Vincent Yang
b92733c402
Add items as protected children.
2015-07-28 11:38:21 +08:00
子龙山人
3a58668d71
Merge pull request #12744 from fusijie/fix_pageturndown
...
Fix PageTurn3D
2015-07-28 11:35:15 +08:00
Vincent Yang
14145e29a8
Fixed #9400 : Widget::setHighlighted does not work after setBright
2015-07-28 11:09:21 +08:00
jianglong0156
439bc8a99f
add conversion cpp file into iOS project
2015-07-28 10:48:18 +08:00
jianglong0156
948628b800
add file in project file with android, linux wp8.1
2015-07-28 10:26:45 +08:00
jianglong0156
ec4d53fcf7
add 3d conversion
2015-07-28 10:08:58 +08:00
jianglong0156
d5a6522a37
Merge branch 'v3' into constructedWith3D#12404
2015-07-28 09:59:35 +08:00
Damien
7fb4dabcb7
Fixed a compile error when CC_SPRITE_DEBUG_DRAW is on
2015-07-27 14:46:15 -07:00
jianglong0156
6d83a3cea4
add Physics3DWorld support new
2015-07-27 18:22:56 +08:00
jianglong0156
cb2b427eed
add Physics3DRigidBodyDes support new , add new file jsb_cocos2dx_3d_conversions.h and jsb_cocos2dx_3d_conversions.cpp
2015-07-27 18:19:10 +08:00
fusijie
651d877e28
set minimum display length to 1.
2015-07-27 17:55:32 +08:00
Vincent Yang
19b3822d87
Fixed #9507 : logic error in isMaxLengthEnabled handling in UITextField::setString
2015-07-27 17:25:48 +08:00
Vincent Yang
2f996b24ef
Fixed #10386 : ui::TextField hitTest not working as expected.
2015-07-27 16:59:35 +08:00
jianglong0156
9c6b5730d0
add Physics3DPointToPointConstraint support new
2015-07-27 16:02:13 +08:00
jianglong0156
1be5981d6a
add Physics3DComponent support new
2015-07-27 14:26:50 +08:00
XiaoFeng
f410fcd737
Fix issue https://github.com/cocos2d/cocos2d-x/issues/12968
2015-07-27 11:55:18 +08:00
jianglong0156
4005ef6588
add skybox support new
2015-07-27 11:19:17 +08:00
CocosRobot
d9b5ce8d28
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-27 03:17:29 +00:00
CocosRobot
e986aac617
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-27 03:14:03 +00:00
子龙山人
bd0bdae530
Merge pull request #12993 from WenhaiLin/v3.8-label-layout-refine
...
Label:refine the implementation about text layout and support debug draw.
2015-07-27 11:10:31 +08:00
jianglong0156
48147ff08a
add the Animate3D and Animation3D js implements
2015-07-27 10:53:34 +08:00
dualface
bd39247192
Add Luabinding conversions for std::map<std::string, std::string>
2015-07-26 07:40:34 +08:00
pandamicro
5be905c181
Merge pull request #13017 from pandamicro/v3.7.1
...
[ci skip] Release docs for v3.7.1
2015-07-25 15:17:52 +08:00
pandamicro
a2a32ef58c
Release docs for v3.7.1
2015-07-25 15:16:39 +08:00
pandamicro
33007e832f
Merge pull request #13014 from CocosRobot/update_lua_bindings_1437802542
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-25 13:40:55 +08:00
CocosRobot
f7fced7b70
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-25 05:40:05 +00:00
pandamicro
fba892f4aa
Merge pull request #13002 from VisualSJ/v3.7.1-12940
...
[ci skip]Issue #12940 : Fixed a bug that is removing SimpleAudio play
2015-07-25 13:20:27 +08:00
pandamicro
4fdfbd05c4
Merge pull request #13005 from geron-cn/3.7.1
...
fix bug:use wrong _modelviewTransform in director to draw bone
2015-07-25 09:53:38 +08:00
pandamicro
fa46a0abb4
Merge pull request #12992 from yangws/v3.7.1
...
Fixed #12962 : Scene can't have std::vector member.
2015-07-25 09:52:00 +08:00
Ricardo Quesada
76982dac89
updates cocos2d version
2015-07-24 15:53:18 -07:00
pandamicro
09d8b8829e
Merge pull request #13006 from MSOpenTech/v3.7.1-winrt
...
v3.7.1: added missing cocostudio files to Win10 libcocos2d project
2015-07-24 23:43:21 +08:00
pandamicro
a666658764
Merge pull request #12998 from pandamicro/v3.7.1
...
Add BoneNode/SkeletonNode/SkinNode JS bindings
2015-07-24 23:42:38 +08:00
WenhaiLin
b1bd8338aa
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8-label-gb2312
2015-07-24 21:30:28 +08:00
pandamicro
05bb775438
Sync timelineParser and fix issue
2015-07-24 20:16:56 +08:00
pandamicro
54330576e6
Fix JS binding issues for skeleton animation
2015-07-24 20:16:01 +08:00
geron-cn
a4b6f4d103
Merge branch 'v3.7.1' of github.com:cocos2d/cocos2d-x into 3.7.1
2015-07-24 19:51:45 +08:00
Dale Stammen
8940eb829f
added missing cocostudio files
2015-07-24 04:48:14 -07:00
geron-cn
a5d41aac0d
fix bug:use wrong _modelviewTransform in director to draw bone
2015-07-24 19:48:05 +08:00
WenhaiLin
37a174ee4a
Label:refine the implementation about text layout and support debug draw
2015-07-24 18:38:45 +08:00
VisualSj
cf70cb9c40
Issue #12940 : Fixed a bug that is removing SimpleAudio play
2015-07-24 17:41:01 +08:00
VisualSj
2b05ca731c
Issue #12941 : Fixed a bug that is ccs.Skin ctor error in jsb
2015-07-24 17:34:04 +08:00
Vincent Yang
20fe1fb1a8
Fix bug: app will crash if move mouse over window when launching.
2015-07-24 16:41:03 +08:00
yangxiao
92ec9ab5f2
add config loaded event
2015-07-24 16:38:30 +08:00
pandamicro
29b9ed685f
Add BoneNode/SkeletonNode/SkinNode JS bindings
2015-07-24 15:48:34 +08:00
geron-cn
4327e4a532
remove include SkinNode.h in cpp
2015-07-24 12:31:45 +08:00
geron-cn
0b09fd5bcb
Merge branch 'v3.7.1' of github.com:cocos2d/cocos2d-x into 3.7.1
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.h
2015-07-24 11:38:09 +08:00
Vincent Yang
e4a8aeee45
Fixed #12962 : Scene can't have std::vector member.
2015-07-24 11:16:45 +08:00
pandamicro
5ffa8efee6
Merge pull request #12977 from chengstory/OptimizationExtensionData
...
Optimization extension data
2015-07-24 11:01:56 +08:00
geron-cn
3341fa0f85
fix the vars' initialize in construct func, and remove using namespace
2015-07-24 10:28:10 +08:00
zhangcheng
be08de6780
Update libcocos2d_8.1 vs project.
2015-07-24 09:32:39 +08:00
Ricardo Quesada
1ea690893a
Merge pull request #12990 from ricardoquesada/xcode7_compiles_and_run
...
compiles and runs on Xcode 7
2015-07-23 16:04:48 -07:00
Ricardo Quesada
2deb492d36
compiles and runs on Xcode 7
2015-07-23 14:28:23 -07:00
Dale Stammen
13149a0bc5
updated version to 3.7.1
2015-07-23 13:26:32 -07:00
Dale Stammen
c3935b921c
updated version to 3.7.1
2015-07-23 13:02:42 -07:00
Dale Stammen
72427a0a64
updated version to 3.8
2015-07-23 12:46:47 -07:00
Dale Stammen
f91e812924
updated version to 3.8
2015-07-23 12:40:36 -07:00
geron-cn
1389fc3d31
some doxygen comments and copyright
2015-07-24 01:30:34 +08:00
pandamicro
a15212dc76
Fix indent
2015-07-23 18:00:23 +08:00
gero
2037616a2d
Merge pull request #4 from fusijie/3.7.1
...
fix compile on iOS/Android/Linux/Win8Universal.
2015-07-23 17:46:28 +08:00
geron-cn
4d58aa2668
remove setcontentsize in skeletonnode
2015-07-23 17:41:37 +08:00
fusijie
e9cbb6b084
fix compile on iOS/Android/Linux/Win8Universal.
2015-07-23 17:32:52 +08:00
Vincent Yang
35040e7bb1
Fixed #12249 : Button touch doesn't work with setScale9Enabled.
2015-07-23 17:27:04 +08:00
zhangcheng
4b8248c015
Optimization of Custom Data.
...
replace ComExtensionData to ObjectExtensionData.
2015-07-23 16:30:23 +08:00
pandamicro
6110700615
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into autoExtend
2015-07-23 15:25:33 +08:00
geron-cn
7255b5308b
config for mac
2015-07-23 15:13:14 +08:00
Vincent Yang
57943b41b1
Fixed #12145 : formarRenderers in RichText doesn’t update container size.
2015-07-23 14:59:24 +08:00
pandamicro
739befdc08
Add audio engine bindings in JSB
2015-07-23 14:43:01 +08:00