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

875 Commits

Author SHA1 Message Date
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
natural-law b1d3e66e68 1. Check the return value of FileData::getFileData() 
2. Fix a bug of CCBitmapFontConfiguration::parseConfigFile()
3. Move the function CCFileUtils::getFileDataFromZip() to class of FileUtils.
 2010-11-29 14:21:33 +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
natural-law 4d98faabc5 fixed #226 add support read resource file from zip file in cocos2d-uphone 2010-11-29 10:49:43 +08:00
Walzer 8854ec5b10 Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2010-11-26 11:59:56 +08:00
minggo b695c42655 Merge branch 'master' of https://github.com/minggo/cocos2d-x 2010-11-26 11:39:26 +08:00
minggo aa826970eb fixed #224 2010-11-26 11:38:10 +08:00
walzer 29191a385e Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2010-11-24 10:38:01 +08:00
yangws 852c57d2c6 add CCLOG support on win32 and uphone 2010-11-23 18:20:46 +08:00
minggo 59a986438f Remove unneeded predefined macro _ADNROID, because ndk build chain has already defined a macro named ANDROID 2010-11-23 18:02:42 +08:00
natural-law 3eba79ec07 fixed #217 2010-11-23 15:15:07 +08:00
minggo 98c5546658 fixed #216: Accelerometer is correct 2010-11-23 14:40:10 +08:00
yangws de97900b6c CCLOG support for cocos2d-win32 2010-11-23 11:23:29 +08:00
minggo 22f7521cd3 fixed #215 2010-11-22 18:09:38 +08:00
yangws efd69c7023 re-add source files to cocos2d-win32.proj. 2010-11-22 15:40:43 +08:00
minggo 96ea648820 fixed #213: fixed the bug. 2010-11-22 11:36:40 +08:00
minggo 8be8a02e73 fixed #210: support accelemeter 2010-11-22 11:11:20 +08:00
Walzer 224e9cfb6c fixed #210: support accelemeter 2010-11-22 10:48:19 +08:00
Ming e379786e4d 2010-11-19 06:57:58 +00:00
yangws d96599e787 2010-11-19 02:48:08 +00:00
natural-law fc745a6a70 debug 2010-11-19 01:21:47 +00:00
Walzer 78a2792dcb issue #211 cocos2d-x.abc -> cocos2d-abc 2010-11-18 15:58:58 +00:00
Walzer 0ad77b779a issue #211 don't checkout 2010-11-18 15:55:00 +00:00
Walzer 820c2f0714 issue #211 cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
Walzer b4328354af issue #211 cocos2dx -> cocos2d-x 2010-11-18 14:07:17 +00:00
Walzer 79ed40ef38 issue #211 don't check out 2010-11-18 13:47:14 +00:00
Walzer a96bb3ef0c rename projects 2010-11-18 12:36:14 +00:00
Walzer 6afe5752f2 rename directories 2010-11-18 12:32:01 +00:00
natural-law 2b23e0f6d5 debug 2010-11-18 10:27:05 +00:00
Ming dc2f5f604f fixed #208 2010-11-18 07:38:47 +00:00
Ming 31809a3774 issue #208 2010-11-18 06:50:28 +00:00
Walzer 0a2567c646 SEL_MunuHandler -> SEL_MenuHandler & SimpleAudioEngine::sharedEngine 2010-11-17 08:31:48 +00:00
Walzer 0c687c3aac jump a messagebox when load image failed in uphone. 2010-11-17 07:24:50 +00:00
natural-law 575922ab7c debug 2010-11-17 06:32:44 +00:00
yangws b181701039 change win32 porject name 2010-11-17 02:46:43 +00:00
yangws 0618af9711 change win32 project name 2010-11-17 02:16:21 +00:00
natural-law 84ece545bd issue #189 
add support of Accelerometer sensor
 2010-11-16 07:13:20 +00:00
