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

421 Commits

Author SHA1 Message Date
minggo 88de01d915 update some files in platfomr/iphone to 0.99.5 2010-12-30 14:22:25 +08:00
minggo b0e5c06d37 Merge branch 'upto-0.99.5' of https://github.com/minggo/cocos2d-x into minggo-upto-0.99.5 2010-12-30 10:36:17 +08:00
minggo da00d82117 fix some error in CCGrid and CCDirector.h 2010-12-30 10:28:13 +08:00
minggo 7b804d985b merge yangws-upto-0.99.5 into upto-0.99.5 2010-12-30 10:25:35 +08:00
minggo dc55c164ba fixed #292 2010-12-29 18:01:37 +08:00
Li Lirong e58ba468ee fix some warnings under android 2010-12-29 10:30:42 +08:00
yangws 0edf124e4f issue #281 CCParticleExamples upto-0.99.5 2010-12-28 14:04:28 +08:00
yangws 5e377f9368 issue #281 CCParticleSystemPoint.h upto-0.99.5 2010-12-28 11:09:40 +08:00
minggo b2b8591b26 fixed #279 2010-12-28 10:23:14 +08:00
minggo 33ad2881b7 merge mingo-upto-0.99.5 to upto-0.99.5 2010-12-27 11:06:44 +08:00
minggo 28a3857f95 Merge branch 'natural-law-upto-0.99.5' into upto-0.99.5 2010-12-27 10:59:03 +08:00
minggo 4e35a660dc Merge branch 'upto-0.99.5' of https://github.com/yangws/cocos2d-x into yangws-upto-0.99.5 2010-12-27 10:55:59 +08:00
minggo 4cd3e59e2b fixed #278 2010-12-27 10:26:56 +08:00
natural-law 01cd90f2cc update layers_scenes_transition_nodes to 0.99.5. 2010-12-27 09:40:45 +08:00
yangws c142070c2c misc_node upto-0.99.5. 
Signed-off-by: yangws <yangws@cocos2d-x.org>
 2010-12-25 15:09:42 +08:00
natural-law 6ee16ce878 update menu_nodes to 0.99.5 2010-12-25 11:15:19 +08:00
minggo e7231f232c fixed #276 2010-12-24 15:53:51 +08:00
minggo d6fb209861 merged from minggo-upto-0.995 to upto-0.99.5 2010-12-24 15:21:57 +08:00
minggo f92b0d514e fixed #273 2010-12-24 15:04:26 +08:00
minggo 6d98bc7b5d Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge 2010-12-23 16:22:37 +08:00
minggo 7e4d8b9d1c set up base environment 2010-12-23 16:16:11 +08:00
minggo 3692d01c5a fixed #288 2010-12-23 14:18:08 +08:00
Walzer f65a6eb90b [iphone-cpp] load image from buffer, support some PD formats 2010-12-20 18:46:58 +08:00
Walzer 639d75e6eb Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master 2010-12-18 16:36:08 +08:00
yangws 6d71a5b0f2 if defined COCOS2D_DEBUG, show messagebox when UIImage can't find resource file on disk. 2010-12-18 15:00:26 +08:00
natural-law 792781f5d6 fixed #266 fix a bug of message box in cocos2d-uphone pop-up at the wrong time. 2010-12-18 14:44:24 +08:00
Leon 96f4f5c9fd fix some compiling warning for iOS 2010-12-17 23:44:19 +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
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
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
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
natural-law 2c84b167e0 fixed #258 Move FileUtils.h from path "support/file_support" to path "include". 2010-12-14 10:45:23 +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
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
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
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 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 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
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 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
natural-law fc745a6a70 debug 2010-11-19 01:21:47 +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
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 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 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 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 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
Ming 0ea2035ec6 2010-11-04 09:33:31 +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
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
yangws 2ba7ba409b fixed #184 support deviceOrientation on win32 now. 2010-10-15 08:06:05 +00:00
yangws fb0987ae6c fixed #183 add zlib1.dll for win32 2010-10-14 07:05:44 +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 c4e53c54e4 fixed #176 test_win32 OK. 2010-10-13 05:09:39 +00:00
natural-law 31c069777d issue #182 2010-10-12 03:52:11 +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 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
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 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 b86a666269 fix some warnings during compile phase 2010-09-30 23:51:06 +00:00
Ming 683596a023 issue #170 2010-09-29 09:39:45 +00:00
Walzer d93aae9133 issue #171, add annotate for protected member variable 2010-09-29 04:03:21 +00:00
Walzer dad659641b issue #171, add @brief in class annotate 2010-09-29 01:44:57 +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 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 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
Ming 12d6df9717 issue #154 2010-09-24 10:10:32 +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 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
yangws 069d3507e8 unified CCXEGL code base on uPhoneEmuGlesPatch.zip 2010-09-17 04:02:23 +00:00
Ming 0c842b7874 issue #142: add depth test of opengl 2010-09-17 01:20:46 +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
natural-law 0c2849eea3 issue #139 
Debug
 2010-09-13 07:00:08 +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 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
