edwardzhou
|
480a9277da
|
fix WebSocket cannot send/receive more than 4096 bytes of data
|
2014-01-09 13:29:56 +08:00 |
CocosRobot
|
2945322b97
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-09 04:50:38 +00:00 |
walzer
|
7055340ace
|
fixed #3627. There're no UICCLabelAtlas any more.
|
2014-01-09 12:43:57 +08:00 |
walzer
|
2d8fcb2c00
|
issue #3627, remove UICCLabelAtlas, add LabelAtlas::create() for GUI module
|
2014-01-09 12:40:51 +08:00 |
James Chen
|
ac547cedca
|
Merge pull request #4999 from CocosRobot/updategeneratedsubmodule_1389238661
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-08 19:38:18 -08:00 |
CocosRobot
|
746a360176
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-09 03:37:44 +00:00 |
James Chen
|
23dec543b3
|
Merge pull request #4995 from Dhilan007/develop_crash
amendment incorrect use of macro
|
2014-01-08 19:30:29 -08:00 |
CaiWenzhi
|
4cadcca497
|
Merge branch 'develop' into develop_nutty_modify_framework_removeuselesssample
|
2014-01-09 11:01:47 +08:00 |
CocosRobot
|
e66468025d
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-09 02:59:53 +00:00 |
CaiWenzhi
|
dc443e36d3
|
Merge branch 'develop' into develop_nutty_modify_framework_removeuselesssample
|
2014-01-09 09:59:39 +08:00 |
CaiWenzhi
|
e3667a2894
|
Fixed bugs.
|
2014-01-09 09:58:27 +08:00 |
Dhilan007
|
fe7d5cbdfb
|
update If Construct
|
2014-01-09 09:46:17 +08:00 |
Dhilan007
|
d18da42695
|
fix addImageAsync bad judgment of generate image for the first ImageFile.
|
2014-01-08 23:42:54 +08:00 |
WuHuan
|
1cd68accc1
|
Merge branch 'develop' of https://github.com/akof1314/cocos2d-x into develop
|
2014-01-08 17:03:44 +08:00 |
WuHuan
|
954ee61022
|
testcpp mingw
|
2014-01-08 16:58:36 +08:00 |
WuHuan
|
668c4b83ef
|
Merge pull request #3 from cocos2d/develop
update
|
2014-01-08 00:44:40 -08:00 |
James Chen
|
eb8f621ab0
|
closed #3597: Uses !xxx.empty() instead of xxx.size() > 0.
|
2014-01-08 10:47:27 +08:00 |
James Chen
|
685b80796b
|
Merge commit 'refs/pull/4846/head' of git://github.com/cocos2d/cocos2d-x into iss3597-particle-plist
|
2014-01-08 10:36:51 +08:00 |
minggo
|
6529380b77
|
Merge pull request #4988 from dumganhar/develop
If this.ctor was not found, output a log.
|
2014-01-07 06:41:53 -08:00 |
James Chen
|
65b5a7c031
|
If this.ctor was not found, output a log.
|
2014-01-07 22:39:14 +08:00 |
James Chen
|
20f2f7255e
|
Merge pull request #4986 from CocosRobot/updategeneratedsubmodule_1389104844
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 06:28:04 -08:00 |
CocosRobot
|
a650ddf88b
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 14:27:34 +00:00 |
minggo
|
ac8a7b4ce1
|
Merge pull request #4983 from dabingnn/develop_layerColorBug
fix layerColor occlude sprite bug on android
|
2014-01-07 06:25:59 -08:00 |
samuele3hu
|
a61f9fce27
|
Fix:Resolve the pLengthSQ’s error in the Cocos2d.lua
|
2014-01-07 22:16:07 +08:00 |
Huabing.Xu
|
b1d9d5e55e
|
fix layerColor occlude sprite bug on android
|
2014-01-07 22:08:00 +08:00 |
James Chen
|
01745f5ba6
|
Merge pull request #4980 from CocosRobot/updategeneratedsubmodule_1389101321
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 05:46:08 -08:00 |
James Chen
|
1d852788e2
|
[Spine] Saves old transform matrix in Skeleton::draw, uses it in ::onDraw.
|
2014-01-07 21:40:06 +08:00 |
CocosRobot
|
6fd72db513
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 13:28:43 +00:00 |
James Chen
|
9387e516be
|
[JSB] Fix for SpineTest didn’t show anything. Skeleton uses new renderer.
|
2014-01-07 21:19:51 +08:00 |
James Chen
|
c7639319ee
|
Fix Armature::init() crashes
|
2014-01-07 20:53:44 +08:00 |
James Chen
|
e90f35daa6
|
Merge pull request #4975 from chengstory/fix_UIAction_play_error
fixed UIAction play error.
|
2014-01-07 03:17:41 -08:00 |
zhangcheng
|
bf8187fee2
|
fixed UIAction play error.
|
2014-01-07 19:04:18 +08:00 |
James Chen
|
54cbfe938b
|
Merge pull request #4973 from CocosRobot/updategeneratedsubmodule_1389091226
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 02:41:53 -08:00 |
CocosRobot
|
ab84228037
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 10:40:28 +00:00 |
James Chen
|
18963b46f5
|
Merge pull request #4971 from Dhilan007/develop_crash
update liblua vs project for add miss file.
|
2014-01-07 02:31:58 -08:00 |
Dhilan007
|
ba4833e070
|
update liblua vs project for add miss file.
|
2014-01-07 18:30:12 +08:00 |
James Chen
|
ac3697db19
|
fix for jsval_to_ssize and ssize_to_jsval, it only supports 32 bits now. Otherwise, (string).toFixed(0) will fails. Do we need 64 bit for JS?
|
2014-01-07 18:28:46 +08:00 |
James Chen
|
5391024399
|
Adds override keyword.
|
2014-01-07 18:27:04 +08:00 |
James Chen
|
26efb4bf5c
|
long —> ssize_t for some classes.
|
2014-01-07 18:26:31 +08:00 |
CocosRobot
|
6967caeff9
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 09:47:05 +00:00 |
CocosRobot
|
7e142d79f7
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 09:05:07 +00:00 |
James Chen
|
44a02ba466
|
Merge pull request #4958 from edwardzhou/rename_UIHelper
rename UIHelper to Helper for consistency
|
2014-01-07 00:57:35 -08:00 |
minggo
|
feb4ac1cdb
|
Merge pull request #4959 from minggo/actionprogress-fade-tint
ActionProgress has fade and tint effect
|
2014-01-07 00:32:43 -08:00 |
minggo
|
1275d03c77
|
add override
|
2014-01-07 16:30:12 +08:00 |
minggo
|
6bb4f9822a
|
ActionProgress has fade and tint effect
|
2014-01-07 16:23:58 +08:00 |
edwardzhou
|
e1c21aa9cb
|
rename UIHelper to Helper for consistency
|
2014-01-07 16:22:18 +08:00 |
James Chen
|
d733556270
|
Merge pull request #4955 from CocosRobot/updategeneratedsubmodule_1389081296
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 00:00:19 -08:00 |
James Chen
|
49ca35fc3d
|
Merge pull request #4956 from dumganhar/move-temp-obj
Uses CMAKE_BINARY_DIR instead of CMAKE_SOURCE_DIR, all temporary files will be in 'build' folder.
|
2014-01-06 23:58:42 -08:00 |
CocosRobot
|
f8e7f570f3
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 07:54:58 +00:00 |
James Chen
|
f5ae2bbacc
|
Merge pull request #4932 from boyu0/iss3401_physical_lua_binding
issue #3401: physical lua binding
|
2014-01-06 23:48:47 -08:00 |
James Chen
|
2a3481f20c
|
Moves temp files to CURRENT_BINARY_DIR.
|
2014-01-06 23:44:36 -08:00 |
Ricardo Quesada
|
aa2168f66f
|
RenderQuad with bigger size
It uses 18 bits for texture id
and 10 bits for shader id
This is a temporal fix
|
2014-01-06 23:41:01 -08:00 |
James Chen
|
2eb8691f6a
|
Merge pull request #4946 from dumganhar/linux-template-fix
Linux template update
|
2014-01-06 20:57:28 -08:00 |
Zhe Wang
|
9b6027d284
|
Merge pull request #4947 from walzer/develop
udpate copyrights for the new year 2014 and Chukong.
|
2014-01-06 19:50:18 -08:00 |
James Chen
|
b4da4071e7
|
Merge pull request #4943 from CocosRobot/updategeneratedsubmodule_1389065122
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-06 19:48:36 -08:00 |
walzer
|
d4c1aa92d5
|
add copyrights for 2014, in folders other then 2d.
|
2014-01-07 11:47:11 +08:00 |
minggo
|
49d314363f
|
Merge pull request #4945 from dabingnn/develop_label_shaderBug
fix label fnt bug for wrong shader
|
2014-01-06 19:44:06 -08:00 |
Huabing.Xu
|
6c6da4cf77
|
fix label fnt bug for wrong shader
|
2014-01-07 11:39:55 +08:00 |
James Chen
|
c965131a08
|
Uses relative path for kazmath/CMakeLists.txt and physics/CMakeLists.txt.
|
2014-01-06 19:33:28 -08:00 |
CocosRobot
|
641255e3ef
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-07 03:25:39 +00:00 |
walzer
|
64af0de648
|
update copyrights for 2014, in cocos/2d/ folder
|
2014-01-07 11:25:07 +08:00 |
boyu0
|
f7c88a8134
|
issue #3401: update cmake project set
|
2014-01-07 11:09:40 +08:00 |
minggo
|
721181632b
|
Merge pull request #4930 from Dhilan007/develop_crash
fix error for load spriteFrames from plist in CCAnimationCache class.
|
2014-01-06 18:57:47 -08:00 |
James Chen
|
465b33f162
|
Merge pull request #4941 from samuele3hu/developNewUI
Fix:Resolve the release version of lua test sample compile error
|
2014-01-06 18:29:38 -08:00 |
boyu0
|
8e64ef6d6d
|
issue #3401: add physics lua auto generate to android.mk
|
2014-01-07 10:20:59 +08:00 |
boyu0
|
cf146b32cf
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss3401_physical_lua_binding
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/scripting/lua/bindings/CCLuaStack.cpp
cocos/scripting/lua/script/Cocos2d.lua
cocos/scripting/lua/script/Cocos2dConstants.lua
|
2014-01-07 10:16:44 +08:00 |
samuele3hu
|
c553fd2b73
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
|
2014-01-07 10:10:17 +08:00 |
samuele3hu
|
01013195d3
|
Fix:Resolve the release lua test sample compile error
|
2014-01-07 10:08:58 +08:00 |
CaiWenzhi
|
8cfc6fcafb
|
Remove useless samples
|
2014-01-07 09:47:46 +08:00 |
boyu0
|
eaa3041a97
|
issue #3401: physical lua banding script, add testlua->physics test
|
2014-01-06 22:19:40 +08:00 |
Dhilan007
|
aec4045797
|
fix error for load spriteFrames from plist in CCAnimationCache class.
|
2014-01-06 20:23:45 +08:00 |
James Chen
|
559e5b771f
|
Merge pull request #4928 from dumganhar/more-warning-fix
More warning fixes
|
2014-01-06 04:18:22 -08:00 |
James Chen
|
75804ac8a2
|
Warning fix in ccUTF8.cpp/h
|
2014-01-06 20:04:09 +08:00 |
James Chen
|
1bd0f90437
|
Warning fix in js_manual_conversions.cpp/h
|
2014-01-06 20:02:01 +08:00 |
James Chen
|
dd0e157c74
|
Warning fix in CCTextFieldTTF.cpp.
|
2014-01-06 20:01:28 +08:00 |
James Chen
|
ea60dbb640
|
Fixing ‘ActionTest->AnimationTest’ crashes. It should return empty ValueMap/ValueVector when Value::asValueVector/Map is invoked in empty Value.
|
2014-01-06 19:55:59 +08:00 |
James Chen
|
2818677795
|
Merge pull request #4913 from nutty898/develop_nutty_modify_framework_fixedmemleak
Develop nutty modify framework fixedmemleak
|
2014-01-06 00:24:36 -08:00 |
minggo
|
9b44e80cf2
|
Merge pull request #4900 from dabingnn/develop_SpriteBatchNodeShaderBug
init shader on construction instead of draw in class CCSpriteBatchNode
|
2014-01-06 00:11:59 -08:00 |
CaiWenzhi
|
60b340f2cd
|
Modify wrong codes
|
2014-01-06 15:59:21 +08:00 |
CaiWenzhi
|
81836d8aeb
|
Merge branch 'develop' into develop_nutty_modify_framework_fixedmemleak
|
2014-01-06 15:57:19 +08:00 |
James Chen
|
34bd322a10
|
Merge pull request #4911 from chengstory/fixesBugs_Develop
Fixes bugs on cocos2dx 3.x
|
2014-01-05 23:13:30 -08:00 |
CaiWenzhi
|
4d1d225bd1
|
Fixed bugs and memory leak
|
2014-01-06 15:07:04 +08:00 |
chengstory
|
e44d28ea7b
|
replace CC_SAFE_RELEASE to CC_SAFE_RELEASE_NULL
|
2014-01-06 13:27:19 +08:00 |
CaiWenzhi
|
63fbec05e9
|
Modify wrong codes
|
2014-01-06 12:19:59 +08:00 |
CaiWenzhi
|
2450841a5f
|
Merge branch 'develop' into develop_nutty_modify_framework_optimizeclipping
|
2014-01-06 12:13:24 +08:00 |
minggo
|
e4bec7d1ef
|
Merge pull request #4902 from Dhilan007/develop_crash
fix TextInput not show IME on android.
|
2014-01-05 19:50:19 -08:00 |
Dhilan007
|
5b317196c8
|
fix TextInput not show IME on android.
|
2014-01-06 11:45:18 +08:00 |
CaiWenzhi
|
99d842d954
|
Merge branch 'develop' into develop_nutty_modify_framework_optimizeclipping
|
2014-01-06 11:39:01 +08:00 |
Huabing.Xu
|
381be48c56
|
init shader on construction instead of draw in class CCSpriteBatchNode
|
2014-01-06 11:26:00 +08:00 |
James Chen
|
d74d21a6f0
|
Merge pull request #4884 from daltomi/debug
Proposal: remove boolean flag, The pointer *atlas == item.second not change in map::erase().
|
2014-01-05 19:08:37 -08:00 |
CaiWenzhi
|
1282debad5
|
Merge branch 'develop' into develop_nutty_modify_framework_addNode
|
2014-01-06 11:03:08 +08:00 |
CaiWenzhi
|
ad30f8ff96
|
Fixed bug of clippinglayout
|
2014-01-06 10:56:33 +08:00 |
chengstory
|
e1b36e2e20
|
Merge branch 'develop' into #3585
|
2014-01-06 10:43:44 +08:00 |
chengstory
|
76f96d0b41
|
fixed ActionNode memoryleak.
|
2014-01-06 10:42:17 +08:00 |
CocosRobot
|
cc4bee319c
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-05 10:43:05 +00:00 |
minggo
|
fcfa6744f4
|
make TMXLayer::getProperties() return reference
|
2014-01-05 18:20:29 +08:00 |
CocosRobot
|
5f8d4f867c
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-05 05:52:52 +00:00 |
chengstory
|
877c6dddf3
|
fixed #3582
1. CCScene -> Scene.
|
2014-01-05 13:16:23 +08:00 |
chengstory
|
4893c561db
|
Merge branch 'develop' into #3582
|
2014-01-05 12:43:41 +08:00 |
chengstory
|
bd9dc274f8
|
fixed #3482
1. add override to virtual functions.
2. replace std::string::npos to filePath.npos.
3. replace std::string to const std::string& .
|
2014-01-05 12:42:39 +08:00 |
James Chen
|
03200374b0
|
Merge pull request #4887 from Dhilan007/develop_crash
fix crash related to not support the z length modifier for size_t on vs
|
2014-01-04 20:10:40 -08:00 |
Dhilan007
|
49d8b76b9e
|
fix crash related to not support the z length modifier for size_t on vs
|
2014-01-05 11:59:32 +08:00 |
chengstory
|
10fec47b04
|
fixed #3582 update libCocoStudio windows project.
|
2014-01-05 11:38:01 +08:00 |
chengstory
|
b4118a7ccc
|
fixed #3582
1. add #include "cocostudio/CCComBase.h" into CocoStudio.h
|
2014-01-05 03:55:10 +08:00 |
chengstory
|
aae6d27c74
|
fixed #3582
1. revert ComRender::create(cocos2d::Node *node, const char *comName).
|
2014-01-05 03:11:32 +08:00 |
chengstory
|
bac600ab9f
|
fixed #3582
1. create Component By component Factory.
|
2014-01-05 02:22:32 +08:00 |
chengstory
|
7efacc4890
|
issue #3582 void serialize(void *r) -> bool serialize(void *r)
|
2014-01-05 01:13:16 +08:00 |
James Chen
|
7d2ec6c2c6
|
Merge pull request #4881 from dumganhar/utf16-to-utf8-error
compilation error fix. ssize_t -> int
|
2014-01-04 06:22:09 -08:00 |
James Chen
|
f94221a93b
|
compilation error fix. ssize_t -> int
|
2014-01-04 22:21:14 +08:00 |
CocosRobot
|
f44775b581
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-04 14:05:19 +00:00 |
James Chen
|
2c47690ebb
|
Merge pull request #4878 from dumganhar/utf16-to-utf8-error
Wrong warning fixes correct in ccUTF8.cpp.
|
2014-01-04 05:58:18 -08:00 |
James Chen
|
3c04d586b0
|
Wrong warning fixes correct in ccUTF8.cpp.
|
2014-01-04 21:54:05 +08:00 |
James Chen
|
42356e8597
|
Exchanges order of Sprite::setSpriteFrame(string), Sprite::setSpriteFrame(frame) . It’s needed for bindings-generator to generate correct binding glue codes.
|
2014-01-04 21:53:03 +08:00 |
CocosRobot
|
0b2926cb70
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-04 11:09:00 +00:00 |
samuele3hu
|
362c1dc0ea
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
|
2014-01-04 18:37:34 +08:00 |
samuele3hu
|
465aba951c
|
Fix:Remove the ScollView and TableView of extension gui lua binding
|
2014-01-04 18:36:33 +08:00 |
Daniel T. Borelli
|
08dad98592
|
map:erase() is safe for item.second == FontAtlas*
|
2014-01-04 07:22:50 -03:00 |
CocosRobot
|
c793f2e0fc
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-04 10:19:07 +00:00 |
James Chen
|
6827538802
|
Adds override keyword for override functions.
|
2014-01-04 18:12:09 +08:00 |
James Chen
|
17be52740a
|
Removes duplicated file in Android.mk
|
2014-01-04 16:57:46 +08:00 |
James Chen
|
284d845f2f
|
Merge commit 'refs/pull/4795/head' of git://github.com/cocos2d/cocos2d-x into merge4795
|
2014-01-04 16:55:40 +08:00 |
samuele3hu
|
70ee13e2e1
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
|
2014-01-04 15:46:27 +08:00 |
samuele3hu
|
0550ec33ad
|
Fix:Resolve the bugs that some lua test cases can’t run
|
2014-01-04 15:46:04 +08:00 |
CocosRobot
|
ad11468b7b
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-04 07:40:50 +00:00 |
James Chen
|
4c3fa3da49
|
Merge pull request #4865 from dumganhar/testjs-bugfix
Some fixes for TestJavascript
|
2014-01-03 23:34:08 -08:00 |
James Chen
|
98265e7961
|
Reverts GUIReader definition. it should be inherited from Object to make bindings happy.
|
2014-01-04 15:17:36 +08:00 |
James Chen
|
b2dc16c065
|
closed #3580: FileUtilsTest->TextWritePlist crashes
|
2014-01-04 15:03:46 +08:00 |
WuHuan
|
e972c97dcf
|
support mingw
|
2014-01-04 14:40:22 +08:00 |
James Chen
|
ef5ab1b9be
|
sharedXXX -> getInstance, purgeXXX -> destroyInstance.
|
2014-01-04 14:23:40 +08:00 |
James Chen
|
43cdf1713b
|
Merge pull request #4864 from daltomi/test
fix bad name variable CCDirector
|
2014-01-03 21:44:42 -08:00 |
Daniel T. Borelli
|
d10992951b
|
fix bad name variable
|
2014-01-04 02:22:09 -03:00 |
James Chen
|
98346474b8
|
Merge pull request #4863 from Dhilan007/develop_crash
fix compiling error and miss file on vs.
|
2014-01-03 20:41:19 -08:00 |
Dhilan007
|
35246b0810
|
fix compiling error and miss file on vs.
|
2014-01-04 12:25:12 +08:00 |
CocosRobot
|
e42f721c6b
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-04 04:22:17 +00:00 |
James Chen
|
44105c5d01
|
Merge pull request #4861 from dumganhar/develop
Fixing CocoStudio bindings error.
|
2014-01-03 20:12:05 -08:00 |
James Chen
|
322cf0d233
|
Fixing CocoStudio bindings error.
|
2014-01-04 12:11:10 +08:00 |
James Chen
|
e65c6b8e53
|
Merge pull request #4841 from dumganhar/template-container-unit-test
Template container unit test
|
2014-01-03 20:01:25 -08:00 |
CocosRobot
|
d29cdb5b52
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-04 03:58:44 +00:00 |
James Chen
|
55e45d44c4
|
Merge pull request #4810 from chengstory/#3480
Update SceneReaderTest Samples
|
2014-01-03 19:49:28 -08:00 |
James Chen
|
9342ae105a
|
issue #3577: const_iterator —> iterator for Vector::erase(first, last). Makes android build happy.
|
2014-01-04 11:41:06 +08:00 |
James Chen
|
ebf6d07720
|
issue #3577: iterator —> const_iterator since Map::getRandomObject is a const function.
|
2014-01-04 11:41:05 +08:00 |
James Chen
|
f55be38ad8
|
Merge pull request #4853 from Dhilan007/develop_crash
fix label not appear on the screen
|
2014-01-03 19:00:06 -08:00 |
CocosRobot
|
0ed307a583
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-04 02:58:59 +00:00 |
Dhilan007
|
b14999a7a7
|
fix label not appear on the screen
|
2014-01-04 10:56:14 +08:00 |
James Chen
|
32546b58f9
|
Merge pull request #4840 from nutty898/develop_nutty_modify_framework_addNode
Develop nutty modify framework add node
|
2014-01-03 18:53:51 -08:00 |
James Chen
|
f3eb21e748
|
Merge pull request #4852 from dumganhar/iss3579-lua-bugtest914-crash
closed #3579: TestLua->BugsTest->bug914 crashes if clicking 'reset' button all the time.
|
2014-01-03 18:51:16 -08:00 |
James Chen
|
61af958976
|
closed #3579: Bug fix in setTouchEnabledForLayer for jsbindings.
|
2014-01-04 10:32:04 +08:00 |
James Chen
|
baeacaddfc
|
closed #3579: Bug fix in setTouchEnabledForLayer for luabindings.
Also fixed lua module error.
|
2014-01-04 10:30:11 +08:00 |
James Chen
|
0082cf3e4d
|
closed #3579: TestLua->BugsTest->bug914 crashes if clicking 'reset' button all the time.
|
2014-01-04 10:28:09 +08:00 |
Ricardo Quesada
|
76960ab83a
|
Merge pull request #4851 from ricardoquesada/node_vertex_z_fix
Node vertex Z fix
|
2014-01-03 17:55:32 -08:00 |