James Chen
e28cf8d258
issue #2129 : Windows doesn't support 'initializer list', using constructor instead.
2013-07-07 21:08:14 +08:00
minggo
04465622b7
issue #2129:remove prefix of types in ccTypes.h
2013-07-05 16:49:22 +08:00
Ricardo Quesada
adaa72fbb4
Adds const to getters
...
Many getters in cocos2d are not declared as const.
This patch adds const to many cocos2d properties, specially in CCNode and
subclasses
2013-07-03 17:22:15 -07:00
James Chen
93b6328303
issue #2129 : Removing CC prefix for cocos2dx module.
2013-06-20 14:13:12 +08:00
James Chen
c0d44cb2e4
fixed #2129 : Rename m_iVar to _var, remove CC prefixes.
2013-06-15 14:03:30 +08:00
Rodrigo Goncalves de Oliveira
78967b7c8e
Removing unused variable
...
These variables are just used on CCAssert comparisons, and result on a
compilation error on Linux (-Werror=unused-variable).
Signed-off-by: Rodrigo Goncalves de Oliveira <rodrigo.goncalves@openbossa.org>
2013-06-03 09:17:03 -04:00
Yongqin Liu
aea9e04fbf
Add out of bound check for the index before do the update
...
Signed-off-by: Yongqin Liu <liuyq0307@thundersoft.com>
2013-05-29 19:18:46 +08:00
Yongqin Liu
f6b5208be5
CCLabelAtlas.cpp: add check for n when call setDirty
...
in CCLabelAtlas::updateAtlasValues, there is the case that n equal to 0,
so we need to check it before when call m_pTextureAtlas->setDirty(true) and do
other process.
Signed-off-by: Yongqin Liu <liuyq0307@thundersoft.com>
2013-05-29 10:45:47 +08:00
Yongqin Liu
56037a4939
CCTextureAtlas::updateQuad modify for the memcpy hot spot
...
change the place that call CCTextureAtlas::updateQuad method to
update the quads with pointer reference directly.
Signed-off-by: Yongqin Liu<liuyq0307@thundersoft.com>
2013-05-28 10:23:47 +08:00
James Chen
d6a0af86eb
fixed #2217 : Updating logic when m_bIgnoreContentScaleFactor is enabled.
2013-05-23 16:12:04 +08:00
James Chen
bb11182279
fixed #2217 : Using CCLabelAtlas instead of CCLabelTTF to show FPS.
2013-05-23 15:06:57 +08:00
minggo
63e4091bfa
fixed #1686:finish updating
2013-02-28 11:55:36 +08:00
James Chen
7dc64fc9a6
issue #1686 : sync to CCLayer
2013-02-27 09:38:30 +08:00
James Chen
6f3b22031f
Using new API of getting full path for file name.
2013-01-25 20:51:52 +08:00
James Chen
6733f786a5
fixed #1649 : Reverted some invokings of function that returns const reference.
2013-01-14 16:06:18 +08:00
minggo
a75f8b7e7a
fixed #1593:remove all deprecated methods expect CCBAnimationManager
2012-12-06 18:51:33 +08:00
James Chen
ebd522e3fa
issue #1564 : Return a new object instead of 'const reference' for some get methods.
2012-11-20 16:34:55 +08:00
minggo
a4a53df159
issue #1555:build ok on android
2012-11-16 14:23:14 +08:00
Rohan Kuruvilla
540b41c091
Fixing LabelAtlas to read texture relative to path of plist file
2012-10-11 18:44:46 -07:00
walzer
06f639edab
update copyright to 2012, update cocos2d version to 2.0.3
...
1. update all copyright from 2010-2011 to 2010-2012 cocos2d-x.org
2. update COCOS2D_VERSION to 0x00020003
3. update const char* cocos2dVersion() to "cocos2d-2.0-x-2.0.3"
2012-09-24 21:22:20 +08:00
Walzer
685b70e6fb
fixed #1402 , résolve conflicting "create" functions
...
1. Following https://docs.google.com/document/d/1eqvYjVah0R9nkjzJ_ga1-_cyjHnizVQ5dyESYNpYM0s/edit?pli=1
2. use CCSequence/CCSpawn::initWithTwoActions, createWithTwoActions instead of initOneTwo, create(one, two).
3. haven't re-generate lua-binding to resolve the conflicts yet.
2012-07-23 22:49:11 +08:00
James Chen
a901b0bb12
fixed #1367 : Refactor "createWith***" to "create".
2012-06-27 14:21:29 +08:00
minggo
90448ec7d0
issue #1269:fix some compiling error because of including error header files
2012-06-19 16:20:46 +08:00
James Chen
7fe3f7357e
issue #1324 : Reverted old interfaces.
2012-06-14 17:18:05 +08:00
James Chen
23574172ff
issue #1324 : Added create() for static member functions that new an autorelease object, updated cocoa folder.
2012-06-14 16:05:58 +08:00
James Chen
3f7b44fc23
issue #1324 : Added create() for static member functions that new an autorelease object
2012-06-14 15:13:16 +08:00
James Chen
b770010c41
issue #1310 : Updated LabelTest. Added init method for CCLabelBMFont. Fixed a bug in CCLabelAtlas::initWithString.
...
In CCSpriteBatchNode::initWithTexture, when capacity is equal to 0, set it to default value.
2012-06-12 14:33:53 +08:00
James Chen
76a560a474
issue #1310 : Made CCFileUtils as a singleton.
2012-06-08 16:22:57 +08:00
minggo
6b7a59f007
issue #1310:synchronize CCLableAtlas and CCLabelBMFont
2012-06-08 15:29:47 +08:00
James Chen
230b8a386b
issue #1176 : Changed linebreak symbol to UNIX format ('\n'),replaced 'tab'
...
with four spaces. Also,
1. Used macro NS_CC_BEGIN instead of namespace cocos2d {, NS_CC_END instead
of }.
2. Removed some unused files.
3. Renamed the name of some folders, for example,
"test.android"-->"proj.android" .
2012-04-19 14:35:52 +08:00
James Chen
7d7baf81a2
refactor updated...
2012-04-18 18:43:45 +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
f0d22ae504
issue #879 : replase assert with CCAssert
2011-11-28 17:28:43 +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
minggo
09dc164fff
issue #645 : update to v1.0.1
2011-08-02 15:45:27 +08:00
minggo
fe3aadf800
update to 1.0.0 07-12
2011-07-13 10:20:24 +08:00
minggo
d48c3fdfb1
upgrade to 1.0.0-final 07-11
2011-07-12 11:20:41 +08:00
minggo
6482f5662b
fixed #557 : upgrade label_nodes to 1.0.1-rc3
2011-07-04 10:59:35 +08:00
natural-law
0378a6a36d
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
...
Conflicts:
cocos2dx/include/CCNode.h
2011-07-01 16:24:23 +08:00
yangws
be966dbddb
fixed #430 Solved bug by replacing glColor4ub with glColor4f.
2011-03-25 13:50:57 +08:00
walzer
81fa070125
fixed #418 , add copyright of original authors, merge Bin's commit
2011-03-19 14:45:51 +08:00
minggo
b5a99f90df
issue #375 : rename file names and object names
2011-03-07 17:11:57 +08:00
minggo
94c7f968e1
Merge branch 'minggo-upto-0.99.5' into upto-0.99.5
2010-12-29 18:18:14 +08:00
natural-law
a48b4b762b
update tileMap_parallax_nodes to 0.99.5.
2010-12-28 15:17:59 +08:00
minggo
355570ea8f
issue #292
2010-12-28 15:05:55 +08:00
natural-law
4a64f899fe
update label_nodes to 0.99.5.
2010-12-24 17:07:31 +08:00
Walzer
641bea0abc
fixed #265 compile error when enable CC_XXX_DEBUG_DRAW switchs in ccConfig.h
2010-12-17 23:18:03 +08:00
Walzer
820c2f0714
issue #211 cocos2d-x back to cocos2dx
2010-11-18 15:01:42 +00:00