Dhilan007
32f23ebdba
fix bad position for performance test about Label.
2013-12-16 11:04:52 +08:00
Huabing.Xu
b1eacd52cb
Merge branch 'develop' into develop_gridNode
...
* develop:
fix compile error related to ssize_t.
issue #2771 : add and change some physics API, and add more documents
[AUTO] : updating submodule reference to latest autogenerated bindings
Some fixes for XXX:getDescription.
Reverts CCSpriteBatchNode.h
size_t —> ssize_t in CCTMXLayer.cpp
issue #2771 : add PhysicsWorld function set/getUpdateRate and set/getSpeed. Change name PhysicsQueryRectCallbackFunc and PhysicsPointQueryCallbackFunc to PhysicsRectQueryCallbackFunc and PhysicsQueryPointCallbackFunc
Fix:Add lua binding of ’registerScriptHandler’、’unregisterScriptHandler’ and ’removeObjectAllHandlers’ of ScriptHandlerMgr and some constants define
[AUTO] : updating submodule reference to latest autogenerated bindings
More renames of description() to getDescription()
getDescription() works as expected
fix compiling error after fixing conflicts
fix compiling error after fixing conflicts
use ssize_t for index
use ssize_t for index and capacity
use ssize_t for capacity and index in containers
Fix:Remove some needless lua binding functions and resolve a bug
2013-12-16 10:43:49 +08:00
minggo
53092b359b
Merge pull request #4486 from boyu0/iss2771_physical
...
[ci skip]issue #2771 : physical
2013-12-15 18:30:48 -08:00
boyu0
2444f407b2
issue #3162 : fix test title
2013-12-16 04:13:49 +08:00
boyu0
c15ad14ed3
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-16 03:45:06 +08:00
boyu0
f9f816caf9
issue #3162 : change log to cpp file
2013-12-16 03:42:54 +08:00
Lee, Jae-Hong
2807e785c0
fix CCImage bug on android platform.
...
- android.graphics.Bitmap bytes are aleady RGBA
- delete swapAlphaChannel and swapAlpha
2013-12-15 21:07:55 +09:00
Ricardo Quesada
d6b1081f67
Merge branch 'newRenderer' of github.com:ricardoquesada/cocos2d-x into newRenderer
2013-12-14 19:28:35 -08:00
Ricardo Quesada
3838268fd0
Merge branch 'develop' into newRenderer
2013-12-14 19:28:01 -08:00
Ricardo Quesada
524751e56f
Merge branch 'develop' into newRenderer
2013-12-13 11:54:48 -08:00
youyou
917bd8c3d9
change Array to Vector
2013-12-13 19:40:38 +08:00
James Chen
df07ae609d
Merge pull request #4487 from Dhilan007/compile_error_ssize
...
fix compile error related to ssize_t.
2013-12-13 02:51:55 -08:00
boyu0
23af9dfd8d
issue #3162 : reset submodule
2013-12-13 18:15:59 +08:00
boyu0
defae416f3
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-13 18:09:39 +08:00
Dhilan007
4e2e423615
fix compile error related to ssize_t.
2013-12-13 17:53:03 +08:00
boyu0
2dbb2d496f
issue #2771 : add and change some physics API, and add more documents
2013-12-13 17:36:58 +08:00
James Chen
d32ed53ca4
Merge pull request #4485 from CocosRobot/updategeneratedsubmodule_1386925833
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-13 01:26:02 -08:00
CocosRobot
4114b682ca
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-13 09:10:37 +00:00
James Chen
ca4e7049ac
Merge pull request #4484 from dumganhar/pr4479
...
Merge PR 4479
2013-12-13 01:03:43 -08:00
James Chen
189cf1a076
Some fixes for XXX:getDescription.
2013-12-13 16:51:57 +08:00
James Chen
ed93c114e5
Reverts CCSpriteBatchNode.h
2013-12-13 16:47:42 +08:00
James Chen
bb5ef615dd
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into pr4479
...
Conflicts:
cocos/2d/CCSpriteBatchNode.h
2013-12-13 16:44:22 +08:00
James Chen
7a8f2ae235
size_t —> ssize_t in CCTMXLayer.cpp
2013-12-13 16:41:03 +08:00
youyou
0e8c3409e5
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
...
Conflicts:
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h
2013-12-13 16:28:50 +08:00
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