Ricardo Quesada
|
015d51b1ac
|
Merge pull request #4480 from ricardoquesada/console_improvements
Console improvements
|
2013-12-12 14:39:54 -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
|
ff57d9fa35
|
Merge branch 'newRenderer' of github.com:darkdukey/cocos2d-x into newRenderer
|
2013-12-12 11:44:21 -08:00 |
Ricardo Quesada
|
29a15c885a
|
Merge branch 'develop' into newRenderer
|
2013-12-12 11:44:09 -08:00 |
Ricardo Quesada
|
4ab98ee8e7
|
Merge branch 'develop' into newRenderer
|
2013-12-12 09:14:30 -08:00 |
James Chen
|
3721ffde64
|
Merge pull request #4478 from samuele3hu/developConversion
Fix:Remove some needless lua binding functions and resolve a bug
|
2013-12-12 02:04:00 -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
|
349724b6fd
|
Fix ArmatureSceneTest Crash
|
2013-12-12 15:15:43 +08:00 |
Huabing.Xu
|
503918db02
|
Fix EffectAdvancedTest Crash
|
2013-12-12 15:15:42 +08:00 |
Huabing.Xu
|
8bcbf8d186
|
Fix EffectTest Crash
|
2013-12-12 15:15:42 +08:00 |
Huabing.Xu
|
6300ce73d1
|
EffectTest can run
|
2013-12-12 15:15:42 +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
|
8ad45c458f
|
Merge pull request #4477 from dumganhar/iss2790-container-comments
issue #2790: Compilation error fix in CCMap.h.
|
2013-12-11 22:38:42 -08:00 |
James Chen
|
3649c12d37
|
issue #2790: Compilation error fix in CCMap.h.
|
2013-12-12 14:36:59 +08:00 |
James Chen
|
b40d799178
|
Merge pull request #4476 from dumganhar/iss2790-container-comments
issue #2790: Updates comments for Map<K, V> and Vector<T> container.
|
2013-12-11 22:24:13 -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 |
James Chen
|
24d8cf0872
|
Merge pull request #4475 from CocosRobot/updategeneratedsubmodule_1386819162
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-11 19:41:21 -08:00 |
CocosRobot
|
f12895a020
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-12 03:32:44 +00:00 |
James Chen
|
3375779f2d
|
Merge pull request #4473 from dumganhar/iss2790-deprecate-ccdict
issue #2790: Deprecates CCDictionary, uses ValueMap for pure base data. Adds StringUtils class .
|
2013-12-11 19:26:21 -08: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 |