Ricardo Quesada
3838268fd0
Merge branch 'develop' into newRenderer
2013-12-14 19:28:01 -08:00
Ricardo Quesada
29a15c885a
Merge branch 'develop' into newRenderer
2013-12-12 11:44:09 -08:00
minggo
16efe94946
fix compiling error after fixing conflicts
2013-12-12 14:48:27 +08:00
Ricardo Quesada
6d1abc7d4d
Merge branch 'develop' into newRenderer
2013-12-11 15:28:05 -08:00
James Chen
cc567a3077
issue #2790 : Vector::remove —> Vector::erase.
2013-12-11 18:08:06 +08:00
Ricardo Quesada
23222923bf
Migrated code to Matrix4
2013-12-10 11:07:15 -08:00
Dhilan007
abef5b59fa
fix compile error for vs project
2013-12-10 21:20:52 +08:00
minggo
b67d567a79
replace long with int or ssize_t
2013-12-05 17:22:22 +08:00
James Chen
499a0404d4
issue #2790 : Renames some functions in Vector<T>. Makes it more like stl vector.
2013-12-05 10:35:10 +08:00
James Chen
9928e8bef1
issue #2790 : Uses Vector<T>::getObjectAtIndex instead of Vector<T>[] operator to avoid some mistakes.
2013-12-04 16:01:55 +08:00
James Chen
1d5984b29a
issue #2790 : Vector::makeObjectsPerformCallback —> Vector::forEach
2013-12-04 16:01:02 +08:00
James Chen
d4d864216b
issue #2790 : Deletes Vector::init, adds Vector::setCapacity.
2013-12-04 16:00:18 +08:00
James Chen
90062b656d
issue #2790 : Node::_children is Vector<Node*> now.
2013-12-04 16:00:17 +08:00
James Chen
c152652c5b
issue #2790 : Vector<FiniteTimeAction*> for Sequence::create(arr) and Spawn::create(arr).
2013-12-04 15:56:08 +08:00
minggo
eded94ef76
don't create a pool, since it doesn't invoke any iOS dependent codes
2013-11-27 17:43:54 +08:00
minggo
bcb131262c
add helper funcion to invoke a function in gl thread
2013-11-27 16:49:07 +08:00
Ricardo Quesada
a26b385b11
Merge branch 'develop' into constructors_are_protected
2013-11-21 10:56:03 -08:00
samuele3
07ea8647c3
Add doxygen comments for the CocoStudio
2013-11-20 15:07:34 +08:00
samuele3
8a408f9951
Add doxygen comments for the CocoStudio
2013-11-20 12:04:47 +08:00
Ricardo Quesada
5c74c938ee
Merge branch 'develop' into constructors_are_protected
...
Conflicts:
cocos/2d/CCLayer.h
2013-11-19 13:13:57 -08:00
2youyou2
d5478f1ca2
fix if last frame has tween effect, armature may display wrong
2013-11-19 11:44:17 +08:00
yinkaile
f308f2f95a
fix CCArmature display wrong on mac version
2013-11-19 11:22:40 +08:00
Ricardo Quesada
c943702bc8
Merge branch 'develop' into constructors_are_protected
...
Conflicts:
cocos/editor-support/cocostudio/CCActionObject.cpp
samples/Cpp/TestCpp/Classes/PhysicsTest/PhysicsTest.h
2013-11-18 11:07:15 -08:00
Liam
c7932b6181
fixed ui anmation crash when stop animation
2013-11-19 00:57:22 +08:00
minggo
1ed8cfee7c
Merge pull request #4297 from liamcindy/develop
...
[ci skip]Shielded unusefull log for develop branch
2013-11-18 07:10:40 -08:00
minggo
5c41130083
Merge pull request #4293 from 2youyouo2/develop
...
[ci skip]fixed BatchNode's _children is empty, draw will crash
2013-11-17 23:01:32 -08:00
Liam
66443255a6
Shielded unusefull log
2013-11-18 14:20:50 +08:00
2youyou2
4f2603f69c
fixed BatchNode's _children is empty, draw will crash
2013-11-18 13:23:38 +08:00
CaiWenzhi
2f3e922a98
Fixed crash of reader
2013-11-18 10:19:40 +08:00
minggo
db804891ed
fix some warnings
2013-11-16 20:02:49 +08:00
Ricardo Quesada
7c2ed2743c
Menu + MenuItem
...
`Menu` and `MenuItem` have protected constructors
2013-11-15 13:14:12 -08:00
Huabing.Xu
e14295c404
Merge branch 'develop' into free_instead_of_delete
2013-11-15 09:45:03 +08:00
Huabing.Xu
022b5c7b9a
Merge branch 'develop' into free_instead_of_delete
...
# By CaiWenzhi (4) and others
# Via minggo (7) and others
* develop:
fix asynchronize loading bug
[AUTO] : updating submodule reference to latest autogenerated bindings
fixed #3185 support for html5.
fixed bug of widget
fixed bugs of widget
fixed #3185 ComponentTest and SceneTest NULL to nullptr.
Add deprecated functions of class TextureCache
fix warning
set z order after reorder
fixed #3185 replace NULL to nullptr.
add "override"
fixed #3185
Modify code criterion
Conflicts:
cocos/editor-support/cocostudio/CCSGUIReader.cpp
cocos/editor-support/cocostudio/CCSSceneReader.cpp
2013-11-15 09:44:29 +08:00
minggo
c594a673fc
Merge pull request #4244 from chengstory/#3185
...
[ci skip]fixed #3185
2013-11-14 01:33:26 -08:00
chengstory
6acf422f3b
fixed #3185 support for html5.
2013-11-14 17:03:45 +08:00
Huabing.Xu
bc55d3246b
Merge branch 'develop' into free_instead_of_delete
...
# By minggo (12) and others
# Via minggo (18) and others
* develop: (78 commits)
[AUTO] : updating submodule reference to latest autogenerated bindings
Update CHANGELOG[ci skip]
Update AUTHORS [ci skip]
fix bug: cccolor to jsval function has error in jsb
[ci skip]
[ci skip]
[ci skip]
[ci skip]
[ci skip]
C++11: NULL -> nullptr
[ci skip]
Fix: UserDefault::createXMLFile with correct XML definition.
[ci skip]
[ci skip]
[ci skip]
Fix bug: rename const with under line seperator
[AUTO] : updating submodule reference to latest autogenerated bindings
Fix bug: Z fighting on TransitionScenePageTurn
Fixed bugs
Modify reader and fixed bugs
...
Conflicts:
cocos/editor-support/cocostudio/CCSGUIReader.cpp
2013-11-14 14:47:01 +08:00
chengstory
e9f5e889d6
fixed #3185 replace NULL to nullptr.
2013-11-14 14:05:24 +08:00
chengstory
14d51f9f35
fixed #3185
2013-11-14 13:28:42 +08:00
CaiWenzhi
611ba9e9f5
Modify code criterion
2013-11-14 11:37:46 +08:00
minggo
84689e0121
Merge pull request #4206 from boyu0/iss2770_fix_warnings
...
[ci skip]issue #2770 : fix warnings
2013-11-13 17:57:25 -08:00
minggo
87fd45a6a4
Merge pull request #4226 from nutty898/develop_nutty_addfunctiontoguireader_3
...
[ci skip]Develop nutty addfunctiontoguireader 3
2013-11-13 17:51:35 -08:00
minggo
408ab94eba
Merge pull request #4215 from liamcindy/develop
...
[ci skip]fixed ui animation play error
2013-11-13 17:47:39 -08:00
CaiWenzhi
3ac054edbd
Fixed bugs
2013-11-13 20:38:18 +08:00
CaiWenzhi
5f68e028b5
Modify reader and fixed bugs
2013-11-13 20:01:57 +08:00
boyu0
fb04c9e574
issue #2770 : fix some warning
2013-11-13 11:22:34 +08:00
CaiWenzhi
0665d6c9bc
Merge branch 'develop' into develop_nutty_optimizeguireader_3
2013-11-13 10:19:09 +08:00
CaiWenzhi
03b3d583e8
Modify scenereader
2013-11-13 10:16:16 +08:00
samuele3
062fb85943
issue #2868:Modify cocos2dx_studio.ini to add more auto-binding class
2013-11-13 10:12:44 +08:00
samuele3
f429c4c632
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-12 17:51:33 +08:00
minggo
8d79e67ecf
Merge pull request #4165 from 2youyouo2/develop
...
[ci skip]update armature
2013-11-11 23:57:30 -08:00