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
|
a8a0516bf4
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
|
2015-08-04 11:22:54 +08:00 |
pandamicro
|
731f7b8fc1
|
Merge pull request #13185 from pandamicro/v3.7.1
[ci skip]Add remote debugger support in JS templates
|
2015-08-04 11:21:52 +08:00 |
pandamicro
|
a89a3c0c56
|
Merge pull request #13184 from pandamicro/v3.7.1
[ci skip]Add remote debugger support in JS templates
|
2015-08-04 11:18:18 +08:00 |
pandamicro
|
06bd3b8868
|
Add remote debugger support in JS templates
|
2015-08-04 11:16:58 +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 |
子龙山人
|
9cc3232cdf
|
Merge pull request #13183 from fusijie/fix_spellingmistake
[ci skip]fix spelling mistake.
|
2015-08-04 09:38:35 +08:00 |
fusijie
|
8d2da20e5f
|
fix spelling mistake.
|
2015-08-04 09:36:33 +08:00 |
pandamicro
|
8d836dade6
|
Merge pull request #13181 from pandamicro/v3
Sync Cocos2d-x v3.7.1
|
2015-08-03 22:12:05 +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 |
pandamicro
|
f012cc68f8
|
Merge pull request #13179 from pandamicro/v3.7.1
[ci skip]Update web engine
|
2015-08-03 18:38:58 +08:00 |
pandamicro
|
d6baad0963
|
Update web engine
|
2015-08-03 18:38:33 +08:00 |
pandamicro
|
6a2440d6f1
|
Merge pull request #13176 from VisualSJ/v3-boneTest
[ci skip][js-tests] add Change skin tests
|
2015-08-03 18:13:08 +08:00 |
pandamicro
|
7802e409da
|
Merge pull request #13175 from CocosRobot/update_lua_bindings_1438596255
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-08-03 18:10:44 +08:00 |
VisualSj
|
479676cbd8
|
[js-tests] add Change skin tests
|
2015-08-03 18:10:31 +08:00 |
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
|
d00e54ad8a
|
remove comment in test case
|
2015-08-03 16:55:55 +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
|
80a207ae43
|
Merge pull request #13172 from jianglong0156/addEmotionTest
add emotion bug test current nothing will show
|
2015-08-03 16:36:47 +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 |
jianglong0156
|
f9b6d6b670
|
add emotion bug test
|
2015-08-03 16:09:45 +08:00 |
pandamicro
|
cdf58c9fc1
|
Merge pull request #13171 from CocosRobot/update_lua_bindings_1438587682
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-08-03 16:03:37 +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
|
0de2a3b33d
|
add terrain test with light map
|
2015-08-03 14:02:46 +08:00 |
子龙山人
|
e11f261dc8
|
Merge pull request #13168 from CocosRobot/update_lua_bindings_1438578238
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-08-03 13:34:11 +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 |
pandamicro
|
8239d26b4a
|
Merge pull request #13163 from fusijie/fix_spritebatchnode_debugdraw
add IF-CASE to fix debug draw under SpriteBatchNode.
|
2015-08-03 12:40:21 +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 |
pandamicro
|
69dd4ebb69
|
Merge pull request #13164 from pandamicro/v3
Add test for PhysicsSprite bug#11618
|
2015-08-03 11:09:18 +08:00 |
pandamicro
|
9393daaf8f
|
Add test for PhysicsSprite bug#11618
|
2015-08-03 11:07:27 +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 |
XiaoYang
|
395f4f2f96
|
Merge pull request #362 from tangziwen/v3
terrain Update
|
2015-08-03 09:16:43 +08:00 |
pandamicro
|
b034268331
|
Merge pull request #13159 from CocosRobot/update_lua_bindings_1438560493
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-08-03 09:16:41 +08:00 |
CocosRobot
|
c281630fa6
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-08-03 00:13:29 +00:00 |
pandamicro
|
7d14768109
|
Merge pull request #13157 from pandamicro/v3
Sync Cocos2d-x v3.7.1
|
2015-08-03 08:04:30 +08: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 |
pandamicro
|
8ce8f8616e
|
Merge pull request #13154 from CocosRobot/update_lua_bindings_1438435111
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-08-02 09:26:15 +08:00 |