Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,994 Commits 2 Branches 33 Tags 1.2 GiB
Commit Graph

12994 Commits

Author SHA1 Message Date
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
boyu0 ef5440f738 issue #2771: change rayCast and rectQuery callback class to std::function 2013-11-07 16:23:50 +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
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
James Chen 9d3716e964 Merge pull request #4109 from HoGarfield/JS_Call 
Missing add "JSB_AUTOCOMPARTMENT_WITH_GLOBAL_OBJCET " before calling JS_CallFunctionValue
 2013-11-05 23:56:03 -08:00
boyu0 6c27a0df0b issue #2771: make api more friendly 2013-11-06 15:43:29 +08:00
garfield_ho f36fd002cd Remove duplicate 2013-11-06 15:40:23 +08:00
2youyou2 efd8f62992 add virtual 2013-11-06 15:40:06 +08:00
James Chen dff6a99117 Merge pull request #4108 from dumganhar/64bit-fix 
[Linux] compilation fix for PR #4099[ci skip]
 2013-11-05 23:39:48 -08:00
garfield_ho f6070406cd Missing add "JSB_AUTOCOMPARTMENT_WITH_GLOBAL_OBJCET " before calling JS_CallFunctionValue 2013-11-06 15:31:58 +08:00
James Chen 2e80e95a37 [Linux] compilation fix for PR #4099 2013-11-06 15:26:33 +08:00
2youyou2 12d6bc1722 1. change CCARRAY_FOREACH to range-based loop 2013-11-06 15:25:44 +08:00
James Chen 4e4798fdcc Merge commit 'refs/pull/4099/head' of https://github.com/cocos2d/cocos2d-x into 64bit-fix 2013-11-06 15:15:47 +08:00
James Chen 33a243155f Merge pull request #4107 from dumganhar/cmake 
issue #3113: 32Bit fix and 13.10 32bit complication is ok.
 2013-11-05 23:09:23 -08:00
James Chen f3c40a3e7a issue #3113: 32Bit fix and 13.10 32bit complication is ok. 2013-11-06 14:54:35 +08:00
boyu0 a01fcc6f36 issue #2771: move header definition to first line 2013-11-06 14:51:56 +08:00
boyu0 75dd32cde9 issue #2771: fix physics test compile error 2013-11-06 14:34:27 +08:00
James Chen 0192c4f042 Merge pull request #4104 from CocosRobot/updategeneratedsubmodule_1383718814 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-11-05 22:29:27 -08:00
CocosRobot d7ed908818 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-06 06:20:17 +00:00
minggo c32628e930 [ci skip] 2013-11-06 14:19:08 +08:00
minggo a416a6b258 Merge pull request #4102 from ricardoquesada/uses_string 
Uses `const std::string&`
 2013-11-05 22:14:27 -08:00