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
d48da20b0f
synchrolize to master
2011-11-18 18:53:53 +08:00
U-zhangxm-PC\zhangxm
d84b6c25be
issue #223 : merge bada branch and fix some error
2011-11-18 18:45:05 +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
dumganhar
5704fdc146
Merge branch 'testMP_static_lib' into newest
2011-11-13 01:05:22 +08:00
dumganhar
25ab866557
when CCTextureAtlas::resizeCapacity, should
...
glDeleteBuffers(2, m_pBuffersVBO);
// initial binding
glGenBuffers(2, &m_pBuffersVBO[0]);
otherwise, CCSpriteBatchNode will have a bug the can't draw more than one sprite on bada 2.0 device.
2011-11-13 00:57:05 +08:00
dumganhar
ca3b91855a
debug issue #852
2011-11-10 16:44:58 +08:00
dumganhar
a81b078286
fixed a bug in calloc(0) return NULL.
2011-11-08 15:59:51 +08:00
dumganhar
da794c1613
Merge branch 'master' into bada
2011-10-21 09:28:29 +08:00
Leon
70a4942ea6
fix some warning
2011-10-19 15:24:19 +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
dumganhar
56eb3060ee
uiimage to uiImage
2011-09-28 09:49:57 +08:00
minggo
a7e8c36eee
invoke this->drawNumberOfQuads(n, 0) in CCTextureAtlas::drawNumberOfQuads(unsigned int n)
2011-08-23 17:04:38 +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
Walzer
3afe6ebfb2
fixed #638 , add support for pvr ccz format. I've tested it on both ios & android, also with instrument memleak detection. But haven't tested on win32 & marmalde, in thoery it will work.
2011-08-16 11:56:17 +08:00
Leon
771e2349c5
fix some warnings under xcode 4.0 llvm compiler
2011-08-10 22:39:02 +08: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
natural-law
32e7ee6e2f
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-07-20 15:35:52 +08:00
natural-law
6a8b563feb
fixed #621 , Add Texture2dTest in tests project.
2011-07-20 15:35:20 +08:00
Leon
5f1f63dabf
fix: passing std::string object to CCLOG
2011-07-20 08:52:29 +08:00
Walzer
d2b44a203f
issue #536 , build success on win32
2011-07-19 16:03:42 +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
fe3aadf800
update to 1.0.0 07-12
2011-07-13 10:20:24 +08:00
RongHong
7b74372cac
fix #592
2011-07-08 15:38:32 +08:00
minggo
f894e00f27
fix a bug of CCProgressTimer when upgrade to rc3
2011-07-06 16:29:56 +08:00
minggo
0d80326392
fixed #564 : upgrade textures to 1.0.0-rc3
2011-07-05 10:47:25 +08:00
minggo
6482f5662b
fixed #557 : upgrade label_nodes to 1.0.1-rc3
2011-07-04 10:59:35 +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
minggo
113f1ab2ef
fixed #484 : solve a potential issue
2011-05-06 18:09:31 +08:00
yangws
e895d9d073
TextInputTest compile ok on android and merge last master code.
...
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input
Conflicts:
HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java
HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxRenderer.java
HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj
cocos2dx/platform/android/Cocos2dJni.cpp
tests/test.android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java
tests/test.android/src/org/cocos2dx/lib/Cocos2dxRenderer.java
tests/test.ios/test.xcodeproj/project.pbxproj
tests/test.win32/test.win32.vcproj
2011-04-26 18:04:07 +08:00
minggo
e5441a4fc2
fixed #450 : can set default pixel format other than RGBA8888
2011-04-20 15:34:33 +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
7d52161804
fixed #441 : Initialize pointer in contruction & detect pointer value in destruction
2011-04-01 16:06:53 +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
walzer
6cc09aa4dc
Merge branch '396' of https://github.com/yangws/cocos2d-x into yangws-396
2011-03-28 21:08:56 +08:00
yangws
dceff2d179
issue #396 android modified.
2011-03-28 11:09:49 +08:00
yangws
4b86cec4be
issue #396 win32 modifyed.
2011-03-28 10:44:14 +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
minggo
47173778cc
fixed #409 : rename NSArray UIAlignment
2011-03-18 14:31:29 +08:00