boyu0
0cb45e50f1
issue #2771 : fix bugs
2013-11-15 16:27:43 +08:00
boyu0
9eac5c4a41
issue #2771 : add comment and improve API
2013-11-12 15:28:07 +08:00
boyu0
a54603390e
issue #2771 : change pointQuery implements
2013-11-11 16:23:42 +08:00
boyu0
b3f44a0805
issue #2771 : edit assert message
2013-11-11 15:31:20 +08:00
boyu0
13efb7e822
issue #2771 : add pointQuery
2013-11-11 15:03:17 +08:00
boyu0
4efacdbcf3
issue #2771 : rename PhysicsWorld::create() to PhysicsWorld::construct(), fix some bugs
2013-11-08 16:17:56 +08:00
boyu0
a56dedb41a
issue #2771 : add class PhysicsDebugDraw
2013-11-08 14:25:03 +08:00
boyu0
cee966e284
issue #2771 : fix build error
2013-11-07 19:24:15 +08:00
boyu0
b6c98ab1eb
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-11-07 17:59:01 +08:00
boyu0
3e8871f2c9
issue #2771 : delete some unfinished PhysicsTest and change subtitle
2013-11-07 17:53:30 +08:00
boyu0
e278ad66c8
issue #2771 : change PhysicsJoint::create() to PhysicsJoint::construct()
2013-11-07 17:46:05 +08:00
boyu0
7363be0697
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-11-07 17:37:33 +08:00
minggo
14fec5ed62
Merge pull request #4124 from CocosRobot/updategeneratedsubmodule_1383815479
...
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-07 01:17:49 -08:00
CocosRobot
a116e7ec79
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-07 09:11:22 +00:00
minggo
258fcbc144
Merge pull request #4122 from samuele3hu/developCheck
...
[ci skip]Reslove the linux compiled error
2013-11-07 01:02:43 -08:00
samuele3
9f5095b9c3
Reslove the compiled error
2013-11-07 16:43:04 +08:00
boyu0
ef5440f738
issue #2771 : change rayCast and rectQuery callback class to std::function
2013-11-07 16:23:50 +08:00
samuele3
e6fd1fece1
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCheck
2013-11-07 15:28:48 +08:00
samuele3
8c025a2cee
Reslove the linux compiled error
2013-11-07 15:12:19 +08:00
boyu0
eb508e4728
issue #2771 : fix PhysicsWorld functions name readadd/removexxx -> doadd/removexxx delayTestAdd/Removexxx -> add/removexxxOrDelay
2013-11-07 15:12:13 +08:00
boyu0
a02fd7c6da
issue #2771 : fix PhysicsWorld some bugs
2013-11-07 14:40:09 +08:00
boyu0
f2cd5ca630
issue #2771 : fix body and joint memory bugs. add removeFormWorld and destroy to PhysicsJoint, and add a destroy param to PhysicsWorld->removeJoint()
2013-11-07 14:17:57 +08:00
minggo
4a691942f1
Merge pull request #4113 from nutty898/develop_nutty_Mergemasterbranchtodevelopbranch
...
Merge 2.x version to 3.0 version
2013-11-06 19:37:08 -08:00
minggo
1fcb95889c
Merge pull request #4121 from minggo/develop
...
remove unneeded files
2013-11-06 19:30:30 -08:00
minggo
f05b79d140
remove unneeded files
2013-11-07 11:29:23 +08:00
CaiWenzhi
cf20ae03ee
Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch
2013-11-07 10:01:00 +08:00
CaiWenzhi
fa0011346e
fixed linux build error
2013-11-07 09:58:24 +08:00
Ricardo Quesada
ddb0111392
continue replacing `const char*` with `const std::string&`
...
This patch includes:
* Continue replacing `const char*` with `const std::string&` where it makes sense.
* It also removes some Hungarian notation from the code.
* It fixes some indentation issues in part of the code
* It replaces `int` or `unsigned int` with `long` where it makes sense.
2013-11-06 17:05:13 -08:00
James Chen
d40c306bad
Merge pull request #4118 from ol-loginov/correct_root_cmake
...
correct typo in root CMakeLists.txt
2013-11-06 15:18:39 -08:00
Oleg Loginov
6be59456a5
correct type in root CMakeLists.txt
2013-11-07 01:24:33 +04:00
James Chen
40c663f963
Merge pull request #4116 from dumganhar/cmake-option
...
issue #3113 : [Linux] Adding options for modules.
2013-11-06 03:36:53 -08:00
James Chen
d6d041f561
issue #3113 : [Linux] Adding options for modules.
2013-11-06 19:17:34 +08:00
James Chen
bec1ce929c
Merge pull request #4114 from CocosRobot/updategeneratedsubmodule_1383730712
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-06 02:37:23 -08:00
CaiWenzhi
e765eb1e7a
Test commit
2013-11-06 18:30:09 +08:00
CaiWenzhi
7163dd4d76
Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch
2013-11-06 18:13:51 +08:00
minggo
b30494cc4f
[ci skip]
2013-11-06 18:07:03 +08:00
minggo
8c0ab2d489
[ci skip]
2013-11-06 18:05:02 +08:00
minggo
3deb3b4231
[ci skip]
2013-11-06 17:52:03 +08:00
CocosRobot
8a836dc477
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-06 09:38:34 +00:00
minggo
cba013736a
Merge pull request #3733 from 2youyouo2/develop
...
fix setcolor
2013-11-06 01:31:27 -08:00
CaiWenzhi
94896b5b74
Modify mk files
2013-11-06 17:20:14 +08:00
2youyou2
3ea0d2f12d
change override function
2013-11-06 16:37:30 +08:00
2youyou2
73e5310bf6
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-11-06 16:29:54 +08:00
CaiWenzhi
12570b5e8f
temp commit
2013-11-06 16:20:01 +08:00
CaiWenzhi
7a207431cd
Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch
...
Conflicts:
cocos/gui/UIHelper.h
2013-11-06 16:13:10 +08:00
2youyou2
fcf0b1ef5f
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-11-06 16:06:37 +08:00
James Chen
9ed5b406f2
Merge pull request #4112 from CocosRobot/updategeneratedsubmodule_1383724833
...
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
2013-11-06 00:05:48 -08:00
CaiWenzhi
e0aa82da13
Merge master branch to develop branch
2013-11-06 16:04:06 +08:00
CocosRobot
d990699417
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-06 08:00:35 +00:00
James Chen
ba8b4866e2
Update AUTHORS [ci skip]
2013-11-06 15:57:57 +08:00