natural-law
|
e38d3a2277
|
Merge branch 'master' into iss434
Conflicts:
cocos2dx/platform/airplay/CCFileUtils_airplay.h
template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj
template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj
template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
|
2011-03-28 17:06:32 +08:00 |
natural-law
|
ed2566e201
|
issue #434,Refactor class CCFileUtils on platform airplay.
|
2011-03-28 16:27:26 +08:00 |
natural-law
|
cee82fe9fa
|
issue #434,refactor class CCFileUtils on android and ios.
|
2011-03-26 17:24:37 +08:00 |
walzer
|
f568ad8487
|
issue #379, fix a bug caused by airplay port integration, which makes android port unable to load resources by zlib.
|
2011-03-26 14:09:42 +08:00 |
walzer
|
ed492bbd1e
|
[airplay] first commit of airplay port. Thanks for Аксёнов Максим's contribution!
|
2011-03-23 22:16:20 +08:00 |
natural-law
|
7c6147421b
|
[wophone]fixed #377,Replace the word "uphone" with "wophone".
|
2011-03-09 17:28:35 +08:00 |
minggo
|
dc55c164ba
|
fixed #292
|
2010-12-29 18:01:37 +08:00 |
minggo
|
b2b8591b26
|
fixed #279
|
2010-12-28 10:23:14 +08:00 |
natural-law
|
95e697d316
|
fixed #262 Add namespace for the project CocosDenshion.
|
2010-12-15 18:28:18 +08:00 |
natural-law
|
94c9addace
|
fixed #226 add support read resource file from zip file in cocos2d-uphone
|
2010-11-29 10:55:32 +08:00 |