Commit Graph

755 Commits

Author SHA1 Message Date
minggo 87b926c74f match the declaration of cocos2dVersion 2010-12-18 16:08:57 +08:00
Walzer 5c858b182c issue #243, fix warnings 2010-12-18 12:02:57 +08:00
Walzer edc742d41b Merge branch 'master' of https://github.com/leon-li/cocos2d-x into leon-li-master 2010-12-18 10:26:22 +08:00
Walzer 5f563102e9 fixed #265 2010-12-18 08:17:53 +08:00
Walzer 6de3f0f404 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2010-12-18 08:10:14 +08:00
Leon 96f4f5c9fd fix some compiling warning for iOS 2010-12-17 23:44:19 +08:00
Walzer 641bea0abc fixed #265 compile error when enable CC_XXX_DEBUG_DRAW switchs in ccConfig.h 2010-12-17 23:18:03 +08:00
Walzer 988d7289b8 Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master 2010-12-17 20:40:16 +08:00
Walzer 63bfa195db Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2010-12-17 20:36:24 +08:00
yangws 53bc90f634 fix UImage Constructor error 2010-12-17 18:16:31 +08:00
yangws caf518f97d fixed: helloworld win32 release configure build error, CCTMXTiledMap.cpp Access NULL pointer error. 2010-12-17 17:20:39 +08:00
minggo 012812a8f5 Because platform/android/ccx_Common_android.cpp is rename to platform/android/ccxCommon_android.cpp, so the Android.mk should change too. 2010-12-17 11:48:46 +08:00
minggo e287466c2f fixed #246 2010-12-17 11:39:25 +08:00
Walzer c8989c7941 fix a memory leak when invoking png_destroy_read_struct, for uphone & andorid platform 2010-12-17 10:14:56 +08:00
Walzer b55ef3cd69 Merge branch 'master' of https://github.com/mattjesson/cocos2d-x into mattjesson-master 2010-12-17 10:03:57 +08:00
Walzer 0b8d5c96f7 fixed #263, compilation error while enableing CC_SPRITE_DEBUG_DRAW 2010-12-16 22:37:15 +08:00
unknown 31951603a4 Fixed a memory leak in the Win32 version of the PNG reading code.
The png_info struct wasn't being properly free'd (leaving behind row data).
(looks like it might also apply to the 'uphone' version but I have no way of testing)
2010-12-16 12:23:27 +00:00
Walzer 063f595e9a Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master 2010-12-16 12:03:25 +08:00
natural-law 95e697d316 fixed #262 Add namespace for the project CocosDenshion. 2010-12-15 18:28:18 +08:00
impact 7434748d4a Capitalization changes for building on linux (case-sensitive filesystem) 2010-12-15 01:00:35 -05:00
natural-law b8b5c2e8cd fixed #258 Modify the files which include FileUtils.h. 2010-12-14 14:05:35 +08:00
natural-law 2576bbe5b4 Merge branch 'master' into iss258 2010-12-14 13:53:25 +08:00
Walzer 02e95f6b06 issue #243 fix a memory leak point of iphone-cpp version. but the leaks isn't completely clear yet. 2010-12-14 11:21:44 +08:00
unknown acc30e35b1 Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master 2010-12-14 11:10:46 +08:00
unknown 57770086e6 Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2010-12-14 11:09:36 +08:00
natural-law 2c84b167e0 fixed #258 Move FileUtils.h from path "support/file_support" to path "include". 2010-12-14 10:45:23 +08:00
minggo a33823706d fixed #259 2010-12-14 09:42:39 +08:00
natural-law 8cb331994d Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge 2010-12-13 17:55:02 +08:00
natural-law 2706e3a003 fixed #251 CCKeypadDelegate implement 2010-12-13 14:10:39 +08:00
minggo 1f34709c03 Merge branch 'master' of https://github.com/minggo/cocos2d-x 2010-12-11 13:40:16 +08:00
minggo 562930f816 fixed #252 2010-12-11 13:33:53 +08:00
Walzer 9737e908ab Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master 2010-12-11 09:49:59 +08:00
Walzer dec419be71 Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2010-12-10 10:34:41 +08:00
Walzer 5babcbca6b fixed #248, crashed in CCSprite::setDisplayFrame 2010-12-10 10:31:14 +08:00
natural-law 6c1eb5d5c0 fixed #227 integrate multi-touch support on uphone 2010-12-09 18:28:16 +08:00
minggo f3126de646 Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master 2010-12-09 13:59:02 +08:00
yangws 1151cea7dd fixed 233 keep the backlight on when the cocos2d-game at foreground.
Signed-off-by: yangws <yangws@cocos2d-x.org>
2010-12-09 11:41:32 +08:00
minggo 6b37bc97d4 fixed #220: run tests on android 2010-12-09 10:50:02 +08:00
unknown 9c06a69ed9 Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master 2010-12-08 18:05:17 +08:00
unknown 4d22e3b263 Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master 2010-12-08 18:03:35 +08:00
minggo 534a55eaa1 issue #220: All tests run on android emulator, but the effect of some tests are wrong 2010-12-06 09:51:21 +08:00
yangws 5b51bd049b issue #233 prevent KeyLock when playgame on uphone. 2010-12-04 18:16:09 +08:00
Walzer c02230b4ae fixed #240, CCSequence(..., CCHide::action(), ...) will not break down now. 2010-12-04 15:03:07 +08:00
natural-law 8891b894d6 fixed #239 Clear memory leak in cocos2d-uphone 2010-12-03 16:42:31 +08:00
yangws 96115bc26e fixed #233 now don't call preMainLoop when application enter background, test ok on uphone device.
fixed a CCXAppWiz.uphone bug, create a empty file named xxxxx_str_str.h when build.

Signed-off-by: yangws <yangws@cocos2d-x.org>
2010-12-03 15:27:55 +08:00
yangws 4df7cbcc40 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2010-12-03 11:24:39 +08:00
natural-law 3a0ae951b7 fixed #236 Fix the bug of cross-compile in cocos2d-uphone 2010-12-03 11:08:30 +08:00
yangws 687fb199fc issue #233 stop main loop when application enter background. test ok on emulator 2010-12-02 18:44:13 +08:00
minggo 7fa8d72076 commit before merging the code from https://walzer@github.com/cocos2d/cocos2d-x.git 2010-11-29 15:54:32 +08:00
minggo 9a2ff2407a commit the change before merging master of cocos2d-x 2010-11-29 15:08:21 +08:00