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
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
ea751f8f1f
Merge pull request #4568 from dabingnn/develop_transitionScene
...
fix transition scene progress timer
2013-12-19 19:06:06 -08:00
2769a2cc2c
Merge pull request #4569 from CocosRobot/updategeneratedsubmodule_1387508214
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-19 19:05:38 -08:00
8c0d74bb33
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-20 02:56:57 +00:00
4f003da8cb
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-20 10:53:37 +08:00
9385fb3481
fix transition scene progress timer
2013-12-20 10:53:35 +08:00
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
a53f00c579
#include <string> in CCComponentContainer.h to fix linux build failure.
2013-12-20 10:41:29 +08:00
756f8f7a11
Merge pull request #4482 from dabingnn/develop_gridNode
...
Develop grid node
2013-12-19 18:30:42 -08:00
3dba88c5c9
#include <algorithm> for std::find in CCVector.h.
2013-12-20 10:12:07 +08:00
58772d7dec
const love in CCFileUtils.cpp.
2013-12-20 10:11:41 +08:00
34382b4a8a
More std::for_each —> for(const auto& …)
2013-12-20 09:54:50 +08:00
72e02e3046
Merge pull request #4566 from ricardoquesada/spritebatchnode_fixes
...
batched children work as expected
2013-12-19 16:34:23 -08:00
f5d0d1ce43
batched children work as expected
...
Fixed order in the multi matrix.
2013-12-19 16:33:47 -08:00
1163d23692
Merge pull request #4565 from ricardoquesada/std_for_each_gone
...
replaces std::for_each with for()
2013-12-19 13:35:12 -08:00
59fee6b8d2
replaces std::for_each with for()
...
replaces `std::for_each` with C++11 `for( : )`
2013-12-19 13:34:41 -08:00
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
eb6bfbaf0e
Merge pull request #4563 from ricardoquesada/compiler_warning_fixes
...
fixes compiler warnings
2013-12-19 12:24:18 -08:00
99ae4d86d3
fixes compiler warnings
...
* converts some `int` to `ssize_t`
* adds `const` to `title()` and `subtitle()`
2013-12-19 12:23:42 -08:00
61cf9e49eb
change TransitionPageTurn::_outSceneProxy when class construction instead of onEnter
2013-12-19 22:01:32 +08:00
517fec4de7
change TransitionTurnOffTiles::_outSceneProxy when class construction instead of onEnter
2013-12-19 21:49:21 +08:00
034e1152e5
minor change accord to cocos2d coding style
2013-12-19 21:41:07 +08:00
9fec597ff3
remove unreachable code
2013-12-19 21:36:44 +08:00
cfec4d5b7e
Updates spine test.
2013-12-19 21:35:43 +08:00
92dba007c7
Merge pull request #4561 from CocosRobot/updategeneratedsubmodule_1387458802
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-19 05:14:25 -08:00
982d5626fc
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-19 13:13:34 +00:00
05e0d03ca9
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-19 21:13:15 +08:00
c58963bd45
add support for tweenRotate property
2013-12-19 21:12:25 +08:00
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
ec0bdf06af
Merge pull request #4555 from 2youyouo2/develop
...
fixed armature position not right
2013-12-19 05:05:25 -08:00
a40e47d227
Update CHANGELOG [ci skip]
2013-12-19 20:57:57 +08:00
eaa8a61de8
Merge pull request #4560 from CocosRobot/updategeneratedsubmodule_1387457638
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-19 04:56:08 -08:00
fc1516aee4
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-19 12:54:14 +00:00
b367896f94
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-19 20:50:27 +08:00
3b6043ce6e
Update AUTHORS [ci skip]
2013-12-19 20:50:05 +08:00
c00bf38ab3
Merge pull request #4559 from dumganhar/more_container_bind
...
[Scripting] Supports to bind more container: std::vector<std::string>, std::vector<int>, cocos2d::Map<std::string, T>.
2013-12-19 04:46:23 -08:00
3dc052db4f
Fixes linux and windows building failure.
2013-12-19 20:32:22 +08:00
755d29b0e1
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into more_container_bind
2013-12-19 20:17:54 +08:00
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
6aa8b779f0
Updates submodule reference of Bindings-generator, it supports to bind std::vector<std::string> ,std::vector<int>, cocos2d::Map<std::string, T> now.
2013-12-19 20:16:18 +08:00
524f2867d8
Merge pull request #4558 from CocosRobot/updategeneratedsubmodule_1387447945
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-19 03:17:12 -08:00
8421d43195
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-19 10:12:28 +00:00
54dfa1bb00
Merge pull request #4447 from boyu0/bug3162_opacity_incorrect
...
Bug #3162 : Merge Node and NodeRGBA, fix opacity incorrect bug.
2013-12-19 02:06:15 -08:00
44366c653c
fix compile error
2013-12-19 17:20:36 +08:00
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
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
911e5b0bac
fix bug : group command nesting will cause infinite loop
2013-12-19 16:55:22 +08:00
1bc7250f7e
node grid migrating to new renderer
2013-12-19 16:54:39 +08:00
c02272ade3
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-19 15:44:05 +08:00
James Chen