Walzer fb25984f12 rename getShared methods to shared 2010-11-16 07:12:09 +00:00
Ming 26363b5f9a fixed #207 2010-11-16 06:33:00 +00:00
Ming 0aab635d85 fixed #206 2010-11-16 04:02:45 +00:00
yangws 2e6f7c0623 issue #205 vs2008 run tests win32 OK. 2010-11-15 02:57:15 +00:00
yangws 278fc00906 issue #205 update third_party's libraries to the latest release version. 2010-11-13 10:19:08 +00:00
natural-law d2006ec7a9 debug 2010-11-13 09:55:41 +00:00
natural-law a0930a2991 debug 2010-11-13 09:01:35 +00:00
Ming 416a319344 fixed #203 2010-11-13 03:34:49 +00:00
Ming 0e78c9071a issue #202 2010-11-12 10:21:52 +00:00
Ming 3a5ce078cf issue #202 2010-11-12 09:44:13 +00:00
Ming 64ac386384 issue #202 2010-11-12 09:29:14 +00:00
Ming 6062cf1558 issue #202 2010-11-12 09:26:01 +00:00
Ming 026713cf76 issue #202 2010-11-12 09:18:54 +00:00
Ming 0a4e9885f3 issue #202 2010-11-12 09:16:15 +00:00
Walzer 916b620259 fixed #201 when load image fails, it will jump a MessageBox now, and return a transparent sprite 2010-11-12 07:55:28 +00:00
Walzer d842a47e10 fix win32 version to sync with uphone-0.9.0-stable 2010-11-11 07:26:16 +00:00
Walzer 94806c9194 merge with tag/0.99.4-uphone-0.9.0 2010-11-11 03:18:58 +00:00
natural-law 000bdeeb42 issue #189 
add support of Accelerometer sensor
 2010-11-10 08:29:52 +00:00
natural-law c165ad36a7 debug 2010-11-05 09:29:24 +00:00
Ming 0ea2035ec6 2010-11-04 09:33:31 +00:00
Ming ca066d0bac fixed #191 2010-11-04 09:32:22 +00:00
yangws c792daec63 update PowerVR OGLES lib to version 2.0.27.0484 2010-11-04 03:59:29 +00:00
yangws d630996bd0 fixed #187 The reason is call preMailLoop too many times in short time in message loop, use sleep(0) to resolve this problem. 2010-11-04 03:51:57 +00:00
Walzer f80ea71066 fix #188, for win32 version, make glDeleteTextrues before eglDestroyContext 2010-11-03 08:00:39 +00:00
Walzer 200080aea0 fix #188 , make eglDestroyContext after glDeleteTexture 2010-11-03 06:47:23 +00:00
Ming b06f84d332 2010-11-03 06:13:40 +00:00
Ming b0e0d63217 2010-11-03 06:04:48 +00:00
Ming b60fbd82a5 added for android 2010-11-03 03:01:17 +00:00
Ming 6853385c8d resolve compile error for android 2010-11-03 02:59:07 +00:00
Walzer 4695fa05df egl function errors will show a messagebox now 2010-10-29 08:36:34 +00:00
natural-law 6d98ae5b2c support Chinese in cocos2dx-uphone 2010-10-27 03:56:51 +00:00
Walzer 2935faebfc change default Makefile.ARM to build static libraries. 2010-10-26 09:51:37 +00:00
natural-law 419544ff45 debug 2010-10-22 07:51:32 +00:00
natural-law 1d8b5d02a3 debug 2010-10-22 07:10:18 +00:00
natural-law 1b81908ae4 add comment 2010-10-21 09:56:13 +00:00
natural-law 78a93db918 issue #182 2010-10-21 02:29:09 +00:00
natural-law 1f8442cc05 issue #182 2010-10-21 02:24:46 +00:00
natural-law 0dbda6c32d issue #185 
Let cocos2d-uphone support WVGA
 2010-10-19 09:08:25 +00:00
