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

7793 Commits

Author SHA1 Message Date
walzer 3dcee98cb8 issue #1733, use json config files instead of python modules for multi-platforms. 2013-02-22 16:32:12 +08:00
James Chen 2b7c4348dc Update AUTHORS 2013-02-22 16:20:24 +08:00
James Chen 49fc92e112 Update AUTHORS 2013-02-22 16:19:52 +08:00
James Chen 1d8a49ad90 Merge pull request #2028 from dumganhar/jianghua-patch 
fixed #1743: Adding an additional transform for CCNode.
 2013-02-22 00:18:02 -08:00
James Chen fdf8595353 tab -> 4 space. 2013-02-22 16:16:16 +08:00
James Chen 476e3801eb tab -> 4 space. 2013-02-22 16:15:17 +08:00
minggo 32fbced31f issue #1489:modify sample code and add readme 2013-02-22 16:02:53 +08:00
James Chen b54b924923 fixed #1743: Adding an additional transform for CCNode. 2013-02-22 16:01:49 +08:00
James Chen 46ee771e1c Merge branch 'master' of https://github.com/jxhgzs/cocos2d-x into jianghua-patch 2013-02-22 13:46:00 +08:00
James Chen ce424a9e1b Merge pull request #2027 from CocosRobot/updategeneratedsubmodule_1361506320 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-02-21 20:51:13 -08:00
CocosRobot e3745b0078 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-02-22 12:12:11 +08:00
James Chen 4bdebc6e3d Merge pull request #2026 from dumganhar/master 
Removed some unused codes.
 2013-02-21 19:59:56 -08:00
James Chen 8921d92143 Removed some unused codes. 2013-02-22 11:58:52 +08:00
James Chen ace8fb7d55 Merge pull request #2025 from CocosRobot/updategeneratedsubmodule_1361501669 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-02-21 19:05:22 -08:00
minggo ed1cbb94c2 Merge https://github.com/cocos2d/cocos2d-x into iss1489-AssetsManager 2013-02-22 11:04:40 +08:00
James Chen b230afa6bf Update AUTHORS 2013-02-22 11:04:13 +08:00
minggo 91f5972b42 issue 1489:add AssetsManager 2013-02-22 11:04:09 +08:00
James Chen b50515c5bc Merge pull request #1873 from ThePickleMan/master 
fixed #1742: Added 'rotationIsDir' property to ParticleSystem.
 2013-02-21 19:02:39 -08:00
minggo 1df0095993 fix a bug of CCUserDefault 2013-02-22 11:01:57 +08:00
CocosRobot 397457aa68 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-02-22 10:54:39 +08:00
minggo 86e9cfb782 Update AUTHORS 2013-02-22 10:10:30 +08:00
minggo 33b857c3f7 Merge pull request #1984 from billy1380/master 
CCLens3d can be concave
 2013-02-21 18:08:47 -08:00
minggo c4f0adaa93 Merge pull request #2024 from folecr/filesystem_cleanup 
Filesystem cleanup
 2013-02-21 18:01:50 -08:00
James Chen a3b4bdaecd Update AUTHORS 2013-02-22 09:57:54 +08:00
James Chen 486f7941a7 Merge pull request #2023 from nicolasgramlich/patch-7 
fixed #1740: Added cleanup and reset methods to ScriptingCore.
 2013-02-21 17:56:55 -08:00
folecr f26f254daa Use CCLOG instead of CCMessageBox to report file system errors 2013-02-21 17:05:17 -08:00
folecr 8408fc6d1b Remove unused access to Android application's external asset path. 2013-02-21 17:05:17 -08:00
folecr 82ae5f62fd Remove unused access to Android application's cache directory 2013-02-21 17:05:17 -08:00
Nicolas Gramlich 84aae750a9 Converted tabs to spaces since that seemed to be the predominant choice in this file. 2013-02-21 08:34:51 -08:00
Nicolas Gramlich b993c6fa08 Added cleanup and reset methods to ScriptingCore. 2013-02-21 08:33:37 -08:00
James Chen da94c0e6d6 Merge pull request #2022 from dumganhar/iss1733-hybrid 
issue #1733: Updated template/multi-platform-lua/proj.win32/HelloLua.sln
 2013-02-21 01:54:15 -08:00
James Chen 7f7f44c05c issue #1733: Updated template/multi-platform-lua/proj.win32/HelloLua.sln. 2013-02-21 17:53:01 +08:00
James Chen 98f5ac3d0b Merge pull request #2020 from walzer/project-creator 
tools/project-creator works for lua and cpp templates.
 2013-02-21 01:50:37 -08:00
James Chen 9332b7ae6c Merge pull request #2021 from dumganhar/iss1733-hybrid 
issue #1733: Updated multi-platform-lua/proj.android/build_native.sh.
 2013-02-21 01:25:19 -08:00
James Chen bd060f2a22 issue #1733: Updated multi-platform-lua/proj.android/build_native.sh. 2013-02-21 17:23:43 +08:00
walzer 3eab5d509b issue #1733, project-creator for lua works. 2013-02-21 17:11:11 +08:00
walzer d736f38fac issue #1733, project-creator for cpp project seems ok 2013-02-21 16:51:22 +08:00
jiang xiaohua 323453d31b add the CocosDenshion project 2013-02-21 14:04:30 +08:00
James Chen ec678445cc Merge pull request #2016 from CocosRobot/updategeneratedsubmodule_1361413471 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-02-20 18:34:25 -08:00
CocosRobot 06ad046c2f cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-02-21 10:24:44 +08:00
James Chen c70412d890 Merge pull request #2015 from dumganhar/iss1730-bind-scrollview 
fixed #1730: Exposed CCScrollView and CCTableView to js.
 2013-02-20 18:23:13 -08:00
James Chen cf33a4538d fixed #1730: Binds CCScrollView and CCTableView to js. 2013-02-21 10:06:22 +08:00
Zhe Wang 3f74886752 Merge pull request #2014 from walzer/project-creator 
unify package name to org.cocos2dx.hello* on both ios and android
 2013-02-20 07:43:20 -08:00
walzer e81c841ad6 issue #1733, improve the help description of create_project.py 2013-02-20 23:42:48 +08:00
walzer ef697781a7 issue #1733, unify package name to org.cocos2dx.hello* lower case on both android & ios. 2013-02-20 23:15:48 +08:00
jiang xiaohua d875edbd74 Additional a transformation matrix, Used in is not parent-child relationship but we still need to maintain transformation parent-child Example: GameObject_Parent(CCNode; create from CCNode) GameObject_sub1(CCNode; Create from the same CCSpriteBatchNode,the node's parent is CCLayer ) RenderComponents1( Create form the same CCSpriteBatchNode) Components2 .... GameObject_sub2 (CCNode; Create from the CCNode,the node's parent is GameObject_Parent ) RenderComponents1( not used batchNode) Now, GameObject_sub1 not GameObject_Parent node, but I want it to simulate the change of the son is GameObject_Parent; I Need additional the father's matrix in child Node ; 2013-02-20 22:33:28 +08:00
walzer 4592e0f775 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into project-creator 2013-02-20 22:10:06 +08:00
Neo Kim 7da2dc953d Move height adjustment code from 'getRect' to 'keyboardWillShow' 2013-02-20 22:52:49 +09:00
Neo Kim a7c87f3b38 Add 'setFont' and 'setAnchorPoint' to CCEditBox 2013-02-20 22:41:08 +09:00
Neo Kim cbebbd8207 Ignore 'DerivedData' directory 2013-02-20 16:50:32 +09:00