James Chen
|
12cc6c6153
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2171-new-renderer
Conflicts:
cocos/2d/CMakeLists.txt
|
2013-12-17 15:50:24 +08:00 |
James Chen
|
7fc7757470
|
issue #2171: Adds header files of renderer in cocos2d.h.
|
2013-12-17 15:40:50 +08:00 |
James Chen
|
08edcca9be
|
issue #2171: small fix in ccTypes.h
|
2013-12-17 15:39:35 +08:00 |
James Chen
|
8f5970ef90
|
issue #2171: Don’t ‘using namespace std;’ in header file.
|
2013-12-17 15:32:24 +08:00 |
CocosRobot
|
21c74322bd
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-17 07:25:00 +00:00 |
minggo
|
16ed9155c0
|
Merge pull request #4460 from Dhilan007/label_distanceField
new label:add support for distanceField
|
2013-12-16 23:18:41 -08:00 |
James Chen
|
2a38d4fe94
|
issue #2171: Fixing compilation errors for Linux port.
|
2013-12-17 14:50:40 +08:00 |
James Chen
|
d74ebe18a9
|
issue #2171: NULL —> nullptr for Android warning of CCBAnimationManager.cpp.
|
2013-12-17 14:19:35 +08:00 |
James Chen
|
4e01769cd5
|
issue #2171: [New Renderer] Fixing compilation errors for Android.
|
2013-12-17 14:18:41 +08:00 |
Ricardo Quesada
|
c7d350c83e
|
Merge branch 'develop' into newRenderer
|
2013-12-16 20:43:43 -08:00 |
James Chen
|
7a1e13acab
|
Merge pull request #4494 from CocosRobot/updategeneratedsubmodule_1387175807
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-15 22:39:08 -08:00 |
CocosRobot
|
1e645cfcd5
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-16 06:36:50 +00:00 |
Dhilan007
|
0cf17f5658
|
label : fix some error on android when the GLSL versions is 1.0
|
2013-12-16 14:36:11 +08:00 |
minggo
|
eb883f735b
|
Merge pull request #4489 from pyrasis/android_shadowstroke
fix CCImage bug on android platform.
|
2013-12-15 22:31:18 -08:00 |
James Chen
|
3a11dafda7
|
Uses reinterpret_cast instead of static_cast for jsval_to_ssize and luaval_to_ssize.
|
2013-12-16 14:13:24 +08:00 |
James Chen
|
adb45d3c68
|
Adds conversions for ssize_t.
|
2013-12-16 13:01:20 +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 |
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
|
3838268fd0
|
Merge branch 'develop' into newRenderer
|
2013-12-14 19:28:01 -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 |
CocosRobot
|
4114b682ca
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-13 09:10:37 +00: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 |
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 |
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 |
Dhilan007
|
39280d55f3
|
new label:add support for distanceField
PerformanceTest:add performance test for label.
|
2013-12-13 12:42:15 +08:00 |
Ricardo Quesada
|
6ca6068cb7
|
Merge branch 'develop' into newRenderer
|
2013-12-12 14:58:47 -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
|
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
|
29a15c885a
|
Merge branch 'develop' into newRenderer
|
2013-12-12 11:44:09 -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
|
3649c12d37
|
issue #2790: Compilation error fix in CCMap.h.
|
2013-12-12 14:36:59 +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 |
James Chen
|
3fc9c93102
|
issue #2790: Comment fix for Map<K, V>::clear.
Signed-off-by: James Chen <jianhua.chen@cocos2d-x.org>
|
2013-12-12 12:58:01 +08:00 |
James Chen
|
6264336809
|
issue #2790: Updates comments for Map<K, V> container.
Signed-off-by: James Chen <jianhua.chen@cocos2d-x.org>
|
2013-12-12 11:54:03 +08:00 |
CocosRobot
|
f12895a020
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-12 03:32:44 +00:00 |
James Chen
|
320ae15db4
|
issue #2790: Lua compilation fix.
|
2013-12-12 10:54:41 +08:00 |
James Chen
|
b5bab598b3
|
issue #2790: Disables deprecated warning for android to make Travis-CI happy.
|
2013-12-12 10:35:13 +08:00 |