James Chen
|
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 |
CocosRobot
|
982d5626fc
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-19 13:13:34 +00: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 |
James Chen
|
a40e47d227
|
Update CHANGELOG [ci skip]
|
2013-12-19 20:57:57 +08:00 |
James Chen
|
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 |
CocosRobot
|
fc1516aee4
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-19 12:54:14 +00:00 |
James Chen
|
3b6043ce6e
|
Update AUTHORS [ci skip]
|
2013-12-19 20:50:05 +08:00 |
James Chen
|
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 |
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 |
James Chen
|
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 |
minggo
|
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 |
CocosRobot
|
8421d43195
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-19 10:12:28 +00:00 |
minggo
|
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 |
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
|
c38ad6db38
|
Merge pull request #4554 from ricardoquesada/const_in_test
Adds const in ShaderTest2.h
|
2013-12-18 21:16:17 -08:00 |
Ricardo Quesada
|
2d2a6b205d
|
Adds const in ShaderTest2.h
Adds const in ShaderTest2.h
|
2013-12-18 21:15:47 -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 |
James Chen
|
c10e32002c
|
Merge pull request #4552 from CocosRobot/updategeneratedsubmodule_1387426744
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-18 20:48:36 -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 |
James Chen
|
3c4ad03a8f
|
Merge pull request #4551 from CocosRobot/updategeneratedsubmodule_1387425519
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-18 20:12:03 -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
|
4fbd179174
|
Merge pull request #4549 from dumganhar/binding-generator-update
Updates submodule of bindings-generator.
|
2013-12-18 19:52:24 -08:00 |
James Chen
|
c14754b720
|
Updates submodule of bindings-generator.
|
2013-12-19 11:50:45 +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 |
Ricardo Quesada
|
8f8e904fb9
|
Merge pull request #4548 from ricardoquesada/perf_tests
Adds `std::for_each` test in invocation
|
2013-12-18 19:29:02 -08:00 |
Ricardo Quesada
|
c044a91f6e
|
Adds `std::for_each` test in invocation
and removes CArray and CMacro tests
|
2013-12-18 19:28:09 -08:00 |
James Chen
|
6c705971b0
|
Reverts bindings-generator.
|
2013-12-19 11:22:45 +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
|
a75d9d976f
|
Merge pull request #4547 from ricardoquesada/node_fixes
Node fixes with the iterator (thanks James)
|
2013-12-18 18:36:25 -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
|
5d1fa0da12
|
Merge pull request #4544 from ricardoquesada/get_node_transform_fixes
getNodeToParentTransform fixes
|
2013-12-18 18:01:33 -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 |