godyZ
46e9eed028
nothing with s3tc
2013-08-08 14:11:22 +08:00
godyZ
cd8430f81a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
...
Conflicts:
cocos2dx/Android.mk
cocos2dx/platform/CCImage.h
cocos2dx/platform/CCImageCommon_cpp.h
cocos2dx/textures/CCTexture2D.h
scripting/javascript/bindings/generated
2013-08-08 10:19:09 +08:00
boyu0
a9d26d3fdc
issue #2345 : edit getPixelFormatInfoMap method to return reference.
2013-08-07 11:20:41 +08:00
godyZ
02419ccb00
update s3tc #3 ,android test
2013-08-06 15:33:38 +08:00
boyu0
dc6503f7d4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2345_refactor_ccimage
2013-08-06 13:37:38 +08:00
godyZ
195536097f
update s3tc #2
2013-08-06 11:52:48 +08:00
godyZ
fd7b00681f
update s3tc#1
2013-08-06 11:19:45 +08:00
boyu0
89dd5a19ad
issue #2345 : move g_texturePixelFormatInfoTables into Texture2D
2013-08-02 14:10:23 +08:00
boyu0
93aa3c7ada
issue #2345 : refract CCImage and CCTexture2D.
2013-08-01 15:53:52 +08:00
carlo morgantini
b2579987e5
Merge remote-tracking branch 'cocos2d/develop' into new_develop_merge
...
Conflicts:
cocos2d_libs.xcodeproj/project.pbxproj
cocos2dx/include/ccTypes.h
samples/samples.xcodeproj/project.pbxproj
2013-07-31 13:58:25 -07:00
boyu0
31da5ebeb7
fix some compile error and pass the linux compile
2013-07-30 13:45:50 +08:00
boyu0
afde1e57b2
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345 and fix the per premultipied tag
2013-07-30 11:10:05 +08:00
James Chen
343c98af13
Fixing warnings of the order of member variables and fixing errors for tizen projects.
2013-07-29 14:07:57 +08:00
boyu0
cecfc13bc4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345
2013-07-27 22:06:30 +08:00
carlo morgantini
23575f0a68
New Label stuff merged and Label::Alignment replaced with TextVAlignment and TextHAlignment
2013-07-26 16:04:21 -07:00
boyu0
02bdfbf169
Combine CCTextureETC to CCImage and CCTexture2D.
2013-07-26 17:34:44 +08:00
Ricardo Quesada
16d0b43181
Constant fixes
...
Director::PROJECTION_2D, 3D,... -> Director::Projection::_2D, _3D, ...
Label::TEXT_ALIGNMENT_... -> Label::HAlignment::...
Label::TEXT_VERTICAL_ALIGNMENT_... -> Label::VAlignment::...
Texture2D::PIXEL_FORMAT_... -> Texture2D::PixelFormat::...
BlendFunc::BLEND_FUNC_DISABLE -> BlendFunc::DISABLE
Also adds more constant for BlendFunc
2013-07-25 13:36:19 -07:00
boyu0
a2b611d8c3
Refactor Image and Texture2D, combine TexturePVR to Image and Texture2D, and delete TexturePVR
2013-07-25 21:35:00 +08:00
minggo
77afae124b
issue #2430:move Texture2D enum into class
2013-07-25 19:52:44 +08:00
minggo
2293630335
issue #2430:move enum in ccTypes.h class
2013-07-25 18:46:43 +08:00
James Chen
e5c2ad0cb8
issue #2404 : Mark Texture2D::setTexParameters(const ccTexParams* texParams) as deprecated.
2013-07-24 17:54:17 +08:00
James Chen
d942de1ae1
issue #2378 : Variables to protected for Texture2D.
2013-07-23 20:42:43 +08:00
James Chen
75a0cb6a29
issue #2378 : Setter/Getter for CCTexture2D, removing CC_PROPERTY_XXX macros.
2013-07-23 14:05:05 +08:00
boyu0
948acd6e29
Refactor CCTexture2D and CCImage
2013-07-19 15:37:54 +08:00
James Chen
7c7d21dd03
issue #2407 : more best practices fixes, more getter and const..
2013-07-19 14:57:54 +08:00
boyu0
70140bb4cb
refactor CCImage and CCTexture2D
2013-07-17 17:12:04 +08:00
Ricardo Quesada
9958e0d7f9
Adds more readability to the class internals.
...
Changes:
- creator (static) methods, and singleton methods (static) are always at the top of the class
- Constructors, destructros, and init methods comes next
- Then the instance methods for the class
- Then the overriden methods
- and finally the ivars
Also, overriden methos have the "override" context keyword
2013-07-15 12:43:22 -07:00
James Chen
d64fb7339c
issue #2129 : FontDefinition* --> const FontDefinition&
2013-07-08 15:18:16 +08:00
minggo
04465622b7
issue #2129:remove prefix of types in ccTypes.h
2013-07-05 16:49:22 +08:00
Ricardo Quesada
1d011510af
setTexParams() is passed as a const reference
...
All structs (PODs), should be passed as const reference.
eg: Size, Point, ccTexParams, etc... should be passed as const reference.
2013-07-03 17:59:22 -07:00
Ricardo Quesada
216c6eada5
Adds more const in getters
...
In Sprite and Texture2D
2013-07-03 17:44:41 -07:00
James Chen
93b6328303
issue #2129 : Removing CC prefix for cocos2dx module.
2013-06-20 14:13:12 +08:00
James Chen
136a9743d4
issue #2129 : [Removing CC Prefix] Removing backward compatible macros, since they are conflict with no CC Prefix ones.
2013-06-20 12:56:51 +08:00
James Chen
c0d44cb2e4
fixed #2129 : Rename m_iVar to _var, remove CC prefixes.
2013-06-15 14:03:30 +08:00
minggo
beef61fc90
issue #2161 : android supports ETC format now
2013-05-27 14:42:22 +08:00
carlo morgantini
4d3ed48905
initWithStringShadowStroke() renamed to initWithString()
2013-05-15 16:37:08 -07:00
carlo morgantini
04c890522d
class renamed and moved to ccTypes.h
2013-05-15 16:35:25 -07:00
carlo morgantini
ed981aee7e
ccTextDefinition becomes CCTextDefinition
2013-05-15 16:29:33 -07:00
carlo morgantini
d9a53b3eb1
CCLabelTTF new interface for ccBuilder
2013-05-15 16:29:33 -07:00
carlo morgantini
c727fa33c0
CCLabelTTF have now a tint, plus bug fixing and code clean up
2013-05-15 16:29:33 -07:00
carlo morgantini
221884f6d4
better CCTexture2D API for init texture with shadow and stroke
2013-05-15 16:29:32 -07:00
carlo morgantini
dd9b4a8932
new shadow and stroke for CCLabelTTF
2013-05-15 16:12:43 -07:00
James Gregory
5bac7b52ac
Move GL server-side buffer code into a separate class and use multiple inheritance to deploy only to classes that need it.
2013-05-06 20:59:48 -07:00
minggo
949700ca1a
issue #1848:use CCConfiguration::supportsPVRTC() to determine if the device support powertc format
2013-03-21 15:50:41 +08:00
minggo
a701eaecce
issue #1555:update to v2.1 beta3
2012-11-14 18:05:15 +08:00
Donald Alan Morrison
4cbd993091
Minor English Spelling Corrections. A few grammar corrections.
2012-09-17 00:02:24 -07:00
minggo
cc39dc55f4
issue #1405:remove unneeded functions of CCFileUtils
2012-08-08 18:39:33 +08:00
Walzer
9eab0c19f8
add groups to all classes for doxygen
2012-06-20 18:09:11 +08:00
minggo
9ec29d715a
issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx
2012-06-19 13:50:11 +08:00
minggo
d0f905992a
issue #1292:make some function names more readable
2012-06-15 15:10:40 +08:00