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

201 Commits

Author SHA1 Message Date
James Chen aefdb852a2 issue #1056: synchronise cocos2d-iphone gles2.0 branch, HelloWorld on win32 works ok. 2012-03-14 14:55:17 +08:00
dumganhar 1e807d00c3 fixed #967: fixed PVR Textures can not be reloaded after GL context lost on android. 2012-02-07 11:18:39 +08:00
minggo babbd64f0d Merge pull request #691 from winbinar/master 
fixed #626: Fix bug #626
 2012-02-05 23:00:31 -08:00
dumganhar f6d6d0dd49 fixed #965: Remove some dynamic_cast callings since selector_protocol.h was removed 2012-02-02 17:46:45 +08:00
winbinar 231446a8a5 Update cocos2dx/textures/CCTextureCache.cpp 2012-01-30 07:10:49 +02:00
winbinar 910ded54c5 Update cocos2dx/textures/CCTextureCache.cpp 2012-01-30 07:10:19 +02:00
dumganhar a773e4fb96 move SelectorProtocol to CCObject 2012-01-08 21:03:16 +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
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 a96285b617 fixed #923: init iamge type and refactor a little codes 2011-12-22 15:38:31 +08:00
minggo a0fe048f11 fixed #923: cache texture with correct image type 2011-12-22 10:48:54 +08:00
minggo 15fca8b4b4 issue #892: use RTTI instead of selectorRetain() and selectorRelease() 2011-12-15 10:26:31 +08:00
minggo f0e80b32f4 fixed #854: cache texture on android 2011-12-01 17:04:56 +08:00
minggo 8fd6a7298f issue #854: fix warning 2011-11-28 10:12:31 +08:00
minggo 842c64486e issue #854: remove unneeded code 2011-11-25 16:16:37 +08:00
minggo 77b830b36b issue #854: use semaphore instead of condition because the condition may lose message 2011-11-25 16:14:06 +08:00
minggo 7e61ce7d67 issue #781: add audio functions on linux 2011-11-25 10:48:05 +08:00
minggo bc60ed7856 issue #854: optimize CCTextureCache::addImageAsync() 2011-11-22 16:47:24 +08:00
minggo efa9275d7f save the codes for testing 2011-11-21 12:04:21 +08:00
minggo 522386a6b7 issue #854: pthread work ok on iOS 2011-11-18 09:55:47 +08:00
minggo 81b8fc0ce8 fixed #854: fix a bug of CCTextureCache 2011-11-17 14:34:41 +08:00
minggo cb75465913 issue #854: add test case for CCTextureCache 2011-11-17 10:10:13 +08:00
minggo cc79e533a3 issue #854: add pthread for win32 and implement CCTextureCache::addImageAsync() 2011-11-16 11:04:29 +08:00
minggo 2c14402107 fixed #776: merge pull request and remove unneeded codes 2011-10-28 09:46:19 +08:00
laschweinski e53649ccaa add a member function to get key string of a texture. 2011-10-22 19:39:31 +08:00
minggo 2b2405e2dc fixed #750: add comment 2011-10-13 10:56:02 +08:00
minggo aaa16b4a4f fixed #750: change the key to full path, because retrieve it use full path 2011-10-13 10:54:22 +08:00
moadib a8d87a9976 Non-trivial arguments passed by reference now. 
Removed unnecessary cocos2d:: prefix inside namespace.
 2011-08-17 17:26:26 +04:00
