James Chen
|
a04c45f0d9
|
issue #3258: Renames ControlSwitchSprite::createWithMaskSprite to ControlSwitchSprite::create.
|
2013-11-26 16:19:12 +08:00 |
James Chen
|
63702188be
|
issue #3258: Compilation error fix for linux port.
|
2013-11-26 15:56:43 +08:00 |
James Chen
|
03005173b1
|
issue #3258: Updates bindings-generator.
|
2013-11-26 15:45:09 +08:00 |
James Chen
|
ebcdf2f87d
|
issue #3258: Bug fix of MenuItemToggle binding.
|
2013-11-26 15:44:49 +08:00 |
James Chen
|
b55e8f17c7
|
issue #3258: MenuItemFont has empty argument create function now.
|
2013-11-26 15:44:21 +08:00 |
James Chen
|
6f67447b5e
|
issue #3258: Updates cocos2dx.ini. Adding some classes to ‘classes_need_extend’ section.
|
2013-11-26 15:43:39 +08:00 |
boyu0
|
99d904363a
|
issue #2771: delete all the box2d implementation in physics parts.
|
2013-11-26 13:47:42 +08:00 |
Dhilan007
|
881d43fe3b
|
add proceed java compilation and generate apk.
|
2013-11-26 11:58:01 +08:00 |
boyu0
|
df1fca3279
|
issue #2771: refactor some functions and delete PHYSICS_INFINITY macro.
|
2013-11-26 11:38:55 +08:00 |
minggo
|
bf07077c52
|
Merge pull request #4361 from Dhilan007/eclipse_build_fix
[ci skip]Remove something association of CDT Builder,it make 'miss error' in buil...
|
2013-11-25 19:37:03 -08:00 |
James Chen
|
3b47ab62ad
|
Merge commit 'refs/pull/4351/head' of git://github.com/cocos2d/cocos2d-x into constructors_are_protected
|
2013-11-26 11:26:20 +08:00 |
James Chen
|
efa37ffdf6
|
Merge pull request #4374 from dumganhar/iss3274-js-override
closed #3274: [JSB] Can't override cc.Node.setPosition in JSB. Removes JSPROP_READONLY and adds JSPROP_ENUMERATE for some methods
|
2013-11-25 19:08:34 -08:00 |
James Chen
|
5fbf164142
|
closed #3274: Can't override cc.Node.setPosition in JSB.
|
2013-11-26 10:14:56 +08:00 |
James Chen
|
9f6d2db8ed
|
Update AUTHORS [ci skip]
|
2013-11-26 09:56:14 +08:00 |
James Chen
|
10e983707e
|
Merge pull request #4373 from lajos/dev_macfonttest
closed #3275: Adding FontTest for Mac
|
2013-11-25 17:50:53 -08:00 |
Ricardo Quesada
|
a198fb51df
|
JS Bindings Menu
doesn't initialize the menu twice.
|
2013-11-25 16:24:33 -08:00 |
Ricardo Quesada
|
b6f6e72c94
|
Merge branch 'develop' into constructors_are_protected
Conflicts:
cocos/2d/CCActionInstant.h
|
2013-11-25 13:59:24 -08:00 |
Lajos Kamocsay
|
4538be2b43
|
FontTest was not rendering TTFs
|
2013-11-25 10:00:53 -05:00 |
boyu0
|
09ba28d522
|
issue #2771: refactor PhysicsWorld and PhysicsWorldInfo
|
2013-11-25 17:57:06 +08:00 |
James Chen
|
9ebc4e3722
|
Merge pull request #4358 from samuele3hu/developTableView
issue #3228:CallFuncND + auto remove lua test case have no effect
|
2013-11-25 00:18:30 -08:00 |
James Chen
|
27b766f691
|
Merge pull request #4372 from dumganhar/iss3273-evalString-crash
closed #3273: ScriptingCore::evalString crashes
|
2013-11-24 23:55:26 -08:00 |
boyu0
|
805312b3d3
|
fix box2d compile error in ndk
|
2013-11-25 15:55:01 +08:00 |
James Chen
|
b9fa8566f2
|
closed #3273: ScriptingCore::evalString crashes
|
2013-11-25 15:52:59 +08:00 |
James Chen
|
fec15b6fe2
|
Merge pull request #4371 from dumganhar/develop
Build fix for XMLHttpRequest after using std::unordered_map instead of std::map.
|
2013-11-24 23:43:21 -08:00 |
James Chen
|
8574fb0494
|
Build fix for XMLHttpRequest after using std::unordered_map instead of std::map.
|
2013-11-25 15:11:43 +08:00 |
boyu0
|
e55c81c9b6
|
upgrade box2d from 2.2.1 to 2.3.0
|
2013-11-25 14:50:11 +08:00 |
minggo
|
eba059e41e
|
Merge pull request #4368 from CocosRobot/updategeneratedsubmodule_1385345794
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-11-24 18:34:58 -08:00 |
CocosRobot
|
a4c2ccdf65
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-11-25 02:16:36 +00:00 |
minggo
|
f23bfcda48
|
Merge pull request #4366 from Dhilan007/jssubmodule
[ci skip]issue #3261:add miss binding
|
2013-11-24 18:11:38 -08:00 |
boyu0
|
f2dabe77ec
|
issue #2771: add some method implements with box2d in PhysicsWorld
|
2013-11-25 10:08:52 +08:00 |
Dhilan007
|
c09f50e3f8
|
issue #3261:add miss binding
|
2013-11-24 22:47:29 +08:00 |
Ricardo Quesada
|
cc5a03f21a
|
updates cocos2d version
|
2013-11-22 16:58:05 -08:00 |
Ricardo Quesada
|
447a34655a
|
RenderTexture contructor ctor is public again
|
2013-11-22 16:14:05 -08:00 |
Ricardo Quesada
|
9b52af010d
|
Macro CC_DISABLE_COPY is renamed to CC_DISALLOW_COPY_AND_ASSIGN
and the old CC_DISALLOW_COPY_AND_ASSIGN is removed
|
2013-11-22 16:09:05 -08:00 |
Ricardo Quesada
|
3f1983214f
|
Effects have protected contructors
and disallowed copy + assign
|
2013-11-22 15:07:58 -08:00 |
Ricardo Quesada
|
72436c896a
|
prevents bug in gcc 4.6.3
|
2013-11-22 13:40:32 -08:00 |
Ricardo Quesada
|
3ab1e4f3a1
|
ClippingNode Test works again
|
2013-11-22 12:15:41 -08:00 |
Ricardo Quesada
|
1c65669a9f
|
fixes type in documentation
|
2013-11-22 11:27:03 -08:00 |
Ricardo Quesada
|
4d7e56b44a
|
fix indentation
|
2013-11-22 09:42:21 -08:00 |
Dhilan007
|
49a1d0ae62
|
Remove something association of CDT Builder,it make 'miss error' in builders.
|
2013-11-22 17:41:03 +08:00 |
samuele3
|
3a69ee301b
|
issue #3228: Resolve TestLua and HelloLua test samples compile error on the Xcode 4.6.2 when choose Mac platform
|
2013-11-22 14:06:48 +08:00 |
samuele3
|
eb3f5eb629
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTableView
|
2013-11-22 11:52:32 +08:00 |
samuele3
|
192deb7952
|
issue #3228: Reconstruct the Callfunc create method to support std::function and add callFuncND + auto remove lua test case
|
2013-11-22 11:51:07 +08:00 |
Ricardo Quesada
|
515786a7ee
|
adds CC_DISALLOW_COPY_AND_ASSIGN() to Actilons
... and also moves the Contructor/Destrucotor/initXXX to `protected:`
|
2013-11-21 17:06:06 -08:00 |
Ricardo Quesada
|
b6ddc6d048
|
Uses std::unordered_map<> instead of std::map<>
and more fixes.
|
2013-11-21 13:43:59 -08:00 |
Ricardo Quesada
|
a26b385b11
|
Merge branch 'develop' into constructors_are_protected
|
2013-11-21 10:56:03 -08:00 |
boyu0
|
8e14cdb8d2
|
issue #2771: add assert to joint
|
2013-11-21 14:39:37 +08:00 |
minggo
|
4582686860
|
Merge pull request #4347 from samuele3hu/developTableView
[ci skip]Add doxygen comments for the CocoStudio
|
2013-11-20 21:55:34 -08:00 |
boyu0
|
627b9538d0
|
issue #2771: fix physics test CC_USE_PHYSICS definition
|
2013-11-21 10:48:21 +08:00 |
Ricardo Quesada
|
41d6bb39c8
|
Merge branch 'develop' into constructors_are_protected
|
2013-11-20 11:29:07 -08:00 |