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

13327 Commits

Author SHA1 Message Date
CaiWenzhi 1f389d3779 Rename event interface 2013-11-08 18:43:06 +08:00
James Chen 5f85db9f4d Merge pull request #4143 from dumganhar/linux-template 
[LINUX] Adding template CMake files for linux.
 2013-11-08 02:39:59 -08:00
James Chen 74497e18ec [CMake template] Fix compilation errors. 2013-11-08 18:25:58 +08:00
James Chen eeedab78b2 [LINUX] Adding template CMake files for linux. 2013-11-08 18:13:24 +08:00
Huabing.Xu b726c6fd2c issue #3025: move VolatileTexture static function to VolatileTextureMgr 2013-11-08 16:47:33 +08:00
boyu0 4efacdbcf3 issue #2771: rename PhysicsWorld::create() to PhysicsWorld::construct(), fix some bugs 2013-11-08 16:17:56 +08:00
minggo 4553db492a Merge pull request #4141 from Dhilan007/m_c_jsb 
[ci skip]use float instead for create point object
 2013-11-07 23:57:14 -08:00
minggo 1ef377c7b7 Merge pull request #4142 from nutty898/develop_nutty_Mergemasterbranchtodevelopbranch 
[ci skip]add "setUserObject" method
 2013-11-07 23:55:47 -08:00
CaiWenzhi da27169d45 add "setUserObject" method 2013-11-08 14:58:20 +08:00
Liam 2aaa21255f fixed cocostudio action can not looping 2013-11-08 14:34:24 +08:00
boyu0 a56dedb41a issue #2771: add class PhysicsDebugDraw 2013-11-08 14:25:03 +08:00
Dhilan007 314f2ac62e use float instead for create point object 2013-11-08 14:13:39 +08:00
Huabing.Xu 6f1e98df34 Merge branch 'develop' of github.com:cocos2d/cocos2d-x into iss3025_TextureCache 2013-11-08 13:50:22 +08:00
minggo 089ea0a79e Merge pull request #4140 from CocosRobot/updategeneratedsubmodule_1383884232 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-11-07 21:43:06 -08:00
CocosRobot fd37d3e973 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-08 04:17:15 +00:00
minggo 91ac461fab Merge pull request #4138 from nutty898/develop_nutty_Mergemasterbranchtodevelopbranch 
[ci skip]Merge some modified file to develop
 2013-11-07 20:11:51 -08:00
CaiWenzhi 18f411fd1e Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch 2013-11-08 11:36:59 +08:00
Huabing.Xu 935d472979 issue #3025: remove TextureCache::_sharedTextureCache 2013-11-08 11:36:27 +08:00
garfield_ho 2c76d8c150 There are not directory entry in some case.So we need to test whether the file directory exists when uncompressing file entry, if does not exist then create directory 2013-11-08 11:23:06 +08:00
minggo 05db4f7301 Merge pull request #4119 from ol-loginov/ignorable_build 
[ci skip]ignore output files from script make-all-linux-project.sh
 2013-11-07 19:23:06 -08:00
minggo 56d7da8933 Merge pull request #4130 from ricardoquesada/love_in_textfield 
[ci skip]More std::string& usage
 2013-11-07 19:14:35 -08:00
minggo 128b1b4d9b Merge pull request #4135 from CocosRobot/updategeneratedsubmodule_1383880234 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-11-07 19:12:09 -08:00
CocosRobot 240fc2ade1 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-08 03:10:36 +00:00
minggo d4f890a6ee [ci skip] 2013-11-08 11:01:16 +08:00
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
Ricardo Quesada ffd4342548 Adds more strings 
and more `override`
and fixes some indetentation issues
 2013-11-07 12:42:16 -08:00
Ricardo Quesada e4662b371a TextField uses std::string& in the public API 
and uses std::string instead of std::string* internally
 2013-11-07 11:58:48 -08:00
Michael Contento 0160bec3ad Colors are now compare- and explicit convertible 2013-11-07 18:13:33 +01: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
samuele3 f56269ce85 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-07 23:23:11 +08:00
samuele3 16d572c04f issue #2868:Add manual lua binding files 2013-11-07 23:22:11 +08:00
Huabing.Xu bd7d62aee0 issue #3025: replace TextureCache::getInstance() by Director::getInstance()->getTextureCache() in samples folder 2013-11-07 21:48:39 +08:00
CaiWenzhi c69163559b Move some method from helper to reader 2013-11-07 21:26:56 +08:00
CaiWenzhi 9b4aa95b31 Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch 2013-11-07 21:18:21 +08:00
CaiWenzhi cbb9c655d9 fixed bugs 2013-11-07 21:10:48 +08:00
boyu0 cee966e284 issue #2771: fix build error 2013-11-07 19:24:15 +08:00