RongHong 5f08bb24fe Merge branch 'master' into 608 2011-08-05 10:59:40 +08:00
RongHong c1fdf9afb5 issue #608 rendertexture disappears after going to background 2011-07-28 17:32:09 +08:00
natural-law d4db9eb566 fixed #636, Modify the implementation of method CCTextureCache::textureForKey(). 2011-07-28 15:08:07 +08:00
Leon 5f1f63dabf fix: passing std::string object to CCLOG 2011-07-20 08:52:29 +08:00
Walzer bc44855091 issue #536, integrate the CCTexturePVR to project, update from 0.99.5 to 1.0.0, compile successfully on ios & android. Haven't test on other platforms yet. 2011-07-19 15:14:59 +08:00
minggo 0d80326392 fixed #564: upgrade textures to 1.0.0-rc3 2011-07-05 10:47:25 +08:00
natural-law d892872d2f fixed #552, Treat the parameter of method CCTextureCache::removeTextureForKey() as relative path. 2011-07-01 09:32:15 +08:00
Marat Yakupov 14c43f4246 changed postfix increment of iterators to prefix increment 2011-06-21 09:30:03 +04:00
liswei 1591c7edc8 fixed #512 fix warnings in /Wall flag 2011-06-10 17:51:37 +08:00
natural-law 1af4aa1138 [android] fixed #374,Modify the approach of cache the textures when EGL rendering context lost. 2011-04-06 16:29:58 +08:00
yangws ba68a5b966 fixed #439 test OK. 2011-03-29 17:32:52 +08:00
yangws 041953151a issue #439 CCFileData and imageWithImageFile modified on win32. 2011-03-29 11:41:44 +08:00
natural-law 28a940ab57 issue #434,refactor class CCFileUtils on win32 and wophone. 2011-03-26 13:52:33 +08:00
walzer 81fa070125 fixed #418, add copyright of original authors, merge Bin's commit 2011-03-19 14:45:51 +08:00
yangws f0661a2679 fix 4 bugs: 
1 call CCTextureCache::purgeSharedTextureCache() to release cached texture when enableRetinaDisplay is called.
2 enableRetinaDisplay performence correctly.
3 Modify libcocos2d project pre-link event performence corretly when the source in the path which contain white blacks.
4 Modify HiResTest, that can switch resouce dynamicly now.
 2011-03-11 11:04:22 +08:00
minggo 75e2ecc16d issue #387: move platform_support into cocos2dx/platform 2011-03-09 14:40:05 +08:00
minggo 63d283d3e8 delete ccxString.h 2011-03-09 12:00:04 +08:00
minggo b5a99f90df issue #375: rename file names and object names 2011-03-07 17:11:57 +08:00
minggo 4379a1c96f Move ccxApplication to cocos2dx/platform on ios. 2011-03-02 17:05:22 +08:00
natural-law 60e9ae873c Merge branch 'dev-retina' of https://github.com/yangws/cocos2d-x into iss316 
Conflicts:
	HelloWorld/AppDelegate.cpp
	tests/AppDelegate.cpp
 2011-02-19 10:19:14 +08:00
yangws 85b9c9ae21 Retina display support and scale with keep w/h rate ok on win32. 2011-02-18 18:30:22 +08:00
natural-law 8035fc366c [uphone]Support read image file from zip file. 2011-02-17 16:16:50 +08:00
yangws 76ea63da7f Change prefix CCX to ccx. 2011-01-27 17:07:36 +08:00
yangws 79b711a758 move CCXBitmapDC from cocos2d/platform to platform_support. 2011-01-19 14:23:26 +08:00
minggo f3e8665387 remove the usage of YES and NO 2010-12-31 16:37:00 +08:00
minggo d0a16a246e fixed comipling error and link error of upto-0.99.5 2010-12-31 14:56:24 +08:00
minggo 942d0233cf fixed #290 2010-12-30 17:30:11 +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
minggo 22f7521cd3 fixed #215 2010-11-22 18:09:38 +08: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 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
Walzer 01eb8da314 issue #171, modify object-c code in annotate. 2010-09-28 04:14:12 +00:00
Walzer 3f233e2651 issue #161，support *.jpg，add texture to texture cache 2010-09-27 09:26:35 +00:00
Walzer 5b82f4d468 issue #161，support *.jpg 2010-09-26 02:09:05 +00:00
Walzer 8de5442c0e issue #161，update CCTMXLayer, CCTMXTiledMap, CCTextureCache 2010-09-25 02:28:27 +00:00
natural-law 8c1c49bff0 issue #143 
Clear memory leaks
 2010-09-11 08:35:06 +00:00