yangws 72e31303a7 Don't need disable statusbar on uphone yet 2010-10-16 09:28:16 +00:00
Ming 992ad7e75d fix the method of computing frame rate 2010-10-16 07:29:53 +00:00
yangws 2ba7ba409b fixed #184 support deviceOrientation on win32 now. 2010-10-15 08:06:05 +00:00
Ming 0298500abe add setContentScaleFactor() 2010-10-15 07:47:48 +00:00
yangws fb0987ae6c fixed #183 add zlib1.dll for win32 2010-10-14 07:05:44 +00:00
yangws 24ae7b36b7 2010-10-13 08:44:16 +00:00
natural-law c8e2874c9f debug 2010-10-13 08:21:59 +00:00
yangws c1225b9396 fixed #183 run test ok. 2010-10-13 06:46:06 +00:00
yangws 83ac66091d 2010-10-13 06:18:39 +00:00
yangws 3317280984 2010-10-13 06:15:11 +00:00
yangws ebb4ae2aa7 issue #183 add iconv libjpeg libpng libxml2 zlib to win32/third_party 2010-10-13 06:12:23 +00:00
yangws 23808af094 win32 window close button enable. 2010-10-13 05:16:17 +00:00
yangws f9b550a7b0 add user files 2010-10-13 05:11:55 +00:00
yangws c4e53c54e4 fixed #176 test_win32 OK. 2010-10-13 05:09:39 +00:00
yangws 040f68160a issue #176 add test code in test_win32, which same with test_uphone . 2010-10-12 09:15:44 +00:00
Walzer 2a43160d39 fix a warning 2010-10-12 04:07:49 +00:00
natural-law 31c069777d issue #182 2010-10-12 03:52:11 +00:00
Walzer 3224f8b9c5 issue 172 : fix the bug. In CCTextureCache::addImage and CCTextureCache::addUIImage, we will lock the texture cache array before we use it. So we must make sure that we unlock the texture cache array when we return in the function. 2010-10-12 03:23:47 +00:00
Ming 7a9b417248 2010-10-11 10:05:34 +00:00
yangws c1e4bf366f 2010-10-11 08:48:44 +00:00
natural-law 09e9638b03 issue #182 2010-10-11 07:35:36 +00:00
natural-law 05bea6a707 issue #182 2010-10-11 07:28:58 +00:00
yangws 5184e4383e change UIImage(TBitmap * ) to UIImage(CCXBitmapDC *) on uPhone platform. 2010-10-11 02:58:27 +00:00
yangws 82e6fabf96 Helloworld-win32 release OK. 2010-10-10 15:30:38 +00:00
yangws e7502ad66f Add PowerVR Lib to platform/win32/third_party. 2010-10-10 13:03:11 +00:00
yangws 8900e0644c helloworld-win32 vertical screen ok. 2010-10-09 09:41:42 +00:00
Ming 9febafadec 2010-10-09 08:23:58 +00:00
Walzer 77564d0017 add LAYER_NODE_FUNC & SCENE_NODE_FUNC 2010-10-09 06:23:47 +00:00
Ming a05f9d0dc5 2010-10-09 01:57:24 +00:00
Walzer f94d1760e5 bug fix: release error in forceRemoveDelegate method 2010-10-08 13:17:03 +00:00
yangws cf0a2c5665 add cocos2dx-win32 framework, can't work yet. 2010-10-08 09:53:04 +00:00
Ming 19b6f1a235 2010-10-08 01:57:07 +00:00
Walzer 371baf3efc add NSSet::anyObject method 2010-10-01 15:05:05 +00:00
Walzer ed4e288f27 modify the logic of "node" method 2010-10-01 15:04:12 +00:00
Walzer 1b385bfe20 fix warnings in NSSet & CCXUIImage_uphone. NSSet will alloc std::set in heap, instead of in stack, to avoid compile warning 2010-10-01 06:34:47 +00:00
Walzer a6b03ce9ea add type cast in "ccp" marco, to avoid warnings 2010-10-01 06:21:37 +00:00
Walzer b86a666269 fix some warnings during compile phase 2010-09-30 23:51:06 +00:00
Ming 0247182dc3 fixed #173 2010-09-30 07:54:15 +00:00
Walzer 72aee0eace issue #175, add retain for CCCallFunc::m_pSelectorTarget 2010-09-30 03:57:31 +00:00
Ming 683596a023 issue #170 2010-09-29 09:39:45 +00:00
Walzer 8633fa5d9e issue #171 2010-09-29 08:33:52 +00:00
Walzer f1c48be489 issue #171, implement CGRectIntersectsRect 2010-09-29 08:06:03 +00:00
Walzer b8f59f623d issue #171, implement CGRectIntersectsRect 2010-09-29 07:24:51 +00:00
Walzer d93aae9133 issue #171, add annotate for protected member variable 2010-09-29 04:03:21 +00:00
yangws c8439ca79e change CGPoint CGSize CGRect function's parameter pass by value to pass by reference, 
impliment CGRectIntersectsRect function
 2010-09-29 03:49:38 +00:00
