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

4330 Commits

Author SHA1 Message Date
dumganhar ffeed3827a Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into moveSel2CCObject 
Conflicts:
	cocos2dx/platform/CCPlatformMacros.h
 2012-01-09 23:23:45 +08:00
dumganhar d61f87ba92 modify construct and destruct function of some class, for example CCNode() --> CCNode.cpp(void) 2012-01-09 23:21:31 +08:00
dumganhar cb4dc6623b Merge pull request #662 from dumganhar/iss939_create_qnx_project 
fixed #939: Add create_qnx_project.vbs and add project references
 2012-01-09 03:09:41 -08:00
dumganhar 317f23f498 fixed #939: Add create_qnx_project.vbs and add project references 2012-01-09 19:06:49 +08:00
minggo 491fbe6302 Merge pull request #661 from minggo/iss917_CCFileUtils 
fixed #917: implement CCFileUtils::getFileDataFromZip() on iOS
 2012-01-09 01:40:26 -08:00
minggo 0ee582e887 fixed #917: add header files to resolve compiling errors 2012-01-09 17:36:57 +08:00
minggo b1aee8f9eb Merge https://github.com/cocos2d/cocos2d-x into iss917_CCFileUtils 2012-01-09 17:12:46 +08:00
dumganhar 3c8f593653 Merge pull request #660 from dumganhar/issue#938WaveM_gl 
Issue#938 glGenFramebuffersOES isn't supported on wave m device
 2012-01-08 22:21:37 -08:00
dumganhar 4cc1658d45 fixed #938:Don't use eglGetProcAddress to get extension function on bada1.0 device, otherwise it will cause crash. 2012-01-09 14:15:49 +08:00
dumganhar 259aaf42a6 Fixed: get extension function from eglGetProcAddress on bada platform 2012-01-09 14:15:18 +08:00
minggo a5150259f0 Merge pull request #659 from dumganhar/useVirtualProperty 
Use virtual property
 2012-01-08 19:20:02 -08:00
dumganhar 30a02030b0 make the property function to virtual 2012-01-09 11:07:45 +08:00
dumganhar 9a8bde433b Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2012-01-09 10:35:15 +08:00
dumganhar a773e4fb96 move SelectorProtocol to CCObject 2012-01-08 21:03:16 +08:00
dumganhar 81ea3eae78 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2012-01-06 21:42:56 +08:00
dumganhar 2f1c313d12 Merge pull request #658 from gzito/master 
Added options to compile libFreetype and libXml2 also under Marmalade Mac (x86 version)
 2012-01-04 22:09:22 -08:00
gzito 65ddb88000 Added options to compile freetype and libXml under Marmalade MAC (x86 simulator version) 2012-01-04 23:34:48 +01:00
dumganhar 85673885be Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2012-01-04 20:56:56 +08:00
minggo d9a6cd0e19 Merge pull request #657 from minggo/iss937_x86 
fixed #937: use gnustl_static instead of stlport_static to resolve compiling error on android x86
 2012-01-04 02:06:24 -08:00
minggo 1bd3601b11 fixed #937: use gnustl_static instead of stlport_static to resolve compiling error on android x86 platform 2012-01-04 18:02:32 +08:00
minggo 342364d3d5 Merge pull request #655 from minggo/iss910_create_template 
fixed some bugs
 2012-01-03 23:04:59 -08:00
minggo 98caa29dc2 fixed a typo error and change resource path for linux port when creating linux template 2012-01-04 15:00:14 +08:00
minggo b5a7766c17 Merge pull request #654 from minggo/master 
generate new LuaCocos2d.cpp for new codes
 2012-01-03 21:55:12 -08:00
minggo 8a05363b05 generate new LuaCocos2d.cpp for new codes 2012-01-04 13:52:58 +08:00
minggo 8ff40328af Merge pull request #653 from minggo/iss936_menu 
fixed #936: check whether selector is valid
 2012-01-03 19:00:45 -08:00