Ming 6d8cad341d issue #131 2010-09-08 06:11:24 +00:00
Ming 712da80ffb 2010-09-08 01:33:43 +00:00
Walzer 4b86b49b08 fixed #134, fullPathFromRelativeFile, modify CCTextureCache::addImage 2010-09-07 10:04:57 +00:00
natural-law bd796c7452 issue #130 
Add function to set the resource path
 2010-09-07 08:30:31 +00:00
natural-law 8eb885382e issue #130 
Add function to set the resource path
 2010-09-07 08:05:18 +00:00
yangws 4a52e5aaf9 impliment CCXEGLView for uPhone device. 2010-09-06 10:35:24 +00:00
Ming 004df276ee issue #122 2010-09-04 04:00:39 +00:00
Ming 642f2a297b issue #61: use delete[] instead of delete to avoid memory leak 2010-09-03 09:23:45 +00:00
Ming 863fc8584a issue #116 2010-09-02 08:58:04 +00:00
Ming 7a1c55dd5a fixed #117 2010-09-02 08:45:51 +00:00
Walzer 3d91d1e58d update to uphone-sdk-2010.08.26, which adds opengl headers 2010-08-31 08:53:25 +00:00
Ming 39c6ebf503 issue #85:remove the using of dynamic_cast() 2010-08-31 03:20:37 +00:00
Walzer aad6392555 issue #72,debug link error 2010-08-27 10:14:17 +00:00
Ming 0f3717cc45 fixed #94 2010-08-26 05:47:47 +00:00
Ming c81b45fe44 fixed #94 2010-08-26 04:04:22 +00:00
Ming 8e3ab00f18 fixed #86 2010-08-25 09:23:32 +00:00
Ming 7291056154 fixed #86 2010-08-25 09:21:38 +00:00
Walzer 3c4eb5e8e0 issue #18, debug xml parser 2010-08-25 08:50:31 +00:00
Walzer b34b5b379e issue #82: debug , undefine CCDictionary 2010-08-25 03:36:57 +00:00
Ming 710e29b086 issue #80 2010-08-25 02:19:20 +00:00
Ming c085826f9a fixed #77 2010-08-23 08:32:37 +00:00
Ming 0c98caf83f fixed #75: include uphone/ZipUtil.h 2010-08-23 06:09:10 +00:00
Ming 61028a5dab fixed #75 2010-08-23 05:51:23 +00:00
Walzer 1d7f567963 issue #18, debug 2010-08-19 08:45:18 +00:00
Walzer b2585b1d4b issue #18, debug 2010-08-19 05:46:34 +00:00
Walzer 2aa067875b issue #18, debug 2010-08-18 08:49:49 +00:00
Walzer b2bbe00479 issue #18, debug uiimage::save, uiimage::initWithBuffer 2010-08-18 08:48:39 +00:00
Ming 5076ff065c issue #55 2010-08-18 08:37:54 +00:00
yangws 876c0dabb8 add CCXEGLView::getFrame() function. 2010-08-18 07:24:19 +00:00
Walzer 1fd2128806 fixed #56, CCRenderTexture 2010-08-18 07:15:02 +00:00
Walzer e7e0ff565b fixed #48, implement CCXBitmapDC 2010-08-17 08:12:46 +00:00
Walzer 55f01578ea issue $48, implement CCXBitmapDC 2010-08-17 04:04:25 +00:00
natural-law bdae947e76 issue #50 
use uPhone's new/delete replace the standard new/delete
 2010-08-17 03:32:33 +00:00