Walzer cba41dc44b issue #129, add obj->release when obj is inserted into NSDictionary 2010-09-08 06:52:56 +00:00
Walzer 64d0d7a7e1 fixed #134, fullPathFromRelativeFile, modify CCTextureCache::addImage 2010-09-08 01:28:28 +00:00
Walzer 4b86b49b08 fixed #134, fullPathFromRelativeFile, modify CCTextureCache::addImage 2010-09-07 10:04:57 +00:00
Ming 7b33c38e51 issue #61: 2010-09-06 10:10:41 +00:00
Ming c549d497a6 issue #116: remove the using of sprintf_s, because it is VC specific 2010-09-03 03:50:04 +00:00
Walzer 820676ea28 issue #18, complete the implementation left. 2010-09-01 04:02:36 +00:00
Walzer 3d91d1e58d update to uphone-sdk-2010.08.26, which adds opengl headers 2010-08-31 08:53:25 +00:00
Walzer daa63cebda issue #82: implement initWithDictionary 2010-08-26 09:22:23 +00:00
Walzer 2658199ead issue #82: debug 2010-08-26 06:06:41 +00:00
Ming 7291056154 fixed #86 2010-08-25 09:21:38 +00:00
Ming bfadb1371a fixed #83: 2010-08-25 06:14:31 +00:00
Walzer e08807083c issue #18, debug, change description 2010-08-06 08:05:19 +00:00
Walzer 324a9fac83 issue #18, debug 2010-08-06 06:32:32 +00:00
Ming 76f62adf62 fixed #30: change some header files to include 2010-08-04 08:45:00 +00:00
Walzer 14427a24d7 2010-08-04 07:46:12 +00:00
natural-law e9f36ce744 fixed #25 
添加一个简单的CCSprite单元测试，同时修正几个小的bug
 2010-08-03 04:07:32 +00:00
Walzer 8e496d09d9 issue #18, debug 2010-08-02 09:38:42 +00:00
Ming a324e38cb2 issue #21: change INT32 to int, change UINT to unsigned int 2010-08-02 02:58:00 +00:00
Walzer 3f8bbaec24 issue #7, add assert for UIImage.initWithContentsOfFile() 2010-07-30 10:21:00 +00:00
Walzer 88ce1c8f83 issue #7, implement 2010-07-30 08:35:07 +00:00
Walzer d2f792363c issue #7, debug 2010-07-28 05:48:13 +00:00
Ming 5eede62659 fixed #16: fixed compile errors 2010-07-27 05:47:29 +00:00
Walzer 0783eddda4 issue #7, implementations 2010-07-26 09:32:23 +00:00
Walzer d2235ef1a3 issue 7#, add NSLock.h in platform/ 2010-07-23 07:39:24 +00:00
Walzer 2fdf9c0ef3 issue #7, add namespace to timeval in platform_uphone.h 2010-07-23 06:23:53 +00:00
Walzer e631a65d9f issue #7, correct an error 2010-07-22 03:20:52 +00:00
Walzer 9934149257 issue #7, change string to const char* 2010-07-22 03:15:25 +00:00
Walzer 59c7a734ba issue #7 , implement .cpp 2010-07-21 09:40:10 +00:00
Walzer adbf70a033 issue #7 , implement .cpp 2010-07-21 03:13:32 +00:00
Walzer 2e5357dc30 issue #7, change the include directory 2010-07-20 06:29:18 +00:00
Walzer 5d60c2ca0a issue #7, change the use of NSMutableArray 2010-07-20 05:49:13 +00:00
Walzer c61ceb8020 issue #7 : complete CCTextureAtlas, done CCTextureCache partly 2010-07-16 08:28:11 +00:00
Walzer aaf5b5859f issue #7 : add CCTextureAtlas.h and implement CCTextureAtlas.cpp partly, add CCTextureCache.h 2010-07-16 06:15:06 +00:00