minggo
6abe6fce78
closed #2393 : fix conflicts
2013-07-12 18:04:32 +08:00
Ricardo Quesada
cf262c28e2
getInstance() / destroyInstance() are used...
...
... instead of sharedXXX / purgeXXX.
They are more C++ friendly, and also easier to remember.
common files + Mac files + iOS files + tests/samples files were updated.
The old methods are deprecated now.
2013-07-11 15:24:23 -07:00
James Chen
9b9fe67d25
issue #2387 : Using static_cast instead of C style cast in iteration of CCArray.
2013-07-09 14:29:51 +08:00
James Chen
cb67ed0227
issue #2129 : Removing CC prefix for extension module.
2013-06-20 14:15:53 +08:00
James Chen
78a5dff06d
issue #2129 : Resetting the namespace of armature to 'cocos2d::extension::armature'.
2013-06-20 12:59:32 +08:00
James Chen
c0d44cb2e4
fixed #2129 : Rename m_iVar to _var, remove CC prefixes.
2013-06-15 14:03:30 +08:00
yinkaile
d29931dc4f
1.add hd resource
...
2.remove zobie resource
3.support frame event
2013-06-08 22:08:22 +08:00
yinkaile
f2021982f4
Change CCAnimation to CCArmatureAnimation
2013-06-08 11:16:17 +08:00
yinkaile
ba09c20434
Standardize code
2013-06-07 18:50:35 +08:00
yinkaile
850ea39107
Standardize code
2013-06-07 17:10:53 +08:00
yinkaile
2418afc96d
conform declare and initialize order
2013-06-07 16:13:08 +08:00
yinkaile
e1e41f7124
move const value to CCDataReaderHelper.cpp
2013-06-07 14:47:08 +08:00
yinkaile
d4116f8478
1.remove #pragma endregion
...
2.change str.compare("")==0 to str.length()==0
2013-06-07 14:01:03 +08:00
yinkaile
65974f2243
standardize code
2013-06-07 10:52:32 +08:00
yinkaile
10ed7ebdf4
merge newest version
2013-06-06 16:22:58 +08:00
yinkaile
245b0395b1
1.upload CCArmature
2013-06-06 12:02:54 +08:00