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

7326 Commits

Author SHA1 Message Date
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
Neo Kim 2f21cad93b Merge from upstream to origin 2013-02-20 16:31:22 +09:00
James Chen 4b5c3a4b22 Merge pull request #2011 from dumganhar/iss1733-hybrid 
issue #1733: Updated hybrid lua template project.
 2013-02-19 23:23:02 -08:00
James Chen a9f030e913 issue #1733: Adding HelloLua.win32.sln. 2013-02-20 15:19:42 +08:00
James Chen 532cbe2466 issue #1733: Updated the template of hybrid lua project for win32. 2013-02-20 15:11:30 +08:00
James Chen 212d445b40 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss1733-hybrid 2013-02-20 14:32:20 +08:00
James Chen bbec9c8a02 Merge pull request #2010 from dumganhar/master 
issue #1733: Updated template projects. Using the same package name on iOS as which on Android.
 2013-02-19 22:31:43 -08:00
James Chen 4da388a2b6 issue #1733: Updated template projects. Using the same package name on iOS as which on Android. 
On iOS, org.cocos2d-x.HelloCpp -> org.cocos2dx.hellocpp.
 2013-02-20 14:30:05 +08:00
James Chen fe41ef4bc2 Merge pull request #2009 from walzer/project-creator 
fixed #1733, the python script perfectly works, tested on both osx and windows
 2013-02-19 21:59:24 -08:00
James Chen fb23323e55 issue #1733: Renamed testlua to hellolua. 2013-02-20 13:54:07 +08:00
James Chen 5b16c3d499 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss1733-hybrid 2013-02-20 13:42:02 +08:00
walzer 4f81e704ae Merge branch 'refs/heads/master' into project-creator 2013-02-20 13:41:53 +08:00
walzer 8915b4787d fixed #1733, the python script perfectly works, tested on both osx and windows 
This pull request fixed:
- Handling the difference of line ending between osx and windows
- remove os.popen("rm -rf" + …) usage which can not cross desktop platforms, uses shutil.rmtree instead
 2013-02-20 13:26:41 +08:00
James Chen 24767349b4 Merge pull request #2008 from dumganhar/master 
fixed a bug of respond touch events in hello.lua. The event type is string now.
 2013-02-19 20:07:02 -08:00
James Chen ab00de629a Removed the definition of the touch event type . 2013-02-20 12:06:12 +08:00
James Chen 9cc4b7ab29 fixed a bug of respond touch events in hello.lua. The event type is string now. 2013-02-20 12:03:21 +08:00
James Chen d3e0aa176b issue #1733: Updated hybrid lua template project. 2013-02-20 12:01:47 +08:00
James Chen e26d110df1 Merge pull request #2007 from dumganhar/fix-jenkins 
fixed the failure of auto generating js binding.
 2013-02-19 19:08:48 -08:00