Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,487 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

205 Commits

Author SHA1 Message Date
minggo 49d8ac72f6 fixed #1202:remove CCFileData 2012-06-07 14:13:44 +08:00
Nicolas Gramlich c9db868d93 CCLabelTTF: Now internally using std::string instead of std::string *. 2012-06-05 17:12:41 -07:00
Nicolas Gramlich 2d86a4089c CCLabelBMFont: Now using std::string to store internal data instead of just storing a 'foreign' const char *. 2012-06-05 17:11:50 -07:00
Nicolas Gramlich eee8ba7586 CCLabelTTF: Added getters for fontName and fontSize. 2012-06-01 15:11:16 -07:00
Nicolas Gramlich 8dbe897755 CCLabelBMFont: Made fntFile a property. (According to: ffbdb60a5908f5baef227bb0365a0b2653a3a59a) 2012-06-01 11:59:10 -07:00
Nicolas Gramlich 7cb3be2057 Minor change. 2012-05-31 17:01:01 -07:00
Nicolas Gramlich 39442e9bb6 Merged with gles20. 2012-05-31 13:10:51 -07:00
James Chen 63a6b97bc5 fixed #1280: Renamed some functions. 2012-05-31 15:32:18 +08:00
James Chen cec50ae2d8 fixed #1280: BitmapFontMultiLineAlignment test can't work correctly. 
We should invoke 'this->setString(m_sString_initial.c_str(), true);' in the 'CCLabelBMFont::updateLabel'.
 2012-05-31 13:07:25 +08:00
Nicolas Gramlich 36e6d94d46 Added setter for dimensions of CCLabelTTF (According to: 302dd76b4f87ddb18cc571ebec3be0811ea534ca). 2012-05-30 16:49:51 -07:00
Nicolas Gramlich 9ca7fa468a Added default init method for CCLabelTTF (See: 24125b93aad2d4fc7ebf1bc6e4ef6b8b83ff770d). 2012-05-30 15:34:50 -07:00
Nicolas Gramlich 827ee160b5 Added support for initializing a CCLabelBMFont without a fntfile and a string. (See: ffbdb60a5908f5baef227bb0365a0b2653a3a59a, a6749b38f8085ba81921063328bc50cb7a989613, e6e3917c0c3f2e95e13c3be29584cb9e3781d3a7). 2012-05-30 15:31:08 -07:00
James Chen ad50d6ee57 fixed #1270: Fixed some warning on win32. 2012-05-29 17:11:33 +08:00
Walzer 184b31efa3 fix compilation warnings on android & ios 2012-05-05 10:44:42 +08:00
James Chen 1d94ba05a0 fixed #1189: updated linebreak and tab(4 space) for all source files. 2012-04-25 18:17:04 +08:00
James Chen a5f0bc3cbc fixed #1189: syn 1.0 branch: CCLabelBMFont updateLabel() optimizations and fixes 2012-04-25 18:08:23 +08:00
James Chen 0f36a89c7e issue #1188: Refactor directory. Compile successfully on android and win32(vs2008 debug). 2012-04-25 16:18:04 +08:00
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
yangws 63cedd1317 Merge code of Platform_support for IOS. 2011-02-23 18:22:05 +08:00
natural-law 949c1000a8 update tests to 0.99.5. 2011-02-23 16:47:25 +08:00
natural-law d0b27c4222 fix bug,MenuTest crash. 2011-01-28 16:05:21 +08:00
natural-law 800033d98b fixed #329,use std::string to implement function CCBMFontConfiguration::parseConfigFile. 2011-01-24 15:53:52 +08:00
minggo f3e8665387 remove the usage of YES and NO 2010-12-31 16:37:00 +08:00
natural-law 3dfd530b38 Merge branch 'iss295' into upto-0.99.5 2010-12-31 09:48:48 +08:00
natural-law 34f45c8faa Implement CCEventDispatcher. 2010-12-31 09:36:53 +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
natural-law 0f0a8ed956 rename the files related to label_nodes. 2010-12-24 14:00:49 +08:00
Walzer edc742d41b Merge branch 'master' of https://github.com/leon-li/cocos2d-x into leon-li-master 2010-12-18 10:26:22 +08:00
Leon 96f4f5c9fd fix some compiling warning for iOS 2010-12-17 23:44:19 +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
natural-law b1d3e66e68 1. Check the return value of FileData::getFileData() 
2. Fix a bug of CCBitmapFontConfiguration::parseConfigFile()
3. Move the function CCFileUtils::getFileDataFromZip() to class of FileUtils.
 2010-11-29 14:21:33 +08:00
natural-law 4d98faabc5 fixed #226 add support read resource file from zip file in cocos2d-uphone 2010-11-29 10:49:43 +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
yangws cf0a2c5665 add cocos2dx-win32 framework, can't work yet. 2010-10-08 09:53:04 +00:00
Ming addfb8df94 issue #151 2010-09-18 09:22:21 +00:00
natural-law cd4bb0bfc8 issue #144 
Clear memory leaks of the test_uphone project
 2010-09-14 02:26:19 +00:00
natural-law 331f777713 issue #144 
Clear memory leaks of the test_uphone project
 2010-09-13 08:01:27 +00:00
Walzer 4b86b49b08 fixed #134, fullPathFromRelativeFile, modify CCTextureCache::addImage 2010-09-07 10:04:57 +00:00
Walzer 5fd1bf85b6 issue #121, return bool in function init**** 2010-09-04 04:02:52 +00:00
Ming 4088681630 issue #122 2010-09-04 03:34:37 +00:00
Ming 863fc8584a issue #116 2010-09-02 08:58:04 +00:00
Ming 59afd38192 issue #116: remove __super 2010-09-02 06:54:42 +00:00
Ming 39c6ebf503 issue #85:remove the using of dynamic_cast() 2010-08-31 03:20:37 +00:00
Ming 7291056154 fixed #86 2010-08-25 09:21:38 +00:00
Ming 25f49cac40 issue #81: remove including header of "platform/platform.h" 2010-08-25 03:14:34 +00:00
Ming 710e29b086 issue #80 2010-08-25 02:19:20 +00:00
Walzer 9703e75e57 issue #18, debug 2010-08-19 06:09:40 +00:00
Walzer acef33a591 issue #18, debug : FNTConfigRemoveCache 2010-08-18 04:03:31 +00:00
Walzer 5448bdd392 issue #18, debug 2010-08-13 03:16:04 +00:00
Walzer 23dc04ffaf issue #18, debug 2010-08-13 01:26:52 +00:00
Walzer 9510be1d72 fixed #41, complete label 2010-08-12 09:39:25 +00:00
Walzer c06cae617f issue #41, implement CCLabel,CCLabelAtlas 2010-08-11 10:09:10 +00:00