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
James Chen
72b830ef49
fixed the failure of auto generating js binding.
2013-02-20 11:07:42 +08:00
James Chen
266761a37d
Merge pull request #2005 from dumganhar/iss1733-hybrid
...
issue #1733 : Adding hybrid projects for cpp and lua.
2013-02-19 18:34:30 -08:00
James Chen
a2e0903b74
issue #1733 : Updated cpp hybrid template project.
2013-02-20 10:20:06 +08:00
James Chen
79f097892a
issue #1733 : Adding multi-platform-cpp/proj.win32/HelloCpp.sln
2013-02-20 10:17:50 +08:00
James Chen
a9fede525a
issue #1733 : Marmalade ok.
2013-02-19 18:26:00 +08:00
James Chen
fa90ae320b
issue #1733 : Updated cocos2dx/proj.linux/Makefile.
2013-02-19 18:08:58 +08:00
James Chen
5c8275ef4f
issue #1733 : Updated make-all-linux-project.sh
2013-02-19 18:08:19 +08:00
James Chen
60ab4c4886
issue #1733 : Updated linux makefile.
2013-02-19 18:06:30 +08:00
James Chen
fc1848eb02
issue #1733 : Updated linux makefile.
2013-02-19 17:39:27 +08:00
James Chen
a94aa15031
issue #1733 : Adding extension project for linux.
2013-02-19 17:28:49 +08:00
James Chen
a54edec0e3
issue #1733 : Adding "multi-platform-cpp" and "multi-platform-lua" projects to template folder.
2013-02-19 15:38:30 +08:00
James Chen
d119d3686e
Merge pull request #2004 from dumganhar/mutoo-master
...
Changed fileformat of list.sh to unix
2013-02-18 22:23:05 -08:00
James Chen
339a60a649
Adding execute permissions for list.sh.
2013-02-19 14:21:56 +08:00
James Chen
93789939fc
Merge branch 'master' of https://github.com/mutoo/cocos2d-x into mutoo-master
2013-02-19 14:18:35 +08:00
James Chen
13ab9c0196
Merge pull request #1999 from walzer/project-creator
...
issue #1733 : python scripts for generating JSB projects.
2013-02-18 22:11:37 -08:00
James Chen
7af080f489
Merge pull request #2001 from hailongiPhone/master
...
Synchronizing with cocos2d-iPhone for CCBReader.
2013-02-18 20:44:25 -08:00
hailong
2f0e10cd74
CCBReader error with generated animations
...
synchronous with cocos2d-iPhone
2013-02-19 12:27:39 +08:00
mutoo
4bc06c7fcb
changed fileformat of list.sh to unix
...
list.sh doesn't work in linux/mac due to its fileformat
2013-02-19 12:20:02 +08:00
James Chen
a329817480
Merge pull request #1998 from dumganhar/iss1724-hellojs
...
issue #1724 : Adding vs solution for HelloJavascript.
2013-02-18 18:57:52 -08:00
James Chen
96c91390cc
issue #1724 : Adding solution for HelloJavascript.
2013-02-19 10:51:55 +08:00
minggo
599f22f1e2
Merge pull request #1997 from minggo/iss1731-lua-declaration
...
issue #1731:change CCSize, CCPoint and CCRect to struct in pkg files
2013-02-18 18:19:00 -08:00
James Chen
84e16a6fd8
Merge pull request #1996 from CocosRobot/updategeneratedsubmodule_1361239496
...
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-02-18 18:11:34 -08:00
minggo
1b743b37c9
issue #1731:change CCSize, CCPoint and CCRect to struct in pkg files
2013-02-19 10:08:25 +08:00
CocosRobot
ac0fa1251b
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-02-19 10:05:12 +08:00
James Chen
92cec0f38f
Merge pull request #1995 from dumganhar/master
...
Updated the submodule of cxx-generator.
2013-02-18 17:51:39 -08:00
James Chen
ed49029744
Updated the submodule of cxx-generator.
2013-02-19 09:48:16 +08:00
walzer
6ebc9b7410
issue #1725 , project-creator, HelloJavascript on win32 works ok
2013-02-19 00:02:42 +08:00