Walzer dad659641b issue #171, add @brief in class annotate 2010-09-29 01:44:57 +00:00
Ming 742baf4fdb issue #170 2010-09-28 10:27:33 +00:00
Ming a257cad0a4 issue #170 2010-09-28 10:00:38 +00:00
natural-law c57957d910 issue #170 
add comment of class CCFileUtils
 2010-09-28 08:57:39 +00:00
natural-law b7dd58e4e1 issue #170 
add comment of class CCFileUtils
 2010-09-28 08:48:26 +00:00
Ming 68d3edc0d3 issue #170 2010-09-28 08:18:05 +00:00
Walzer 01eb8da314 issue #171, modify object-c code in annotate. 2010-09-28 04:14:12 +00:00
Walzer a279e5dc9b issue 169, we should retain the new variable first, and then release the old one. assignment at last. 2010-09-27 10:19:10 +00:00
Walzer 3f233e2651 issue #161，support *.jpg，add texture to texture cache 2010-09-27 09:26:35 +00:00
Walzer dff457e4eb issue 167， premutiply alpha when read png file 2010-09-27 08:05:49 +00:00
Ming ced3d86507 issue #166 2010-09-26 06:55:28 +00:00
Ming 167aed310c 2010-09-26 06:26:19 +00:00
Ming 85e2bfdea0 fixed #163 2010-09-26 06:11:10 +00:00
Ming 29dba052bf fixed #163 2010-09-26 04:01:19 +00:00
Walzer 5b82f4d468 issue #161，support *.jpg 2010-09-26 02:09:05 +00:00
natural-law c4c81dba7e issue #165 
Update the tests code to 0.99.4 release version
 2010-09-25 03:54:33 +00:00
Walzer 8de5442c0e issue #161，update CCTMXLayer, CCTMXTiledMap, CCTextureCache 2010-09-25 02:28:27 +00:00
Ming 12d6df9717 issue #154 2010-09-24 10:10:32 +00:00
Walzer 5415e04d7c issue #161，add CCSpriteBatchNode 2010-09-24 04:05:25 +00:00
Walzer 156d1ff69b issue #161，add CCSpriteBatchNode 2010-09-24 04:04:13 +00:00
Ming 0d0b68a200 fixed #151 2010-09-24 02:54:06 +00:00
Ming a50b1b97bb issue #151: because now the r, g, b is correct, so we should not 
change it
 2010-09-21 08:15:23 +00:00
yangws 30417e37f9 2010-09-21 07:06:01 +00:00
Ming 7852912fdd issue #151 2010-09-18 09:49:02 +00:00
Ming addfb8df94 issue #151 2010-09-18 09:22:21 +00:00
Ming 556b8ed455 issue #151: change the function name 2010-09-18 07:44:56 +00:00
Ming 93135d1366 issue #151 2010-09-18 07:22:07 +00:00
Ming b87fb419fb issue #151 2010-09-18 06:14:51 +00:00
natural-law 5af16c3282 issue #144 
Clear memory leaks of the test_uphone project
 2010-09-17 06:51:34 +00:00
