minggo
f3d97bd9b6
fixed #1180 : synchronize CCConfiguration
2012-04-20 11:39:12 +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
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
ab8af9e04c
retina for win32
2012-04-11 16:41:12 +08:00
James Chen
8271fdd95b
Initialize m_sString pointer.
2012-04-10 15:24:06 +08:00
James Chen
22052db4bd
Fixed a memory leak in CCLabelBMFont.cpp.
2012-04-10 15:14:55 +08:00
Walzer
203f40a00d
add shader files correctly in test.xcodeproj, fix a warning in CCLabelBMFont.cpp,
2012-04-06 23:33:42 +08:00
James Chen
59393c2fef
issue #1056 : Update CCLabelBMFont.
2012-03-22 09:46:07 +08:00
James Chen
02ae04c1d6
issue #1056 : Modified the configuration of ios project.
2012-03-21 10:41:21 +08:00
James Chen
6ce06bd906
issue #1056 : Remove CCMutableArray and CCMutableDictionary template, offer CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost.
2012-03-20 15:04:53 +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
dumganhar
a23893507d
fixed 952: make CCLabelBMFont support other language, such as chinese, korean, japanese.
2012-01-18 18:43:41 +08:00
dumganhar
543d96a73f
issue 952: make CCLabelBMFont support other language, such as chinese, korean, japanese.
2012-01-18 18:02:39 +08:00
minggo
cdc842051f
issue #892 : use RTTI to simplify codes, work ok on win32
2011-12-07 14:28:22 +08:00
minggo
f0d22ae504
issue #879 : replase assert with CCAssert
2011-11-28 17:28:43 +08:00
Walzer
dcb4f14a5b
According to this thread, http://www.cocos2d-x.org/boards/6/topics/5075?r=5177 , we must prevent yOffset to become a negative value. I use the laziest approach.
2011-11-09 22:11:36 +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
9a884ffda6
[iOS] fixed #668 : CCLabelBMFont looks ok in retina mode
2011-08-10 15:07:34 +08:00
minggo
09dc164fff
issue #645 : update to v1.0.1
2011-08-02 15:45:27 +08:00
natural-law
d6221cfa36
Use the setter to set the value of m_tAnchorPoint.
2011-08-02 11:02:02 +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
natural-law
134a3a0fcf
fixed #590
2011-07-08 14:32:09 +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
natural-law
7d7f3a9241
fixed #562 , Upgrade folder sprite_nodes to rc3.
2011-07-01 16:11:31 +08:00
Marat Yakupov
0b3586126b
Removed unnecessary copy of ccBMFontDef structure in CCLabelBMFont::createFontChars()
2011-06-20 10:40:27 +04: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
natural-law
5d2ac1fc0c
fixed #428 , Use CCArray instead of CCMutableArray as the parameter type of CCNode::m_pChildren.
2011-04-21 14:46:15 +08:00
yangws
d11bd85d00
CCTextFieldTTF works on win32.
2011-04-19 09:32:33 +08:00
natural-law
f3b1385279
fixed #446,read the .fnt file by it's full path.
2011-04-06 10:20:01 +08:00
minggo
7d52161804
fixed #441 : Initialize pointer in contruction & detect pointer value in destruction
2011-04-01 16:06:53 +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
natural-law
e38d3a2277
Merge branch 'master' into iss434
...
Conflicts:
cocos2dx/platform/airplay/CCFileUtils_airplay.h
template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj
template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj
template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
2011-03-28 17:06:32 +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
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
47173778cc
fixed #409 : rename NSArray UIAlignment
2011-03-18 14:31:29 +08:00
natural-law
06ad40f101
[android]fixed #356,modify the parameter type form ccxScopedPtr<std::string> to std::string *.
2011-03-15 11:59:45 +08:00
natural-law
0c75af0f97
[android]fixed #356,CCLabelTTF::initWithString not crashed anymore.
2011-03-14 18:29:15 +08:00
minggo
b5a99f90df
issue #375 : rename file names and object names
2011-03-07 17:11:57 +08:00
minggo
f504211e56
merge natural-law-iss332 to dev
2011-02-28 09:48:14 +08:00