samuele3hu
|
cc2323b636
|
issue #2790:Open travis support
|
2013-12-10 18:26:10 +08:00 |
Dhilan007
|
7c97ed2bcd
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop
|
2013-12-10 18:20:40 +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 |
James Chen
|
c130da3d6f
|
Merge pull request #4464 from CocosRobot/updategeneratedsubmodule_1386664198
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-10 00:39:55 -08:00 |
CocosRobot
|
a775f7940d
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-10 08:30:00 +00:00 |
James Chen
|
882d3998cb
|
Merge pull request #4462 from samuele3hu/developConversion
issue #2790:Update binding-generator submodule
|
2013-12-10 00:13:04 -08: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 |
James Chen
|
98eebb67a9
|
Merge pull request #4461 from CocosRobot/updategeneratedsubmodule_1386660097
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-10 00:10:04 -08:00 |
samuele3hu
|
883ecaa03f
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developConversion
|
2013-12-10 16:07:58 +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 |
samuele3hu
|
1ed8d108f7
|
issue #2790:Update binding-generator
|
2013-12-10 15:21:21 +08: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
|
34e1ffb319
|
Merge pull request #4459 from CocosRobot/updategeneratedsubmodule_1386648497
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-09 21:46:32 -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 |
James Chen
|
75c9d415b4
|
Merge pull request #4458 from samuele3hu/developConversion
issue #2790:Add more conversion functions to support templates containers
|
2013-12-09 20:01:42 -08: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 |
Dhilan007
|
b2875618b2
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop
|
2013-12-10 10:15:53 +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
|
ad5daeb962
|
issue #2790: Don’t bind CCBAnimationManager::addNode.
|
2013-12-09 17:55:56 +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 |
minggo
|
6e6bdea04c
|
Merge pull request #4451 from CocosRobot/updategeneratedsubmodule_1386561179
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-08 20:04:42 -08:00 |
CocosRobot
|
b2e7966137
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-09 03:53:01 +00:00 |
minggo
|
3e622646b8
|
Merge pull request #4449 from dumganhar/iss2790-deprecate-ccarray
[ci skip]issue #2790: Deprecates CCArray in some places, uses Vector<T> instead.
|
2013-12-08 19:43:19 -08: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 |
Dhilan007
|
79e7d1a378
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop
|
2013-12-09 10:38:42 +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 |