luocker
|
fc655162fa
|
Update CCString.cpp
we can't change _string value after get Array.
|
2013-12-27 00:26:02 +08:00 |
walzer
|
d7704d574a
|
issue #3517, enable CC_USE_PHYSICS by default
|
2013-12-27 00:00:50 +08:00 |
walzer
|
c5e95618d9
|
fixed #3517, make CC_USE_PHYSICS can be switch off, and bring Scene::update(float), Scene::addChild(...) out of CC_USE_PHYSICS segment
|
2013-12-26 23:55:05 +08:00 |
chengstory
|
7a7d939da0
|
issue #3457 use C++ 11 auto loop.
|
2013-12-26 23:51:55 +08:00 |
chengstory
|
774e3d8536
|
issue #3457
1. replace UIAction NULL to nullptr.
2. modify class variable name.
|
2013-12-26 23:40:50 +08:00 |
chengstory
|
cfbbb7889b
|
Merge branch 'develop' into #3457
Conflicts:
cocos/editor-support/cocostudio/CCSGUIReader.cpp
|
2013-12-26 23:01:34 +08:00 |
CocosRobot
|
edeeae4ff9
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-26 14:48:08 +00:00 |
chengstory
|
26df681915
|
fixed #3457 remove jsoncpp.
|
2013-12-26 22:45:23 +08:00 |
James Chen
|
17ff6ef764
|
Renames: IntValueMap —> ValueMapIntKey
|
2013-12-26 22:07:20 +08:00 |
James Chen
|
a73991dcc1
|
Merge pull request #4685 from dumganhar/develop
Restricts the element type for Vector<T> and Map<K, V>, it has to be `Object*` or `ObjectSubClass*`.
|
2013-12-26 06:03:11 -08:00 |
boyu0
|
a19d212f4f
|
fix bug.
|
2013-12-26 22:00:52 +08:00 |
James Chen
|
a8d93ddf72
|
Restricts the element type for Vector<T> and Map<K, V>, it has to be `Object*` or `ObjectSubClass*`.
|
2013-12-26 21:49:40 +08:00 |
boyu0
|
6bc0a7066f
|
change CustomCommand variable to class member.
|
2013-12-26 21:19:12 +08:00 |
CaiWenzhi
|
26a7f3474c
|
Modify reader
|
2013-12-26 21:02:47 +08:00 |
CaiWenzhi
|
a8ab58d8d8
|
Merge branch 'develop' into develop_nutty_modify_framework_addnewreader
|
2013-12-26 20:32:50 +08:00 |
James Chen
|
93ed5a4f0f
|
long --> ssize_t for TableView callback.
|
2013-12-26 04:09:24 -08:00 |
samuele3hu
|
756a72cbca
|
Reconstruct the operation of handling lua script event
|
2013-12-26 19:43:49 +08:00 |
boyu0
|
dec003477c
|
delete ‘delete ptr’ and add CC_UNUSED_PARAM
|
2013-12-26 19:25:53 +08:00 |
boyu0
|
d32fbbbfca
|
change GroupCommand variable to class member.
|
2013-12-26 18:11:23 +08:00 |
CaiWenzhi
|
ad535e2fcb
|
Add listview and pageview reader
|
2013-12-26 17:53:22 +08:00 |
chengstory
|
bd46681867
|
fixed #3457 continue to fixes failed to build.
|
2013-12-26 17:37:02 +08:00 |
CaiWenzhi
|
f0eb5d28c1
|
Merge branch 'develop' into develop_nutty_modify_framework_newrender_modify_projectfiles
|
2013-12-26 17:32:08 +08:00 |
chengstory
|
041e78cb54
|
Fixes failed to build android.
|
2013-12-26 17:17:02 +08:00 |
CocosRobot
|
50a379b8f0
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-26 09:04:04 +00:00 |
CaiWenzhi
|
3206727b9c
|
Modify actionnode
|
2013-12-26 17:01:31 +08:00 |
chengstory
|
91edad5152
|
Merge branch 'develop' into #3457
|
2013-12-26 16:56:43 +08:00 |
yinkaile
|
891d8c3a38
|
change comment
|
2013-12-26 16:48:19 +08:00 |
CaiWenzhi
|
a2e873d12a
|
Merge branch 'develop' into develop_nutty_modify_framework_newrender_modify_projectfiles
|
2013-12-26 16:45:48 +08:00 |
Liam
|
a158e25767
|
modify coco action with new coding rule
|
2013-12-26 16:36:21 +08:00 |
boyu0
|
2fb0179293
|
change QuadCommand variable to class member.
|
2013-12-26 16:36:03 +08:00 |
Liam
|
bc54707893
|
modify coco action with new coding rule
|
2013-12-26 16:29:59 +08:00 |
CocosRobot
|
09996ea82c
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-26 08:20:26 +00:00 |
yinkaile
|
f0d4f3f9bf
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2013-12-26 16:19:21 +08:00 |
CaiWenzhi
|
7b6e022388
|
Merge branch 'develop' into develop_nutty_modify_framework_newrender_modify_projectfiles
|
2013-12-26 16:19:12 +08:00 |
CaiWenzhi
|
067af2fb93
|
optimize loop
|
2013-12-26 16:17:52 +08:00 |
James Chen
|
5dfb7f321a
|
Compilation fixes after merge PR #4669 https://github.com/cocos2d/cocos2d-x/pull/4669
|
2013-12-26 16:03:30 +08:00 |
yinkaile
|
7027587542
|
fixed armature update
|
2013-12-26 15:49:20 +08:00 |
boyu0
|
f878864794
|
Specialize GroupCommand and CustomCommand, change generateCommand to new.
|
2013-12-26 15:41:47 +08:00 |
yinkaile
|
c096743325
|
change comment
|
2013-12-26 14:57:38 +08:00 |
CaiWenzhi
|
530f82ee27
|
Add refresh layout method
|
2013-12-26 14:57:30 +08:00 |
Huabing.Xu
|
963d637198
|
use raw new instead of generateCommand
|
2013-12-26 14:45:44 +08:00 |
Huabing.Xu
|
b4c61d5a7c
|
specialize RenderCommandPool<QuadCommand>
|
2013-12-26 14:44:21 +08:00 |
chengstory
|
ab3cf064d1
|
fixed #4357 failed to build android.
|
2013-12-26 13:26:23 +08:00 |
chengstory
|
8ae7ecff33
|
Merge branch 'develop' into #3457
Conflicts:
build/cocos2d_samples.xcodeproj/project.pbxproj
cocos/editor-support/cocostudio/CCSGUIReader.cpp
cocos/editor-support/cocostudio/CCSGUIReader.h
|
2013-12-26 12:55:52 +08:00 |
CaiWenzhi
|
946dab0b34
|
Modify android mk
|
2013-12-26 12:23:58 +08:00 |
CaiWenzhi
|
b1d2aa9b79
|
Modify CMakeList
|
2013-12-26 11:25:49 +08:00 |
CaiWenzhi
|
581678b6b0
|
Modify android mk
|
2013-12-26 11:06:10 +08:00 |
CocosRobot
|
e6727ea087
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-26 02:50:37 +00:00 |
yinkaile
|
b553828ed2
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2013-12-26 10:24:33 +08:00 |
yinkaile
|
b44090b40b
|
change std::map to std::unordered_map
|
2013-12-26 10:23:51 +08:00 |
chengstory
|
19d75cee01
|
fixed #3647 fixes ComAttribute warning.
|
2013-12-26 02:18:28 +08:00 |
chengstory
|
8afdf88d25
|
Test triiger 3.0
|
2013-12-26 01:17:04 +08:00 |
CaiWenzhi
|
eaef723bd7
|
Remove C cast
|
2013-12-25 22:13:19 +08:00 |
CaiWenzhi
|
8299e4c494
|
Merge branch 'develop' into develop_nutty_modify_framework_newrender
|
2013-12-25 22:05:21 +08:00 |
yinkaile
|
5eb961b165
|
fixed warning
|
2013-12-25 19:46:09 +08:00 |
CocosRobot
|
6492f61691
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-25 10:34:46 +00:00 |
CaiWenzhi
|
96279c12dc
|
Merge branch 'develop' into develop_nutty_modify_framework_newrender
|
2013-12-25 18:32:15 +08:00 |
CaiWenzhi
|
c516860017
|
Fixed bugs about color and opacity
|
2013-12-25 18:30:21 +08:00 |
samuele3hu
|
7c3978bdd8
|
Add missing file for linux lua binding
|
2013-12-25 17:42:59 +08:00 |
yinkaile
|
d72c9d94d7
|
upload trigger code.
|
2013-12-25 17:40:54 +08:00 |
CaiWenzhi
|
570b6c95a7
|
Merge branch 'develop' into develop_nutty_modify_framework_newrender
|
2013-12-25 17:29:30 +08:00 |
samuele3hu
|
a2c5881699
|
Add include_directories for spine
|
2013-12-25 17:22:14 +08:00 |
samuele3hu
|
1075a711e0
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Spine
|
2013-12-25 16:58:19 +08:00 |
yinkaile
|
369b4da721
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into #3456
|
2013-12-25 16:55:56 +08:00 |
yinkaile
|
ebf9833958
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2013-12-25 16:47:14 +08:00 |
yinkaile
|
13408e4dc5
|
change play interface name
|
2013-12-25 16:46:31 +08:00 |
samuele3hu
|
9cf45a292b
|
Delete some annotated statement about spine and add some reserve manual lua binding functions
|
2013-12-25 16:42:40 +08:00 |
James Chen
|
142b189305
|
Some warning fixes.
|
2013-12-25 16:06:39 +08:00 |
CocosRobot
|
c71cd5a407
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-25 06:39:38 +00:00 |
James Chen
|
55b0ef85d8
|
Merge pull request #4631 from boyu0/const_char_star_to_std_string
Change const char* to const std::string&
|
2013-12-24 22:34:34 -08:00 |
boyu0
|
2c2953abc1
|
change “string.compare()” to “==“
|
2013-12-25 14:20:37 +08:00 |
boyu0
|
f2e18f32a9
|
fix android compile error
|
2013-12-25 13:57:17 +08:00 |
samuele3hu
|
9fd64df099
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Spine
|
2013-12-25 13:48:10 +08:00 |
samuele3hu
|
45cfe00ec4
|
Modify iOS project set and some manual lua binding
|
2013-12-25 13:47:22 +08:00 |
CocosRobot
|
9aa48cac37
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-25 03:49:23 +00:00 |
James Chen
|
538da31773
|
Removes CC prefix for CCSkeleton and CCSkeletonAnimation. Adds namespace `sp` for JSBindings.
|
2013-12-25 11:18:14 +08:00 |
James Chen
|
6fce4f9061
|
Don’t use ‘String::createWithFormat’ in our codes, use StringUtils::format() instead.
|
2013-12-25 11:00:51 +08:00 |
boyu0
|
62fc889a54
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into const_char_star_to_std_string
Conflicts:
cocos/2d/platform/CCFileUtils.cpp
cocos/2d/platform/CCFileUtils.h
cocos/2d/platform/CCImageCommon_cpp.h
cocos/2d/platform/CCSAXParser.cpp
cocos/2d/platform/CCSAXParser.h
|
2013-12-25 10:41:37 +08:00 |
CaiWenzhi
|
2ae8576e0f
|
Merge branch 'develop' into develop_nutty_modify_framework_newrender
|
2013-12-25 10:40:05 +08:00 |
chengstory
|
e4e22b52cb
|
Merge branch 'develop' into #3456
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/editor-support/cocostudio/CCDataReaderHelper.cpp
cocos/editor-support/cocostudio/CCSGUIReader.cpp
cocos/editor-support/cocostudio/CCSSceneReader.cpp
|
2013-12-24 22:05:13 +08:00 |
chengstory
|
64f0987fea
|
issue #3456 ios test rapidjson.
|
2013-12-24 21:23:24 +08:00 |
zhangcheng
|
2c6f95ecea
|
issue #3456 replace jsoncpp to rapidjson.
|
2013-12-24 20:33:55 +08:00 |
CaiWenzhi
|
0dac69523c
|
Remove "_renderer" from widget
|
2013-12-24 20:22:14 +08:00 |
James Chen
|
17a6dbebb6
|
Compilation error fixes.
|
2013-12-24 19:05:35 +08:00 |
zhangcheng
|
5214965e4f
|
fixed #3456
|
2013-12-24 18:33:19 +08:00 |
James Chen
|
1f5611ae05
|
Adds missing ‘)’.
|
2013-12-24 18:23:36 +08:00 |
James Chen
|
0ff85852cc
|
Don’t use FileUtils::getInstance()->getFileData, please use getStringFromFile and getDataFromFile instead.
|
2013-12-24 18:08:40 +08:00 |
James Chen
|
f664a72d6e
|
Merge pull request #4635 from dabingnn/develop_FixClippingNodeBug
fix clippingNode bug
|
2013-12-24 01:50:51 -08:00 |
Huabing.Xu
|
b6dc3d0371
|
fix clippingNode bug
|
2013-12-24 17:16:28 +08:00 |
CocosRobot
|
c3b7406b43
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-24 09:00:04 +00:00 |
James Chen
|
81d073aff0
|
Reverts FileUtil::getFileData to virtual function.
|
2013-12-24 16:29:55 +08:00 |
James Chen
|
d33b2c41c7
|
Merge branch 'develop' into data-refactor
Conflicts:
tools/tolua/cocos2dx.ini
|
2013-12-24 16:24:17 +08:00 |
samuele3hu
|
e497f823ea
|
Merge branch 'lua_spine_dev' of https://github.com/edwardzhou/cocos2d-x into Spine
|
2013-12-24 16:14:10 +08:00 |
boyu0
|
1a453a26ab
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into const_char_star_to_std_string
Conflicts:
cocos/2d/renderer/CCNewSpriteBatchNode.cpp
cocos/2d/renderer/CCNewSpriteBatchNode.h
|
2013-12-24 16:07:25 +08:00 |
James Chen
|
f527b50ce6
|
Merge pull request #4630 from dumganhar/iss3492-bmfont-fix
closed #3492: LabelBMFont string can't be shown integrally.
|
2013-12-23 23:56:38 -08:00 |
James Chen
|
7ee0771101
|
closed #3492: LabelBMFont string can't be shown integrally.
Issue URL: http://www.cocos2d-x.org/issues/3492
|
2013-12-24 15:55:45 +08:00 |
boyu0
|
6e6ccbd5f9
|
change some const char* to const std::string&
|
2013-12-24 15:49:58 +08:00 |
James Chen
|
16195b4571
|
Merge pull request #4629 from Dhilan007/update_vsProject
update vs project for remove some file into renderer.
|
2013-12-23 23:49:48 -08:00 |
Dhilan007
|
f140ece282
|
update vs project for remove some file into renderer.
|
2013-12-24 15:34:40 +08:00 |
CocosRobot
|
3875d89ce6
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-24 07:31:29 +00:00 |
James Chen
|
0305ff15db
|
Merge pull request #4625 from dabingnn/develop_NewClippingNode
Develop new clipping node
|
2013-12-23 23:20:38 -08:00 |
Huabing.Xu
|
5cc45493ef
|
remove commented codes
|
2013-12-24 15:13:37 +08:00 |
Huabing.Xu
|
ccf47e6422
|
remove commented codes
|
2013-12-24 15:11:01 +08:00 |
James Chen
|
451d76f6b0
|
Merge pull request #4611 from dumganhar/spine-test
Merge PR #4572, Spine JS test support.
|
2013-12-23 22:55:58 -08:00 |
Huabing.Xu
|
07bc4d34a8
|
some rename for global variables and member functions.
|
2013-12-24 14:53:49 +08:00 |
CocosRobot
|
4775b4c4d8
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-24 06:33:43 +00:00 |
James Chen
|
39c3bc10ed
|
Merge pull request #4614 from 2youyouo2/develop
update armature, using `const std::string&` instead of `const char*`
|
2013-12-23 22:25:50 -08:00 |
yinkaile
|
67c3480320
|
change std::string.compare() to ==
|
2013-12-24 14:21:25 +08:00 |
Huabing.Xu
|
c36d920159
|
remove include reference
|
2013-12-24 14:15:23 +08:00 |
Huabing.Xu
|
eee06ec905
|
update project file:android and linux
|
2013-12-24 14:12:15 +08:00 |
Huabing.Xu
|
9db599c0c9
|
remove class NewClippingNode
|
2013-12-24 14:10:54 +08:00 |
Huabing.Xu
|
e7facf9f85
|
remove NewClippingNode feature function into ClippingNode
|
2013-12-24 14:08:57 +08:00 |
CocosRobot
|
c170559759
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-24 05:59:50 +00:00 |
yinkaile
|
9f8d95131e
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2013-12-24 13:48:41 +08:00 |
samuele3hu
|
7f4e384886
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher
|
2013-12-24 13:43:57 +08:00 |
samuele3hu
|
98e4e802f4
|
Support pass by value for setPosition\setAnchorPoint\setContentSize for lua binding
|
2013-12-24 13:42:32 +08:00 |
yinkaile
|
44e22584a4
|
fixed getFileData
|
2013-12-24 13:35:46 +08:00 |
Edward Zhou
|
4082c86070
|
1. add Spine LUA binding with testcase; 2. CCSkeleton inherites from Node since NodeRGBA is deprecated.
|
2013-12-24 11:55:53 +08:00 |
CocosRobot
|
e50b6b616b
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-24 03:45:37 +00:00 |
boyu0
|
8e329501ba
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into const_char_star_to_std_string
Conflicts:
cocos/2d/renderer/CCNewSprite.cpp
cocos/2d/renderer/CCNewSprite.h
cocos/2d/renderer/CCNewTextureAtlas.cpp
cocos/2d/renderer/CCNewTextureAtlas.h
|
2013-12-24 11:44:08 +08:00 |
Huabing.Xu
|
b821a33cfa
|
remove comment code
|
2013-12-24 11:28:42 +08:00 |
Huabing.Xu
|
a607bc9ac1
|
Merge branch 'develop' into develop_NewSpriteBatchNode
* develop:
[JSB] long —> ssize_t in JSB_TableViewDataSource::callJSDelegate.
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-24 11:21:37 +08:00 |
Huabing.Xu
|
12e2cfedf2
|
update project file:android and linux
|
2013-12-24 11:20:21 +08:00 |
CaiWenzhi
|
f355fa6201
|
Fixed bugs
|
2013-12-24 11:18:25 +08:00 |
yinkaile
|
ff053e71fe
|
change std::string compare method
|
2013-12-24 11:05:53 +08:00 |
Huabing.Xu
|
24ac743a3c
|
remove class NewSpriteBatchNode
|
2013-12-24 11:03:59 +08:00 |
boyu0
|
3344c5243c
|
change some const char* to const std::string&
|
2013-12-24 10:51:47 +08:00 |
Huabing.Xu
|
b61bf3ad95
|
LabelBMFont inherit SpriteBatchNode instead of NewSpriteBatchNode
remove NewSpriteBatchNode testcase to SpriteBatchNode
|
2013-12-24 10:51:35 +08:00 |
yinkaile
|
4de3e520d8
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2013-12-24 10:51:24 +08:00 |
Huabing.Xu
|
410cfb9ca4
|
move NewSpriteBatchNode feature function into SpriteBatchNode
|
2013-12-24 10:48:57 +08:00 |
CaiWenzhi
|
6dd55921aa
|
Merge branch 'develop' into develop_nutty_modify_framework_newrender
|
2013-12-24 10:44:57 +08:00 |
James Chen
|
325f2e21a7
|
[JSB] long —> ssize_t in JSB_TableViewDataSource::callJSDelegate.
|
2013-12-24 10:41:45 +08:00 |
CaiWenzhi
|
3885477276
|
Remove CCDictionary from GUIReader
|
2013-12-24 10:41:01 +08:00 |
CocosRobot
|
d22f2aaf67
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-24 02:28:17 +00:00 |
Huabing.Xu
|
8310c18105
|
update project file: android and linux
|
2013-12-24 10:07:53 +08:00 |
Huabing.Xu
|
c4f4f91cb4
|
Merge branch 'develop' into develop_mergeNewSprite
* develop:
[AUTO] : updating submodule reference to latest autogenerated bindings
Updates Bindings-generator.
Binds Node::setAnchorPoint manually.
Don’t hide parent’s addChild method in TMXLayer class.
[AUTO] : updating submodule reference to latest autogenerated bindings
Updates JS-tests to the latest version.
[Lua Binding] Supports to bind more container: std::vector<std::string>, std::vector<int>, cocos2d::Map<std::string, T>.
Updates js tests to the latest version.
Removes unneeded binding glue codes, Sprite::setPosition.
Bindings-generator skips Node::setContentSize. Binds it manually.
[AUTO] : updating submodule reference to latest autogenerated bindings
issue #3353:Add the DisplayLinkDirector lua binding
issue #2771: fix warning log and fix typo.
issue #3353:Lua gc mechanism will make the extended attributes of lua userdata disapper
|
2013-12-24 10:03:21 +08:00 |
Huabing.Xu
|
8d58e43ad2
|
remove Class NewSprite
|
2013-12-24 09:40:00 +08:00 |
CocosRobot
|
a9d8a64e63
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-23 14:10:01 +00:00 |
James Chen
|
05f6a5b09b
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into spine-test
|
2013-12-23 22:05:20 +08:00 |
James Chen
|
44f9009a5d
|
Merge pull request #4610 from dumganhar/lastest-js-test
Updates JS-test to the latest version and some binding fixes
|
2013-12-23 06:04:49 -08:00 |
James Chen
|
3327614a99
|
Binds Node::setAnchorPoint manually.
|
2013-12-23 21:54:02 +08:00 |
James Chen
|
5f17984826
|
Don’t hide parent’s addChild method in TMXLayer class.
|
2013-12-23 21:53:23 +08:00 |
CocosRobot
|
cc7aa1ee0d
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-23 13:45:59 +00:00 |
James Chen
|
6b73fa570e
|
Merge pull request #4601 from samuele3hu/toluaerror
issue #3353 Lua gc mechanism will make the extended attributes of lua userdata disapper
|
2013-12-23 05:40:15 -08:00 |
James Chen
|
09e04e1490
|
Merge pull request #4607 from samuele3hu/NewEventDispatcher
[Lua Binding] Supports to bind more container: std::vector<std::string>, std::vector<int>, cocos2d::Map<std::string, T>
|
2013-12-23 05:38:53 -08:00 |
James Chen
|
6bbc6e2dde
|
CCSkeleton is inherited from Node now.
|
2013-12-23 21:12:58 +08:00 |
Huabing.Xu
|
e66eb6464d
|
use Sprite instead of NewSprite
|
2013-12-23 21:07:25 +08:00 |
Huabing.Xu
|
c3247c800f
|
merge feature function from NewSprite into Sprite
|
2013-12-23 21:06:37 +08:00 |
James Chen
|
a48544c814
|
Merge pull request #4598 from boyu0/iss2771_physical
issue #2771: fix warning log and fix typo.
|
2013-12-23 05:00:03 -08:00 |
samuele3hu
|
b1dd233a04
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher
|
2013-12-23 20:30:33 +08:00 |