Commit Graph

43 Commits

Author SHA1 Message Date
YuLei Liao 7a6253d9aa * merge cocos2d-1.0.1-x-0.9.2-luafix to master 2011-11-21 16:38:00 +08:00
YuLei Liao 09d12be875 * format cocos2d-x source files 2011-11-18 21:23:54 +08:00
minggo cc79e533a3 issue : add pthread for win32 and implement CCTextureCache::addImageAsync() 2011-11-16 11:04:29 +08:00
minggo 2c14402107 fixed : 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
laschweinski 606c8803bc modified: CocosDenshion/Linux/FmodAudioPlayer.cpp
modified:   CocosDenshion/Linux/FmodAudioPlayer.h
	deleted:    HelloWorld/AppDelegate.cpp
	deleted:    HelloWorld/AppDelegate.h
	deleted:    HelloWorld/HelloWorldScene.cpp
	deleted:    HelloWorld/HelloWorldScene.h
	modified:   cocos2dx/.cproject
	modified:   cocos2dx/actions/CCActionInstant.cpp
	modified:   cocos2dx/include/CCActionInstant.h
	modified:   lib/android/Debug/libcocos2d.so
	modified:   lib/android/Release/libcocos2d.so
	modified:   lib/linux/Debug/libcocos2d.so
	modified:   lib/linux/Debug/libcocosdenshion.so
	modified:   lib/linux/Release/libcocos2d.so
	modified:   lib/linux/Release/libcocosdenshion.so
	HelloWorld/AndroidDebug/
	HelloWorld/AndroidRelease/
	HelloWorld/Classes/
	HelloWorld/android/assets
	HelloWorld/postCompiled.sh
	cocos2dx/platform/third_party/linux/
	installLinuxLib.sh
	tests/Res/gui_close.WAV
2011-08-25 19:04:29 +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 c1fdf9afb5 issue rendertexture disappears after going to background 2011-07-28 17:32:09 +08:00
Walzer bc44855091 issue , 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 : upgrade textures to 1.0.0-rc3 2011-07-05 10:47:25 +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
minggo 22b55eaf78 issue : add copyright of original author to each file 2011-03-19 10:59:01 +08:00
minggo 75e2ecc16d issue : move platform_support into cocos2dx/platform 2011-03-09 14:40:05 +08:00
minggo b5a99f90df issue : rename file names and object names 2011-03-07 17:11:57 +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 942d0233cf fixed 2010-12-30 17:30:11 +08:00
Walzer 820c2f0714 issue cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
Walzer b4328354af issue cocos2dx -> cocos2d-x 2010-11-18 14:07:17 +00:00
Walzer dad659641b issue , add @brief in class annotate 2010-09-29 01:44:57 +00:00
Walzer 01eb8da314 issue , modify object-c code in annotate. 2010-09-28 04:14:12 +00:00
Walzer 64d0d7a7e1 fixed , fullPathFromRelativeFile, modify CCTextureCache::addImage 2010-09-08 01:28:28 +00:00
Walzer 4b86b49b08 fixed , fullPathFromRelativeFile, modify CCTextureCache::addImage 2010-09-07 10:04:57 +00:00
Walzer 820676ea28 issue , 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 2658199ead issue : debug 2010-08-26 06:06:41 +00:00
Walzer e08807083c issue , debug, change description 2010-08-06 08:05:19 +00:00
Walzer 324a9fac83 issue , debug 2010-08-06 06:32:32 +00:00
Ming 76f62adf62 fixed : 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
添加一个简单的CCSprite单元测试,同时修正几个小的bug
2010-08-03 04:07:32 +00:00
Walzer 88ce1c8f83 issue , implement 2010-07-30 08:35:07 +00:00
Walzer d2235ef1a3 issue 7#, add NSLock.h in platform/ 2010-07-23 07:39:24 +00:00
Walzer 2fdf9c0ef3 issue , add namespace to timeval in platform_uphone.h 2010-07-23 06:23:53 +00:00
Walzer b34c778e79 issue , remove unusable include in .h 2010-07-22 10:39:40 +00:00
Walzer 9934149257 issue , change string to const char* 2010-07-22 03:15:25 +00:00
Walzer 59c7a734ba issue , implement .cpp 2010-07-21 09:40:10 +00:00
Walzer adbf70a033 issue , implement .cpp 2010-07-21 03:13:32 +00:00
Walzer 2e5357dc30 issue , change the include directory 2010-07-20 06:29:18 +00:00
Walzer 5d60c2ca0a issue , change the use of NSMutableArray 2010-07-20 05:49:13 +00:00
Walzer e0b4307d30 fixed , CCAtlasNode complete, CCNode is short of Action 2010-07-19 08:45:53 +00:00
Walzer c61ceb8020 issue : complete CCTextureAtlas, done CCTextureCache partly 2010-07-16 08:28:11 +00:00
Walzer aaf5b5859f issue : add CCTextureAtlas.h and implement CCTextureAtlas.cpp partly, add CCTextureCache.h 2010-07-16 06:15:06 +00:00