yangws 069d3507e8 unified CCXEGL code base on uPhoneEmuGlesPatch.zip 2010-09-17 04:02:23 +00:00
natural-law d2b60c4402 issue #144 
Clear memory leaks of the test_uphone project
 2010-09-17 03:41:02 +00:00
Ming 0c842b7874 issue #142: add depth test of opengl 2010-09-17 01:20:46 +00:00
natural-law 6bd7d28e06 issue #144 
Clear memory leaks of the test_uphone project
 2010-09-16 09:19:18 +00:00
Ming 300e1abbbb issue #142 2010-09-16 07:53:58 +00:00
natural-law 4db7ac0e9b issue #144 
Clear memory leaks of the test_uphone project
 2010-09-16 03:18:09 +00:00
Ming 14982bd715 issue #141 2010-09-15 06:52:11 +00:00
Ming a92f74d318 fixed #141: the transition vertex is error, so use CCDirector's instead 2010-09-15 03:47:55 +00:00
Ming be2baff67f fixed #146: convert the pointer to NSObject* before HASH_FIND_INT, because we save it as NSObject*, and the saving operation will adjust the value of pointer. 2010-09-15 01:31:01 +00:00
Walzer c83678f9b2 hide system state bar when cocos2d running 2010-09-14 08:47:29 +00:00
yangws 221f07610c hide system state bar when cocos2d running 2010-09-14 08:34:14 +00:00
Ming 622170528c issue #141 2010-09-14 07:23:38 +00:00
natural-law 16b360fd7d fixed #148 
Explant Box2D and add Box2dTest
 2010-09-14 06:47:12 +00:00
natural-law cd4bb0bfc8 issue #144 
Clear memory leaks of the test_uphone project
 2010-09-14 02:26:19 +00:00
natural-law 331f777713 issue #144 
Clear memory leaks of the test_uphone project
 2010-09-13 08:01:27 +00:00
natural-law 0c2849eea3 issue #139 
Debug
 2010-09-13 07:00:08 +00:00
natural-law ae1439812a issue #139 
Debug
 2010-09-13 06:12:50 +00:00
natural-law 40b6d8500a issue #139 
Debug
 2010-09-13 03:09:15 +00:00
natural-law ea125c8500 issue #143 
Clear memory leaks
 2010-09-11 10:15:34 +00:00
natural-law 8c1c49bff0 issue #143 
Clear memory leaks
 2010-09-11 08:35:06 +00:00
natural-law 44ce8d9c5a issue #143 
Clear memory leaks
 2010-09-11 08:18:18 +00:00
natural-law 2c682380ed issue #143 
Clear memory leaks
 2010-09-11 07:48:37 +00:00
natural-law b25f35d2c0 issue #143 
Clear memory leaks
 2010-09-11 07:40:01 +00:00
natural-law 143d8a3271 debug 2010-09-11 06:51:13 +00:00
Ming 8ee9347d72 issue #138 2010-09-10 07:52:10 +00:00
Ming 1c0d6b1d31 issue #138 2010-09-10 07:47:10 +00:00
Walzer b2d950743b issue 136, use NSDictionary in CCSpriteFrameCache 2010-09-10 06:08:25 +00:00
Ming 1de4c1eb6e issue #138 2010-09-10 01:21:49 +00:00
Ming 9cab8be0ff issue #138 2010-09-09 09:24:55 +00:00
natural-law 2f438483e5 fixed #137 
add SchedulerTest code
 2010-09-09 08:15:21 +00:00
natural-law 2997a74699 issue #135 
Add SpriteTest code
 2010-09-09 02:17:38 +00:00
Walzer cba41dc44b issue #129, add obj->release when obj is inserted into NSDictionary 2010-09-08 06:52:56 +00:00