minggo 4bffaaf9cb fixed #936: check whether selector is valid 2012-01-04 10:58:20 +08:00
minggo 5d8c8f5596 Merge pull request #652 from minggo/master 
invoke CallStaticVoidMethod instead of CallStaticObjectMethod
 2012-01-03 18:54:12 -08:00
minggo c6da8d2fbd call correct java method 2012-01-04 10:14:46 +08:00
gzito 2acea5f7af libxml2.mkf for both Windows and Mac Marmalade versions 2012-01-03 00:39:31 +01:00
gzito 083d0015a3 Merge branch 'master' of git://github.com/cocos2d/cocos2d-x 2012-01-02 22:32:29 +01:00
dumganhar 8648d171bb Merge pull request #651 from dumganhar/issue#927 
Issue#927:fix some bugs of CocosDenshion for bada platform
 2011-12-31 02:24:20 -08:00
dumganhar 92ea6596a3 use ceil function to set effect volume 2011-12-31 18:08:41 +08:00
dumganhar 82c978c34e setEffectVolume, apply for all effect instance. 2011-12-31 17:53:01 +08:00
dumganhar 4010733c20 fixed #927: To use 'std::map::find' instead of 'std::map::[]', because '[]' will create a new element with default value. 2011-12-31 17:44:45 +08:00
dumganhar 6858c03ba4 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into issue#927 2011-12-31 15:35:37 +08:00
minggo f776ecc7e0 Merge pull request #650 from dumganhar/issue#934_add_isEqual 
Add 'isEqual' function for CCString, make CCObject::isEqual to virtual function
 2011-12-30 18:18:39 -08:00
dumganhar 8c65786dce fixed #934: Add 'isEqual' function for CCString, make CCObject::isEqual to virtual function 2011-12-31 10:10:41 +08:00
minggo ef62732268 Merge pull request #649 from minggo/iss752_touch 
make add/remove touch delegate in menu callback function correctly
 2011-12-29 23:59:20 -08:00
minggo 53fae04ba8 fixed #752: make add/remove touch delegate in menu callback function correctly 2011-12-30 15:43:36 +08:00
dumganhar 022530f9c8 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-12-30 11:12:14 +08:00
minggo ea260dceb4 Merge pull request #648 from dumganhar/issue#928 
16bit texture is changed to 32bit after application enter foreground
 2011-12-29 00:03:41 -08:00
dumganhar 20b6257198 fixed #928:change 'vt->m_PixelFormat = CCTexture2D::defaultAlphaPixelFormat();' to 'vt->m_PixelFormat = tt->getPixelFormat();' 2011-12-29 16:00:36 +08:00
dumganhar 025258d21d fixed #928: save pixelformat for each texture, restore the pixelformat after entering foreground 2011-12-29 15:05:38 +08:00
dumganhar 0f2d99b27e Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-12-29 14:56:15 +08:00
dumganhar d6c18ab71c fixed #927: unloadEffect called after stopEffect will cause crash 2011-12-29 14:54:18 +08:00
minggo a4330acfd4 Merge pull request #647 from minggo/iss910_create_template 
fixed #910: when create new android project, not delete existing directory
 2011-12-28 19:01:02 -08:00
minggo 5c04551567 fixed #910: when create new android project, not delete existing directory 2011-12-29 10:39:46 +08:00
minggo 8664bc6607 Merge pull request #645 from minggo/iss926_rtti 
fixed #926: retain/release in Paddle
 2011-12-27 23:15:39 -08:00
minggo 08e0be754b fixed #926: retain/release in Paddle 2011-12-28 15:13:02 +08:00
minggo 9645d14bf4 Merge pull request #644 from minggo/iss926_rtti 
add functions in CCTouchDelegate for subclass to retain/release when dynamic_cast() faild
 2011-12-27 22:54:51 -08:00