James Chen
|
7d7baf81a2
|
refactor updated...
|
2012-04-18 18:43:45 +08:00 |
James Chen
|
a71e5be0d8
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20_optimize_data
Conflicts:
cocos2dx/shaders/CCGLProgram.cpp
|
2012-04-16 12:45:47 +08:00 |
Phenix Yu
|
e623cd6357
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Conflicts:
cocos2dx/include/CCTexture2D.h
cocos2dx/include/ccMacros.h
cocos2dx/textures/CCTexture2D.cpp
lua/cocos2dx_support/LuaCocos2d.cpp
|
2012-04-15 15:46:01 +08:00 |
James Chen
|
d01f1277af
|
optimize data struct.
|
2012-04-14 19:11:57 +08:00 |
Phenix Yu
|
61a7ca71c5
|
fixed getContentSize pass by reference issue
update project setting for release mode
|
2012-04-14 17:13:38 +08:00 |
Phenix Yu
|
1ed6df9de8
|
add pixel format I8
|
2012-04-12 20:44:50 +08:00 |
Phenix Yu
|
247bf08d98
|
fixed content size issue for retina
|
2012-04-11 19:27:34 +08:00 |
minggo
|
4c61035231
|
return correct content size
|
2012-04-08 22:37:58 +08:00 |
minggo
|
355e27dada
|
merge commit 928a28e37d3469fcd41aff14cb136b1415f2fc86
|
2012-04-08 14:16:29 +08:00 |
James Chen
|
8ef5e4ae3b
|
issue #1056: Update the configuration of ios project.Sort the the project folder.
|
2012-03-21 11:07:31 +08:00 |
James Chen
|
bb4d7c2f88
|
issue #1056: Updated some files for ios platform. Added some 'TODO'.
|
2012-03-21 10:36:20 +08:00 |
James Chen
|
275891dfb0
|
issue #1056: synchronise cocos2d-iphone-2.0-rc0a
|
2012-03-16 13:42:53 +08:00 |
James Chen
|
9e89171557
|
issue #1056: Rename ccGLState to ccGLStateCache, add some ccShader_***_.h, update CCGLProgram class.
|
2012-03-15 10:42:22 +08:00 |
James Chen
|
aefdb852a2
|
issue #1056: synchronise cocos2d-iphone gles2.0 branch, HelloWorld on win32 works ok.
|
2012-03-14 14:55:17 +08:00 |
minggo
|
01cf5793ad
|
fixed #922: rename CCTexture2D::setPVRImagesHavePremultipliedAlpha() and change it to a static method
|
2011-12-20 14:59:15 +08:00 |
minggo
|
f0d22ae504
|
issue #879: replase assert with CCAssert
|
2011-11-28 17:28:43 +08:00 |
dumganhar
|
56eb3060ee
|
uiimage to uiImage
|
2011-09-28 09:49:57 +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 |
natural-law
|
6a8b563feb
|
fixed #621, Add Texture2dTest in tests project.
|
2011-07-20 15:35:20 +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
|
0d80326392
|
fixed #564: upgrade textures to 1.0.0-rc3
|
2011-07-05 10:47:25 +08:00 |
liswei
|
1591c7edc8
|
fixed #512 fix warnings in /Wall flag
|
2011-06-10 17:51:37 +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
|
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 |
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 |
minggo
|
b5a99f90df
|
issue #375: rename file names and object names
|
2011-03-07 17:11:57 +08:00 |
yangws
|
63cedd1317
|
Merge code of Platform_support for IOS.
|
2011-02-23 18:22:05 +08:00 |
natural-law
|
e4063fd190
|
[uphone]issue #340.Refactor platform_support on uphone,and run HelloWorld successful on both simulator and device.
|
2011-02-17 14:31:52 +08:00 |
yangws
|
76ea63da7f
|
Change prefix CCX to ccx.
|
2011-01-27 17:07:36 +08:00 |
yangws
|
804dc4ef7c
|
Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
Conflicts:
cocos2dx/platform/CCArchOptimalParticleSystem.h
cocos2dx/platform/win32/CCXBitmapDC.cpp
cocos2dx/proj.win32/cocos2d-win32.vcproj
|
2011-01-19 15:29:08 +08:00 |
yangws
|
79b711a758
|
move CCXBitmapDC from cocos2d/platform to platform_support.
|
2011-01-19 14:23:26 +08:00 |
natural-law
|
237042f7dd
|
fixed #309,App will not crash any more when surface re-created.
|
2011-01-10 17:54:44 +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 |
Walzer
|
5c858b182c
|
issue #243, fix warnings
|
2010-12-18 12:02:57 +08:00 |
Leon
|
96f4f5c9fd
|
fix some compiling warning for iOS
|
2010-12-17 23:44:19 +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 |
Ming
|
31809a3774
|
issue #208
|
2010-11-18 06:50:28 +00:00 |
natural-law
|
d2006ec7a9
|
debug
|
2010-11-13 09:55:41 +00:00 |
Ming
|
416a319344
|
fixed #203
|
2010-11-13 03:34:49 +00:00 |
Ming
|
6062cf1558
|
issue #202
|
2010-11-12 09:26:01 +00:00 |
Walzer
|
200080aea0
|
fix #188 , make eglDestroyContext after glDeleteTexture
|
2010-11-03 06:47:23 +00:00 |