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

3160 Commits

Author SHA1 Message Date
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
minggo fcb2294e20 fixed #926: subclass should retain/release when dynamic_cast fail. 2011-12-28 14:47:54 +08:00
minggo 37915cfed6 remove unneeded function, and make protocol an abstract class 2011-12-28 14:46:49 +08:00
gzito 28562c3fb9 Merge branch 'master' of git://github.com/cocos2d/cocos2d-x 2011-12-27 16:14:19 +01:00
dumganhar 2d4e14ad26 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-12-27 10:22:00 +08:00
dumganhar 2438dba1a8 Merge pull request #643 from dumganhar/issue#903 
Issue#903
 2011-12-23 04:37:24 -08:00
dumganhar a09bebb32b fixed #903: 1.pass 'id' parameter to setTouchInfo function; 
2.when double press happens, deal with it as single press.
 2011-12-23 20:33:42 +08:00
dumganhar 6a8400a350 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-12-23 19:41:25 +08:00
minggo 69bfc7ab48 Merge pull request #642 from minggo/iss919_script 
make script support global variable
 2011-12-23 00:03:04 -08:00
minggo beb57fc486 fixed #919: make script support global variable 2011-12-23 16:00:31 +08:00
minggo afa8e48783 fixed #919: linux template supports global variable 2011-12-23 14:45:41 +08:00
minggo c2761cc84f issue #919:make create project support global variable 2011-12-23 14:15:01 +08:00
minggo ae329f62ca Merge pull request #641 from minggo/iss888_linux_eclipse 
Iss888 linux eclipse
 2011-12-22 19:35:41 -08:00
minggo 4cd5ecc524 Merge pull request #640 from minggo/master 
fixed #892: update pkg and LuaCocos2d.cpp
 2011-12-22 19:32:04 -08:00
minggo d82471478d add run permition 2011-12-23 11:17:20 +08:00
minggo 48aa511116 Merge branch 'master' of https://github.com/minggo/cocos2d-x into iss888_linux_eclipse 2011-12-23 11:13:14 +08:00
minggo 61e87f661b issue #888: fix some typo error 2011-12-23 11:12:06 +08:00
minggo 333342afe2 fixed #892: update pkg and LuaCocos2d.cpp 2011-12-23 11:10:36 +08:00
minggo e287e74a6e fix a typo error 2011-12-23 10:43:39 +08:00
minggo edbbe25a98 issue #888: remove the setting for android building 2011-12-23 10:40:02 +08:00
minggo 3b15f02867 Merge pull request #639 from minggo/iss911 
make CCTextureCache::addUIImage() work ok when key is null
 2011-12-22 00:31:36 -08:00
minggo 12237cf288 fixed #911: add some comment 2011-12-22 16:29:25 +08:00
minggo 7422a424da fixed #911: make CCTextureCache::addUIImage() work ok when key is null 2011-12-22 16:26:56 +08:00
minggo 55f54b3425 Merge pull request #638 from minggo/iss923_addImageAsync 
fixed #923: init iamge type and refactor a little codes
 2011-12-21 23:40:17 -08:00
minggo a96285b617 fixed #923: init iamge type and refactor a little codes 2011-12-22 15:38:31 +08:00
minggo 52a46e01f1 Merge pull request #637 from minggo/iss924_cocosdenshion 
fixed 924: make cocosdenshion thread safe for preloading
 2011-12-21 23:07:41 -08:00
minggo 3a3dcf736b fixed 924: make cocosdenshion thread safe for preloading 2011-12-22 15:06:00 +08:00
minggo 9f02cfd2aa Merge pull request #636 from minggo/iss923_addImageAsync 
fixed #923: cache texture with correct image type
 2011-12-21 18:53:58 -08:00
minggo a0fe048f11 fixed #923: cache texture with correct image type 2011-12-22 10:48:54 +08:00