boyu0
|
4befb50307
|
issue #2771: add PhysicsWorld function set/getUpdateRate and set/getSpeed. Change name PhysicsQueryRectCallbackFunc and PhysicsPointQueryCallbackFunc to PhysicsRectQueryCallbackFunc and PhysicsQueryPointCallbackFunc
|
2013-12-13 16:26:26 +08:00 |
James Chen
|
a52eafc3b8
|
Merge pull request #4483 from samuele3hu/developConversion
Fix:Add more lua binding functions of ScriptHandlerMgr and some constants define
|
2013-12-13 00:23:28 -08:00 |
youyou
|
6a3aff0861
|
fixed change animation internal, animation speed not right
|
2013-12-13 15:58:58 +08:00 |
samuele3hu
|
6c49131ed6
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developConversion
|
2013-12-13 15:51:03 +08:00 |
samuele3hu
|
98bd84c436
|
Fix:Add lua binding of ’registerScriptHandler’、’unregisterScriptHandler’ and ’removeObjectAllHandlers’ of ScriptHandlerMgr and some constants define
|
2013-12-13 15:50:12 +08:00 |
youyou
|
1bdf1a44a1
|
1.change blendfunc method
2.support custom easing
|
2013-12-13 15:02:09 +08:00 |
boyu0
|
b5bf9fb448
|
issue #3162: change js/cocos2dx.ini
|
2013-12-13 14:44:44 +08:00 |
Dhilan007
|
8b9cfd7d35
|
fix compiling error on linux and android.
|
2013-12-13 12:58:16 +08:00 |
Dhilan007
|
39280d55f3
|
new label:add support for distanceField
PerformanceTest:add performance test for label.
|
2013-12-13 12:42:15 +08:00 |
Huabing.Xu
|
a8a2ceb887
|
add linux make list
|
2013-12-13 12:25:17 +08:00 |
boyu0
|
aabb2c655d
|
issue #3162: reset submodule
|
2013-12-13 11:48:16 +08:00 |
Huabing.Xu
|
305e80030c
|
update Visual studio project file
|
2013-12-13 10:59:23 +08:00 |
Huabing.Xu
|
2be1a640fa
|
update Xcode project file
|
2013-12-13 10:58:31 +08:00 |
Huabing.Xu
|
00edb5f7fe
|
update android.mk in 2d folder
|
2013-12-13 10:57:23 +08:00 |
boyu0
|
d4c8fb0be6
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
|
2013-12-13 10:47:52 +08:00 |
boyu0
|
c8c0e2270e
|
issue #3162: deprecated RGBAProtocol, NodeRGBA and LayerRGBA
|
2013-12-13 10:10:49 +08:00 |
Ricardo Quesada
|
6ca6068cb7
|
Merge branch 'develop' into newRenderer
|
2013-12-12 14:58:47 -08:00 |
Ricardo Quesada
|
4c1acfe841
|
Merge pull request #4481 from CocosRobot/updategeneratedsubmodule_1386888533
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-12 14:58:11 -08:00 |
CocosRobot
|
644e2d923c
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-12 22:48:57 +00:00 |
Ricardo Quesada
|
61cc365d9e
|
Merge branch 'develop' into newRenderer
Conflicts:
cocos/2d/CCGLProgram.h
cocos/2d/CCLabelTTF.h
|
2013-12-12 14:41:42 -08:00 |
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 |