CocosRobot
bc5fd247ac
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-21 20:35:41 +00:00
Ricardo Quesada
f0fd59f7d5
Merge pull request #4589 from ricardoquesada/node_get_scene
...
Adds getScene() to Node
2013-12-21 12:29:37 -08: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
Ricardo Quesada
219fa29146
Merge pull request #4584 from CocosRobot/updategeneratedsubmodule_1387597649
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-20 19:55:17 -08:00
CocosRobot
58e25a657f
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-21 03:47:33 +00:00
Ricardo Quesada
dbb9e91799
Merge branch 'develop' into events_in_director
2013-12-20 19:45:58 -08:00
Ricardo Quesada
72d77bb035
removes dirty from ActionCamera
2013-12-20 19:45:30 -08:00
Ricardo Quesada
28739c5efe
Merge pull request #4583 from ricardoquesada/without_cccamaera
...
Removes CCCamera object
2013-12-20 19:40:31 -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
f55513fa48
Merge pull request #4581 from ricardoquesada/node_grid_fixes
...
NodeGrid fixes
2013-12-20 11:54:40 -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
690dee22eb
Update AUTHORS [ci skip]
2013-12-20 21:07:23 +08:00
James Chen
e8f946c973
Update CHANGELOG [ci skip]
2013-12-20 21:06:05 +08:00
James Chen
a37d5c9fd7
Merge pull request #4579 from dumganhar/new-spine
...
Merge PR #4545 : new Spine Runtime
2013-12-20 05:01:22 -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
8b6a6489fe
Update CHANGELOG [ci skip]
2013-12-20 20:11:14 +08:00
minggo
15c6295361
Merge pull request #4578 from dumganhar/event-dispatcher-fix
...
closed #3463 : ListenerID is std::string now. To avoid hash collision when using lots of EventCustoms.
2013-12-20 04:03:37 -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
minggo
b151a657af
Merge pull request #4577 from dabingnn/develop_transitionScene
...
Develop transition scene
2013-12-20 03:35:16 -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
d5ea2d22a5
undo my mistake
2013-12-20 19:45:50 +09:00
byeonggee.seo
ef1709bc3d
Add SpineTest to TestJavascript 1
2013-12-20 19:20:13 +09:00
byeonggee.seo
f3e4d9277e
spine android build phase moved
2013-12-20 19:16:16 +09:00
James Chen
ab7cee26cc
Merge pull request #4575 from CocosRobot/updategeneratedsubmodule_1387532101
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-20 01:35:39 -08:00
CocosRobot
f3d3e65e76
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-20 09:35:05 +00:00
James Chen
5751995e2e
Merge pull request #4574 from dumganhar/hash_code-fix
...
closed #3463 : Potential hash collision by using typeid(T).hash_code() in JSB and LuaBinding.
2013-12-20 01:27:50 -08: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
4fe74c84bc
Update CHANGELOG [ci skip]
2013-12-20 16:15:02 +08:00
James Chen
db542d751e
Update AUTHORS [ci skip]
2013-12-20 16:14:15 +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
minggo
d3e7ccd872
Merge pull request #4571 from dumganhar/user-default-fix
...
closed #3457 : Fix of UserDefault. Infinite loop in UserDefault's destructor on iOS. The destructor of UserDefault is private now.
2013-12-19 22:16: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