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
James Chen
adb45d3c68
Adds conversions for ssize_t.
2013-12-16 13:01:20 +08:00
Huabing.Xu
b1eacd52cb
Merge branch 'develop' into develop_gridNode
...
* develop:
fix compile error related to ssize_t.
issue #2771 : add and change some physics API, and add more documents
[AUTO] : updating submodule reference to latest autogenerated bindings
Some fixes for XXX:getDescription.
Reverts CCSpriteBatchNode.h
size_t —> ssize_t in CCTMXLayer.cpp
issue #2771 : add PhysicsWorld function set/getUpdateRate and set/getSpeed. Change name PhysicsQueryRectCallbackFunc and PhysicsPointQueryCallbackFunc to PhysicsRectQueryCallbackFunc and PhysicsQueryPointCallbackFunc
Fix:Add lua binding of ’registerScriptHandler’、’unregisterScriptHandler’ and ’removeObjectAllHandlers’ of ScriptHandlerMgr and some constants define
[AUTO] : updating submodule reference to latest autogenerated bindings
More renames of description() to getDescription()
getDescription() works as expected
fix compiling error after fixing conflicts
fix compiling error after fixing conflicts
use ssize_t for index
use ssize_t for index and capacity
use ssize_t for capacity and index in containers
Fix:Remove some needless lua binding functions and resolve a bug
2013-12-16 10:43:49 +08:00
minggo
53092b359b
Merge pull request #4486 from boyu0/iss2771_physical
...
[ci skip]issue #2771 : physical
2013-12-15 18:30:48 -08:00
boyu0
c15ad14ed3
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-16 03:45:06 +08:00
boyu0
f9f816caf9
issue #3162 : change log to cpp file
2013-12-16 03:42:54 +08:00
Lee, Jae-Hong
2807e785c0
fix CCImage bug on android platform.
...
- android.graphics.Bitmap bytes are aleady RGBA
- delete swapAlphaChannel and swapAlpha
2013-12-15 21:07:55 +09:00
Ricardo Quesada
3838268fd0
Merge branch 'develop' into newRenderer
2013-12-14 19:28:01 -08:00
youyou
917bd8c3d9
change Array to Vector
2013-12-13 19:40:38 +08:00
boyu0
defae416f3
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-13 18:09:39 +08:00
Dhilan007
4e2e423615
fix compile error related to ssize_t.
2013-12-13 17:53:03 +08:00
boyu0
2dbb2d496f
issue #2771 : add and change some physics API, and add more documents
2013-12-13 17:36:58 +08:00
CocosRobot
4114b682ca
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-13 09:10:37 +00:00
James Chen
189cf1a076
Some fixes for XXX:getDescription.
2013-12-13 16:51:57 +08:00
James Chen
ed93c114e5
Reverts CCSpriteBatchNode.h
2013-12-13 16:47:42 +08:00
James Chen
bb5ef615dd
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into pr4479
...
Conflicts:
cocos/2d/CCSpriteBatchNode.h
2013-12-13 16:44:22 +08:00
James Chen
7a8f2ae235
size_t —> ssize_t in CCTMXLayer.cpp
2013-12-13 16:41:03 +08:00
youyou
0e8c3409e5
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
...
Conflicts:
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h
2013-12-13 16:28:50 +08:00
boyu0
4befb50307
issue #2771 : add PhysicsWorld function set/getUpdateRate and set/getSpeed. Change name PhysicsQueryRectCallbackFunc and PhysicsPointQueryCallbackFunc to PhysicsRectQueryCallbackFunc and PhysicsQueryPointCallbackFunc
2013-12-13 16:26:26 +08:00
youyou
6a3aff0861
fixed change animation internal, animation speed not right
2013-12-13 15:58:58 +08:00
samuele3hu
6c49131ed6
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developConversion
2013-12-13 15:51:03 +08:00
samuele3hu
98bd84c436
Fix:Add lua binding of ’registerScriptHandler’、’unregisterScriptHandler’ and ’removeObjectAllHandlers’ of ScriptHandlerMgr and some constants define
2013-12-13 15:50:12 +08:00
youyou
1bdf1a44a1
1.change blendfunc method
...
2.support custom easing
2013-12-13 15:02:09 +08:00
Dhilan007
39280d55f3
new label:add support for distanceField
...
PerformanceTest:add performance test for label.
2013-12-13 12:42:15 +08:00
Huabing.Xu
a8a2ceb887
add linux make list
2013-12-13 12:25:17 +08:00
boyu0
aabb2c655d
issue #3162 : reset submodule
2013-12-13 11:48:16 +08:00
Huabing.Xu
305e80030c
update Visual studio project file
2013-12-13 10:59:23 +08:00
Huabing.Xu
00edb5f7fe
update android.mk in 2d folder
2013-12-13 10:57:23 +08:00
boyu0
d4c8fb0be6
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-13 10:47:52 +08:00
boyu0
c8c0e2270e
issue #3162 : deprecated RGBAProtocol, NodeRGBA and LayerRGBA
2013-12-13 10:10:49 +08:00
Ricardo Quesada
6ca6068cb7
Merge branch 'develop' into newRenderer
2013-12-12 14:58:47 -08:00
CocosRobot
644e2d923c
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-12 22:48:57 +00:00
Ricardo Quesada
61cc365d9e
Merge branch 'develop' into newRenderer
...
Conflicts:
cocos/2d/CCGLProgram.h
cocos/2d/CCLabelTTF.h
2013-12-12 14:41:42 -08:00
Ricardo Quesada
f4c68e4eef
More renames of description() to getDescription()
2013-12-12 14:38:12 -08:00
Ricardo Quesada
a8c317bd83
getDescription() works as expected
...
renames `description` to `getDescription`. Adds `virtual` to it.
Adds `getDescription` to missing nodes.
2013-12-12 14:30:22 -08:00
Ricardo Quesada
29a15c885a
Merge branch 'develop' into newRenderer
2013-12-12 11:44:09 -08:00
boyu0
d7106d49be
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-12 17:04:21 +08:00
Huabing.Xu
5509bd48ef
remove _grid
2013-12-12 16:21:21 +08:00
Huabing.Xu
08bfbbc582
Fix project can not compile after rebased pull
2013-12-12 16:20:52 +08:00
Huabing.Xu
256fe13d3f
other grid scene transitions can work now
2013-12-12 15:15:43 +08:00
Huabing.Xu
f1cac00dd7
TransitionPageTurn can work now
2013-12-12 15:15:43 +08:00
Huabing.Xu
ea9d744d79
add setGridTarget method, grid node now can affect its target and its child
2013-12-12 15:15:43 +08:00
Huabing.Xu
09a9b1f557
remove setGrid getGrid in class Node
2013-12-12 15:15:43 +08:00
Huabing.Xu
aad617e200
add class GridNode
2013-12-12 15:10:04 +08:00
minggo
21e2b341f1
fix compiling error after fixing conflicts
2013-12-12 14:59:33 +08:00
minggo
16efe94946
fix compiling error after fixing conflicts
2013-12-12 14:48:27 +08:00
minggo
040c42ebfd
use ssize_t for index
2013-12-12 14:48:26 +08:00
minggo
1e9c763b40
use ssize_t for index and capacity
2013-12-12 14:48:26 +08:00
minggo
ab23b47043
use ssize_t for capacity and index in containers
2013-12-12 14:48:26 +08:00
samuele3hu
edfebce42c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developConversion
2013-12-12 14:48:21 +08:00
samuele3hu
4ccceea230
Fix:Remove some needless lua binding functions and resolve a bug
2013-12-12 14:47:35 +08:00
James Chen
3649c12d37
issue #2790 : Compilation error fix in CCMap.h.
2013-12-12 14:36:59 +08:00
James Chen
93bd45cefd
issue #2790 : Adds comments for Vector<T>.
...
Signed-off-by: James Chen <jianhua.chen@cocos2d-x.org>
2013-12-12 14:22:49 +08:00
James Chen
3fc9c93102
issue #2790 : Comment fix for Map<K, V>::clear.
...
Signed-off-by: James Chen <jianhua.chen@cocos2d-x.org>
2013-12-12 12:58:01 +08:00
James Chen
6264336809
issue #2790 : Updates comments for Map<K, V> container.
...
Signed-off-by: James Chen <jianhua.chen@cocos2d-x.org>
2013-12-12 11:54:03 +08:00
CocosRobot
f12895a020
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-12 03:32:44 +00:00
James Chen
320ae15db4
issue #2790 : Lua compilation fix.
2013-12-12 10:54:41 +08:00
James Chen
b5bab598b3
issue #2790 : Disables deprecated warning for android to make Travis-CI happy.
2013-12-12 10:35:13 +08:00
James Chen
5c62fe8f3f
issue #2790 : Reverts comments in CCString.h
2013-12-12 10:34:41 +08:00
James Chen
92a7aa03de
issue #2790 : Reverts comments in CCDictionary.h
2013-12-12 09:53:50 +08:00
James Chen
b2e8bdce1e
issue #2790 : Uses StringUtils::format for Node::description().
2013-12-12 09:47:35 +08:00
James Chen
976bef8b68
issue #2790 : StringUtils::toStringWithFormat —> StringUtils::format.
2013-12-12 09:37:56 +08:00
Ricardo Quesada
6d1abc7d4d
Merge branch 'develop' into newRenderer
2013-12-11 15:28:05 -08:00
James Chen
9e637a3a3b
issue #2790 : GLProgram::getXXXLog return `std::string` to prevent using CCString which was deprecated.
2013-12-11 22:35:37 +08:00
James Chen
c2bccbaf98
issue #2790 : Removes unneeded dynamic_cast in CCPhyicsWorld.cpp.
2013-12-11 22:09:59 +08:00
James Chen
ce61fa4d9b
issue #2790 : const_iterator —> iterator to fix android build errors.
2013-12-11 22:09:22 +08:00
James Chen
45dabe305f
issue #2790 : performance improved for PhysicsWorld.
2013-12-11 18:08:07 +08:00
James Chen
36fd873257
issue #2790 : Adds Vector::find.
2013-12-11 18:08:07 +08:00
James Chen
cc567a3077
issue #2790 : Vector::remove —> Vector::erase.
2013-12-11 18:08:06 +08:00
James Chen
093e310cab
issue #2790 : Vector::remove —> Vector::erase.
2013-12-11 18:08:06 +08:00
James Chen
b66fccb5ab
issue #2790 : Removes Map::erase(first, last).
2013-12-11 18:08:06 +08:00
James Chen
be9bb6998b
issue #2790 : Deprecates Dictionary, Array, String, Integer, Bool, Float, Double classes.
...
Also renames Map::remove to Map::erase.
2013-12-11 18:08:06 +08:00
James Chen
49cc9719a6
issue #2790 : log —> CCLOG.
2013-12-11 18:08:06 +08:00
James Chen
40bc797b1f
issue #2790 : Configuration::getValue has default value now.
2013-12-11 18:08:06 +08:00
James Chen
1a1cef9342
issue #2790 : Addes Value::Null variable.
2013-12-11 18:08:05 +08:00
James Chen
022df4c014
issue #2790 : Removes test codes.
2013-12-11 18:08:05 +08:00
James Chen
2cda34d59a
issue #2790 : Deprecates CCDictionary, uses ValueMap for pure base data. Adds StringUtils class .
2013-12-11 18:08:05 +08:00
boyu0
00b115843c
issue #3162 : add updateColor function to Label and delete duplicate functions.
2013-12-11 16:38:47 +08:00
boyu0
7cbce905bf
issue #3162 : delete duplicate functions.
2013-12-11 16:12:14 +08:00
boyu0
463ae20ce6
issue #3162 : Add layer cascade color and cascade opacity test, fix bugs
2013-12-11 15:57:20 +08:00
samuele3hu
d104f49dea
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developConversion
2013-12-11 12:06:37 +08:00
samuele3hu
6d8deac8a8
issue #3374:Register the lua manual binding funtions leading to the top index of lua state
2013-12-11 12:05:46 +08:00
James Chen
473b21a05a
Merge pull request #4471 from Dhilan007/compile_error_vs_131210
...
fix compile error for vs project.
2013-12-10 18:06:57 -08:00
Ricardo Quesada
3b66d09bf5
Merge branch 'develop' into newRenderer
2013-12-10 11:10:55 -08:00
Ricardo Quesada
23222923bf
Migrated code to Matrix4
2013-12-10 11:07:15 -08:00
Dhilan007
35eeebe64a
add comments for include "CCStdC.h" only for windows
2013-12-10 23:13:21 +08:00
Dhilan007
abef5b59fa
fix compile error for vs project
2013-12-10 21:20:52 +08:00
James Chen
f10bd853c0
A warning fix in CCBAnimationManager. Uses CallFuncN::create(std::function) instead.
2013-12-10 20:33:21 +08:00
James Chen
1db469fa3d
Merge pull request #4467 from CocosRobot/updategeneratedsubmodule_1386674868
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-10 03:28:49 -08:00
CocosRobot
bf11a8d309
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-10 11:27:50 +00:00
James Chen
47541523e8
Merge pull request #4466 from dumganhar/iss2790-deprecate-ccarray
...
issue #2790 : HttpClient and TouchesTest uses Vector<T> now.
2013-12-10 03:24:31 -08:00
boyu0
a71394b122
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-10 18:03:41 +08:00
samuele3hu
89c079009b
issue #2790:Resolve some errors of basical conversion functions
2013-12-10 18:01:40 +08:00
James Chen
627a1bf700
issue #2790 : HttpClient uses Vector<T> now.
2013-12-10 16:41:13 +08:00
CocosRobot
a775f7940d
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-10 08:30:00 +00:00
James Chen
eff05669b9
Merge pull request #4463 from boyu0/edit_using_of_std_move
...
Edit using of std move
2013-12-10 00:12:07 -08:00
boyu0
083a0eea2a
Remove all std::move in function returns.
2013-12-10 16:06:05 +08:00
boyu0
698cdc5591
add std::move to Vector move constructor and move equal operator overloading function.
2013-12-10 15:58:13 +08:00
CocosRobot
b5a0048ffd
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-10 07:21:39 +00:00
minggo
55270cecb4
Merge pull request #4457 from dumganhar/iss2790-deprecate-ccarray
...
issue #2790 : Don't use CCDictionary, CCArray for CCBReader, use std::unordered_map, Vector<T>, Map<K, V> instead.
2013-12-09 23:15:43 -08:00
James Chen
e03dc97726
isssue #2790 : Removes unused FIXME comment.
2013-12-10 13:51:58 +08:00
James Chen
1a385c1572
issue #2790 : _actionManager —> _animationManager.
2013-12-10 13:45:15 +08:00
James Chen
52d00477ad
issue #2790 : Uses std::shared_ptr for _actionManagers.
2013-12-10 13:42:55 +08:00
James Chen
479477be52
issue #2790 : Stops all actions when reset _rootNode.
2013-12-10 13:41:51 +08:00
CocosRobot
1927e3e62c
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-10 04:08:19 +00:00
samuele3
85783fff2b
issue #2790:Unify the format
2013-12-10 11:47:51 +08:00
samuele3
34c0147cf3
issue #2790:Resolve the compile error
2013-12-10 11:33:57 +08:00
samuele3
f801a8e5fe
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developConversion
2013-12-10 11:21:59 +08:00
samuele3
c2e7299d8f
Issue #2790:Add more conversion functions to support templates containers
2013-12-10 11:21:30 +08:00
Ricardo Quesada
0222c6544e
Migration to Mat4x4
...
Armature not migrated yet
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-12-09 17:32:51 -08:00
Ricardo Quesada
aa00137fde
Merge branch 'develop' into newRenderer
2013-12-09 11:10:00 -08:00
James Chen
64fd2386a9
issue #2790 : Uses Map<K, V> instead of Dictionary in CCBAnimationManager.
2013-12-09 18:17:04 +08:00
James Chen
8b69994d5c
issue #2790 : Removes CCBValue.
2013-12-09 17:55:56 +08:00
James Chen
d1d5659818
issue #2790 : Uses Vector<T> or Map<K, V> as many as possible for CCBReader.
2013-12-09 17:55:56 +08:00
James Chen
f6dc9bf9b6
issue #2790 : Adds more ‘assignment operator’ method for CCValue.
2013-12-09 17:55:56 +08:00
James Chen
f16068e621
issue #2790 : Bug fix in CCMap.h
2013-12-09 17:55:56 +08:00
James Chen
21b84339ca
issue #2790 : Reverts to use Dictionary to avoid a strange bug for CCBReader.
2013-12-09 17:55:56 +08:00
James Chen
d63b933eb3
issue #2790 : More CCArray —> Vector<T> or ValueVector for CCBAnimationMangager
2013-12-09 17:55:55 +08:00
minggo
63779930a6
Merge pull request #4452 from boyu0/add_stencil_nil_test
...
[ci skip]Add _stencil is nil test, add warning log.
2013-12-09 01:32:40 -08:00
boyu0
d0da73c365
Add _stencil is nil test, add warning log.
2013-12-09 14:00:10 +08:00
youyou
a884a70045
fix2d compling warning
2013-12-09 13:56:07 +08:00
CocosRobot
b2e7966137
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-09 03:53:01 +00:00
boyu0
d6d7923134
closed #3162 : add RGBAProtocol, NodeRGBA and LayerRGBA back and deprecate them
2013-12-09 11:32:28 +08:00
youyou
c96bc7b58d
fix collider Synchronization
2013-12-09 11:14:53 +08:00
James Chen
a2e90f1fca
issue #2790 : Small fixes for physics, uses reference and std::move.
2013-12-09 10:54:22 +08:00
James Chen
13111c2cd9
issue #2790 : Error fix in CCBReader.
2013-12-09 09:54:04 +08:00
James Chen
e07f2bdddd
issue #2790 : Vector<T> and Map<K, V> for CCBReader. Not finished yet.
2013-12-08 22:17:54 +08:00
James Chen
f406dcfebc
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2790-deprecate-ccarray
2013-12-07 23:32:49 +08:00
James Chen
abbcd45c58
issue #2790 : CCLOG —> CCLOGINFO in CCMap.h
2013-12-07 23:32:29 +08:00
James Chen
908f5ed515
issue #2790 : Fix for TMXObjectGroup::getObject.
2013-12-07 16:38:50 +08:00
James Chen
beb6bb6c8d
issue #2790 : Bug fix in CCMap.h
2013-12-07 16:14:22 +08:00
James Chen
be7c62a2b9
issue #2790 : Removes unused CCSet binding glue codes.
2013-12-07 14:44:21 +08:00
James Chen
16cd61f024
issue #2790 : Vector<T> for physics and remove lots of unneeded dynamic_cast.
2013-12-07 14:28:14 +08:00
James Chen
365f6faabb
issue #2790 : Warning fixes for CCDictionary.cpp and CCString.cpp
2013-12-07 14:26:52 +08:00
James Chen
06e6d38ab0
issue #2790 : Initializes Value when empty constructor was invoked.
2013-12-07 14:26:17 +08:00
James Chen
6b0589679b
issue #2790 : Vector<SchedulerScriptHandlerEntry*> instead of CCArray* in CCScheduler
2013-12-07 14:25:24 +08:00
James Chen
d7997cf0cc
issue #2790 : Updates MenuItemToggole
2013-12-07 14:24:31 +08:00
James Chen
cd72813389
issue #2790 : Autorelease pool is using Vector<T> now.
2013-12-07 14:23:29 +08:00
James Chen
b0cb7c230a
#issue #2790 : Uses Vector<Scene*> for scenesStack in CCDirector.
2013-12-07 14:22:51 +08:00
James Chen
0091ca2b6f
issue #2790 : Uses non-const ValueMap for simplifying codes in CCAnimationCache.cpp.
2013-12-07 14:22:03 +08:00
James Chen
6f13a111ae
issue #2790 : Adds Vector<T>::sort method, adds Vector::removeObject(object, toRemoved).
2013-12-07 14:18:42 +08:00
James Chen
165cdf7fe6
issue #2790 : Deprecates CCArray.
2013-12-07 10:48:02 +08:00
James Chen
23ad9f4e1a
issue #2790 : Adds const version of Vector<T>::forEach.
2013-12-07 10:46:40 +08:00
Ricardo Quesada
8df96b1a6e
Layercolor uses the new API
2013-12-06 17:59:34 -08:00
Ricardo Quesada
ba2f65c6b2
Merge remote-tracking branch 'darkdukey/newRenderer' into newRenderer
2013-12-06 17:42:48 -08:00
Ricardo Quesada
ee0ef6bf46
ProgressTimer works OK
...
Adds _modelViewTransform as ivar of Node (temporary fix)
2013-12-06 17:42:16 -08:00
Nite Luo
94255a9d52
Fix culling
2013-12-06 14:59:06 -08:00
Ricardo Quesada
439adafbcd
Merge remote-tracking branch 'darkdukey/newRenderer' into newRenderer
2013-12-06 11:57:19 -08:00
Ricardo Quesada
745541979b
Particles working again.
...
Paticle Batch working too: increased VBO_SIE to 10500
2013-12-06 11:51:17 -08:00
Nite Luo
3e0bee706e
Fix a hack in CCLabelAtlas for vertice color, add TODO for quad command
2013-12-06 11:41:24 -08:00
Ricardo Quesada
97fb43b8d7
Merge remote-tracking branch 'darkdukey/newRenderer' into newRenderer
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2013-12-06 11:19:12 -08:00
Ricardo Quesada
73b1e3bb9e
Merge branch 'develop' into newRenderer
...
Conflicts:
cocos/2d/CCLabelAtlas.cpp
cocos/2d/CCSprite.cpp
2013-12-06 09:37:08 -08:00
boyu0
0e94d4f3b8
closed #3162 : fix indent.
2013-12-06 18:23:31 +08:00
James Chen
6cd573fa7f
issue #2790 : Deprecates CCSet.
2013-12-06 18:16:58 +08:00
boyu0
4d0e3dbd8d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-06 18:16:26 +08:00
boyu0
af5f496861
issue #3162 : Merge Node and NodeRGBA, fix bug: Child's opacity will not be changed when its parent's setCascadeOpacityEnabled was set to true and opacity was changed.
2013-12-06 18:07:16 +08:00
CocosRobot
8442f17259
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-06 09:31:16 +00:00
James Chen
0d30f2bbbb
Merge pull request #4445 from dumganhar/iss2790-template-container
...
issue #2790 : Fix of JSB project broken after using Vector<T>
2013-12-06 01:24:21 -08:00
minggo
368647c166
Merge pull request #4444 from minggo/fix-warning
...
fix some warnings
2013-12-06 01:07:03 -08:00
James Chen
9f6d2df63b
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2790-template-container
2013-12-06 16:46:51 +08:00
James Chen
b5978eeee6
issue #2790 : Bindings-generator supports binding Vector<T> and some bug fixes.
2013-12-06 16:46:19 +08:00
minggo
fa7c97171b
fix some warnings
2013-12-06 16:32:06 +08:00
minggo
0126aaa205
Merge pull request #4442 from minggo/use-schedule
...
use Schedule::performFunctionInCocosThread
2013-12-05 22:30:54 -08:00
Ricardo Quesada
81b06f06a9
Merge branch 'develop' into newRenderer
...
Conflicts:
cocos/2d/CCAtlasNode.h
2013-12-05 22:24:41 -08:00
minggo
19c86c0e4f
Merge pull request #4434 from martell/msys2
...
Msys2 and Mingw added fixed x64 cocos/audio on Windows for MSVC and MinGW
2013-12-05 22:23:45 -08:00
minggo
eecd5d7980
Merge pull request #4441 from xhcnb/mem_leak_android_userdefault
...
[ci skip]UserDefault::setDataForKey on android will cause memory leak
2013-12-05 22:19:58 -08:00
samuele3
c006bfd68e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into toluaerror
2013-12-06 14:17:23 +08:00
samuele3
ad8638d976
issue #3353:Lua gc mechanism will make the extended attributes of lua userdata disapper
2013-12-06 14:16:33 +08:00
minggo
1502fef7e4
use Schedule::performFunctionInCocosThread
2013-12-06 14:15:01 +08:00
youyou
e17b9d839b
1.add TEST_EASING
...
2.add play serveral movement function
3.update TEST_COLLIDER_DETECTOR
4.fixed movement event
2013-12-06 13:40:49 +08:00
Jason Xu
29bd5001ae
UserDefault::setDataForKey on android will cause memory leak
2013-12-06 11:53:43 +08:00
minggo
f02d15d71f
initialize static member variable in cpp
2013-12-06 11:46:13 +08:00
Ricardo Quesada
e699a3b765
Uses MV in Quad Command
2013-12-05 19:04:01 -08:00
Nite Luo
42de943662
Fix Bug for Sprite performance test
2013-12-05 14:25:45 -08:00
Nite Luo
e3fc789070
Merge branch 'newRenderer' of github.com:darkdukey/cocos2d-x into newRenderer
2013-12-05 12:05:44 -08:00
darkdukey
5f902d95b3
Merge pull request #5 from dabingnn/newRendererParticleSystem
...
New renderer particle system
2013-12-05 12:05:18 -08:00
Ricardo Quesada
f68dcd9969
Merge branch 'develop' into newRenderer
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
samples/Cpp/TestCpp/Classes/tests.h
2013-12-05 11:47:46 -08:00
minggo
9676821479
use int in Vector
2013-12-05 17:38:08 +08:00
minggo
b67d567a79
replace long with int or ssize_t
2013-12-05 17:22:22 +08:00
James Chen
6aa2e5b257
Updates comments that vs2012 doesn’t support initializer list.
2013-12-05 16:49:05 +08:00
James Chen
b520941c5c
Reverts config of VS project.
2013-12-05 16:37:50 +08:00
James Chen
b4b50f3491
Compilation fix for windows.
2013-12-05 16:33:13 +08:00
James Chen
79700118db
Merge commit 'refs/pull/4433/head' of git://github.com/cocos2d/cocos2d-x into ccconsole
...
Conflicts:
cocos/base/CCConsole.cpp
cocos/base/CCConsole.h
2013-12-05 16:26:04 +08:00
James Chen
2b857ebb52
Fixing compilation errors on windows.
2013-12-05 16:09:38 +08:00
Ricardo Quesada
c617eee505
Uses the new Vector<>. Code is more robust!
2013-12-04 22:07:23 -08:00
Ricardo Quesada
6a034a91f1
Merge branch 'develop' into console
...
Conflicts:
cocos/scripting/auto-generated
2013-12-04 21:58:11 -08:00
Ricardo Quesada
73321199b9
Console: commands receives the char*
...
The char* is passed in case the commands
need to sub-parse the arguments.
Very useful for QA.
For example, the could create a command called "click", and the command could
receive arguments.
2013-12-04 21:51:08 -08:00
James Chen
b0af2667f8
Merge commit 'refs/pull/4433/head' of git://github.com/cocos2d/cocos2d-x into ccconsole
...
Conflicts:
cocos/scripting/auto-generated
2013-12-05 12:48:32 +08:00
minggo
ba62c88682
Merge pull request #4420 from dumganhar/iss2790-template-container
...
[ci skip]issue #2790 : (ONLY FOR REVIEW NOW)Template Containers for Reference counted classes, Value for Pure Data
2013-12-04 20:06:24 -08:00
CocosRobot
d04f777351
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-05 04:02:07 +00:00
James Chen
14ab7ccd16
Merge pull request #4428 from boyu0/iss2771_move_CC_USE_PHYSICS_to_header
...
issue #2771 : move CC_USE_PHYSICS from project definition to ccConfig.h
2013-12-04 19:55:10 -08:00
martell
e0523c73f5
fixed CCImage for MSVC someone added std:tolower which broke it
2013-12-05 03:53:25 +00:00
James
373c3b01bf
issue #2790 : Fixing compilation errors on linux.
2013-12-05 11:44:37 +08:00
martell
e5ada6f377
added support for msys2 mingwtoolchains and fix x64 cocos/audio on windows platform for MSVC and Mingw. Also fixed a few very bad type casts very important for future Arm64 bit processors
2013-12-05 03:37:27 +00:00
Ricardo Quesada
e0bf32d881
dprintf is not defined on Android
...
using my own dprintf
2013-12-04 19:33:50 -08:00
Ricardo Quesada
49b25231f2
Compiles on Android
2013-12-04 19:16:01 -08:00
Nite Luo
9b0e0d2116
Fix a bug with auto batching logic
2013-12-04 19:05:17 -08:00
James Chen
944160210c
issue #2790 : Renames functions in Map<K, V>.
2013-12-05 10:59:43 +08:00
Ricardo Quesada
4aae44f1e9
fixes cocos2d.h include
2013-12-04 18:54:15 -08:00
James Chen
499a0404d4
issue #2790 : Renames some functions in Vector<T>. Makes it more like stl vector.
2013-12-05 10:35:10 +08:00
Ricardo Quesada
15321a58df
fixes compiler errors on Linux
2013-12-04 18:28:09 -08:00
Huabing.Xu
e6823875d5
change VBO_SIZE to a big number to avoid crash temporarily
2013-12-05 10:20:54 +08:00
Huabing.Xu
7a58cb5a29
use quad command instead of custom command for ParticleSystemQuad::draw()
2013-12-05 10:20:22 +08:00
Ricardo Quesada
b52d535a42
fixes indentation issues
...
and some compilations issues on Linux
2013-12-04 18:19:51 -08:00
Ricardo Quesada
f42aef0af8
Moves CCConsole.* to base/
2013-12-04 18:09:23 -08:00
Nite Luo
e316ac779b
Sprite culling now using vertices directly to avoid calculation on transform
2013-12-04 17:41:18 -08:00
Ricardo Quesada
c2a88154af
Custom commands are working OK
2013-12-04 17:38:11 -08:00
Nite Luo
a98714f6a5
support device without VAO
2013-12-04 17:02:02 -08:00
Ricardo Quesada
e41deeee86
Adds Scene Graph command
2013-12-04 16:57:44 -08:00
Ricardo Quesada
ef18d4891e
More bug fixes
2013-12-04 16:26:21 -08:00
Nite Luo
792cb5a716
Merge branch 'develop' into newRenderer
2013-12-04 15:23:12 -08:00
Nite Luo
143df8af7d
Fix RenderTexture after merging commandpool
2013-12-04 15:13:13 -08:00
darkdukey
4b7d0c290a
Merge pull request #4 from dabingnn/newRendererCommandPool
...
New renderer command pool
2013-12-04 15:08:17 -08:00
Nite Luo
f423166471
Fix bugs with RenderTexture with NewRender
2013-12-04 15:06:28 -08:00
Ricardo Quesada
f69d5d1328
Merge branch 'develop' into console
2013-12-04 12:28:05 -08:00
Ricardo Quesada
245d33e4ad
Fixes several bugs in the console.
...
[*] Doesn't crash
[*] Closes connection
[*] Its faster
2013-12-04 12:26:43 -08:00
Nite Luo
ae551ae294
Convert RenderTexture to use RenderCommands
2013-12-04 11:54:57 -08:00
James Chen
c9767b8ea0
issue #2790 : fileToValueDict —> getValueMapFromFile, fileToValueArray —> getValueVectorFromFile.
2013-12-04 17:50:57 +08:00
James Chen
54289276de
issue #2790 : ValueArray —> ValueVector, ValueDict —> ValueMap, IntValueDict —> IntValueMap.
2013-12-04 17:46:57 +08:00
James Chen
736c70704b
issue #2790 : Some FIXME fixes.
2013-12-04 17:28:14 +08:00
James Chen
4212e33aee
issue #2790 : Removes unused comments in CCAnimation.h
2013-12-04 17:27:53 +08:00
James Chen
bbeec97b48
issue #2790 : Bug fixes in CCValue.cpp.
2013-12-04 16:38:12 +08:00
James Chen
82cc795ecf
issue #2790 : Adds more move functions.
2013-12-04 16:37:48 +08:00
James Chen
293ba0210b
issue #2790 : CCLOG —> CCLOGINFO for CCMap.h and CCVector.h
2013-12-04 16:37:08 +08:00
James Chen
60874ece64
issue #2790 : Updates Makefile, Moves some codes to CCValue.cpp.
2013-12-04 16:18:22 +08:00
James Chen
ceaa1f26bb
issue #2790 : Windows run ok with ValueDict for FileUtils.
2013-12-04 16:02:54 +08:00
James Chen
76896d70d0
issue #2790 : Android build was ok, fixes some warnings.
2013-12-04 16:02:54 +08:00
James Chen
35b96602d3
issue #2790 : includes <algorithm> for std::for_each.
2013-12-04 16:02:53 +08:00
James Chen
5c60f66c63
issue #2790 : Menu::itemForTouch —> Menu::getItemForTouch. Array* —> ValueArray.
2013-12-04 16:02:53 +08:00
James Chen
f01f56113c
issue #2790 : Don’t make an assert if converting Value failed.
2013-12-04 16:02:53 +08:00
James Chen
5eb9446b80
issue #2790 : Uses const reference instead of value for std::for_each ’s argument.
2013-12-04 16:02:53 +08:00
James Chen
3fc5fffd26
issue #2790 : const char* —> const std::string& for CCNS.h/.cpp.
2013-12-04 16:02:53 +08:00
James Chen
9881ab2178
issue #2790 : Uses cocos2d::Map and ValueDict for SpriteFrameCache.
2013-12-04 16:02:53 +08:00
James Chen
2e0489a49c
issue #2790 : Uses ValueDict instead of Dictionary* for ParticleSystem.
2013-12-04 16:02:53 +08:00
James Chen
2d6e6dbdb0
issue #2790 : Assert fix for Vector<T>::insertObject.
2013-12-04 16:02:52 +08:00
James Chen
1164176bed
issue #2790 : NULL —> nullptr in CCParticleSystem.cpp.
2013-12-04 16:02:52 +08:00
James Chen
411136dd57
issue #2790 : Updates CCValue, supports using ‘const char*’ to construct a Value.
2013-12-04 16:02:52 +08:00
James Chen
4ec6e50cc4
issue #2790 : Pure base data from Dictionary* to ValueDict, Array* to ValueArray.
2013-12-04 16:02:52 +08:00
James Chen
8a435aa274
issue #2790 : ArrayValue —> ValueArray, DictValue —> ValueDict.
2013-12-04 16:02:52 +08:00
James Chen
3136ffc3dd
issue #2790 : Adds CCValue.h/.cpp.
2013-12-04 16:02:51 +08:00
James Chen
d2bddee11e
issue #2790 : Adds CCMap.h.
2013-12-04 16:01:56 +08:00
James Chen
9928e8bef1
issue #2790 : Uses Vector<T>::getObjectAtIndex instead of Vector<T>[] operator to avoid some mistakes.
2013-12-04 16:01:55 +08:00
James Chen
cb215bc931
issue #2790 : Vector<T> replaces Array* finished.
2013-12-04 16:01:55 +08:00
James Chen
0d581a15d8
issue #2790 : MenuItemToggle::setSubItems() uses Vector<MenuItem*> now.
2013-12-04 16:01:55 +08:00
James Chen
8aef092005
issue #2790 : TestCpp with new Vector<>.
2013-12-04 16:01:54 +08:00
James Chen
1d5984b29a
issue #2790 : Vector::makeObjectsPerformCallback —> Vector::forEach
2013-12-04 16:01:02 +08:00
James Chen
d4d864216b
issue #2790 : Deletes Vector::init, adds Vector::setCapacity.
2013-12-04 16:00:18 +08:00
James Chen
90062b656d
issue #2790 : Node::_children is Vector<Node*> now.
2013-12-04 16:00:17 +08:00
James Chen
c152652c5b
issue #2790 : Vector<FiniteTimeAction*> for Sequence::create(arr) and Spawn::create(arr).
2013-12-04 15:56:08 +08:00
James Chen
80004548c8
issue #2790 : Adds CCVector.h to Xcode project. int —> long
2013-12-04 15:56:08 +08:00
James Chen
52af153a81
issue #2790 : Commit CCVector.h from Riq’s repo( https://github.com/ricardoquesada/cocos2d-x/blob/template_vector/cocos2dx/cocoa/CCVector.h ).
2013-12-04 15:56:08 +08:00
CocosRobot
a354031526
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-04 07:47:50 +00:00
samuele3
629ffcbbfd
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDeprecated
2013-12-04 15:20:09 +08:00
samuele3
c1a226686f
issue #3309:Modify some deprecated cpp files and lua files
2013-12-04 15:15:55 +08:00
boyu0
98779b0a9f
issue #2771 : move CC_USE_PHYSICS from project definition to ccConfig.h
2013-12-04 14:36:32 +08:00
minggo
608e3bfa1b
Merge pull request #4410 from signmotion/corrected_DISALLOW_COPY_AND_ASSIGN
...
[ci skip]Corrected "disallow copy and assign"
2013-12-03 19:21:45 -08:00
minggo
92b180080c
Merge pull request #4409 from mlepage/develop
...
[ci skip]Fix typos
2013-12-03 19:13:23 -08:00
Ricardo Quesada
a34352cef7
Console is working!
2013-12-03 18:46:54 -08:00
Huabing.Xu
cd562676f5
use block allocation for commands
2013-12-04 10:39:34 +08:00
minggo
9babdaa1fa
Merge pull request #4419 from boyu0/iss2771_physical_fix_update_physics_transform
...
[ci skip]issue #2771 : add condition test to updatePhysicsTransform
2013-12-03 18:15:35 -08:00
minggo
712bcc7b36
Merge pull request #4416 from minggo/change-long
...
[ci skip]use size_t instead of long in Array
2013-12-03 18:08:08 -08:00
Nite Luo
0c292e59b8
Merge branch 'develop' into newRenderer
2013-12-03 10:52:10 -08:00
boyu0
fd68dc4f9f
issue #2771 : add condition test to updatePhysicsTransform
2013-12-03 16:28:18 +08:00
samuele3
367799da0d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDeprecated
2013-12-03 15:42:31 +08:00
samuele3
a8c1bba464
issue #3309:Add some deprecated functions and classes to support master cocostudio lua bindings
2013-12-03 15:40:59 +08:00
Huabing.Xu
757f1abc7f
1. protected render command construction/destruction function.
...
2. use renderCommandPool<T> to allocate and deallocate command
3. use releaseToCommandPool interface to push command back to pool
2013-12-03 14:08:47 +08:00
minggo
02aca34ccf
Merge pull request #4417 from boyu0/iss2771_physical
...
[ci skip]issue #2771 physical, add more joint and joint tests
2013-12-02 21:59:46 -08:00
boyu0
63a4e09c90
issue #2771 : add more joint tests, add some joint api, fix bugs
2013-12-03 12:47:03 +08:00
Huabing.Xu
44f12ce8e4
add RenderCommandPool head file
2013-12-03 11:52:51 +08:00
Huabing.Xu
d4b9e0538b
refactor: group command use a non parameter constructor and a reentrant init function
2013-12-03 11:24:03 +08:00
Huabing.Xu
d33f05b3f0
refactor: custom command use a non parameter constructor and a reentrant init function
2013-12-03 11:17:21 +08:00
Huabing.Xu
ace75eebce
refactor: quad command use a non parameter constructor and a reentrant init function
2013-12-03 11:11:46 +08:00
minggo
225348cdde
use size_t instead of long in Array
2013-12-03 11:09:39 +08:00
Nite Luo
6862d59bb2
Add NewRenderTexture to convert RenderTexture to use new renderer
2013-12-02 17:23:52 -08:00
Nite Luo
8801f508eb
Partcle system use the new renderer
2013-12-02 12:13:05 -08:00
Nite Luo
fbadb3329a
Merge branch 'develop' into newRenderer
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2013-12-02 10:55:31 -08:00
Ricardo Quesada
dbcae0af1e
Merge branch 'develop' into console
2013-12-02 09:57:53 -08:00
Ricardo Quesada
eb834bce7f
Adds readline
2013-12-02 09:57:16 -08:00
boyu0
dba58f6a9b
issue #2771 : add more joints
2013-12-02 18:29:04 +08:00
James Chen
9618eb00be
Merge pull request #4411 from martell/cmake
...
closed #3328 : cmake support for windows
2013-12-02 01:22:57 -08:00
garfield_ho
bac83f3740
Cancel the onSubThreadEnded callback,because _ws may be deleted in the onClose callback.
2013-12-02 17:19:52 +08:00
martell
06ff1bc594
Fixed HelloCpp Linking on Linux
2013-12-02 07:10:37 +00:00
martell
7a8653525b
fixed Audio for Linux
2013-12-02 06:37:32 +00:00
2youyou2
963dd6852b
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop
2013-12-02 13:33:26 +08:00
2youyou2
246b03d52d
fixed alpha effect
2013-12-02 13:32:31 +08:00
minggo
d2f235f8b8
Merge pull request #4408 from boyu0/iss2345_add_tga_support_to_CCImage
...
[ci skip]issue #2345 : add tga support to Image
2013-12-01 18:18:42 -08:00
minggo
24f7819e99
Merge pull request #4362 from xhcnb/hotfix_android_setAccelerometerInterval
...
[ci skip]Fix: on android, Device::setAccelerometerInterval will causes dead loop
2013-12-01 18:08:58 -08:00
martell
f369606d77
fix cocos2d-x for vs2013
2013-11-30 08:05:39 +00:00
martell
79401a7596
quickly added win32 cmake
2013-11-30 06:09:12 +00:00
signmotion
03d64e0689
- Corrected CC_DISALLOW_COPY_AND_ASSIGN.
2013-11-29 20:34:15 +02:00
signmotion
41daad30fa
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-11-29 19:44:03 +02:00
Marc Lepage
940b0ffd56
Fix typos
2013-11-29 12:09:38 -05:00
Jason Xu
266e4e1654
rename to with Jni suffex
2013-11-29 19:34:36 +08:00
Jason Xu
27c3a459ed
rename android native function names.
2013-11-29 17:17:15 +08:00
boyu0
83f855e2ec
issue #2345 : delete unnecessary include
2013-11-29 15:31:58 +08:00
boyu0
04c3d95005
issue #2345 : namespace cocos2d { -> NS_CC_BEGIN
2013-11-29 15:25:21 +08:00
boyu0
dffc12e648
issue #2345 : new/delete -> malloc/free
2013-11-29 15:13:16 +08:00
boyu0
86074c23d8
issue #2345 : class Image add tga image format support.
2013-11-29 14:31:42 +08:00
minggo
3268da3a4d
Merge pull request #4401 from minggo/thread-helper
...
[ci skip]add helper funcion to invoke a function in gl thread
2013-11-27 22:26:11 -08:00
CocosRobot
a24af527a3
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-28 03:14:39 +00:00
Ricardo Quesada
21afd63d82
Merge branch 'develop' into console
2013-11-27 14:29:27 -08:00
Nite Luo
83972ecf57
Merge branch 'newRenderer' of github.com:darkdukey/cocos2d-x into newRenderer
2013-11-27 10:16:34 -08:00
Nite Luo
75381ebc51
Merge branch 'develop' into newRenderer
2013-11-27 10:16:17 -08:00
boyu0
4615eae22f
issue #2771:remove unneeded include “ccConfig.h”
2013-11-27 18:30:48 +08:00
boyu0
72f2d68edd
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-11-27 17:47:37 +08:00
minggo
eded94ef76
don't create a pool, since it doesn't invoke any iOS dependent codes
2013-11-27 17:43:54 +08:00
boyu0
2b43e72e7c
issue #2771 : fix vs compile errors, change project setting
2013-11-27 17:33:33 +08:00
minggo
bcb131262c
add helper funcion to invoke a function in gl thread
2013-11-27 16:49:07 +08:00
James Chen
468ba24183
Merge pull request #4397 from CocosRobot/updategeneratedsubmodule_1385533506
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-26 22:32:04 -08:00
Huabing.Xu
ea46e1c658
change test case
2013-11-27 14:30:38 +08:00
James Chen
1a283ab600
Merge pull request #4396 from dumganhar/iss3289-armature-crash
...
closed #3289 : [JSB] 'Test Frame Event' of CocoStudioArmatureTest Crashes...
2013-11-26 22:29:36 -08:00
CocosRobot
4d327b8180
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-27 06:25:08 +00:00
James Chen
6dc9183c8a
closed #3289 : [JSB] 'Test Frame Event' of CocoStudioArmatureTest Crashes!
2013-11-27 14:12:43 +08:00
James Chen
4311e7c469
[Script Binding] Bind ‘unsigned long’.
2013-11-27 13:52:41 +08:00
2youyou2
36cd51a453
change ColliderFilter param type
2013-11-27 11:39:58 +08:00
2youyou2
c0bd7f012c
change ColliderFilter param type
2013-11-27 11:32:37 +08:00
James Chen
f4610c5272
Merge pull request #4382 from dumganhar/iss3279-xmlhttprequest-bin
...
closed #3279 : XMLHttpRequest receives wrong binary array.
2013-11-26 19:02:07 -08:00
Ricardo Quesada
534fd9600e
Adds CCConsole.
...
it doesn't work... just the skeleton
2013-11-26 18:58:36 -08:00
Huabing.Xu
3da196ea43
add Frustum culling to new Sprite
2013-11-27 10:35:12 +08:00
Huabing.Xu
80da1dac3f
add Frustum, AABB, ViewTransform
2013-11-27 10:34:30 +08:00
CocosRobot
dda13b7e8a
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-27 02:18:42 +00:00
James Chen
6c097fa692
Merge pull request #4389 from minggo/remove-unneeded-codes
...
override addChild in Sprite to fix error in binding generator
2013-11-26 18:14:20 -08:00
minggo
0ac9022201
fix a typo
2013-11-27 10:02:32 +08:00
minggo
85002285c2
override addChild in Sprite to fix error in binding generator
2013-11-27 09:50:47 +08:00
Nite Luo
3123c70153
Sprite are now using NewRenderer
2013-11-26 17:13:04 -08:00
Nite Luo
bf53cc116b
use updateQuadVertices function to update vertices since update transform is highly customized for BatchNode
2013-11-26 17:01:32 -08:00
Ricardo Quesada
2f1dffe46b
Adds performFunctionInCocos2dThread
...
... in Scheduler
2013-11-26 16:58:14 -08:00
Ricardo Quesada
b7f7b0dae4
Reports wether the build is DEBUG or RELEASE
...
Reports wether the build is DEBUG or RELEASE in Configuration
2013-11-26 14:36:31 -08:00
Nite Luo
92b57c79ba
Merge branch 'develop' into newRenderer
...
Conflicts:
cocos/2d/CCClippingNode.h
cocos/2d/CCLayer.h
2013-11-26 11:56:03 -08:00
Nite Luo
61ca4f0137
Fix a bug with NewSprite Update Quad
2013-11-26 11:48:37 -08:00
James Chen
f6a1f5cc95
issue #3279 : A warning fix for 64bit platform.
2013-11-26 21:54:48 +08:00
James Chen
ecc7783685
closed #3279 : XMLHttpRequest receives wrong binary array.
2013-11-26 20:31:44 +08:00
boyu0
8346fe4b4d
issue #2771 : edit android.mk, CMakeLists.txt, change PHYSICS_CONTACT_POINT_MAX to PhysicsContactData:POINT_MAX
2013-11-26 18:22:52 +08:00
minggo
fcf43823b4
remove unneeded codes
2013-11-26 17:53:34 +08:00
James Chen
23de9bf8cd
Merge pull request #4378 from hulefei/dev_addGuiNamespace
...
add gui namespace before SEL_TouchEvent
2013-11-26 01:43:36 -08:00
boyu0
0100c05a93
issue #2771 : fix compile errors
2013-11-26 17:29:09 +08:00
hanson
d650c0a6a1
add gui namespace before SEL_TouchEvent
2013-11-26 17:03:01 +08:00
CocosRobot
17c4631f45
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-26 08:36:22 +00:00
James Chen
999b7ccd07
Merge pull request #4375 from dumganhar/constructors_are_protected
...
issue #3258 : Merge PR #4351 : Constructors are protected
2013-11-26 00:30:06 -08:00
James Chen
63702188be
issue #3258 : Compilation error fix for linux port.
2013-11-26 15:56:43 +08:00
James Chen
ebcdf2f87d
issue #3258 : Bug fix of MenuItemToggle binding.
2013-11-26 15:44:49 +08:00
James Chen
b55e8f17c7
issue #3258 : MenuItemFont has empty argument create function now.
2013-11-26 15:44:21 +08:00
boyu0
99d904363a
issue #2771 : delete all the box2d implementation in physics parts.
2013-11-26 13:47:42 +08:00
boyu0
df1fca3279
issue #2771 : refactor some functions and delete PHYSICS_INFINITY macro.
2013-11-26 11:38:55 +08:00
James Chen
5fbf164142
closed #3274 : Can't override cc.Node.setPosition in JSB.
2013-11-26 10:14:56 +08:00
Nite Luo
f3830985bb
Sprite now using New renderer
2013-11-25 16:33:05 -08:00
Ricardo Quesada
a198fb51df
JS Bindings Menu
...
doesn't initialize the menu twice.
2013-11-25 16:24:33 -08:00
Ricardo Quesada
b6f6e72c94
Merge branch 'develop' into constructors_are_protected
...
Conflicts:
cocos/2d/CCActionInstant.h
2013-11-25 13:59:24 -08:00
Nite Luo
19b8ba89e2
Merge branch 'develop' into newRenderer
2013-11-25 10:21:02 -08:00
boyu0
09ba28d522
issue #2771 : refactor PhysicsWorld and PhysicsWorldInfo
2013-11-25 17:57:06 +08:00
signmotion
25cc4101a7
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-11-25 10:23:50 +02:00
James Chen
9ebc4e3722
Merge pull request #4358 from samuele3hu/developTableView
...
issue #3228:CallFuncND + auto remove lua test case have no effect
2013-11-25 00:18:30 -08:00
signmotion
5f74496d7a
- Reverted modification. See below.
...
> @@ -301,7 +301,8 @@ void UIListView::removeLastItem()
>
> UIWidget* UIListView::getItem(unsigned int index)
> {
> - if ((int)index < 0 || index >= _items->count())
> + // @todo Signed/unsigned mishmash. Index is must be unsigned int always. Yes?
> + if ( ((int)index < 0) || ((int)index >= _items->count()) )
May be we should change the type of parameter.
So could you please revert the modification of this file?
2013-11-25 10:00:09 +02:00
James Chen
b9fa8566f2
closed #3273 : ScriptingCore::evalString crashes
2013-11-25 15:52:59 +08:00
James Chen
8574fb0494
Build fix for XMLHttpRequest after using std::unordered_map instead of std::map.
2013-11-25 15:11:43 +08:00
2youyou2
9cfb7b2a85
change armature version
2013-11-25 14:46:10 +08:00
CocosRobot
a4c2ccdf65
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-25 02:16:36 +00:00
boyu0
f2dabe77ec
issue #2771 : add some method implements with box2d in PhysicsWorld
2013-11-25 10:08:52 +08:00
signmotion
0d9cd9784b
* Fixed warnings in VS2012: C4018 (signed/unsigned mismatch) and C4244 (conversion from 'double' to 'float').
2013-11-23 07:23:06 +02:00
Nite Luo
b67ec6618f
Finish converting LayerColor start working on particle system
2013-11-22 17:14:24 -08:00
Ricardo Quesada
cc5a03f21a
updates cocos2d version
2013-11-22 16:58:05 -08:00
Ricardo Quesada
447a34655a
RenderTexture contructor ctor is public again
2013-11-22 16:14:05 -08:00
Nite Luo
60ada5dee3
Fonts are now using NewSprite to render
2013-11-22 16:09:11 -08:00
Ricardo Quesada
9b52af010d
Macro CC_DISABLE_COPY is renamed to CC_DISALLOW_COPY_AND_ASSIGN
...
and the old CC_DISALLOW_COPY_AND_ASSIGN is removed
2013-11-22 16:09:05 -08:00
Ricardo Quesada
3f1983214f
Effects have protected contructors
...
and disallowed copy + assign
2013-11-22 15:07:58 -08:00
Nite Luo
b02af0cbfe
Clean up renderer code
2013-11-22 10:24:52 -08:00
Ricardo Quesada
4d7e56b44a
fix indentation
2013-11-22 09:42:21 -08:00
Jason Xu
7c5784005c
Fix: on android, Device::setAccelerometerInterval will causes dead loop
2013-11-23 00:07:15 +08:00
samuele3
eb3f5eb629
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTableView
2013-11-22 11:52:32 +08:00
samuele3
192deb7952
issue #3228 : Reconstruct the Callfunc create method to support std::function and add callFuncND + auto remove lua test case
2013-11-22 11:51:07 +08:00
Ricardo Quesada
515786a7ee
adds CC_DISALLOW_COPY_AND_ASSIGN() to Actilons
...
... and also moves the Contructor/Destrucotor/initXXX to `protected:`
2013-11-21 17:06:06 -08:00
Nite Luo
43941bcbe0
Only init render after GLview has been initialized
2013-11-21 16:36:19 -08:00
Ricardo Quesada
b6ddc6d048
Uses std::unordered_map<> instead of std::map<>
...
and more fixes.
2013-11-21 13:43:59 -08:00
Ricardo Quesada
a26b385b11
Merge branch 'develop' into constructors_are_protected
2013-11-21 10:56:03 -08:00
Nite Luo
96d2910a99
Merge branch 'develop' into newRenderer
2013-11-21 10:19:32 -08:00
boyu0
8e14cdb8d2
issue #2771 : add assert to joint
2013-11-21 14:39:37 +08:00
minggo
4582686860
Merge pull request #4347 from samuele3hu/developTableView
...
[ci skip]Add doxygen comments for the CocoStudio
2013-11-20 21:55:34 -08:00
Nite Luo
db52698b26
Fix the crash on ios 7
2013-11-20 20:39:32 -08:00
Ricardo Quesada
90f51e0dab
Merge branch 'develop' into constructors_are_protected
2013-11-20 11:26:55 -08:00
Ricardo Quesada
6a8c4784a4
Adds some #pragma mark love
2013-11-20 11:26:33 -08:00
Ricardo Quesada
d3c44cbb0b
Merge branch 'develop' into constructors_are_protected
...
Conflicts:
cocos/2d/CCLayer.h
2013-11-20 11:23:03 -08:00
Nite Luo
f438e83104
Merge branch 'develop' into newRenderer
2013-11-20 11:14:28 -08:00
Nite Luo
0e51504ee6
Use stack to manage current RenderGroup
2013-11-20 11:05:01 -08:00
James Chen
bffc5bb4d5
Merge pull request #4348 from boyu0/iss2771_physical
...
issue #2771 : physical bug fix.
2013-11-20 00:24:07 -08:00
boyu0
1743826498
issue #2771 : fix a careless mistake
2013-11-20 16:08:48 +08:00
boyu0
bde6f5d9eb
issue #2771 : fix crash bug
2013-11-20 15:54:09 +08:00
samuele3
07ea8647c3
Add doxygen comments for the CocoStudio
2013-11-20 15:07:34 +08:00
samuele3
3ed7a79a84
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTableView
2013-11-20 13:01:07 +08:00
CocosRobot
54ef1d6c15
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-20 04:24:55 +00:00
samuele3
8a408f9951
Add doxygen comments for the CocoStudio
2013-11-20 12:04:47 +08:00
James Chen
59c2647bd6
Prevents warning of invoking ScrollView::setTouchEnabled. Layer::setTouchEnabled should not be a virtual function.
2013-11-20 11:35:04 +08:00
James Chen
da8c34d994
Fix of unsigned / signed mismatch in UIPageView.cpp.
2013-11-20 11:20:35 +08:00
James Chen
6b579ebe5e
Don't deprecate callback functions in Layer. Reason:
...
Callback function should not be deprecated, it will generate lots of warnings.
Since 'setTouchEnabled' was deprecated, it will make warnings if developer overrides onTouchXXX and invokes setTouchEnabled(true) instead of using EventDispatcher::addEventListenerWithXXX.
2013-11-20 11:19:51 +08:00
James Chen
93333ad252
Merge pull request #4340 from Dhilan007/jssubmodule
...
recover controller on layer.
2013-11-19 18:49:07 -08:00
James Chen
3c783d2e28
Merge pull request #4344 from dumganhar/develop
...
Fixing warning generated by VS2012.
2013-11-19 18:43:14 -08:00
Dhilan007
bd3789e0b5
add miss api
2013-11-20 10:40:43 +08:00
James Chen
424431690a
Fixing warning generated by VS2012.
2013-11-20 10:39:30 +08:00
Dhilan007
0646e59bf3
resolve conflict
2013-11-20 10:26:00 +08:00
boyu0
c945fbd42c
issue #2771 : add some warning log
2013-11-20 10:25:43 +08:00
James Chen
60ed1dcd3a
Merge pull request #4341 from Dhilan007/touchfix
...
fix touches not working in cocosbuilder
2013-11-19 18:20:42 -08:00
Ricardo Quesada
9a51d6c0ba
Merge branch 'develop' into constructors_are_protected
2013-11-19 17:59:43 -08:00
Dhilan007
02c69a5c6a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bind_studio
2013-11-20 09:57:50 +08:00
Ricardo Quesada
0d750cdbaf
Adds virtual destructors on Interfaces
...
Classes with at least one virtual function needs a virtual destructor.
This patch adds virtual destructors to Interface classes
And also enables 'warn on missing virtual destructors'
2013-11-19 16:57:23 -08:00
Nite Luo
8ce16e1e12
Finish DrawNode
2013-11-19 13:57:39 -08:00
Ricardo Quesada
27b09a2b3b
Merge branch 'develop' into constructors_are_protected
2013-11-19 13:54:34 -08:00
Ricardo Quesada
582afe3b61
Fixes warnings in CCLabel
...
These warnings were introduced yesterday.
Since we are paying attention to the warnings, new code MUST NOT
generate new warnings.
2013-11-19 13:51:40 -08:00
Ricardo Quesada
5c74c938ee
Merge branch 'develop' into constructors_are_protected
...
Conflicts:
cocos/2d/CCLayer.h
2013-11-19 13:13:57 -08:00
Nite Luo
a3725c2394
Merge branch 'develop' into newRenderer
2013-11-19 11:08:26 -08:00
Nite Luo
7ad64ece36
Add Transform to DrawNode
2013-11-19 11:06:26 -08:00
Dhilan007
948410c7b5
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bind_studio
2013-11-19 19:33:26 +08:00
Dhilan007
23f36e0406
fix touches not working in cocosbuilder
2013-11-19 19:24:04 +08:00
boyu0
aec514e3a2
issue #2771 : fix collision bug cause by dynamic/static cast.
2013-11-19 18:30:12 +08:00
CocosRobot
d8ec58831a
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-19 09:40:27 +00:00
Dhilan007
dc42645afe
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bind_studio
2013-11-19 16:49:28 +08:00
Dhilan007
3929e6070d
fix error form overrides a 'final' function
2013-11-19 16:27:09 +08:00
Dhilan007
c307d83b35
add miss Deprecated api
2013-11-19 16:06:27 +08:00
Dhilan007
1a65af9d1a
fix warn
2013-11-19 15:54:54 +08:00
Dhilan007
f0ab3f9ca1
fix some error in layer controller code
2013-11-19 15:41:22 +08:00
Dhilan007
0586c4d275
recover controller on layer.
2013-11-19 13:56:30 +08:00
minggo
594450e3f7
Merge pull request #4330 from CocosRobot/updategeneratedsubmodule_1384833055
...
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-18 19:52:09 -08:00
CocosRobot
0855ff0841
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-19 03:50:57 +00:00
minggo
2848e0dc3e
Merge pull request #4328 from 2youyouo2/develop
...
[ci skip]update armature
2013-11-18 19:46:29 -08:00
2youyou2
d5478f1ca2
fix if last frame has tween effect, armature may display wrong
2013-11-19 11:44:17 +08:00
minggo
bd00e6fabb
Merge pull request #4326 from dabingnn/develop_hotFix
...
[ci skip]Develop hot fix
2013-11-18 19:33:07 -08:00
Huabing.Xu
1fc928df41
HotFix: use static cast for format conversion
2013-11-19 11:32:12 +08:00
yinkaile
f308f2f95a
fix CCArmature display wrong on mac version
2013-11-19 11:22:40 +08:00
Huabing.Xu
49f34c5339
HotFix: fix CCB particle alpha blend-> setBlendAddictive after set texture
2013-11-19 11:19:12 +08:00
Huabing.Xu
fff851a8aa
HotFix: change tab to space
2013-11-19 11:17:02 +08:00
Huabing.Xu
458b9b53da
HotFix: fix CCB particle alpha blend
2013-11-19 11:16:14 +08:00
minggo
1e8a3fc92f
Merge pull request #4322 from dabingnn/develop_hotFix
...
[ci skip]HotFix: fix bug spine alpha blend error
2013-11-18 18:54:16 -08:00
minggo
fb2c2ec7f2
Merge pull request #4323 from Dhilan007/jssubmodule
...
[ci skip]fix miss bind setGrid\getGrid for JS.
2013-11-18 18:53:51 -08:00
minggo
8e7cce8cea
Merge pull request #4324 from CocosRobot/updategeneratedsubmodule_1384828843
...
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-18 18:53:06 -08:00
Huabing.Xu
69b38f6e40
HotFix: change tab to space
2013-11-19 10:42:37 +08:00
CocosRobot
186b6fd98b
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-19 02:40:44 +00:00
minggo
78f2e0982e
Merge pull request #4319 from liamcindy/develop
...
[ci skip]fixed ui anmation crash when stop animation for develop branch
2013-11-18 18:34:16 -08:00
Dhilan007
ce0a6d5b57
fix miss bind setGrid\getGrid for JS.
2013-11-19 10:33:11 +08:00
Huabing.Xu
d9681150fc
HotFix: fix bug spine alpha blend error
2013-11-19 10:15:12 +08:00
Nite Luo
abb011f0ef
Test clipping node with alpha
2013-11-18 15:52:47 -08:00
Nite Luo
c288e5ef9c
Fix Clipping Node
2013-11-18 14:58:41 -08:00
Ricardo Quesada
c943702bc8
Merge branch 'develop' into constructors_are_protected
...
Conflicts:
cocos/editor-support/cocostudio/CCActionObject.cpp
samples/Cpp/TestCpp/Classes/PhysicsTest/PhysicsTest.h
2013-11-18 11:07:15 -08:00
Nite Luo
e5ebcb2845
Merge branch 'develop' into newRenderer
2013-11-18 10:22:16 -08:00
Liam
c7932b6181
fixed ui anmation crash when stop animation
2013-11-19 00:57:22 +08:00
James Chen
91a57c614d
closed #3224 : The subthread of CCHttpClient interrupts main thread if timeout signal comes.
2013-11-19 00:19:57 +08:00
minggo
1ed8cfee7c
Merge pull request #4297 from liamcindy/develop
...
[ci skip]Shielded unusefull log for develop branch
2013-11-18 07:10:40 -08:00
minggo
27f35ac3e3
Merge pull request #4312 from samuele3hu/developTableView
...
[ci skip]Hot fix:Repair some lua test samples and modify layer touch listener functions
2013-11-18 07:09:57 -08:00
minggo
0e2ea2971d
Merge pull request #4313 from minggo/develop
...
[ci skip]fix compiling error of js template
2013-11-18 06:33:23 -08:00
minggo
2028cde015
fix compiling error of js template
2013-11-18 22:32:13 +08:00
minggo
62bd6453fc
Merge pull request #4310 from boyu0/iss2771_physical
...
[ci skip]issue #2771 physical fix crashes
2013-11-18 06:19:49 -08:00
samuele3
6c88dd34c0
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTableView
2013-11-18 22:17:47 +08:00
samuele3
a2e9920288
Hot fix:Repair some lua test samples and modify layer touch listener functions
2013-11-18 22:16:49 +08:00
minggo
fc56d9234e
Merge pull request #4309 from dabingnn/develop_hotFix
...
[ci skip]HotFix: fix bug callback retain release error
2013-11-18 05:14:41 -08:00
Huabing.Xu
699dd9518b
HotFix: fix bug callback retain release error
2013-11-18 21:12:47 +08:00
boyu0
68b98fc84f
issue #2771 : change PhysicsContact::create to construct
2013-11-18 21:06:05 +08:00
CocosRobot
853a895c69
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-18 10:57:00 +00:00
James Chen
060e8413dd
Merge pull request #4307 from CocosRobot/updategeneratedsubmodule_1384771216
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-18 02:51:11 -08:00
CocosRobot
7afb8877c5
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-18 10:40:18 +00:00
minggo
593c0f8946
Merge pull request #4304 from Dhilan007/di3223
...
[ci skip]issue #3223:bind gui and studio
2013-11-18 02:28:53 -08:00
Dhilan007
8b14575d7e
bind gui and studio.
2013-11-18 16:54:52 +08:00
minggo
da2158de20
Merge pull request #4303 from boyu0/iss2771_physical
...
[ci skip]issue #2771 : physics. rename resetForce to resetForces
2013-11-18 00:32:06 -08:00
boyu0
23c477f15d
issue #2771 : rename resetForce to resetForces
2013-11-18 16:27:23 +08:00
minggo
c7971bcaad
Merge pull request #4300 from minggo/textinput-crash
...
[ci skip]fix crash of textinput test case
2013-11-18 00:23:51 -08:00
samuele3
ee815c8e9a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTableView
2013-11-18 15:57:14 +08:00
samuele3
b281a2f06f
Hot fix:repalce unsigned int/int type of params with long to solve tableview bug
2013-11-18 15:55:58 +08:00
minggo
30b7ac8dd1
fix crash of textinput test case
2013-11-18 15:14:48 +08:00
minggo
946fd16adc
Merge pull request #4295 from samuele3hu/developCCS
...
[ci skip]hot fix:Repair the crash of cocostudio and the bug of some lua test samples can't come in
2013-11-17 23:10:01 -08:00
minggo
5c41130083
Merge pull request #4293 from 2youyouo2/develop
...
[ci skip]fixed BatchNode's _children is empty, draw will crash
2013-11-17 23:01:32 -08:00
minggo
bbb579faad
Merge pull request #4298 from boyu0/fix_keypadtest_crash
...
[ci skip]fix keypad test crash bug
2013-11-17 23:01:10 -08:00
boyu0
eea09d60f7
fix keypad test crash bug
2013-11-18 14:33:24 +08:00
Liam
66443255a6
Shielded unusefull log
2013-11-18 14:20:50 +08:00
samuele3
e6ed691e7c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-18 14:13:05 +08:00
samuele3
5c8d24a11e
hot fix:Repair the crash of cocostudio and the bug of some lua test samples can't come in
2013-11-18 14:12:07 +08:00
2youyou2
4f2603f69c
fixed BatchNode's _children is empty, draw will crash
2013-11-18 13:23:38 +08:00
minggo
5e4b3c6919
Merge pull request #4291 from dabingnn/develop_hotFix
...
[ci skip]HotFix: remove Mac platform Image::saveToFile assert
2013-11-17 20:57:47 -08:00
minggo
4c6aa04e98
Merge pull request #4288 from nutty898/develop_nutty_modify_bugfixed
...
[ci skip]Develop nutty modify bugfixed
2013-11-17 20:56:18 -08:00
boyu0
90f07f680f
Merge commit '95e7373dad8591b11c9bedefe159878210e12e56' into iss2771_physical
2013-11-18 11:22:20 +08:00
CaiWenzhi
2f3e922a98
Fixed crash of reader
2013-11-18 10:19:40 +08:00
Huabing.Xu
09f27f1d16
HotFix: remove Mac platform Image::saveToFile assert
2013-11-18 10:14:57 +08:00
boyu0
a7d884a63f
issue #2771 : change debug draw defines to class static const variable
2013-11-18 10:10:37 +08:00
CaiWenzhi
e63ef05c30
Merge branch 'develop' into develop_nutty_modify_bugfixed
2013-11-18 09:57:35 +08:00
boyu0
8ab64c9fa8
issue #2771 : fix some api name and code style
2013-11-18 03:10:13 +08:00
boyu0
0710cfa526
issue #2771 : delete PhysicsSlidingJoint and PhysicsSpringJoint. add joint tests, fix bugs
2013-11-18 02:16:20 +08:00
minggo
982a23af3d
fix some hungarial
2013-11-16 21:08:00 +08:00
minggo
db804891ed
fix some warnings
2013-11-16 20:02:49 +08:00
Nite Luo
f5a8c1d02c
Fix NewClipNodeTest
2013-11-15 17:32:29 -08:00
Ricardo Quesada
a3fabd6b6d
TiledMap uses std::string
2013-11-15 16:37:57 -08:00
Ricardo Quesada
7c2ed2743c
Menu + MenuItem
...
`Menu` and `MenuItem` have protected constructors
2013-11-15 13:14:12 -08:00
Ricardo Quesada
208d25bdff
ControlSwitch compies
...
Uses procted constructor
2013-11-15 12:04:47 -08:00
Nite Luo
c5f9434331
Merge branch 'develop' into newRenderer
2013-11-15 11:33:38 -08:00
Nite Luo
566767da60
Add NewDrawNode
2013-11-15 11:29:11 -08:00
Ricardo Quesada
417657b5a9
Merge branch 'develop' into constructors_are_protected
2013-11-15 10:11:49 -08:00
CaiWenzhi
71ff8fef9c
Fixed crash
2013-11-15 22:25:29 +08:00
boyu0
02e5d44955
Merge branch 'iss2771_physical' of https://github.com/boyu0/cocos2d-x into iss2771_physical
2013-11-15 16:54:02 +08:00
boyu0
988630c12f
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-11-15 16:38:58 +08:00
boyu0
0cb45e50f1
issue #2771 : fix bugs
2013-11-15 16:27:43 +08:00
minggo
8b5068d4c5
Merge pull request #4273 from boyu0/fix_ccbreader_magic_bits_compare_bug
...
[ci skip]fix CCBReader magic bytes compare bug.
2013-11-14 23:45:33 -08:00
minggo
2923b1c1ed
Merge pull request #4271 from nutty898/develop_nutty_modify_relativelayout
...
[ci skip]Modify relative layout
2013-11-14 23:43:30 -08:00
boyu0
0c309acbe7
fix CCBReader magic bytes compare bug which cause CocosBuilderTest turns black
2013-11-15 15:41:43 +08:00
samuele3
63d4014586
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-15 14:52:17 +08:00
CaiWenzhi
75d9bde459
Modify relative layout
2013-11-15 14:37:34 +08:00
samuele3
c1bdd8ad3c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-15 13:49:19 +08:00
samuele3
ec9bc0069f
Modify template of lua ios_mac config and some bugs
2013-11-15 13:48:34 +08:00
CaiWenzhi
1730fcddcb
Modify layout
2013-11-15 13:29:39 +08:00
Huabing.Xu
e14295c404
Merge branch 'develop' into free_instead_of_delete
2013-11-15 09:45:03 +08:00
Huabing.Xu
022b5c7b9a
Merge branch 'develop' into free_instead_of_delete
...
# By CaiWenzhi (4) and others
# Via minggo (7) and others
* develop:
fix asynchronize loading bug
[AUTO] : updating submodule reference to latest autogenerated bindings
fixed #3185 support for html5.
fixed bug of widget
fixed bugs of widget
fixed #3185 ComponentTest and SceneTest NULL to nullptr.
Add deprecated functions of class TextureCache
fix warning
set z order after reorder
fixed #3185 replace NULL to nullptr.
add "override"
fixed #3185
Modify code criterion
Conflicts:
cocos/editor-support/cocostudio/CCSGUIReader.cpp
cocos/editor-support/cocostudio/CCSSceneReader.cpp
2013-11-15 09:44:29 +08:00
Ricardo Quesada
a583ad461f
CCControlButton has protected constructor
2013-11-14 17:19:16 -08:00
Nite Luo
7ad93d8a94
Create new clippingNode
2013-11-14 16:39:03 -08:00
Ricardo Quesada
17a6575bd3
more protected constructors
...
Adds protected constructors for:
* ClippingNode
* ParallaxNode
* RenderTexture
* TMXTiledMap
2013-11-14 16:33:43 -08:00
Ricardo Quesada
dd68eb4796
ParticleSystem uses protected constructors
2013-11-14 16:21:49 -08:00
Ricardo Quesada
b87684c022
fixes Sprite::setTexture()
...
Sprite::setTexture(std::string&) works as expected.
It sets the texture rect of the sprite
2013-11-14 15:37:43 -08:00
Nite Luo
8d63faa0de
New Renderer working with RenderStack
2013-11-14 12:17:54 -08:00
Ricardo Quesada
cd0ba6850c
Merge branch 'develop' into constructors_are_protected
2013-11-14 11:57:18 -08:00
Nite Luo
a70cad8c97
Merge branch 'develop' into newRenderer
2013-11-14 10:36:43 -08:00
Nite Luo
4f1858fa8a
Crate NewClipping Node
2013-11-14 10:35:28 -08:00
minggo
9b746d22f5
Merge pull request #4259 from minggo/async-loading-fix
...
[ci skip]fix asynchronize loading bug
2013-11-14 02:40:44 -08:00
minggo
2f7f05d1d7
fix asynchronize loading bug
2013-11-14 18:39:23 +08:00
minggo
f06d71dd49
Merge pull request #4258 from CocosRobot/updategeneratedsubmodule_1384421963
...
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-14 02:26:45 -08:00
CocosRobot
523cb2e8d9
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-14 09:39:25 +00:00
minggo
c594a673fc
Merge pull request #4244 from chengstory/#3185
...
[ci skip]fixed #3185
2013-11-14 01:33:26 -08:00
Huabing.Xu
4894632467
Fix bug: add android, fix android can not compile
2013-11-14 17:14:35 +08:00
chengstory
6acf422f3b
fixed #3185 support for html5.
2013-11-14 17:03:45 +08:00
CaiWenzhi
19c605eb51
Merge branch 'develop' into develop_nutty_code_criterion
2013-11-14 15:46:52 +08:00
CaiWenzhi
5f22edf095
fixed bug of widget
2013-11-14 15:42:59 +08:00
minggo
e0076cbdf3
Merge pull request #4246 from minggo/zorder-fix
...
[ci skip]Zorder fix
2013-11-13 23:26:05 -08:00
Huabing.Xu
03c8c8f4fc
Fix bug: use free() in imageCommon_cpp.h
2013-11-14 14:48:16 +08:00
Huabing.Xu
bc55d3246b
Merge branch 'develop' into free_instead_of_delete
...
# By minggo (12) and others
# Via minggo (18) and others
* develop: (78 commits)
[AUTO] : updating submodule reference to latest autogenerated bindings
Update CHANGELOG[ci skip]
Update AUTHORS [ci skip]
fix bug: cccolor to jsval function has error in jsb
[ci skip]
[ci skip]
[ci skip]
[ci skip]
[ci skip]
C++11: NULL -> nullptr
[ci skip]
Fix: UserDefault::createXMLFile with correct XML definition.
[ci skip]
[ci skip]
[ci skip]
Fix bug: rename const with under line seperator
[AUTO] : updating submodule reference to latest autogenerated bindings
Fix bug: Z fighting on TransitionScenePageTurn
Fixed bugs
Modify reader and fixed bugs
...
Conflicts:
cocos/editor-support/cocostudio/CCSGUIReader.cpp
2013-11-14 14:47:01 +08:00
CaiWenzhi
dee5305f7b
fixed bugs of widget
2013-11-14 14:46:44 +08:00
CaiWenzhi
ccaa8f7310
Merge branch 'develop' into develop_nutty_code_criterion
2013-11-14 14:31:04 +08:00
samuele3
a20620c185
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-14 14:14:52 +08:00
samuele3
babc985409
Add deprecated functions of class TextureCache
2013-11-14 14:12:25 +08:00
minggo
a057274115
set z order after reorder
2013-11-14 14:08:50 +08:00
chengstory
e9f5e889d6
fixed #3185 replace NULL to nullptr.
2013-11-14 14:05:24 +08:00
CaiWenzhi
2432e6e40d
add "override"
2013-11-14 13:42:10 +08:00
Huabing.Xu
46ef7a7fbc
Fix bug: deprecate old interface
2013-11-14 13:35:17 +08:00
chengstory
14d51f9f35
fixed #3185
2013-11-14 13:28:42 +08:00
CocosRobot
515d20d863
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-14 04:32:48 +00:00
rablwupei
96462eb81f
fix bug: cccolor to jsval function has error in jsb
2013-11-14 12:03:44 +08:00
minggo
996be7502a
Merge pull request #4129 from michaelcontento/color-convenience
...
[ci skip]Colors are now compare- and explicit convertible
2013-11-13 19:50:31 -08:00
minggo
5c58a8224c
Merge pull request #4168 from xhcnb/fix_ccb_nodeloader
...
[ci skip]Fix a bug:we can use 'Custom Class' in CocosBuilder, and assign custom p...
2013-11-13 19:46:08 -08:00
CaiWenzhi
611ba9e9f5
Modify code criterion
2013-11-14 11:37:46 +08:00
minggo
f56cf9b8bf
Merge pull request #4222 from HoGarfield/Scale9SpriteLoader
...
[ci skip]To set anchor point to 0,0 when created by loader
2013-11-13 19:23:49 -08:00
minggo
95effc0207
Merge pull request #4234 from xhcnb/dev_fix_ccuserdefalut
...
[ci skip]Fix: UserDefault::createXMLFile with correct XML definition.
2013-11-13 19:16:34 -08:00
Jason Xu
f4425f5db2
C++11: NULL -> nullptr
2013-11-14 11:08:50 +08:00
Jason Xu
dee3bffcdc
Fix: UserDefault::createXMLFile with correct XML definition.
2013-11-14 10:40:06 +08:00
minggo
ed83a0b374
Merge pull request #4205 from bmanGH/fix_touch_retain
...
[ci skip]fix direct delete touch object without use release crash bug;
2013-11-13 18:30:21 -08:00
minggo
e6653e133b
Merge pull request #4193 from ricardoquesada/doxygen_markdown
...
[ci skip]Adds markdown comments in the doxstrings
2013-11-13 18:15:59 -08:00
minggo
97063dfe7d
Merge pull request #4208 from bmanGH/feature/add_functions_to_glprogram
...
[ci skip]add setUniformLocationWithMatrix2fv, setUniformLocationWithMatrix3fv mothed into GLProgram class
2013-11-13 18:10:10 -08:00
minggo
a34011c682
Merge pull request #4229 from dabingnn/develop_fix_zFighting_TransitionScenePageTurn
...
[ci skip]Fix bug: Z fighting on TransitionScenePageTurn
2013-11-13 18:08:25 -08:00
Huabing.Xu
b4b4e99522
Fix bug: rename const with under line seperator
2013-11-14 10:00:59 +08:00
minggo
84689e0121
Merge pull request #4206 from boyu0/iss2770_fix_warnings
...
[ci skip]issue #2770 : fix warnings
2013-11-13 17:57:25 -08:00
minggo
7b61a34d71
Merge pull request #4230 from CocosRobot/updategeneratedsubmodule_1384393975
...
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-13 17:55:15 -08:00
CocosRobot
dff9c6a5b5
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-14 01:52:57 +00:00
minggo
87fd45a6a4
Merge pull request #4226 from nutty898/develop_nutty_addfunctiontoguireader_3
...
[ci skip]Develop nutty addfunctiontoguireader 3
2013-11-13 17:51:35 -08:00
minggo
408ab94eba
Merge pull request #4215 from liamcindy/develop
...
[ci skip]fixed ui animation play error
2013-11-13 17:47:39 -08:00
minggo
4abf5b50dd
Merge pull request #4214 from samuele3hu/developCCS
...
[ci skip]issue #2868:Add CocoStudio UI lua binding and some releated test samples
2013-11-13 17:45:34 -08:00
Huabing.Xu
ccbbff3c22
Fix bug: Z fighting on TransitionScenePageTurn
2013-11-14 09:44:35 +08:00
Nite Luo
f17af1f319
Add group command
2013-11-13 17:31:12 -08:00
Ricardo Quesada
d590986e73
Constructors are protected
2013-11-13 15:55:36 -08:00
Nite Luo
d5f651deee
Merge branch 'develop' into newRenderer
2013-11-13 10:27:30 -08:00
Nite Luo
05bc444ccb
Add some optimization tips
2013-11-13 10:26:26 -08:00
CaiWenzhi
9c1bd673ff
Merge branch 'develop' into develop_nutty_optimizeguireader_3
2013-11-13 20:43:57 +08:00
CaiWenzhi
3ac054edbd
Fixed bugs
2013-11-13 20:38:18 +08:00
CaiWenzhi
5f68e028b5
Modify reader and fixed bugs
2013-11-13 20:01:57 +08:00
samuele3
17f74eeb17
issue #2868:Modify armature test samples and add more armature test samples
2013-11-13 18:18:29 +08:00
minggo
304b09527b
Merge pull request #4207 from bmanGH/feature/configuration_VAO_runtime
...
[ci skip]Configuration of VAO in runtime
2013-11-12 22:55:29 -08:00
bmanGH
2687ee8915
put '{' in a new line to follow cocos2d-x coding style
2013-11-13 14:52:16 +08:00
garfield_ho
fbb4d02251
When anchor point is 0,0 , CocosBuilder will not output anchor point param setting request.Although the Scale9Sprite`s anchor point is default to 0, 0, but when calling function "initWithBatchNode", the anchor point will be set to 0.5, 0.5.
2013-11-13 14:38:01 +08:00
boyu0
ca4c289fd8
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2770_fix_warnings
2013-11-13 11:24:19 +08:00
boyu0
fb04c9e574
issue #2770 : fix some warning
2013-11-13 11:22:34 +08:00
CaiWenzhi
0665d6c9bc
Merge branch 'develop' into develop_nutty_optimizeguireader_3
2013-11-13 10:19:09 +08:00
CaiWenzhi
03b3d583e8
Modify scenereader
2013-11-13 10:16:16 +08:00
samuele3
26c3266711
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-13 10:15:24 +08:00
samuele3
062fb85943
issue #2868:Modify cocos2dx_studio.ini to add more auto-binding class
2013-11-13 10:12:44 +08:00
Ricardo Quesada
4848e3d3bb
correct size for Listener ID
2013-11-12 17:14:51 -08:00
Nite Luo
37d3601fd0
Merge branch 'develop' into newRenderer
2013-11-12 11:56:17 -08:00
Nite Luo
0c0c11be5c
Finish NewSpriteBatchTest
2013-11-12 11:53:53 -08:00
Nite Luo
8c972d96a8
Create new test for NewRenderer
2013-11-12 11:19:18 -08:00
Nite Luo
ab8b61aaec
Create NewSpriteBatchNode to use NewRender
2013-11-12 11:18:49 -08:00
bmanGH
683ce1692d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into feature/configuration_VAO_runtime
...
Conflicts:
cocos2dx/CCConfiguration.cpp
cocos2dx/draw_nodes/CCDrawNode.cpp
cocos2dx/particle_nodes/CCParticleSystemQuad.cpp
cocos2dx/platform/android/CCEGLView.cpp
cocos2dx/platform/ios/EAGLView.mm
cocos2dx/textures/CCTextureAtlas.cpp
cocos2dx/textures/CCTextureAtlas.h
2013-11-12 20:18:04 +08:00
bmanGH
9893fbc514
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into fix_touch_retain
...
Conflicts:
cocos2dx/platform/CCEGLViewProtocol.cpp
2013-11-12 19:24:09 +08:00
bmanGH
f540131320
add setUniformLocationWithMatrix2fv, setUniformLocationWithMatrix3fv mothed in GLProgram class.
2013-11-12 18:59:37 +08:00
boyu0
15c8c04f3a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2770_fix_warnings
2013-11-12 18:22:26 +08:00
boyu0
0aa140a6e5
issue #2771 : add comments
2013-11-12 18:13:44 +08:00
samuele3
f429c4c632
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-12 17:51:33 +08:00
CocosRobot
0acaa1f76e
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-12 09:50:13 +00:00
samuele3
ae6597dbaa
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCheck
...
Conflicts:
tools/bindings-generator
2013-11-12 17:23:41 +08:00
samuele3
18bc96096c
Resolve some warning and modify uint32_t to long
2013-11-12 17:18:51 +08:00
samuele3
c1d256c159
issue #2868:modify ccs lua test samples
2013-11-12 16:52:03 +08:00
minggo
8d79e67ecf
Merge pull request #4165 from 2youyouo2/develop
...
[ci skip]update armature
2013-11-11 23:57:30 -08:00
samuele3
cfb1cfdf65
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
...
Conflicts:
cocos/editor-support/cocostudio/CCSGUIReader.h
2013-11-12 15:30:36 +08:00
boyu0
9eac5c4a41
issue #2771 : add comment and improve API
2013-11-12 15:28:07 +08:00
samuele3
482ee5d47f
issue #2868:Add more ccs lua test samples
2013-11-12 15:25:47 +08:00
Ricardo Quesada
6b29391212
Adds markdown comments in the doxstrings
...
Since Doxygen 1.8.0 (we are already using it), it is possible to
add markdown comments in the doxygen strings.
This will make our comments easier to read.
This patch only adds markdown to CCNode.h as a test.
If you like, I'll keep adding markdown comments as I see them.
Please, encourage the rest of the team to do the same.
2013-11-11 20:21:01 -08:00
Liam
f0ca796da1
merge from develop
2013-11-12 11:20:29 +08:00
James Chen
42ca4f6122
Merge pull request #4187 from dumganhar/develop
...
#include <algorithm> for std::max, std::min on VS2013.
2013-11-11 18:52:16 -08:00
James Chen
db07c781ab
#include <algorithm> for std::max, std::min on VS2013.
2013-11-12 10:35:50 +08:00
James Chen
cfd82a26bb
Merge pull request #4156 from bopohaa/patch-1
...
closed #3159 : Webp Test Crashes.
2013-11-11 18:31:03 -08:00
Ricardo Quesada
be64dd97cf
replaces `delete[]` with `free()` in C-based API
...
API that returns a newly allocated buffer as an output argument (not return value) are error-prone.
- Users forget to release the newly allocated buffer
- Or the call `delete` instead of `delete[]`
But some of those API need to call `realloc` on the buffer.
But `realloc` is only valid if the buffer was previously allocated with `malloc`.
If a buffer needs to be re-allocated using a C++ API, then `std::vector<char*>` should be used instead...
So, this patch does:
- Migrates the API from `new []` / `delete[]` to `malloc()` / `free()`
- Fixes all the memory issues: incorrect deallocs and memory leaks
- Updates the documentation
- And fixes misc issues with the API: removes `cc` from the ZipUtils class.
2013-11-11 18:09:47 -08:00
boyu0
dbafd9af2b
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2770_fix_warnings
2013-11-12 10:07:26 +08:00
James Chen
cc3a6ebda9
Merge pull request #4150 from ledyba/fix_ccdevice
...
Close X Display
2013-11-11 17:40:32 -08:00
minggo
44bed76c21
Merge pull request #4175 from nutty898/develop_nutty_optimizeguireader_3
...
[ci skip]Develop nutty optimizeguireader 3
2013-11-11 17:36:22 -08:00
Ricardo Quesada
d6446e9b14
calls `delete[]` instead of `delete`
...
calls `delete[]` instead of `delete`
2013-11-11 16:07:46 -08:00
Nite Luo
a28f3f6f03
Merge branch 'develop' into newRenderer
2013-11-11 12:04:28 -08:00
Nite Luo
f6fb48ba56
Fix crashing bug
2013-11-11 11:54:08 -08:00
James Chen
51cfd3fb4b
Merge pull request #4151 from pyrasis/develop
...
[Win32] fix compile error.
2013-11-11 04:42:42 -08:00
CocosRobot
3472d7ad50
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-11 10:57:57 +00:00
boyu0
d75c96443d
issue #2770 : fix some warning
2013-11-11 18:28:59 +08:00
CaiWenzhi
b688e39584
Merge branch 'develop' into develop_nutty_optimizeguireader_3
2013-11-11 18:23:21 +08:00
CaiWenzhi
4f76141c41
optimize guireader
2013-11-11 18:22:14 +08:00
minggo
b868c3f1dc
Merge pull request #4173 from minggo/remove-makefile
...
[ci skip]remove makefiles
2013-11-11 02:19:16 -08:00
minggo
d3cf36ba37
Merge pull request #4171 from dumganhar/jsb-64bit-fix
...
[ci skip]Jsb 64bit fix
2013-11-11 02:17:42 -08:00
CaiWenzhi
782c26bc37
Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch
2013-11-11 17:57:43 +08:00
2youyou2
cdae8f51bc
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop
2013-11-11 17:30:52 +08:00
2youyou2
528c257497
add setUserObject method to CCArmatureAnimation
2013-11-11 17:30:37 +08:00
minggo
1e15071dc7
remove makefiles
2013-11-11 17:29:48 +08:00
samuele3
7cfe890d5d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-11 17:04:37 +08:00
samuele3
06c7d3e96d
issue #2868:Add ccd lua test samples
2013-11-11 17:03:43 +08:00
minggo
2a31ff04c2
Merge pull request #4166 from dabingnn/iss3025_TextureCache
...
[ci skip]issue #3025 : move deprecated texture cache implementation to cpp file
2013-11-11 00:46:46 -08:00
James Chen
49289d7576
Adding cc.TextureCache.getInstance() to jsb_deprecated.js.
2013-11-11 16:45:44 +08:00
James Chen
20b350a58b
Removing cocosjs_manual_conversions.h(.cpp). Put all jsval <-> native value conversion codes to js_manual_conversions.h(.cpp).
2013-11-11 16:45:44 +08:00
James Chen
0151ac60ba
fix 64bit warning. unsigned int (int) —> long.
2013-11-11 16:45:44 +08:00
boyu0
a54603390e
issue #2771 : change pointQuery implements
2013-11-11 16:23:42 +08:00
Nite Luo
f68a2a47e7
Improved batching
2013-11-11 00:14:29 -08:00
CocosRobot
2e52dd4905
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-11 08:05:15 +00:00
Huabing.Xu
dfcae4ed0d
issue #3025 : change TextureCache::purgeSharedTextureCache() and TextureCache::sharedTextureCache() to do not call deprecate function anymore
2013-11-11 16:04:34 +08:00
Jason Xu
891ddb5018
Fix a bug:we can use 'Custom Class' in CocosBuilder, and assign custom properties to it, but when you create some nodes with the same custom_class , and they have different custom properties, as they are same class and the share one Loader, so in the loader _customProperties will be wrong.
...
So, I dropped some lines to clear _customProperties before handle an new node.
2013-11-11 15:45:07 +08:00
Huabing.Xu
3fc16256ab
issue #3025 : move deprecated texture cache implementation to cpp file
2013-11-11 15:40:12 +08:00
boyu0
b3f44a0805
issue #2771 : edit assert message
2013-11-11 15:31:20 +08:00
yinkaile
677cf00355
fix compiler warning
2013-11-11 15:29:24 +08:00
yinkaile
50ab5783d5
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-11-11 15:16:13 +08:00
minggo
cd22f5543b
Merge pull request #3997 from ondesly/screen_size_change
...
[ci skip]android & ios screen size change support
2013-11-10 23:10:13 -08:00
minggo
bbb2579114
Merge pull request #4160 from dabingnn/iss3025_TextureCache
...
[ci skip]Iss3025 texture cache
2013-11-10 23:08:01 -08:00
boyu0
13efb7e822
issue #2771 : add pointQuery
2013-11-11 15:03:17 +08:00
yinkaile
9f67ea786e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-11-11 14:57:20 +08:00
yinkaile
0bb8714f86
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop
2013-11-11 14:53:18 +08:00
yinkaile
5ba1e4ce10
1.remove compiler wornings
...
2.change void Bone::removeFromParent(bool recursion); to void Bone::removeFromParent();
2013-11-11 14:50:30 +08:00
James Chen
9d7a8c44f9
Reverts auto-generated.
2013-11-11 14:40:23 +08:00
James Chen
8f8d0f86d7
Updating Bindings-generator.
2013-11-11 14:38:12 +08:00
James Chen
ff3bfbe8a2
Using std::unordered_map instead of UTHASH for js_type_class_t.
...
Since xxx.hash_code() return size_t which is 8bytes on 64bit system, we should not use HASH_ADD_INT and HASH_FIND_INT for js_type_class_t.
2013-11-11 14:36:43 +08:00
James Chen
55cf30b7c8
HASH_FIND_INT —> HASH_FIND_PTR for CCAcitonManager.cpp and CCScheduler.cpp.
2013-11-11 14:36:43 +08:00
James Chen
5a0df8d2e8
VS2012 doesn’t support invoke another constructor method in current constructor.
2013-11-11 14:36:43 +08:00
James Chen
fe88f7c941
Fixing memory leak of JSStringWrapper::set .
2013-11-11 14:36:43 +08:00
James Chen
9d5813b7d9
Some fixes:
...
1) Moving the implementation of JSStringWrapper to .cpp file. Removing override operator() which will be easy to make errors.
2) Deleting JSCallFuncWrapper since it isn’t needed after using std::function for MenuItem’s Callback.
3) Fixing ChipmunkTest crash sometimes on MAC platform(64bit).
2013-11-11 14:36:42 +08:00
Huabing.Xu
55b9462b17
issue #3025 : directly use _textureCache in Director
2013-11-11 14:21:41 +08:00
boyu0
9b99872067
issue #2770 : fix some warning
2013-11-11 14:11:06 +08:00
minggo
e193311e55
Merge pull request #4161 from boyu0/iss2770_fix_warnings
...
[ci skip]issue #2770 : fix warning
2013-11-10 22:10:10 -08:00
2youyou2
0a72c3c1c2
1.when add a skin to last index, applay it's skindata to the previous skindata
...
2.Do not retain target when regist frame event and movement event
2013-11-11 13:33:47 +08:00
James Chen
707a6c246f
Merge pull request #4157 from dumganhar/iss3137-fix-acc
...
closed #3137 : Device::setAccelerometerEnabled needs to be invoked before adding ACC listener
2013-11-10 21:03:24 -08:00
boyu0
6c1144ee79
issue #2770 : fix some warning
2013-11-11 12:49:38 +08:00
minggo
e981dbf7e4
Merge pull request #4158 from dumganhar/remove-jsb-version
...
[ci skip]Removing JSB Version since JSB source codes will be updated with cocos2d-x.
2013-11-10 20:45:22 -08:00
minggo
def560c811
Merge pull request #4159 from mlepage/develop
...
[ci skip]Fix typos and other trivial cleanup
2013-11-10 20:06:56 -08:00
Huabing.Xu
02da3a29cc
issue #3025 : deprecate TextureCache::reloadAllTextures, call VolatileTextureMgr::reloadAllTextures instead
2013-11-11 11:38:02 +08:00
Marc Lepage
27b82f8f67
Fix typos and other trivial cleanup
2013-11-10 22:00:50 -05:00
James Chen
0c4b6e7a37
Removing JSB Version since JSB source codes will be updated with cocos2d-x.
...
Also, remove some unused codes.
2013-11-11 10:40:51 +08:00
James Chen
a6c85a3906
issue #3137 : Disabling Accelerometer when layer is destroyed.
2013-11-11 10:23:05 +08:00
minggo
9a3d2e941e
Merge pull request #3969 from dualface/develop
...
[ci skip]fix tolua_fix, cleanup peertable after object deleted
2013-11-10 17:44:24 -08:00
bopohaa
ef92efcd79
Update CCImageCommon_cpp.h
...
webp don't work for me
2013-11-11 02:28:27 +03:00
James Chen
deeaa4d1bc
Merge pull request #4148 from dumganhar/touch-onebyone-available
...
Triggers an assert only onTouchBegan is nullptr for EventListenerTouchOneByOne. Fixes comments for checkAvailable.
2013-11-10 00:39:30 -08:00
dualface
c75c20de04
fix Lua 5.2 compatibility
2013-11-10 11:49:52 +08:00
CocosRobot
6e6c63e111
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-10 03:29:03 +00:00
samuele3
d4dbc7a442
Add conversion config for long type
2013-11-10 09:21:33 +08:00
dualface
2a2fc81f86
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-11-10 00:00:19 +08:00
samuele3
e26fe04deb
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-09 23:04:11 +08:00
samuele3
286393d28e
issue #2868:Add more manual lua binding functions
2013-11-09 22:58:40 +08:00
Lee, Jae-Hong
e132142689
[Win32] Update libGUI project
...
- Update files list.
2013-11-09 23:57:18 +09:00
Lee, Jae-Hong
3d23ca328e
[Win32] fix compile error.
...
- fix C2552 error in VS2012.
2013-11-09 23:56:24 +09:00
Lee, Jae-Hong
5e36021d54
[Win32] fix argument type.
...
- argument of interface is a long type.
2013-11-09 23:44:15 +09:00
psi
c4e70387f7
Close display
2013-11-09 23:02:45 +09:00
James Chen
f3a5245bfa
Triggers an assert only onTouchBegan is nullptr for EventListenerTouchOneByOne. Fixes comments for checkAvailable.
2013-11-09 18:11:57 +08:00
Nite Luo
5a1d92cbf2
Merge branch 'develop' into newRenderer
...
Conflicts:
samples/Cpp/TestCpp/Classes/controller.cpp
2013-11-08 14:01:08 -08:00
Nite Luo
050f3f705e
minor code format fix
2013-11-08 13:57:21 -08:00
Nite Luo
fa9d8fe077
Add CustomCommand
2013-11-08 12:06:39 -08:00
Ricardo Quesada
5faae4a51e
removes exe bit from text files
2013-11-08 11:30:50 -08:00
CaiWenzhi
a0f794b7df
optimize layout
2013-11-08 23:26:44 +08:00
CaiWenzhi
8a5084effa
add list view event
2013-11-08 20:29:49 +08:00
CaiWenzhi
1f389d3779
Rename event interface
2013-11-08 18:43:06 +08:00
Huabing.Xu
b726c6fd2c
issue #3025 : move VolatileTexture static function to VolatileTextureMgr
2013-11-08 16:47:33 +08:00
boyu0
4efacdbcf3
issue #2771 : rename PhysicsWorld::create() to PhysicsWorld::construct(), fix some bugs
2013-11-08 16:17:56 +08:00
minggo
4553db492a
Merge pull request #4141 from Dhilan007/m_c_jsb
...
[ci skip]use float instead for create point object
2013-11-07 23:57:14 -08:00
CaiWenzhi
da27169d45
add "setUserObject" method
2013-11-08 14:58:20 +08:00
Liam
2aaa21255f
fixed cocostudio action can not looping
2013-11-08 14:34:24 +08:00
boyu0
a56dedb41a
issue #2771 : add class PhysicsDebugDraw
2013-11-08 14:25:03 +08:00
Dhilan007
314f2ac62e
use float instead for create point object
2013-11-08 14:13:39 +08:00
Huabing.Xu
6f1e98df34
Merge branch 'develop' of github.com:cocos2d/cocos2d-x into iss3025_TextureCache
2013-11-08 13:50:22 +08:00
CocosRobot
fd37d3e973
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-08 04:17:15 +00:00
CaiWenzhi
18f411fd1e
Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch
2013-11-08 11:36:59 +08:00
Huabing.Xu
935d472979
issue #3025 : remove TextureCache::_sharedTextureCache
2013-11-08 11:36:27 +08:00
minggo
56d7da8933
Merge pull request #4130 from ricardoquesada/love_in_textfield
...
[ci skip]More std::string& usage
2013-11-07 19:14:35 -08:00
CocosRobot
240fc2ade1
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-08 03:10:36 +00:00
minggo
d2bb1c72cc
Merge pull request #4117 from michaelcontento/add-missing-setscale-to-sprite
...
[ci skip]add Sprite::setScale(float, float)
2013-11-07 18:54:04 -08:00
minggo
d1f94e0d9d
Merge pull request #4111 from boyu0/iss2771_physical
...
[ci skip]issue #2771 : physical
2013-11-07 18:51:15 -08:00
minggo
167242e540
Merge pull request #4127 from Dhilan007/ANCHOR_XXX
...
[ci skip]Point: Adds ANCHOR_XXX constants like ANCHOR_MIDDLE, ANCHOR_TOP_RIGHT, e...
2013-11-07 18:45:50 -08:00
Nite Luo
be71eb8626
Merge branch 'develop' into newRenderer
...
Conflicts:
.gitignore
build/cocos2d_libs.xcodeproj/project.pbxproj
build/cocos2d_samples.xcodeproj/project.pbxproj
cocos/2d/CCDirector.cpp
2013-11-07 17:24:57 -08:00
Nite Luo
72828acaec
Add some todo
2013-11-07 16:53:20 -08:00
Nite Luo
935d2bdebb
Implement sprite batching
2013-11-07 16:50:53 -08:00
Nite Luo
d7cb4ed219
First attempt for batching
2013-11-07 15:48:37 -08:00
Ricardo Quesada
ffd4342548
Adds more strings
...
and more `override`
and fixes some indetentation issues
2013-11-07 12:42:16 -08:00
Ricardo Quesada
e4662b371a
TextField uses std::string& in the public API
...
and uses std::string instead of std::string* internally
2013-11-07 11:58:48 -08:00
Nite Luo
3421eb8e5d
Cleanup the code a bit before implement sprite batching
2013-11-07 10:09:53 -08:00
Michael Contento
0160bec3ad
Colors are now compare- and explicit convertible
2013-11-07 18:13:33 +01:00
Dhilan007
916361af3f
Point: Adds ANCHOR_XXX constants like ANCHOR_MIDDLE, ANCHOR_TOP_RIGHT, etc.
2013-11-07 23:40:33 +08:00
samuele3
f56269ce85
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-07 23:23:11 +08:00
samuele3
16d572c04f
issue #2868:Add manual lua binding files
2013-11-07 23:22:11 +08:00
CaiWenzhi
c69163559b
Move some method from helper to reader
2013-11-07 21:26:56 +08:00
CaiWenzhi
9b4aa95b31
Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch
2013-11-07 21:18:21 +08:00
Huabing.Xu
99bcca0532
issue #3025 : replace TextureCache::getInstance() by Director::getInstance()->getTextureCache() in cocos folder
2013-11-07 19:11:09 +08:00
Huabing.Xu
c8fe6077aa
issue #3025 : Deprecate TextureCache::getInstance() destroyInstance()
2013-11-07 19:10:14 +08:00
Huabing.Xu
99546cef46
issue #3025 : add getTextureCache() in CCdirector()
2013-11-07 18:52:36 +08:00
minggo
237f7a7839
Merge pull request #4125 from minggo/fix-compiling-error
...
[ci skip]fix compiling erros on Android
2013-11-07 02:04:27 -08:00
boyu0
b6c98ab1eb
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-11-07 17:59:01 +08:00
boyu0
e278ad66c8
issue #2771 : change PhysicsJoint::create() to PhysicsJoint::construct()
2013-11-07 17:46:05 +08:00
CaiWenzhi
b0a422eb09
Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch
2013-11-07 17:40:13 +08:00
boyu0
7363be0697
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-11-07 17:37:33 +08:00
minggo
b9b14571ac
fix compiling erros on Android
2013-11-07 17:16:31 +08:00
CaiWenzhi
e2249c8c3f
Fixed crash
2013-11-07 17:15:52 +08:00
CocosRobot
a116e7ec79
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-07 09:11:22 +00:00
CaiWenzhi
9f2297a5a6
add "retain" to listeners
2013-11-07 16:46:41 +08:00
samuele3
9f5095b9c3
Reslove the compiled error
2013-11-07 16:43:04 +08:00
boyu0
ef5440f738
issue #2771 : change rayCast and rectQuery callback class to std::function
2013-11-07 16:23:50 +08:00
samuele3
e6fd1fece1
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCheck
2013-11-07 15:28:48 +08:00
samuele3
8c025a2cee
Reslove the linux compiled error
2013-11-07 15:12:19 +08:00
boyu0
eb508e4728
issue #2771 : fix PhysicsWorld functions name readadd/removexxx -> doadd/removexxx delayTestAdd/Removexxx -> add/removexxxOrDelay
2013-11-07 15:12:13 +08:00
boyu0
a02fd7c6da
issue #2771 : fix PhysicsWorld some bugs
2013-11-07 14:40:09 +08:00
boyu0
f2cd5ca630
issue #2771 : fix body and joint memory bugs. add removeFormWorld and destroy to PhysicsJoint, and add a destroy param to PhysicsWorld->removeJoint()
2013-11-07 14:17:57 +08:00
CaiWenzhi
af5ab02bc7
temp commit
2013-11-07 14:00:51 +08:00
CaiWenzhi
cf20ae03ee
Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch
2013-11-07 10:01:00 +08:00
CaiWenzhi
fa0011346e
fixed linux build error
2013-11-07 09:58:24 +08:00
Ricardo Quesada
ddb0111392
continue replacing `const char*` with `const std::string&`
...
This patch includes:
* Continue replacing `const char*` with `const std::string&` where it makes sense.
* It also removes some Hungarian notation from the code.
* It fixes some indentation issues in part of the code
* It replaces `int` or `unsigned int` with `long` where it makes sense.
2013-11-06 17:05:13 -08:00
Nite Luo
21cd03bc13
Remove transform from QuadCommand, NewSprite using world coordinates
2013-11-06 16:39:20 -08:00
Nite Luo
63324db70d
Subclass QuadCommand
2013-11-06 14:57:42 -08:00
Nite Luo
3108d499e5
use placeholder logic to generate material id
2013-11-06 14:24:56 -08:00
Michael Contento
b7173cd60d
add Sprite::setScale(float, float)
2013-11-06 14:42:31 +01:00
James Chen
d6d041f561
issue #3113 : [Linux] Adding options for modules.
2013-11-06 19:17:34 +08:00
CaiWenzhi
e765eb1e7a
Test commit
2013-11-06 18:30:09 +08:00
CaiWenzhi
7163dd4d76
Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch
2013-11-06 18:13:51 +08:00
CocosRobot
8a836dc477
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-06 09:38:34 +00:00
CaiWenzhi
94896b5b74
Modify mk files
2013-11-06 17:20:14 +08:00
2youyou2
3ea0d2f12d
change override function
2013-11-06 16:37:30 +08:00
2youyou2
73e5310bf6
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-11-06 16:29:54 +08:00
CaiWenzhi
12570b5e8f
temp commit
2013-11-06 16:20:01 +08:00
CaiWenzhi
7a207431cd
Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch
...
Conflicts:
cocos/gui/UIHelper.h
2013-11-06 16:13:10 +08:00
2youyou2
fcf0b1ef5f
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-11-06 16:06:37 +08:00
CaiWenzhi
e0aa82da13
Merge master branch to develop branch
2013-11-06 16:04:06 +08:00
CocosRobot
d990699417
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-06 08:00:35 +00:00
James Chen
9d3716e964
Merge pull request #4109 from HoGarfield/JS_Call
...
Missing add "JSB_AUTOCOMPARTMENT_WITH_GLOBAL_OBJCET " before calling JS_CallFunctionValue
2013-11-05 23:56:03 -08:00
boyu0
6c27a0df0b
issue #2771 : make api more friendly
2013-11-06 15:43:29 +08:00
garfield_ho
f36fd002cd
Remove duplicate
2013-11-06 15:40:23 +08:00
2youyou2
efd8f62992
add virtual
2013-11-06 15:40:06 +08:00
garfield_ho
f6070406cd
Missing add "JSB_AUTOCOMPARTMENT_WITH_GLOBAL_OBJCET " before calling JS_CallFunctionValue
2013-11-06 15:31:58 +08:00
James Chen
2e80e95a37
[Linux] compilation fix for PR #4099
2013-11-06 15:26:33 +08:00
2youyou2
12d6bc1722
1. change CCARRAY_FOREACH to range-based loop
2013-11-06 15:25:44 +08:00
James Chen
4e4798fdcc
Merge commit 'refs/pull/4099/head' of https://github.com/cocos2d/cocos2d-x into 64bit-fix
2013-11-06 15:15:47 +08:00
James Chen
33a243155f
Merge pull request #4107 from dumganhar/cmake
...
issue #3113 : 32Bit fix and 13.10 32bit complication is ok.
2013-11-05 23:09:23 -08:00
James Chen
f3c40a3e7a
issue #3113 : 32Bit fix and 13.10 32bit complication is ok.
2013-11-06 14:54:35 +08:00
boyu0
a01fcc6f36
issue #2771 : move header definition to first line
2013-11-06 14:51:56 +08:00
CocosRobot
d7ed908818
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-06 06:20:17 +00:00
minggo
a416a6b258
Merge pull request #4102 from ricardoquesada/uses_string
...
Uses `const std::string&`
2013-11-05 22:14:27 -08:00
2youyou2
f05c1590ae
1.fix particle kCCPositionTypeFree state bug
2013-11-06 11:20:16 +08:00
Ricardo Quesada
555f3609c8
Uses `const std::string&`
...
... instead of const char*
* Because it is more robust
* and it is faster... yes faster.
It is faster because internally some of our classes use std::string
(like FileUtils and Dictionary) so converting back-and-forth from const
char * to std::string is very expensive.
It is faster to have everthing in std::string as soon as possible to
prevent further conversions.
There are still some parts of the code that require conversion, but
most of the code was converted.
2013-11-05 19:02:03 -08:00
Ricardo Quesada
84a6aa29cd
Adds more 64-bit fixes
...
Replaces more `int` with `long` where it makes sense.
Also , it repalces some `unsigned long` with `long` for "lenght"
values as described in our c++ guideline
2013-11-05 17:36:44 -08:00
Nite Luo
51fb1edc0c
Fix sorting bug
2013-11-05 17:00:34 -08:00
Chris Hannon
471dd07f3b
[android] update nativeactivity.cpp to work with changes made in commit 0220f27 (AMD support), changing int to long int for the second argument in most touch callbacks
2013-11-05 15:54:31 -05:00
2youyou2
8b86373b08
1.Change to range-based loop
2013-11-05 20:33:29 +08:00
boyu0
af129e25f0
issue #2771 : change some coding style
2013-11-05 20:02:58 +08:00
2youyou2
16c23d0ad3
remove CC_PROPERTY and CC_SYNTHESIZE.
2013-11-05 19:53:38 +08:00
CocosRobot
47e0d343ff
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-05 11:30:43 +00:00
James Chen
64b9cba5d5
Merge pull request #4092 from samuele3hu/developCCS
...
issue 2868:Move armature related lua binding from namespace 'cc' to namespace 'ccs'
2013-11-05 03:24:20 -08:00
samuele3
66256e9ad7
issue #2868:Move armature related lua binding from namespace 'cc' to namespace 'ccs'
2013-11-05 17:48:29 +08:00
samuele3
b9e5d4bc91
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-05 17:37:54 +08:00
samuele3
61d8f9673c
issue #2868:Move armature related lua binding from namespace 'cc' to namespace 'ccd'
2013-11-05 17:34:25 +08:00
CocosRobot
8c75cd0dfa
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-05 08:07:15 +00:00
boyu0
8c62bf813f
issue #2771 : enhance API and add Slice demo
2013-11-05 15:54:33 +08:00
James Chen
963d7f3bd0
Changes the touch id declaration from int to long.
2013-11-05 15:49:58 +08:00
James Chen
11e6a277be
Merge commit 'refs/pull/4086/head' of git://github.com/cocos2d/cocos2d-x into riq-arm64
2013-11-05 15:49:48 +08:00
2youyou2
3eef64c3b8
1. Change NULL to null
...
2. Remove CocoStudio/Armature files
2013-11-05 15:32:13 +08:00
samuele3
b76865c692
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-05 15:11:05 +08:00
samuele3
b445f0824a
issue #2868:Bind UI and Scene parser to lua by bindings-generator and add releated test samples
2013-11-05 15:09:51 +08:00
CocosRobot
5cecc93c3e
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-05 06:31:26 +00:00
2youyou2
b076711b69
fix compile error
2013-11-05 13:42:27 +08:00
2youyou2
25196072f2
1. change color json format
...
2. fix tween easing
3. fix CCBone crate bug
2013-11-05 11:57:20 +08:00
Ricardo Quesada
ba7ed6e578
Fixes some compiler warnings
...
The warnings are related to:
* 64-to-32-bit conversion
* shadow variables
2013-11-04 16:31:36 -08:00
Ricardo Quesada
24ecbc426c
removes Hungarian notation
...
from CCACtionManager and fixes some 64-bit issues.
2013-11-04 16:30:50 -08:00
Ricardo Quesada
8fb5fad20d
Merge branch 'develop' into arm64
2013-11-04 15:02:35 -08:00
Ricardo Quesada
0350ac7021
arm64 support
2013-11-04 11:53:40 -08:00
Nite Luo
e4ffd250cb
Simple implementation of RenderCommand and RenderQueue
2013-11-04 09:14:22 -08:00
James Chen
9be8ca3714
[cmake] output lib to root/lib
2013-11-04 21:03:08 +08:00
James Chen
f17aa8b450
Move the library of fmod to external folder.
2013-11-04 21:03:08 +08:00
James Chen
daa91ad413
[CMake] Update library dependency.
2013-11-04 21:03:07 +08:00
James Chen
59adba1a6d
Updating physics/CMakeLists.txt
2013-11-04 21:03:07 +08:00
James Chen
c085412636
[CMake] TestLua and HelloLua is ok.
2013-11-04 21:03:07 +08:00
James Chen
922924e1ab
TestCpp is ok.
2013-11-04 21:03:07 +08:00
James Chen
e560de6e4e
HelloCpp works.
2013-11-04 21:03:07 +08:00
James Chen
8676523433
Adding CMakeLists.txt
2013-11-04 21:03:07 +08:00
boyu0
46710c5f06
issue #2771 : delay load
2013-11-04 19:26:34 +08:00
boyu0
00acd67ff3
issue #2771 : finish OneWayPlatform demo and fix some bugs
2013-11-04 14:36:38 +08:00
CocosRobot
1cf0a926e1
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-04 02:46:22 +00:00
minggo
25b0ffe853
Merge pull request #4022 from boyu0/iss2771_physical
...
issue #2771 : physical
2013-11-03 18:40:14 -08:00
James Chen
a340f88477
Merge pull request #4073 from ledyba/fix_ccuserdefault
...
closed #3107 : When parsing XML using TinyXML, the data size has to be specified. Otherwise, XMLDocument::Parse(data) will treat data as a null-terminal string. It may cause potential issues.
2013-11-03 00:34:48 -07:00
psi
5443fc0d07
pXmlBuffer is not null terminated
2013-11-03 11:17:04 +09:00
James Chen
e1f821c25d
Merge pull request #4068 from michaelcontento/trigger-onKeyPressed-while-down
...
Trigger onKeyReleased only after the key has been released[ci skip]
2013-11-02 07:12:40 -07:00
James Chen
fd21e3ea38
closed #3106 : fixed: EventListeners can't be removed sometimes.
2013-11-02 22:08:08 +08:00
James Chen
a4b28353a7
Merge commit 'refs/pull/4069/head' of git://github.com/cocos2d/cocos2d-x into eventdispatcher-fix
2013-11-02 21:47:24 +08:00
psi
06f166f613
why not search _toAddedListeners??
2013-11-02 16:03:54 +09:00
Michael Contento
ffad18a1ed
Trigger onKeyReleased only after the key has been released
2013-11-02 06:15:08 +01:00
boyu0
04c8e9f34e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-11-02 00:12:14 +08:00
CocosRobot
6360c40725
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-01 13:03:20 +00:00
James Chen
e2f14635e8
Merge pull request #4065 from dumganhar/develop
...
closed #3104 : Touch listener should be registered in Menu::initXXX and Control::init rather than onEnter.
2013-11-01 05:55:32 -07:00
James Chen
50c4261092
closed #3104 : Touch listener should be registered in Menu::initXXX and Control::init rather than onEnter.
2013-11-01 20:53:51 +08:00
James Chen
84e8aaf016
Merge pull request #4012 from ledyba/fix_inclusion_phys
...
include climits for UINT_MAX
2013-11-01 04:55:51 -07:00
CocosRobot
a272bcd6ea
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-01 10:02:54 +00:00
minggo
d4210c77bb
Merge pull request #4058 from samuele3hu/developAssetsManager
...
issue #3037:Add assetsmananger lua binding and a releated test sample
2013-11-01 02:50:47 -07:00
boyu0
6d37aa8cd5
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-11-01 17:39:09 +08:00
James Chen
c754e1b64f
Merge pull request #4035 from darkdukey/mousewheel_mac
...
issue #3099 : Adding MouseEvent and MouseListener, Adding Mouse Support For Desktop Platform.
2013-11-01 02:33:28 -07:00
samuele3
80f3a7d57a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
...
Conflicts:
build/cocos2d_samples.xcodeproj/project.pbxproj
cocos/scripting/lua/bindings/LuaScriptHandlerMgr.h
cocos/scripting/lua/script/Cocos2dConstants.lua
2013-11-01 17:17:21 +08:00
boyu0
a2adbff2c8
issue #2771 : fix some code style
2013-11-01 16:32:27 +08:00
boyu0
2f67ceb495
issue #2771 : fix some code style
2013-11-01 16:26:03 +08:00
CocosRobot
8aac938531
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-01 07:42:11 +00:00
James Chen
9177f78e5e
Merge pull request #4046 from dumganhar/ios-mac-project-fix
...
iOS and Mac project fix[ci skip]
2013-11-01 00:24:08 -07:00
James Chen
ed10b92a60
Fix of including wrong include files.
2013-11-01 15:19:10 +08:00
CocosRobot
6eb6809b2c
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-01 06:52:31 +00:00
boyu0
b2951b70ff
issue #2771 : enhance Listener use EventListener mechanism
2013-11-01 14:50:06 +08:00
2youyou2
a9054ba14a
1.add method to set collider filter
2013-11-01 14:36:44 +08:00
James Chen
db6bce4cf0
Merge pull request #4023 from samuele3hu/developHttp
...
issue #3049:Add XMLHttpRequest lua binding and corresponding test sample
2013-10-31 20:40:29 -07:00
James Chen
3a8c052ae5
Merge pull request #4039 from dumganhar/spv25
...
issue #2826 : Bug fix of 'js::IsInRequest'
2013-10-31 19:56:09 -07:00
James Chen
baccf828f3
closed #2826 : Removing js::IsInRequest in ScriptingCore.cpp for win32.
2013-11-01 10:45:01 +08:00
minggo
f684dc0ff7
Merge pull request #4025 from Dhilan007/di2893
...
issues #2893:perfect new label
2013-10-31 18:46:30 -07:00
minggo
0a9755bcc4
Merge pull request #4037 from samuele3hu/developLabelTTF
...
issue #2970:crash for CCLabelTTF when setting dimension width less than the font height
2013-10-31 18:45:42 -07:00
Ricardo Quesada
17af5b6850
Adds flags in GLProgram to prevent sending uneeded uniforms
2013-10-31 17:56:15 -07:00
James Chen
074f688d95
Merge pull request #4030 from dumganhar/spv25
...
[sp v25] Updating SpiderMonkey library to FFv25.
2013-10-31 07:08:09 -07:00
samuelhu
4031556398
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp
...
Conflicts:
build/cocos2d_samples.xcodeproj/project.pbxproj
samples/Lua/TestLua/Resources/luaScript/mainMenu.lua
2013-10-31 21:57:24 +08:00
samuelhu
5891f00967
issue #3037:Add assetsmananger lua binding and a releated test sample
2013-10-31 21:52:28 +08:00
James Chen
8884c58ac1
issue #2826 : Updating ScriptingCore.cpp. runScript small fix.
2013-10-31 21:03:06 +08:00
Dhilan007
150f1aeaab
issue #2893:improve new label
2013-10-31 20:17:30 +08:00
boyu0
dec749a692
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-10-31 18:20:32 +08:00
boyu0
2efef34144
issue #2771 : fix vs compile errors
2013-10-31 18:18:02 +08:00
Dhilan007
b8faaeba59
issus #2893:improve new label
2013-10-31 17:52:22 +08:00
2youyou2
005d3c0121
1. fix if frame event is at the last frame, it may emit event several times
...
2. add method for removing single data info
3. add test TEST_DIRECT_LOADING
4. add test TEST_FRAME_EVENT
5. add method for getting calculated collider vertex
2013-10-31 17:28:14 +08:00
samuelhu
7c45ddafe2
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2013-10-31 17:22:14 +08:00
samuelhu
80c29b5a9c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developLabelTTF
2013-10-31 17:01:43 +08:00
samuelhu
15cf519757
issue #2970:crash for CCLabelTTF when setting dimension width less than the font height
2013-10-31 16:59:55 +08:00
James Chen
4b2429186c
closed #3093 : The last test of OpenglTest crashes on Windows.
2013-10-31 16:27:00 +08:00
Nite Luo
771844fc58
Fix android build after adding MouseEvent and MouseTest
2013-10-31 00:40:38 -07:00
samuelhu
de4b4dcc73
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developLuaOcBridge
2013-10-31 15:23:25 +08:00
samuelhu
faf3b30e9b
issue #3069:Add LuaObjectCBridge and related test sample
2013-10-31 15:20:53 +08:00
James Chen
f478e2d2a5
issue #2826 : Bug fixes for win32.
2013-10-31 15:15:52 +08:00
James Chen
6f978c5cbd
issue #2826 : Bug fixes after using Spidermonkey v25. Adding JSB_AUTOCOMPARTMENT_WITH_GLOBAL_OBJCET macro.
2013-10-31 15:13:49 +08:00
Nite Luo
49a2acfbd4
Merge branch 'develop' into mousewheel_mac
2013-10-31 00:10:45 -07:00
Nite Luo
a27975763f
Add MouseEvent to win32 build
2013-10-31 00:04:39 -07:00
dingpinglv
7e8faed7af
fixed #3048 : rename some comments
2013-10-31 14:36:17 +08:00
dingpinglv
f172abbc14
fixed #3048 : add some comments for cc.rect
2013-10-31 14:31:25 +08:00
Nite Luo
fe04448c8d
Merge folder changes from develop
2013-10-30 23:19:36 -07:00
dingpinglv
c116d070d3
Closed #3048 : cc.rect can receiving different type parameters now
2013-10-31 14:16:42 +08:00
James Chen
0f7a99f898
[sp v25] Don't use 'using namespace std;' to make android build happy.
2013-10-31 11:15:18 +08:00
James Chen
541a0478ac
[sp v25] Removing unused comments in main.js
2013-10-31 11:15:18 +08:00
James Chen
d2fc29dbfa
[sp v25] Updating Debugger script.
2013-10-31 11:15:17 +08:00
James Chen
a81998ccf6
[sp v25] Debugger script, loading file is ok.
2013-10-31 11:15:17 +08:00
James Chen
d1b88b0a78
[sp v25] Updating auto-generated and bindings-generated submodules.
2013-10-31 11:15:17 +08:00
James Chen
3b86d6398f
[sp v25] Fixing complication errors after updating Spidermonkey to v25.
2013-10-31 11:15:17 +08:00
Dhilan007
a68d92ff5a
perfect vs-project configuration
2013-10-31 10:51:38 +08:00
Dhilan007
12db6a32ab
issues #2893 :
...
1.Texture atlas are create on demand, based on the characters used in the label.
2.Create Quads (and not sprites) for each letter.
2013-10-31 10:49:37 +08:00
samuelhu
1f07a659a6
issue #3069:Modify layer lua register and add some compatible lua binding functions
2013-10-31 09:49:04 +08:00
boyu0
e8d06496d0
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-10-30 17:27:09 +08:00
boyu0
391cda44ef
issue #2771 : edit listener
2013-10-30 15:53:58 +08:00
yinkaile
80b97be6f4
update develop
2013-10-30 11:34:16 +08:00
samuelhu
c08a09a7e0
#3049:Add LICENSE_JSON4LUA and some constant values.
2013-10-30 10:52:04 +08:00
yinkaile
8fa8b9f844
update develop
2013-10-30 09:41:40 +08:00
samuelhu
471bbb8af9
issue #3049:Add XMLHttpRequest lua binding and corresponding test sample
2013-10-29 18:21:15 +08:00
samuelhu
663b27d1e7
#3049:Add XMLHttpRequest lua binding and corresponding test sample
2013-10-29 18:06:02 +08:00
samuelhu
b611177a65
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp
2013-10-29 17:58:00 +08:00
samuelhu
70082ddc29
issue #3409:Add XMLHttpRequest lua binding and corresponding test sample
2013-10-29 17:54:35 +08:00
boyu0
cae9a3e54f
issue #2771 : add physics pump demo and fix bugs
2013-10-29 17:31:35 +08:00
yinkaile
2d3df69982
fix add display
2013-10-29 16:57:06 +08:00
James Chen
5c8424423e
issue #3069 : Update ios/CCDevice.mm.
2013-10-29 16:29:29 +08:00
James Chen
e2ce714463
issue #3069 : Update device.mm for iOS.
2013-10-29 16:20:42 +08:00
James Chen
ca598f29eb
Merge pull request #4008 from dumganhar/touchevent-refactor
...
issue #3069 : Refactor and Improve EventDispatcher
2013-10-29 00:46:56 -07:00
James Chen
91932ea906
issue #3069 : Fixing compilation errors.
2013-10-29 15:36:43 +08:00
James Chen
bb568e84e8
Updating auto generated binding codes.
2013-10-29 15:09:13 +08:00
James Chen
fbd04a476a
issue #3069 : Updating comments in CCEventListenerCustom.h.
2013-10-29 15:02:26 +08:00
James Chen
01579e12b0
issue #3069 : Remove unused ID.
2013-10-29 15:01:39 +08:00
James Chen
5698dcd0e1
issue #3069 : Protecting some methods in EventListener, make EventDispatcher as its friend class.
2013-10-29 14:58:47 +08:00
James Chen
296978a9be
issue #3069 : Separate 'EventDispatcher::removeEventListeners' to 'removeEventListeners' and 'removeCustomEventListeners'.
2013-10-29 14:57:16 +08:00
samuelhu
3508213615
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2013-10-29 11:45:19 +08:00
samuelhu
a4d028e905
issue #3409:Add XMLHttpRequest lua binding and corresponding test sample
2013-10-29 11:40:41 +08:00
Andrew Glass
06bd7fafd5
Clear NoSuchMethodError Exception when JniHelper fails to find methodID
...
When calling GetMethodID a NoSuchMethodError will be raised if the method cannot be found.
See http://docs.oracle.com/javase/7/docs/technotes/guides/jni/spec/functions.html#wp16660
This exception should be cleared if JNI execution is to be continued.
Currently JniHelper informs that the method is not found, but there is no way to continue execution without manually clearing the exception. This prevents checking for the existence of a method and recovering from it being missing.
This fix will clear the exception if JniHelper fails to find the method.
2013-10-28 18:40:58 +00:00
boyu0
66d1bbd89f
issue #2771 : edit physics effect with all bodies and fix some bugs
2013-10-28 16:17:19 +08:00
James Chen
8b7d1934c8
issue #3069 : Using enum class for define Event type and EventListener type.
2013-10-28 16:00:01 +08:00
boyu0
d0d8694091
issue #2771 : fix some retain/release bugs
2013-10-28 11:08:41 +08:00
James Chen
8d11f484a9
issue #3069 : Removing unused comments.
2013-10-28 10:52:23 +08:00
James Chen
0622434321
issue #3069 : Using `std::string` to initialize `EventCustom`. It will be easier for editor parser to emit callback event.
2013-10-28 10:49:21 +08:00
James Chen
48ce5e39fe
EventDispatcher is managed by Director now, like Scheduler and ActionManager.
2013-10-26 15:04:01 +08:00
psi
9ecc0c6db8
include climits for UINT_MAX
2013-10-26 13:33:31 +09:00
James Chen
6c6757a04e
issue #3069 : Moving s_eventPriorityIndex to member variable of EventDispatcher.
2013-10-25 17:03:50 +08:00
James Chen
063b012a9c
int --> Event::Type
2013-10-25 16:43:04 +08:00
James Chen
cb7e0b391b
issue #3069 : Removing unused variables in CCEventListenerTouch.h.
2013-10-25 16:37:40 +08:00
James Chen
9bf44a6c83
issue #3069 : Renaming 'removeListeners' to 'removeEventListeners'.
2013-10-25 16:34:26 +08:00
James Chen
cf20329b71
issue #3069 : Removing unused codes in UILayer.
2013-10-25 16:33:54 +08:00
James Chen
0d2d522f12
issue #3069 : int --> EventListener::Type.
2013-10-25 16:15:37 +08:00
James Chen
312e1bd27c
[Dispatcher] Updating comments.
2013-10-25 15:40:21 +08:00
James Chen
1339ef7ecb
[JSB] These are only for v2.x JSB compatibility after removing controller codes in Layer.
2013-10-25 15:20:06 +08:00
James Chen
efa5afb1c3
[Dispatcher] Removing unused codes in Layer.
2013-10-25 15:19:25 +08:00
James Chen
30a3199a91
[Dispatcher] Removing unused codes.
2013-10-25 15:19:04 +08:00
James Chen
27b71ba73c
Use integer as event type and listener type.
2013-10-25 10:53:47 +08:00
James Chen
c4f9acbee7
disable DUMP_LISTENER_ITEM_PRIORITY_INFO. use std::unordered_map instead of std::map.
2013-10-25 10:53:47 +08:00
James Chen
9632cd7949
memoryleak fix.
2013-10-25 10:53:47 +08:00
James Chen
dc6e201eb6
bug fix for eventdispatcher.
2013-10-25 10:53:46 +08:00
James Chen
5ecb664a58
crash and memory leak fix.
2013-10-25 10:53:46 +08:00
James Chen
aeef62d893
bug fix for EventDispatcher.
2013-10-25 10:53:46 +08:00
James Chen
e59c49a5e3
fix crash.
2013-10-25 10:53:46 +08:00
James Chen
a56475e872
Updating jsb.
2013-10-25 10:53:46 +08:00
James Chen
6f9bee5b1a
bug fix in EventDispatcher.
2013-10-25 10:53:46 +08:00
James Chen
9ed263056c
Use eventDispatcher to dispatch event. Remove controller codes in Layer.
2013-10-25 10:53:46 +08:00
James Chen
1f3863e787
Event Dispatcher refactor commit. TestCpp could run.
2013-10-25 10:53:45 +08:00
James Chen
f7e2c63230
Refactor event dispatcher. Remove non-node relative member variables.
2013-10-25 10:53:45 +08:00
James Chen
cfaef2a01a
Adding onEnterHook, onXXXHook for Node.
2013-10-25 10:53:45 +08:00
James Chen
779e539658
Remove event controller codes from Layer class. HelloCpp works.
2013-10-25 10:53:45 +08:00
boyu0
fdcf019665
issue #2771 : implement contact callbacks
2013-10-25 10:31:22 +08:00
Dhilan007
56ef197146
update the reference to cocos2d-x repo.
2013-10-24 18:36:36 +08:00
Dhilan007
08960f1510
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into di2893
2013-10-24 18:16:44 +08:00
Dhilan007
fd993e2fa2
issues #2905:split jsbinding module
2013-10-24 17:54:57 +08:00
James Chen
10329de46c
Merge pull request #4002 from boyu0/iss2771_physical
...
issue #2771 physical
2013-10-24 02:31:40 -07:00
samuelhu
a5e479d2bb
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
2013-10-24 11:14:20 +08:00
samuelhu
d7689073e0
issue #3049:Add XMLHttpRequest lua binding and corresponding test sample
2013-10-24 11:12:21 +08:00
boyu0
a8ddca81bd
issue #2771 : fix some compile error in win32
2013-10-23 18:52:09 +08:00
minggo
914269b4bd
Merge pull request #4001 from minggo/iss2905-adjust_folder
...
issue #2905:ndk-r8e build ok now
2013-10-23 02:47:05 -07:00
minggo
d07d054a01
issue #2905:ndk-r8e build ok now
2013-10-23 17:44:20 +08:00
boyu0
912a9a2887
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-10-23 17:41:52 +08:00
boyu0
899f720efa
issue #2771 : implement getShapeAtPoint and getShapesAtPoint
2013-10-23 17:28:23 +08:00
Dhilan007
dfd69d262a
adjust std:function support 10 parameter
2013-10-23 16:48:51 +08:00
ondesly
969b464b9b
android & ios screen size change support
2013-10-23 12:29:59 +04:00
minggo
4952df576b
Merge pull request #3996 from boyu0/iss2771_physical
...
issue #2771 : physical
2013-10-22 20:45:55 -07:00
boyu0
17422c3123
issue #2771 : fix some compile error in win32
2013-10-23 11:08:21 +08:00
boyu0
51801d9218
issue #2771 : fix some compile error in android and win32
2013-10-23 10:11:08 +08:00
samuelhu
26caaa0a36
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
2013-10-23 09:57:21 +08:00
minggo
abcf8f268d
fix conflicts
2013-10-22 18:36:13 +08:00
minggo
6a664d480a
issue #2905:samples build ok on linux
2013-10-22 18:01:56 +08:00
boyu0
24561860f0
issue #2771 : add ray cast test
2013-10-22 18:00:24 +08:00
samuelhu
5f769b2313
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
2013-10-22 16:52:44 +08:00
James Chen
feee6ca84b
Merge pull request #3978 from HoGarfield/cc.RESOLUTION_POLICY
...
Add cc.RESOLUTION_POLICY to jsb_cocos2d.js,so it can use setDesignResolutionSize in cc.EGLView
2013-10-22 01:34:44 -07:00
James Chen
59b5c26abf
Merge pull request #3991 from HoGarfield/AnimationManager
...
closed #3040 : Modify the sequenceCompleted method in CCBAnimationManager,So it can set the next sequence in callback
2013-10-22 01:30:06 -07:00
samuelhu
be1f17ca0f
issue #3037:Add assetsmananger lua binding and a releated test sample
2013-10-22 16:14:49 +08:00
minggo
d968ef6949
Merge pull request #3990 from Dhilan007/di2905
...
issues #2905:add miss file
2013-10-22 00:58:34 -07:00
garfield_ho
0002815acb
Modify the sequenceCompleted method in CCBAnimationManager,So it can set the next sequence in callback
2013-10-22 15:56:35 +08:00
Dhilan007
31a2217178
issues #2905:add miss file
2013-10-22 15:56:08 +08:00
garfield_ho
55d45081f6
Fixed name
2013-10-22 15:41:43 +08:00
James Chen
74b514c299
Merge pull request #3979 from HoGarfield/AutoPlay-Animation
...
closed #3033 : CCBReader can't play sequence automatically in JSB.
2013-10-22 00:30:47 -07:00
minggo
d07fbb8903
Merge pull request #3974 from boyu0/iss2771_physical
...
issue 2771: physical
2013-10-21 22:44:22 -07:00
boyu0
e99b80b304
issue #2771 : implements rayCast and rectQuery
2013-10-21 23:16:21 +08:00
Dhilan007
232f0d598b
issues #2905:add new vs project
2013-10-21 22:21:11 +08:00
Dhilan007
f11dba586a
issue #2905:modification vs-project for folder structure change
2013-10-21 22:09:21 +08:00
garfield_ho
464d1598d2
fixed bug of CCBReader that can not autoplaySequence
2013-10-19 16:48:57 +08:00
garfield_ho
54ac8f3537
Add cc.RESOLUTION_POLICY to jsb_cocos2d.js,so it can use setDesignResolutionSize in cc.EGLView
2013-10-19 16:44:14 +08:00
boyu0
5741a16620
issue #2771 : edit some include head file path
2013-10-18 17:47:29 +08:00
boyu0
6e2c4801f8
Merge https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-10-18 16:05:29 +08:00
boyu0
6aef4476d9
issue #2771 : edit some mistake when merge
2013-10-18 15:55:47 +08:00
Dhilan007
6ce34288e0
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-10-18 15:53:26 +08:00
minggo
5f65cdc3c0
fix xcode compiling error and simplify android.mk
2013-10-18 15:39:09 +08:00
boyu0
d12ee5f120
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-10-18 15:34:13 +08:00
Dhilan007
8fb0327597
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-10-18 14:57:33 +08:00
minggo
63c13d8eaa
issue #2905:simplify Android.mk dependence
2013-10-18 14:18:36 +08:00
Dhilan007
86384b0df1
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-10-18 12:36:18 +08:00
dualface
8f2f524f2d
fix tolua_fix, cleanup peertable after object deleted
2013-10-18 11:30:28 +08:00
James Chen
39afa3b8df
Merge pull request #3967 from dumganhar/change-url
...
Changing the submodule URL for 'auto-generated'.
2013-10-17 19:00:36 -07:00
James Chen
8c0d7e151c
Updating the submodule reference of 'auto-generated'.
2013-10-18 10:02:47 +08:00
Dhilan007
66c2fe26ef
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-10-17 22:34:09 +08:00
minggo
9c3cac759c
issue #2905:simple game and assets manager build ok on android
2013-10-17 18:39:37 +08:00
Dhilan007
6f39f903e3
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-10-17 16:23:19 +08:00
James Chen
fd0e84bfa2
Merge pull request #3963 from kpkhxlgy0/use
...
closed #2994 : Can't click the area that outside of keyboard to close keyboard when using EditBox
2013-10-17 00:36:33 -07:00
minggo
e50f9fc43b
issue #2905 : jsbinding samples and lua binding samples build ok on android
2013-10-17 15:04:30 +08:00
XiaoLongHan
a2de02cc19
Change the class name of textfield to compare, so that you can touch anywhere outside of the virtual keyboard.
2013-10-17 14:21:55 +08:00
Dhilan007
546bc3aa32
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-10-17 11:33:10 +08:00
minggo
8f9756f030
issue #2905:TestJavascript build ok on Android
2013-10-17 11:28:57 +08:00
Dhilan007
a91621ae5a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-10-16 17:51:02 +08:00
James Chen
afe2b8e0c1
Update auto-generated submodule manually.
2013-10-16 17:37:34 +08:00
Dhilan007
c6344875de
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-10-16 17:30:51 +08:00
James Chen
d283c66803
Merge pull request #3955 from dumganhar/iss2905-folder-structure
...
issue #2905 : [iOS Mac] HelloLua and TestLua work now.
2013-10-16 02:17:43 -07:00
James Chen
225738ecc5
issue #2905 : [iOS Mac] HelloLua and TestLua work now.
2013-10-16 17:19:02 +08:00
minggo
91eada6c1e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2905-adjust_folder
2013-10-16 16:50:46 +08:00
minggo
8f7a489a4d
issue #2905:make cocostudio and gui flat
2013-10-16 16:48:39 +08:00
James Chen
352d1f6768
issue #2905 : Renaming lua/cocos2dx_support to lua/bindings.
2013-10-16 16:40:07 +08:00
Dhilan007
3d1f734326
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-10-16 15:44:43 +08:00
James Chen
6fba0dd5db
issue #2905 : [iOS Mac] TestJavascript works now.
2013-10-16 15:43:59 +08:00
James Chen
7dc8aeb156
issue #2905 : Updating include path for 'cocostudio' module, adding 'cocostudio' prefix.
2013-10-16 11:19:01 +08:00
Dhilan007
5116e91c4b
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into di2905
2013-10-16 11:00:22 +08:00
minggo
410280a8d3
Merge pull request #3945 from minggo/iss2905-adjust_folder
...
issue #2905 : testcpp bild ok on Android
2013-10-15 03:02:12 -07:00
minggo
6fc2be62f5
issue #2905 : testcpp bild ok on Android
2013-10-15 18:00:03 +08:00
Dhilan007
2865ad798b
issues #2905:Updating project configuration for folder change.
2013-10-15 10:18:37 +08:00
James Chen
438fe70287
issue #2905 : [iOS, Mac] HelloCpp works now.
2013-10-14 15:53:14 +08:00
minggo
92e0dbe0c1
issue #2905:add ccUtils.cpp
2013-10-14 14:56:57 +08:00
minggo
95acb1b9e3
issue #2905 : helloworld build ok on android
2013-10-14 14:01:00 +08:00
ThePickleMan
870f7de357
Readded trimmed semicolon
2013-10-13 23:12:41 -05:00
PickleMan
01ebb2ac29
Added triangle, quad bezier, cubic bezier drawing to DrawNode
2013-10-13 23:41:55 -04:00
minggo
1751cc3d89
Merge pull request #3935 from minggo/remove-subfolder
...
issue #2905 : remove sub folders except platform
2013-10-13 18:40:02 -07:00
minggo
49d7bbd600
issue #2905 : remove sub folders except platform
2013-10-12 15:41:45 +08:00
minggo
5182a3c978
Merge pull request #3933 from minggo/iss2905-adjust_folder
...
adjust folder structure
2013-10-12 00:27:48 -07:00
minggo
8eeb911e8f
issue #2905 : adjust folder structure
2013-10-12 15:25:45 +08:00
James Chen
f6275667bf
Removing unused ios projects.
2013-10-12 15:02:28 +08:00
James Chen
7de6646213
Don't ignore (D|d)ebugXXX folders or files. And move scripting/javascript/bindings/js to 'scripting/javascript/script/' folder.
2013-10-12 14:56:40 +08:00
minggo
19ee87e29a
issue #2905 : step2 Box2D -> box2d
2013-10-12 14:03:04 +08:00
minggo
1f38636e84
issue #2905 : step1 Box2D -> box2d
2013-10-12 14:02:13 +08:00
minggo
5acbe663e0
issue #2905 : add missing files
2013-10-12 13:44:57 +08:00
minggo
ad6325b0dd
fix conflicts
2013-10-12 11:31:32 +08:00
minggo
4313c46e93
issue #2905:adjust folder structure
2013-10-12 11:22:05 +08:00