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

3461 Commits

Author SHA1 Message Date
winbinar 231446a8a5 Update cocos2dx/textures/CCTextureCache.cpp 2012-01-30 07:10:49 +02:00
winbinar 910ded54c5 Update cocos2dx/textures/CCTextureCache.cpp 2012-01-30 07:10:19 +02:00
folecr b0b5790e06 Simplify inclusion of cocos2d in Android NDK projects: Cocos2DX is the only module that importing projects need to add. Requires Android NDK r7. 
* Uses NDK modules as the basis of the build system for Android NDK
 * Add a cocos2dx module to generate a shared library named cocos2dx_shared. Library name is still libcocos2d.so
 * The dependencies of this module are also Android NDK modules
 * ... which are prebuilt static libraries from the png, jpeg and xml2 modules.
 * Dependency library names set to libjpeg, libpng, etc. even though we are building variants with names like jpeg_shared.
 2012-01-29 09:52:38 -08:00
folecr e6fddbc047 Move libraries & include files for third party dependencies so that it is possible to create Android NDK Modules from prebuilt libs. 2012-01-29 09:33:17 -08:00
gzito fe79a2c5d2 Merge branch 'master' of git://github.com/cocos2d/cocos2d-x 2012-01-28 10:54:31 +01:00
dumganhar 6c4c837d13 Merge pull request #688 from dumganhar/iss756_CCMenu_init 
fixed #756: CCMenu can't be initialized by using CCMenu::node() method.
 2012-01-27 22:44:07 -08:00
dumganhar 49b57569c9 fixed #756: CCMenu can't be initialized by using CCMenu::node() method. 2012-01-28 14:38:44 +08:00
folecr a9d7500ae7 Fix whitespace line ending in one single line. 2012-01-25 18:14:29 -08:00
gzito f40d3d3db8 Changed use of animation interval in game loop 2012-01-24 23:27:03 +01:00
YuLei Liao f8dafe6712 * add CCNode::getChildrenCount() 2012-01-21 01:29:41 +08:00
YuLei Liao 279e915b55 * update tolua++ packages 2012-01-21 01:29:30 +08:00
YuLei Liao 26ab000906 * tmp 2012-01-21 01:15:05 +08:00
YuLei Liao b79828a697 * merge lua fix 2012-01-21 00:47:51 +08:00
YuLei Liao 9660bcd165 * merge upstream/master to master 2012-01-20 19:08:21 +08:00
minggo 94342f85e0 Merge pull request #681 from krstns/master 
fixed #953: Added tolua++ for Mac
 2012-01-19 02:21:39 -08:00
dumganhar 57eee38f4e Merge branch 'master' into moveSel2CCObject 2012-01-19 15:46:31 +08:00
dumganhar e0bebb5f6c Merge pull request #685 from dumganhar/iss940_replace_ico 
fixed #940: replace .ico file with clear image for win32 template.
 2012-01-18 20:01:39 -08:00
dumganhar 98b1ec0b30 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss940_replace_ico 2012-01-19 11:59:52 +08:00
dumganhar 8c81fcf232 fixed #940: replace .ico file with clear image for win32 template. 2012-01-19 11:58:37 +08:00
minggo 9bf4a228c7 Merge pull request #684 from dumganhar/iss952_bmfont_support 
make CCLabelBMFont support other language, such as chinese, korean, japanese.
 2012-01-18 18:52:00 -08:00
dumganhar a23893507d fixed 952: make CCLabelBMFont support other language, such as chinese, korean, japanese. 2012-01-18 18:43:41 +08:00
dumganhar 543d96a73f issue 952: make CCLabelBMFont support other language, such as chinese, korean, japanese. 2012-01-18 18:02:39 +08:00
gzito 08d2e5ef51 Merge branch 'master' of git://github.com/cocos2d/cocos2d-x 2012-01-17 21:21:48 +01:00
gzito b400570265 Workaround for issue #635. Prevents "ERROR: 5 in device 25" to be reported in X86 Marmalade Mac OSX simulator 2012-01-17 10:57:31 +01:00
gzito 9e180e9c01 Added true type fonts file for Marmalade version 2012-01-17 10:53:47 +01:00
dumganhar 931d499966 Merge pull request #683 from dumganhar/marmalade 
Add Marker Felt.ttf file for marmalade platform
 2012-01-17 00:10:42 -08:00
dumganhar 31656b2d99 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into marmalade 2012-01-17 16:07:26 +08:00
dumganhar 55b762cdf6 add Marker Felt.ttf file for marmalade platform 2012-01-17 16:06:42 +08:00
dumganhar 2dfc9ae37a Merge pull request #682 from gzito/master 
Added Marmalade support to TextInputTest and HelloLua samples
 2012-01-17 00:00:49 -08:00
dumganhar cea250a962 restore original CCCopying as the parent class of CCObject 2012-01-17 10:54:21 +08:00
dumganhar d37664934f Merge branch 'master' of https://github.com/gzito/cocos2d-x into gzito 2012-01-17 10:04:51 +08:00
dumganhar aa4fae3980 restore original CCCopying as the parent class of CCObject 2012-01-17 10:00:22 +08:00
dumganhar ea0fb47f98 Merge branch 'master' into moveSel2CCObject 2012-01-17 09:37:31 +08:00
gzito c87881ff94 Added Marmalade support to TextInputTest and HelloLua samples 2012-01-15 15:57:10 +01:00
gzito bd22d74331 Merge remote-tracking branch 'remotes/upstream/master' 2012-01-14 23:09:50 +01:00
gzito a9d03e6ad8 Renamed folder from airplay to marmalade 2012-01-14 22:47:19 +01:00
gzito cfd365f5d7 Updated paths from airplay to marmalade 2012-01-14 22:46:20 +01:00
Krystian Szczesny fecd429044 Fixed missing "using namespace cocos2d;" in LuaCocos2d.cpp when using tolua++ 
Added tolua++ for Mac, which was posted on Cocos2d-x forums by Haseeb Yousaf
 2012-01-14 11:31:49 +01:00
dumganhar 1d460b70c7 Merge pull request #680 from dumganhar/modify_prompt 
update create-qnx-project.sh
 2012-01-12 05:14:41 -08:00
dumganhar f15cf31872 update create-qnx-project.sh 2012-01-12 21:12:58 +08:00
dumganhar d2f41bca1a Merge pull request #679 from dumganhar/modify_prompt 
Modify prompt of building successfully
 2012-01-12 05:10:31 -08:00
dumganhar 29b03b5355 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into modify_prompt 2012-01-12 21:07:10 +08:00
dumganhar 7c99004f27 modify prompt of building successfully 2012-01-12 21:06:05 +08:00
minggo dc6a4ce709 Merge pull request #678 from minggo/test 
make linux template work correctly
 2012-01-12 04:24:38 -08:00
minggo 813342fb83 make linux template work correctly 2012-01-12 20:20:09 +08:00
dumganhar d3642be42d Merge pull request #677 from dumganhar/modify_linux_port 
modify eclipse project setting for linux port
 2012-01-12 04:00:02 -08:00
minggo 07452fb561 Merge pull request #676 from minggo/test 
update CHANGELOG
 2012-01-12 03:33:04 -08:00
minggo bd5ff14e45 Merge branch 'test' of https://github.com/minggo/cocos2d-x into test 2012-01-12 19:30:46 +08:00
minggo fc44e1b778 update CHANGELOG 2012-01-12 19:29:08 +08:00
dumganhar 3f7ab5a58f Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into modify_linux_port 2012-01-12 19:17:31 +08:00