Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
13,024 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

13024 Commits

Author SHA1 Message Date
Ricardo Quesada 956425f894 Merge pull request #4134 from ricardoquesada/toc_for_coding_style 
Adds TOC to coding style
 2013-11-07 19:01:05 -08:00
Ricardo Quesada d936622070 Adds TOC to coding style 2013-11-07 19:00:31 -08:00
minggo 109adaf337 Merge pull request #4103 from luisparravicini/issue-2882 
[ci skip]added | operator for Control::EventType
 2013-11-07 18:59:33 -08:00
minggo 61970934a2 [ci skip] 2013-11-08 10:55:49 +08:00
minggo d2bb1c72cc Merge pull request #4117 from michaelcontento/add-missing-setscale-to-sprite 
[ci skip]add Sprite::setScale(float, float)
 2013-11-07 18:54:04 -08:00
minggo d1f94e0d9d Merge pull request #4111 from boyu0/iss2771_physical 
[ci skip]issue #2771: physical
 2013-11-07 18:51:15 -08:00
minggo 21f8050a4d [ci skip] 2013-11-08 10:50:28 +08:00
minggo 04bb4033fd Merge pull request #4128 from Dhilan007/m_c_jsb 
[ci skip]rename jsb boot file.
 2013-11-07 18:48:30 -08:00
minggo 6d0be761eb [ci skip] 2013-11-08 10:47:12 +08:00
minggo 167242e540 Merge pull request #4127 from Dhilan007/ANCHOR_XXX 
[ci skip]Point: Adds ANCHOR_XXX constants like ANCHOR_MIDDLE, ANCHOR_TOP_RIGHT, e...
 2013-11-07 18:45:50 -08:00
Ricardo Quesada 7a0fbf540e Merge pull request #4132 from ricardoquesada/doc_fixes 
More fixes to the C++ guide
 2013-11-07 15:38:12 -08:00
Ricardo Quesada 3300e46d0f More fixes to the C++ guide 2013-11-07 15:37:41 -08:00
Ricardo Quesada 2ce08f9113 Merge pull request #4131 from ricardoquesada/udpates_coding_style 
updates coding style.
 2013-11-07 15:09:36 -08:00
Ricardo Quesada 0fb85f88fb updates coding style. 
Everything is in MarkDown format.
Much easier to read than  in redmine
 2013-11-07 15:08:49 -08:00
Dhilan007 006d32f883 rename jsb boot file. 2013-11-07 23:51:01 +08:00
Dhilan007 916361af3f Point: Adds ANCHOR_XXX constants like ANCHOR_MIDDLE, ANCHOR_TOP_RIGHT, etc. 2013-11-07 23:40:33 +08:00
boyu0 cee966e284 issue #2771: fix build error 2013-11-07 19:24:15 +08:00
minggo 237f7a7839 Merge pull request #4125 from minggo/fix-compiling-error 
[ci skip]fix compiling erros on Android
 2013-11-07 02:04:27 -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
minggo b9b14571ac fix compiling erros on Android 2013-11-07 17:16:31 +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
Michael Contento b7173cd60d add Sprite::setScale(float, float) 2013-11-06 14:42:31 +01: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