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
Liam
921f067ab7
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop
2013-12-24 15:42:50 +08:00
Dhilan007
f140ece282
update vs project for remove some file into renderer.
2013-12-24 15:34:40 +08:00
Liam
c6fb3b7e0d
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop
2013-12-24 15:32:09 +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
samuele3hu
48a95cfa55
[Lua Binding] Supports to bind more container: std::vector<std::string>, std::vector<int>, cocos2d::Map<std::string, T>.
2013-12-23 20:29:05 +08:00
James Chen
cafebe7295
Merge commit 'refs/pull/4572/head' of git://github.com/cocos2d/cocos2d-x into spine-test
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2013-12-23 20:28:51 +08:00
James Chen
3096c34311
Removes unneeded binding glue codes, Sprite::setPosition.
2013-12-23 20:25:46 +08:00
James Chen
1ed0f80348
Merge pull request #4605 from dabingnn/develop_mergeNewTextureAtlas
...
Develop merge new texture atlas
2013-12-23 04:16:16 -08:00
CocosRobot
2efe4b7420
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-23 12:14:14 +00:00
Huabing.Xu
b3eb297249
Merge branch 'develop' into develop_mergeNewTextureAtlas
...
* develop:
[AUTO] : updating submodule reference to latest autogenerated bindings
closed #3478 : BitmapFontMultiLineAlignment test shows some unneeded 'line break'
Removes unneeded ‘override’ codes, uses `using Node::addChild;` to prevent compiler warnings.
Updates bindings-generator, skips to bind override functions.
Removes unneeded ‘clone’ in cocos2d_specifics.cpp.
2013-12-23 20:12:06 +08:00
Huabing.Xu
1dd2c1c20c
remove NewTextureAtlas
2013-12-23 20:11:50 +08:00
James Chen
bbbfa4b106
Merge pull request #4603 from dabingnn/develop_mergeNewRenderTexture
...
Develop merge new render texture
2013-12-23 04:09:33 -08:00
Huabing.Xu
98d573f4cb
rename protected _beginWithClear to beginWithClear
2013-12-23 19:59:09 +08:00
CocosRobot
509d4513eb
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-23 11:48:15 +00:00
James Chen
eb9cb237d5
Merge pull request #4600 from dumganhar/remove-unneeded-bindings-codes
...
closed #3480 : Removes unneeded codes of override function.
2013-12-23 03:43:27 -08:00
Huabing.Xu
0dab85a3bf
update CMakeLists.txt
2013-12-23 18:37:18 +08:00
Huabing.Xu
75597bc47f
Merge branch 'develop' into develop_mergeNewRenderTexture
...
* develop:
[LUA] Removes CCCameraDeprecated table in Deprecated.lua.
[AUTO] : updating submodule reference to latest autogenerated bindings
issue #3403:Modify the registerScriptHandler functions inputparams and some EventData struct info
Compilation fix after this PR (https://github.com/cocos2d/cocos2d-x/pull/4583 ).
issue #3403:Delete Camera manual lua binding
issue #3403:Add the EventDispatcher lua binding and the releated test cases
2013-12-23 18:34:12 +08:00
James Chen
8c3315de76
closed #3478 : BitmapFontMultiLineAlignment test shows some unneeded 'line break'
2013-12-23 18:23:39 +08:00
Huabing.Xu
9c97fc6f19
remove NewRenderTexture include file
2013-12-23 18:08:50 +08:00
Huabing.Xu
bcaec978d3
remove NewRenderTexture Class
2013-12-23 18:04:04 +08:00
Huabing.Xu
487e0b21af
update Xcode project file& android.mk
2013-12-23 18:03:08 +08:00
samuele3hu
783be69322
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into toluaerror
...
Conflicts:
tools/tolua/cocos2dx.ini
2013-12-23 17:20:17 +08:00
Huabing.Xu
41a77fed61
TestCase Use RenderTexture instead of NewRenderTexture
2013-12-23 17:13:41 +08:00
Huabing.Xu
a7a50dffcc
move begin(), end(),draw() to RenderTexture
2013-12-23 17:13:06 +08:00
boyu0
669ba8149a
closed #2050 : fix js glue code.
2013-12-23 17:06:13 +08:00
James Chen
ed93f90ccc
Removes unneeded ‘override’ codes, uses `using Node::addChild;` to prevent compiler warnings.
2013-12-23 16:58:26 +08:00
James Chen
43e9df17bb
Removes unneeded ‘clone’ in cocos2d_specifics.cpp.
2013-12-23 16:39:25 +08:00
James Chen
9dff1dcd36
[LUA] Removes CCCameraDeprecated table in Deprecated.lua.
2013-12-23 16:37:40 +08:00
Huabing.Xu
fad585fbef
move rendering callback to RenderTexture
2013-12-23 15:59:47 +08:00
boyu0
0cbbfdba8c
closed #2050 : Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug2050_tilemap_firstgid_bug
...
Conflicts:
cocos/2d/CCTMXLayer.cpp
2013-12-23 15:40:33 +08:00
CaiWenzhi
9aa85d2bd6
Remove NodeRGBA inherit
2013-12-23 15:02:52 +08:00
Huabing.Xu
b7c0d7a9e8
1. remove redundant code in NewRenderTexture 2. rename protected beginWithClear to _beginWithClear
2013-12-23 14:59:44 +08:00
boyu0
69f1834e61
issue #2771 : fix warning log and fix typo.
2013-12-23 14:30:43 +08:00
yinkaile
8d9035c5e8
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-23 14:06:22 +08:00
yinkaile
ba809a0096
change const char* to const std::string&
2013-12-23 14:05:46 +08:00
CocosRobot
9901703f4a
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-23 05:52:59 +00:00
James Chen
f9c45f89ac
Merge branch 'data-refactor' of https://github.com/dumganhar/cocos2d-x into data-refactor
2013-12-23 13:52:42 +08:00
James Chen
2fec81fcae
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor
...
Conflicts:
tools/tolua/cocos2dx.ini
2013-12-23 13:52:15 +08:00
James Chen
4ed988b8c5
Fixes linux build failure.
2013-12-23 13:45:31 +08:00
James Chen
aeafe06d7f
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor
...
Conflicts:
cocos/scripting/lua/bindings/lua_cocos2dx_manual.cpp
2013-12-23 11:57:29 +08:00
James Chen
11423b5851
Changes the type of FontFreeType::_ttfData from `unsigned char*` to `Data`, makes codes more elegant.
2013-12-23 11:53:39 +08:00
James Chen
ca082080b5
Binds FileUtils::getStringFromFile automatically since we have added this method.
2013-12-23 11:47:56 +08:00
samuele3hu
9128960c13
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher
2013-12-23 11:22:41 +08:00
samuele3hu
f0dc7f0b15
issue #3403:Modify the registerScriptHandler functions inputparams and some EventData struct info
2013-12-23 11:19:55 +08:00
boyu0
1072711a4c
issue #2050 : use static_cast
2013-12-23 10:46:35 +08:00
boyu0
baf8cb06c5
issue #2050 : delete max/minGID, fix firstGID bug
2013-12-23 10:37:46 +08:00
James Chen
0a2490333b
Compilation fix after this PR ( https://github.com/cocos2d/cocos2d-x/pull/4583 ).
2013-12-23 10:03:36 +08:00
samuele3hu
7daace0b2a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher
2013-12-23 09:43:05 +08:00
samuele3hu
71d5896d41
issue #3403:Delete Camera manual lua binding
2013-12-23 09:42:36 +08:00
yinkaile
87103434e3
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-23 09:30:14 +08:00
samuele3hu
50bcdee725
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher
2013-12-22 22:11:17 +08:00
samuele3hu
97f26176e8
issue #3403:Add the EventDispatcher lua binding and the releated test cases
2013-12-22 22:10:21 +08:00
Dhilan007
786b7d9912
update vs project for remove CCCamera.
2013-12-22 17:19:59 +08:00
CocosRobot
bc5fd247ac
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-21 20:35:41 +00:00
Ricardo Quesada
4f435a8613
Adds getScene() to Node
...
helper function to get the Scene containing the Node
2013-12-21 12:28:49 -08:00
Ricardo Quesada
d35846b0d4
Merge pull request #4588 from ricardoquesada/events_in_director
...
Events in director
2013-12-21 10:58:43 -08:00
Ricardo Quesada
49903ea779
Director emits events after visit, after draw and after update. And when the projection changes
...
Adds helper functions on EventDispatcher
Adds test in NewEventDispatcherTest
2013-12-21 10:55:16 -08:00
Ricardo Quesada
eea2e70d1e
Adds events in director
2013-12-21 00:56:28 -08:00
CocosRobot
58e25a657f
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-21 03:47:33 +00:00
Ricardo Quesada
72d77bb035
removes dirty from ActionCamera
2013-12-20 19:45:30 -08:00
Ricardo Quesada
eadbaa3bf5
Adds comment to ActionCamera file
2013-12-20 19:37:14 -08:00
Ricardo Quesada
fd8c7e9a5d
Removes CCCamera
...
Not needed anymore.
2013-12-20 19:24:56 -08:00
Ricardo Quesada
b8b7714431
Camera is working OK in 2d projection
2013-12-20 19:19:24 -08:00
Ricardo Quesada
d8ad5291f4
Nore camera
2013-12-20 16:33:31 -08:00
Ricardo Quesada
0703d974e2
NodeGrid fixes
...
Adds license
Removes unneded matrix
replaces std::for_each with for range-loop
2013-12-20 11:52:52 -08:00
James Chen
2a7b2c107a
Updates CCUserDefaultAndroid.cpp.
2013-12-20 21:51:53 +08:00
James Chen
b504d817b5
Small bug fix in CCData.
2013-12-20 21:41:20 +08:00
minggo
9bea08ded9
Merge pull request #4580 from dabingnn/develop_MotionStreak
...
Migrate MotionStreak to new renderer
2013-12-20 05:36:52 -08:00
Huabing.Xu
739cf0ce85
Migrate MotionStreak to new renderer
2013-12-20 21:21:50 +08:00
James Chen
9e05f300f3
[Data Refactor] compilation error fix.
2013-12-20 21:16:46 +08:00
James Chen
21a9f05110
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor
...
Conflicts:
cocos/2d/CCUserDefault.cpp
cocos/2d/CCUserDefault.mm
cocos/2d/CCUserDefaultAndroid.cpp
cocos/2d/ZipUtils.cpp
cocos/2d/platform/CCFileUtils.h
cocos/2d/platform/CCSAXParser.cpp
2013-12-20 21:12:11 +08:00
James Chen
ab7a273354
closed #3465 : New spine runtime support, update CMakeLists.txt
2013-12-20 20:18:32 +08:00
James Chen
0db2067f97
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-spine
2013-12-20 20:11:41 +08:00
James Chen
3d76281617
Removes an unused assert.
2013-12-20 19:49:25 +08:00
James Chen
5852c66e5a
closed #3463 : ListenerID is std::string now. To avoid hash collision when using lots of EventCustoms.
2013-12-20 19:47:11 +08:00
Huabing.Xu
a8d2ae9eda
Merge branch 'develop' into develop_transitionScene
...
* develop:
[AUTO] : updating submodule reference to latest autogenerated bindings
closed #3463 : Potential hash collision by using typeid(T).hash_code() in JSB and LuaBinding. Instead of using std::unordered_map<long, T>(long is the hash_code generated by typeid(T).hash_code()), We needs to use std::unordered_map<std::string, T> to avoid collision since unordered_map internally processes collisions.
Update CHANGELOG [ci skip]
Update AUTHORS [ci skip]
closed #3457 : Fix of UserDefault. Infinite loop in UserDefault's destructor on iOS. The destructor of UserDefault is private now.
[AUTO] : updating submodule reference to latest autogenerated bindings
Fixed non-functioning default value for CCUserDefault::getDoubleForKey()
2013-12-20 19:15:50 +08:00
byeonggee.seo
f3e4d9277e
spine android build phase moved
2013-12-20 19:16:16 +09:00
CocosRobot
f3d3e65e76
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-20 09:35:05 +00:00
James Chen
55ff96df3a
closed #3463 : Potential hash collision by using typeid(T).hash_code() in JSB and LuaBinding.
...
Instead of using std::unordered_map<long, T>(long is the hash_code generated by typeid(T).hash_code()),
We needs to use std::unordered_map<std::string, T> to avoid collision since unordered_map internally processes collisions.
2013-12-20 17:13:09 +08:00
yinkaile
3bd1562f4a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-20 16:46:29 +08:00
James Chen
e54c993918
Merge pull request #4564 from dmurtagh/UserDefault_GetDouble_Fix_For_Android
...
Fixed non-functioning default value for CCUserDefault::getDoubleForKey()
2013-12-20 00:13:05 -08:00
byeonggee.seo
0a30a9a604
spine simple JS binding supported
2013-12-20 16:10:15 +09:00
Huabing.Xu
ef5b072182
fix transition scene CrossFade
2013-12-20 14:38:02 +08:00
James Chen
2c590cea3e
closed #3457 : Fix of UserDefault. Infinite loop in UserDefault's destructor on iOS. The destructor of UserDefault is private now.
2013-12-20 14:06:24 +08:00
Huabing.Xu
87f62bc8a0
Merge branch 'develop' into develop_transitionScene
...
* develop:
#include <string> in CCComponentContainer.h to fix linux build failure.
#include <algorithm> for std::find in CCVector.h.
const love in CCFileUtils.cpp.
More std::for_each —> for(const auto& …)
2013-12-20 12:45:22 +08:00
minggo
ea751f8f1f
Merge pull request #4568 from dabingnn/develop_transitionScene
...
fix transition scene progress timer
2013-12-19 19:06:06 -08:00
CocosRobot
8c0d74bb33
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-20 02:56:57 +00:00
yinkaile
4f003da8cb
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-20 10:53:37 +08:00
Huabing.Xu
9385fb3481
fix transition scene progress timer
2013-12-20 10:53:35 +08:00
James Chen
e56a4a7c00
Merge pull request #4567 from dumganhar/for_each-gone
...
All std::for_each has gone. uses for(const auto& ...) instead.
2013-12-19 18:50:50 -08:00
James Chen
a53f00c579
#include <string> in CCComponentContainer.h to fix linux build failure.
2013-12-20 10:41:29 +08:00
minggo
756f8f7a11
Merge pull request #4482 from dabingnn/develop_gridNode
...
Develop grid node
2013-12-19 18:30:42 -08:00
James Chen
3dba88c5c9
#include <algorithm> for std::find in CCVector.h.
2013-12-20 10:12:07 +08:00
James Chen
58772d7dec
const love in CCFileUtils.cpp.
2013-12-20 10:11:41 +08:00
James Chen
34382b4a8a
More std::for_each —> for(const auto& …)
2013-12-20 09:54:50 +08:00
boyu0
19e1609c27
issue #2050 : unsigned int to int
2013-12-20 09:50:53 +08:00
Ricardo Quesada
f5d0d1ce43
batched children work as expected
...
Fixed order in the multi matrix.
2013-12-19 16:33:47 -08:00
Ricardo Quesada
59fee6b8d2
replaces std::for_each with for()
...
replaces `std::for_each` with C++11 `for( : )`
2013-12-19 13:34:41 -08:00
Damien
52c66a678c
Fixed non-functioning default value for CCUserDefault::getDoubleForKey()
...
- defaultValue was not being passed into the JNI CallStaticDoubleMethod
method previously.
- CCUserDefault::getDoubleForKey() would return undefined garbage when
the key doesn’t exist.
Test Case:
Call the following from anywhere in your code (in release
configuration). X will be garbage.
Call the following from your code:
double x =
CCUserDefault::sharedUserDefault()->getDoubleForKey("Some-Non-existant-k
ey-1234", 0);
CCLOG("x = %4.2f", x);
Fix Tested on Android. Affects Android only.
2013-12-19 12:32:51 -08:00
Ricardo Quesada
99ae4d86d3
fixes compiler warnings
...
* converts some `int` to `ssize_t`
* adds `const` to `title()` and `subtitle()`
2013-12-19 12:23:42 -08:00
Huabing.Xu
61cf9e49eb
change TransitionPageTurn::_outSceneProxy when class construction instead of onEnter
2013-12-19 22:01:32 +08:00
Huabing.Xu
517fec4de7
change TransitionTurnOffTiles::_outSceneProxy when class construction instead of onEnter
2013-12-19 21:49:21 +08:00
Huabing.Xu
034e1152e5
minor change accord to cocos2d coding style
2013-12-19 21:41:07 +08:00
Huabing.Xu
9fec597ff3
remove unreachable code
2013-12-19 21:36:44 +08:00
James Chen
cfec4d5b7e
Updates spine test.
2013-12-19 21:35:43 +08:00
CocosRobot
982d5626fc
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-19 13:13:34 +00:00
yinkaile
05e0d03ca9
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-19 21:13:15 +08:00
yinkaile
c58963bd45
add support for tweenRotate property
2013-12-19 21:12:25 +08:00
James Chen
df85ba8fd9
Merge commit 'refs/pull/4545/head' of git://github.com/cocos2d/cocos2d-x into new-spine
...
Conflicts:
cocos/editor-support/spine/CCSkeleton.h
2013-12-19 21:07:24 +08:00
James Chen
ec0bdf06af
Merge pull request #4555 from 2youyouo2/develop
...
fixed armature position not right
2013-12-19 05:05:25 -08:00
CocosRobot
fc1516aee4
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-19 12:54:14 +00:00
yinkaile
b367896f94
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-19 20:50:27 +08:00
James Chen
3dc052db4f
Fixes linux and windows building failure.
2013-12-19 20:32:22 +08:00
James Chen
755d29b0e1
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into more_container_bind
2013-12-19 20:17:54 +08:00
James Chen
f73e939b57
Supports to bind more container: std::vector<std::string>, std::vector<int>, cocos2d::Map<std::string, T>.
2013-12-19 20:17:44 +08:00
CocosRobot
8421d43195
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-19 10:12:28 +00:00
Huabing.Xu
44366c653c
fix compile error
2013-12-19 17:20:36 +08:00
Huabing.Xu
d51ad36613
Merge branch 'develop' into develop_gridNode
...
* develop: (67 commits)
Adds const in ShaderTest2.h
Skew works again!
[AUTO] : updating submodule reference to latest autogenerated bindings
[AUTO] : updating submodule reference to latest autogenerated bindings
Reverts submodule.
Updates submodule of bindings-generator.
Adds `std::for_each` test in invocation
Reverts bindings-generator.
fixed not render
iterator in Sprite fixes
update vs project for removes unneeded files
getNodeToParentTransform fixes
Node cleanup
[AUTO] : updating submodule reference to latest autogenerated bindings
Improves SpriteTest
[AUTO] : updating submodule reference to latest autogenerated bindings
Android and Linux fixes
removes `using namespace std` from header file
Removes unneeded files
change play arguments
...
Conflicts:
cocos/2d/CCNode.cpp
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
2013-12-19 17:20:22 +08:00
boyu0
ef54ed3c15
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD
...
Conflicts:
cocos/2d/CCLabel.cpp
cocos/2d/CCLabel.h
cocos/2d/CCLabelBMFont.cpp
cocos/2d/CCLabelBMFont.h
cocos/2d/CCLayer.cpp
cocos/2d/CCLayer.h
cocos/2d/CCNode.cpp
extensions/GUI/CCControlExtension/CCControl.cpp
extensions/GUI/CCControlExtension/CCControlButton.cpp
extensions/GUI/CCControlExtension/CCScale9Sprite.cpp
tools/tojs/cocos2dx.ini
2013-12-19 17:05:59 +08:00
Huabing.Xu
911e5b0bac
fix bug : group command nesting will cause infinite loop
2013-12-19 16:55:22 +08:00
Huabing.Xu
1bc7250f7e
node grid migrating to new renderer
2013-12-19 16:54:39 +08:00
yinkaile
c02272ade3
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-19 15:44:05 +08:00
yinkaile
140bd2ecad
fixed armature position not right
2013-12-19 15:43:32 +08:00
Ricardo Quesada
1ed37df37f
Merge pull request #4553 from ricardoquesada/skew_fixes
...
Skew works again!
2013-12-18 21:11:47 -08:00
Ricardo Quesada
1d3cc7a24c
Skew works again!
2013-12-18 21:11:06 -08:00
CocosRobot
ac24dec620
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-19 04:19:07 +00:00
James Chen
113fa9924e
Merge pull request #4550 from dumganhar/merge-pr-4532
...
Merge pr 4532
2013-12-18 20:12:18 -08:00
CocosRobot
403315e315
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-19 03:58:41 +00:00
James Chen
f8b7d70d92
Reverts submodule.
2013-12-19 11:53:56 +08:00
James Chen
d31c1457b1
Merge pull request #4546 from Dhilan007/update_vsProject
...
update vs project for removes unneeded files
2013-12-18 19:30:21 -08:00
James Chen
75b5edb66c
Merge commit 'refs/pull/4532/head' of git://github.com/cocos2d/cocos2d-x into armature-test
2013-12-19 11:16:03 +08:00
yinkaile
a6a432d2a2
fixed not render
2013-12-19 10:42:06 +08:00
Ricardo Quesada
d138925aa0
Merge branch 'develop' into node_fixes
2013-12-18 18:33:56 -08:00
Ricardo Quesada
b9a64725ab
iterator in Sprite fixes
...
And replaces some std::for_each() with for() to prevent another object in the stack.
2013-12-18 18:33:04 -08:00
Dhilan007
ffa6ad3cb2
update vs project for removes unneeded files
2013-12-19 10:24:50 +08:00
minggo
9fc28e6c7d
Merge pull request #4534 from boyu0/edit_hungarian_notation
...
Edit hungarian notation
2013-12-18 18:10:17 -08:00
Ricardo Quesada
89701f5006
getNodeToParentTransform fixes
...
Code is cleaner.
`Armature` calls parent to reduce code.
[]: Skew is still not working properly
2013-12-18 18:00:55 -08:00
byeonggee.seo
e673bd80bb
new spine runtime applied
2013-12-19 10:50:37 +09:00
boyu0
c6cc77e75b
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into edit_hungarian_notation
2013-12-19 09:45:21 +08:00
yinkaile
93eaf44e9c
Merge branch 'develop' into Array
...
Conflicts:
cocos/scripting/auto-generated
2013-12-19 09:42:21 +08:00
Ricardo Quesada
8390e7eadb
Node cleanup
...
Uses "normal" interation without the lambda to prevent another object in the stack.
removed unused code.
2013-12-18 16:56:59 -08:00
CocosRobot
228b4ebf75
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-18 22:11:07 +00:00
Ricardo Quesada
7616edd9f3
Improves SpriteTest
...
Improves SpriteTest.
It is easier to see if Sprite works as SpriteBatchNode (and vice-versa).
Needed for the new renderer.
Also adds `const` to title() and subtitle()
2013-12-18 13:52:10 -08:00
Ricardo Quesada
a175e5a13c
Merge pull request #4539 from CocosRobot/updategeneratedsubmodule_1387397647
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-18 12:18:22 -08:00
CocosRobot
d0779b5352
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-18 20:14:20 +00:00
Ricardo Quesada
b36d77b1c2
Android and Linux fixes
2013-12-18 12:07:51 -08:00
Ricardo Quesada
d1b555614e
removes `using namespace std` from header file
...
... in order to prevent possible collisions.
`using namespace XXX` MUST never be used in header files.
2013-12-18 11:45:30 -08:00
Ricardo Quesada
903844c7bd
Removes unneeded files
...
New functionality is merged into the 'official' classes
2013-12-18 11:44:45 -08:00
yinkaile
324732b867
change play arguments
2013-12-18 23:29:54 +08:00
yinkaile
7be834ea37
change play arguments
2013-12-18 22:57:18 +08:00
boyu0
d0b039ceda
fix compile errors.
2013-12-18 22:44:03 +08:00
yinkaile
57c33e0604
fixed compile error
2013-12-18 22:36:10 +08:00
yinkaile
d3a575e8cc
change for iterator and callfunc
2013-12-18 22:07:33 +08:00
yinkaile
026811ca59
Merge branch 'develop' into Array
...
Conflicts:
cocos/scripting/auto-generated
tools/bindings-generator
2013-12-18 22:03:16 +08:00
boyu0
71be55a9aa
revert AccelerometerSimulation.m
2013-12-18 19:02:49 +08:00
boyu0
50544a04a7
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into edit_hungarian_notation
2013-12-18 18:53:44 +08:00
boyu0
f16384a105
fix more code with hungarian notation
2013-12-18 18:51:36 +08:00
boyu0
d16c67096a
revert submodules
2013-12-18 18:33:39 +08:00
boyu0
082c3d274a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into edit_hungarian_notation
2013-12-18 18:05:30 +08:00
CocosRobot
000958bf82
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-18 09:57:15 +00:00
James Chen
9c0d39c6f9
Merge pull request #4531 from dumganhar/extension-warning-fix
...
Some warning fixes in SocketIO, ContriolButton, js_manual_conversion.h/.cpp.
2013-12-18 01:48:14 -08:00
boyu0
e07c4ffec1
Change NULL to nullptr, edit hungarian notation.
2013-12-18 17:47:20 +08:00
Huabing.Xu
46d1d5bb91
add GridNode New renderer imp
2013-12-18 17:19:50 +08:00
James Chen
589b71eecf
Merge pull request #4530 from samuele3hu/developConversion
...
issue #3402:Add the new label lua binding and the releated test cases
2013-12-18 01:16:47 -08:00
James Chen
ddc1328e6b
Small fix in CCValue.cpp. visitMap is a template that supports IntValueMap and ValueMap. IntValueMap is confused. ValueMapIntKey seems better.
2013-12-18 17:01:57 +08:00
James Chen
7719c692b8
More warning fixes.
2013-12-18 16:03:07 +08:00
James Chen
581ba49399
Diables CC_ENABLE_CACHE_TEXTURE_DATA in Renderer::initGLView since Renderer is not inherited from Object now. CCNotificationCenter will not be able to work.
...
Signed-off-by: James Chen <jianhua.chen@cocos2d-x.org>
2013-12-18 15:41:57 +08:00
James Chen
0695e32fff
Some warning fixes in SocketIO, ContriolButton, js_manual_conversion.h/.cpp.
2013-12-18 15:40:31 +08:00
samuele3hu
f5f95399fd
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developConversion
2013-12-18 14:58:35 +08:00
James Chen
2892e8be3f
Refactors Data class, adds FileUtils::getStringFromFile, FileUtils::getDataFromFile and deprecates FileUtils::getFileData.
2013-12-18 14:58:17 +08:00
CocosRobot
8f1e94471e
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-18 06:52:09 +00:00
James Chen
7a5074652c
Merge pull request #4526 from samuele3hu/LuaConversion
...
Add support for unsigned short
2013-12-17 22:43:42 -08:00
Dhilan007
2d9b7ee4fc
update vs project for new renderer and fix compiling fail on vs.
2013-12-18 14:36:49 +08:00
samuele3hu
55830c3023
Add support for unsigned short
2013-12-18 13:47:59 +08:00
samuele3hu
4d4b96ba30
issue #3402:Add the new label lua binding and the releated test cases
2013-12-18 11:39:43 +08:00
Ricardo Quesada
24f89ac45c
Revert... android platform is 10
2013-12-17 19:07:28 -08:00
Ricardo Quesada
156f69c528
Renderer is subclass of Object again... needed for Android.
...
ouch
2013-12-17 19:06:22 -08:00
Ricardo Quesada
5c9b8db0cb
Updates project files file Linux and Android
2013-12-17 18:47:46 -08:00
Ricardo Quesada
33c4f891a0
Adds 'CC' to renderer files
2013-12-17 18:41:09 -08:00
Ricardo Quesada
f369a8eec3
Adds correct License to Renderer files
2013-12-17 18:12:15 -08:00
Ricardo Quesada
3f3071fbb6
Cleanup RenderCommand code
...
RenderCommand code is cleaner
2013-12-17 18:02:11 -08:00
Ricardo Quesada
d6be81b7a8
The Renderer is not a singleton
...
In order to access, you have to get it from the Director
`Director::getInstance()->getRenderer()`
2013-12-17 17:50:17 -08:00
Ricardo Quesada
10eafeaeed
fixes warning compiler
2013-12-17 11:16:30 -08:00
Ricardo Quesada
441cb6c282
fixes warnings in QuadCommand
2013-12-17 10:35:15 -08:00
Ricardo Quesada
ff106ed070
fixes warning on Label Fragment shader
2013-12-17 10:01:38 -08:00
yinkaile
581a7856de
fixed compiler error
2013-12-17 19:32:16 +08:00
CocosRobot
12d8740537
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-17 10:39:43 +00:00
James Chen
9d1cb43d8c
Merge pull request #4510 from dumganhar/vector-fix
...
Small fix for Vector::insert(const Vector<T>& other), renames it to Vector::pushBack(const Vector<T>& other).
2013-12-17 02:28:56 -08:00
James Chen
37f408f2b9
Merge pull request #4506 from Dhilan007/ushort_jsb
...
add API for transform unsigned short
2013-12-17 02:20:56 -08:00
Dhilan007
0414926b52
add API for transform unsigned short
2013-12-17 18:17:04 +08:00
Huabing.Xu
25fc3d3c2a
Merge branch 'develop' into develop_gridNode
...
* develop: (105 commits)
update armature to new render
iOS & Mac project fix.
[AUTO] : updating submodule reference to latest autogenerated bindings
use size_t replace unsigned int for record redeque::size returned value.
issue #2171 : Updates CMakeLists.txt.
issue #2171 : Binds New renderer classes, ignores NewTextureAtlas.
issue #2171 : Adds header files of renderer in cocos2d.h.
issue #2171 : Reorder renderer files for iOS & mac project.
issue #2171 : small fix in ccTypes.h
issue #2171 : Don’t ‘using namespace std;’ in header file.
[AUTO] : updating submodule reference to latest autogenerated bindings
issue #2171 : Ignores Director::getFrustum.
issue #2171 : Fixing compilation errors for Linux port.
issue #2171 : NULL —> nullptr for Android warning of CCBAnimationManager.cpp.
issue #2171 : [New Renderer] Fixing compilation errors for Android.
[Win32] fix argument type. - argument of interface is ssize_t.
Update AUTHORS [ci skip]
Update CHANGELOG [ci skip]
Add mouse scrolling support for extension test
issue #3341:fix Incorrect at TextureCache::addImageAsync for repeatedly execute for the same image
...
Conflicts:
cocos/2d/CCNode.cpp
cocos/2d/cocos2d.vcxproj.filters
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
2013-12-17 18:16:05 +08:00
James Chen
3829f841e7
Small fix for Vector::insert(const Vector<T>& other), renames it to Vector::pushBack(const Vector<T>& other).
2013-12-17 18:09:07 +08:00
yinkaile
6ff45b09e7
Merge branch 'newRenderer' into Array
...
Conflicts:
cocos/editor-support/cocostudio/CCArmature.cpp
cocos/editor-support/cocostudio/CCArmature.h
cocos/editor-support/cocostudio/CCBatchNode.cpp
cocos/editor-support/cocostudio/CCColliderDetector.cpp
cocos/scripting/auto-generated
tools/bindings-generator
2013-12-17 18:06:11 +08:00
James Chen
16b643fbef
Merge pull request #4508 from CocosRobot/updategeneratedsubmodule_1387273832
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-17 01:56:09 -08:00
James Chen
c0d741d0d8
Merge pull request #4507 from dumganhar/del-vector-foreach
...
Removes Vector<T>::forEach, please use std::for_each instead. The same as Vector<T>::sort.
2013-12-17 01:55:35 -08:00
James Chen
c85f9877bb
Reverts Vector::eraseObject, not need to return iterator.
2013-12-17 17:54:38 +08:00
CocosRobot
30521ff5a4
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-17 09:50:36 +00:00
James Chen
d16fa07661
Removes Vector<T>::forEach, please use std::for_each instead. The same as Vector<T>::sort.
2013-12-17 17:45:29 +08:00
minggo
bcb07abb7b
Merge pull request #4505 from 2youyouo2/newRenderer
...
update armature to new render
2013-12-17 01:43:07 -08:00
yinkaile
bc868cc004
update armature to new render
2013-12-17 17:00:01 +08:00
minggo
85ba3ee1a9
Merge pull request #4496 from Dhilan007/addImageAsync_IncorrectError
...
issue #3341:fix Incorrect at TextureCache::addImageAsync for repeatedly ...
2013-12-17 00:32:50 -08:00
CocosRobot
91cfecb931
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-17 08:13:06 +00:00
LinWenhai
649e6b8065
use size_t replace unsigned int for record redeque::size returned value.
2013-12-17 16:04:48 +08:00
James Chen
12cc6c6153
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2171-new-renderer
...
Conflicts:
cocos/2d/CMakeLists.txt
2013-12-17 15:50:24 +08:00
James Chen
7fc7757470
issue #2171 : Adds header files of renderer in cocos2d.h.
2013-12-17 15:40:50 +08:00
James Chen
08edcca9be
issue #2171 : small fix in ccTypes.h
2013-12-17 15:39:35 +08:00
James Chen
8f5970ef90
issue #2171 : Don’t ‘using namespace std;’ in header file.
2013-12-17 15:32:24 +08:00
CocosRobot
21c74322bd
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-17 07:25:00 +00:00
minggo
16ed9155c0
Merge pull request #4460 from Dhilan007/label_distanceField
...
new label:add support for distanceField
2013-12-16 23:18:41 -08:00
James Chen
2a38d4fe94
issue #2171 : Fixing compilation errors for Linux port.
2013-12-17 14:50:40 +08:00
James Chen
d74ebe18a9
issue #2171 : NULL —> nullptr for Android warning of CCBAnimationManager.cpp.
2013-12-17 14:19:35 +08:00
James Chen
4e01769cd5
issue #2171 : [New Renderer] Fixing compilation errors for Android.
2013-12-17 14:18:41 +08:00
Ricardo Quesada
c7d350c83e
Merge branch 'develop' into newRenderer
2013-12-16 20:43:43 -08:00
Huabing.Xu
6abb6639b5
remove android properties change by eclipse
2013-12-16 19:22:40 +08:00
Liam
3c26106ffb
update ui animation with frame ease type
2013-12-16 18:13:49 +08:00
Dhilan007
f7a448814c
issue #3341:fix Incorrect at TextureCache::addImageAsync for repeatedly execute for the same image
2013-12-16 17:12:53 +08:00
Huabing.Xu
d63d3b3c24
remove manually JS binding functions
2013-12-16 14:45:21 +08:00
James Chen
7a1e13acab
Merge pull request #4494 from CocosRobot/updategeneratedsubmodule_1387175807
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-15 22:39:08 -08:00
CocosRobot
1e645cfcd5
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-16 06:36:50 +00:00
Dhilan007
0cf17f5658
label : fix some error on android when the GLSL versions is 1.0
2013-12-16 14:36:11 +08:00
youyou
81cdbea9c8
change Array to Vector, Dictionary to Map
2013-12-16 14:34:09 +08:00
minggo
eb883f735b
Merge pull request #4489 from pyrasis/android_shadowstroke
...
fix CCImage bug on android platform.
2013-12-15 22:31:18 -08:00
Huabing.Xu
6aa2908c13
rename:
...
1. class: GridNode->NodeGrid
2. function: setNodeGrid->setGrid getNodeGrid->getGrid setGridTarget->setTarget
3. file: CCGridNode.h&cpp->CCNodeGrid.h&cpp
2013-12-16 14:21:05 +08:00
James Chen
3a11dafda7
Uses reinterpret_cast instead of static_cast for jsval_to_ssize and luaval_to_ssize.
2013-12-16 14:13:24 +08:00