Jaroslaw Lewandowski
f1023232db
Now opacity option for shadow in CCLabelTTF works.
2013-07-09 23:23:41 +01:00
Ricardo Quesada
77dbe995d4
Merge branch 'develop' into ios_mac_one_project
2013-07-03 11:39:00 -07:00
Ricardo Quesada
2b73d0cb5f
ios and mac projects unified in one simple xcode project
...
Not finished yet:
- iOS only includes Test Cpp (Simple Game not working yet on iOS)
It is easier to maintain and add more targets, files, etc.
2013-07-02 18:20:38 -07:00
Jaroslaw Lewandowski
d26fa847d8
- Fixing shadows for text with stroke in iOS
...
- Improved text shadows in Android (they look the same as in iOS)
2013-07-02 22:45:07 +01:00
minggo
8938268183
issue #2329 : remove unneeded codes
2013-06-26 16:42:11 +08:00
James Chen
0879a12516
issue #2129 : Re-adds 'CC' prefix to objective-c classes for all projects.
2013-06-21 11:14:03 +08:00
Ricardo Quesada
578bce4bc8
Re-adds 'CC' prefix to objective-c classes.
...
And also makes it compile on Mac, which was broken
2013-06-20 17:46:22 -07:00
James Chen
93b6328303
issue #2129 : Removing CC prefix for cocos2dx module.
2013-06-20 14:13:12 +08:00
minggo
8d4f715008
Merge pull request #2929 from minggo/iss2304-refator-cclayer
...
issue #2304:use function to simplify acceremeter call back
2013-06-19 01:43:18 -07:00
minggo
ccbd0a831d
issue #2304:use function to simplify acceremeter call back
2013-06-19 16:10:53 +08:00
James Chen
016d34d889
Compilation errors fix after merging https://github.com/cocos2d/cocos2d-x/pull/2919
2013-06-19 15:08:09 +08:00
James Chen
f007819f74
Merge branch 'develop' of https://github.com/musikov/cocos2d-x into musikov-develop
...
Conflicts:
cocos2dx/textures/CCTexture2D.cpp
2013-06-19 14:05:55 +08:00
James Chen
c0d44cb2e4
fixed #2129 : Rename m_iVar to _var, remove CC prefixes.
2013-06-15 14:03:30 +08:00
Mykyta Usikov
28e8899089
fixed strokeColor and fontFillColor of CCLabelTTF
2013-06-13 14:16:33 +03:00
minggo
cd5bcb87af
issue #2284 : merge master and fixed some conflicts
2013-06-13 17:54:05 +08:00
James Chen
b372fc8534
Merge pull request #2872 from maciekczwa/develop
...
fixed #2283 : Adding Polish language support.
2013-06-13 00:00:36 -07:00
Ricardo Quesada
1780643c63
merge pull reqeust fixing for iOS7 and Xcode5 into master
2013-06-13 10:43:41 +08:00
Ricardo Quesada
af49023741
Fixes for iOS7 and Xcode5
2013-06-11 12:11:05 -07:00
Maciej Czerniak
1e71ea85f3
add Polish language support
2013-06-11 16:46:38 +02:00
minggo
a8fe210c7e
fixed #2260 : make CCDictionary::createWithContentsOfFile() return NULL when the file is missing
2013-06-06 12:50:42 +08:00
franck
3fab093f5b
adding Norwegian language support
2013-05-29 10:16:22 +02:00
minggo
0857fdd599
issue #2188:fix compiling error of iOS
2013-05-21 18:18:44 +08:00
carlo morgantini
0ff33fd4f5
fix a problem with float stroke size
2013-05-15 16:37:08 -07:00
carlo morgantini
3b50ffe5ba
Fix problem with CCLabelTTF + shadow and text alignment; also fontDefinition property names now are lowercase
2013-05-15 16:37:08 -07:00
carlo morgantini
fcea506fef
fixed some text formatting issues
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
dd9b4a8932
new shadow and stroke for CCLabelTTF
2013-05-15 16:12:43 -07:00
minggo
ea5d7bc5ad
Merge pull request #2361 from tiantian20007/dictStuff
...
Implement CCDictionary::writeToFile();
2013-05-06 23:17:11 -07:00
Romain Tisserand
d2690d8942
Fix iOS 4.3 JPEG loading (darken picture, alpha issue)
2013-05-04 19:14:23 +02:00
minggo
1a0db3749e
Merge pull request #2496 from mchinen/mchinensedit
...
Fix missing protocol method warning for iOS 6.0 addition
2013-05-04 08:55:07 -07:00
Michael Chinen
d47759cc32
EAGLView.mm: fix indent
2013-05-03 19:46:58 +09:00
Michael Chinen
be2f20e213
Fix missing protocol method warning for iOS 6.0 addition
2013-05-01 00:35:17 +09:00
tiantian
2ba5035e5a
Make sure XMLDocument is deleted; Code clean up; Add test;
2013-04-28 00:36:37 +08:00
James Chen
d1afe6cfa6
Fixing a bug in CCFileUtilsIOS::isFileExist().
2013-04-25 22:02:20 +08:00
James Chen
93a8b60111
If file path is an empty string, return false directly in CCFileUtils::isFileExist.
2013-04-25 21:51:13 +08:00
James Chen
ddd6d9d155
fixed #2059 : cc.FileUtils.getInstance().getStringFromFile(filename) doesn't return a whole string.
2013-04-17 16:08:48 +08:00
tianTian
9a04eee8d1
do it atomically;
2013-04-16 12:38:53 +08:00
tianTian
b7f0b2a8e0
Use CCLOG instead of CCLog;
2013-04-13 18:20:17 +08:00
tianTian
96359950cf
Implement CCDictionary::writeToFile();
...
Use NSDictionay to do the job for iOS and Mac, and using tinyxml2 for other platform;
2013-04-13 16:55:24 +08:00
minggo
71659f4aa9
Merge pull request #2247 from hailongiPhone/master
...
release && set nil
2013-03-22 04:09:47 -07:00
hailong
2ea447dbfd
Update CCDirectorCaller.mm
...
First destroy CCDirector instance with cocos2d::CCDirector::sharedDirector()->end()
Then create new CCDirector instance with
cocos2d::CCApplication::sharedApplication()->run();
APP will crash at
CCApplication::setAnimationInterval
[[CCDirectorCaller sharedDirectorCaller] setAnimationInterval: interval ];
2013-03-22 15:02:46 +08:00
James Chen
ac509f70db
[iOS] Using system font by `[UIFont systemFontOfSize]` when font name wasn't found.
2013-03-19 13:11:33 +08:00
Darragh Coy
f84a4e2e08
Code review changes for pull request #2102
...
We should only load the 'MarkerFelt-Wide' fallback font in 'CCImage.mm, _initWithString()' if the user is attempting to load a custom font, not when the user is attempting to load a system font. If the user is trying to load a system font then give back the default system font instead.
2013-03-04 22:24:28 -08:00
Darragh Coy
df3c449b4f
Fix for loading custom fonts on iOS when referenced from a CocosBuilder CCB file
...
Fix up how fonts are loaded in Cocos2dx for iOS to work transparently with custom font filenames/paths such as 'MyCustomFont.ttf' or 'fonts/MyCustomFont.ttf'. Referring to fonts by these paths would be OK on Android but can't be used on iOS since fonts must be referred to by family name on iOS; we must use 'MyCustomFont' when referring to that particular font in both examples on iOS. Hence add the code to strip out the folder path and extension on iOS so that the font path 'MyCustomFont.ttf' and 'fonts/MyCustomFont.ttf' can be used transparently across all platforms. This is required especially in the case where we have custom fonts being referenced from CCB files, since CCB files store the font names with the .ttf extension included.
2013-03-04 15:32:24 -08:00
James Chen
cda7da3d43
fixed #1712 : Adding default dpi for marmalade and mac since i don't know how to get DPI for these platforms.
2013-02-17 17:13:06 +08:00
James Chen
ac17f67686
issue #1712 : Adding getting dpi support for iOS and Android.
2013-02-16 19:36:21 +08:00
Ben Ward
5f6ce9db92
Adding Portuguese and Arabic language support
2013-02-11 15:29:56 +00:00
minggo
404cdf1122
issue #1702:return documents for iOS
2013-02-06 18:11:27 +08:00
minggo
0c5bcb3f7b
issue #1702:fix a typo error
2013-02-06 18:04:40 +08:00
James Chen
da91e97e17
Merge branch 'add_webp_support' of https://github.com/dualface/cocos2d-x into iss1770-webp
...
Conflicts:
scripting/javascript/bindings/generated
2013-02-05 11:22:53 +08:00
dualface
c13965c939
remove duplicate codes
2013-02-04 11:52:16 +08:00
minggo
744bfb3cb2
Merge pull request #1945 from dualface/add_CCLuaObjcBridge
...
add CCLuaObjcBridge
2013-02-03 19:32:17 -08:00
James Chen
a0bf0d8655
issue #1687 : Moving the implementation of NS2CC.mm to CCFileUtilsIOS(MAC).mm.
2013-02-03 10:56:59 +08:00
dualface
f8c372ca9b
fix CCLuaLog()
2013-02-02 15:05:30 +08:00
dualface
d6686fe57c
Merge branch 'upstream_master' into add_webp_support
2013-02-02 12:24:05 +08:00
James Chen
e25c79f1ec
issue #1687 : CCFileUtils::isFileExist now support relative path.
2013-02-01 22:19:58 +08:00
James Chen
ae0b973cf1
issue #1687 : Moving the global function( ccFileUtils_dictionaryWithContentsOfFileThreadSafe, ccFileUtils_arrayWithContentsOfFileThreadSafe) to the CCFileUtils class.
...
)
2013-02-01 18:48:44 +08:00
James Chen
a110778739
issue #1687 : Updating comments for CCFileUtils.
2013-02-01 15:41:41 +08:00
James Chen
3a9346e6ff
issue #1687 : Refactoring CCFileUtils, abstracting the same implementations for all platforms.
2013-02-01 11:20:46 +08:00
James Chen
2694cb150b
CCFileUtils::s|gSearchPath -> CCFileUtils::s\gSearchPaths.
2013-01-29 09:56:38 +08:00
James Chen
c160d3ed0a
Using full path in CCFileUtils::getFileData.
2013-01-28 23:37:04 +08:00
James Chen
ba852e8606
issue #1683 : Adding default path to the vector of searching path.
2013-01-28 19:53:16 +08:00
James Chen
e736ed487f
issue #1683 : Adding default search path if developer didn't pass it.
2013-01-28 17:44:53 +08:00
James Chen
f2dad83610
issue #1683 : Refactoring CCFileUtils for MAC port.
2013-01-27 20:53:32 +08:00
James Chen
119115502d
issue #1683 : Making some api of CCFileUtils more c++ friendly by using std::vector rather than CCArray.
2013-01-26 22:31:57 +08:00
James Chen
3328cfd6a4
Refactoring some logic of CCFileUtils.
2013-01-26 14:19:14 +08:00
James Chen
fde39c6dcb
Adding cache support for CCFileUtils.
2013-01-25 21:52:35 +08:00
James Chen
55af1fd3bf
Removing unneeded codes in CCFileUtils.mm for iOS port.
2013-01-25 21:17:28 +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
e954ce4f75
Made compatibility with old api CCFileUtils::setResourceDirectory.
2013-01-24 14:07:48 +08:00
James Chen
8cfd912a06
CrystalCraze works ok on iOS.
2013-01-23 23:17:44 +08:00
James Chen
388e1d82c3
Added resource structure which is the same as cocos2d-iphone.
2013-01-23 22:29:00 +08:00
James Chen
294509c4c0
Merge branch 'master' of https://github.com/dumganhar/cocos2d-x into myccfileutils
2013-01-23 19:52:17 +08:00
James Chen
9eb149efda
Updated CCFileUtils.mm.
2013-01-18 22:14:03 +08:00
James Chen
0a42829428
issue #1667 : Adding file name lookup support for iOS and Android, TBD: Other platform supports.
2013-01-18 18:05:32 +08:00
Michael Ding
088e568c8e
Update cocos2dx/platform/ios/CCFileUtils.mm
...
fix the problem when calling CCFileUtils::sharedFileUtils()->getFileData("a.png") doesn't work.
2013-01-18 09:27:22 +11:00
dualface
d9ef93bbe5
fix some issues
2012-12-30 02:14:30 +08:00
dualface
0b25220f22
update libwebp to 2.1
...
add support RGB888, RGB565,RGBA4444
2012-12-30 02:12:02 +08:00
dualface
806138d990
fix some issues
2012-12-29 13:58:02 +08:00
fape
320d532e15
add Hungarian language support
2012-12-05 11:31:05 +01:00
Taro Kobayashi
a37e034e61
added support for Japanese language
2012-11-28 17:53:10 +09:00
minggo
a701eaecce
issue #1555:update to v2.1 beta3
2012-11-14 18:05:15 +08:00
minggo
5fd56370d8
issue #1555:fix a bug about CCGLProgram
2012-11-13 11:06:32 +08:00
Rohan Kuruvilla
ecee64d07c
Adding accelerometer setInterval support to iOS
2012-10-29 15:08:07 +08:00
minggo
77b69262c8
not invoke CCDirector::reshapeProjection() in EAGLView::layoutSubViews
2012-10-26 10:10:34 +08:00
wenbin1989
62351462a8
Add kLanguageKorean to ccLanguageType and CCApplication::getCurrentLanguage()
2012-10-18 17:17:11 +08:00
wenbin1989
29a63a3b0f
Fix stack overflow in CCLog
2012-10-18 14:39:56 +08:00
minggo
2ded8ea034
Merge pull request #1442 from dumganhar/iss1486-multi-res
...
Multiresolution support
2012-10-15 02:15:21 -07:00
James Chen
a65f13defe
issue #1486 : Fix bugs for CCEditBox iOS port.
2012-10-15 13:01:36 +08:00
minggo
93d702e3cc
fixed #1491:remove dependency of FontLabel lib
2012-10-15 12:03:15 +08:00
James Chen
ade54a3de7
Merge branch 'multi_resolution_support' of https://github.com/BorMor/cocos2d-x into bormor-multi-res
...
Conflicts:
samples/HelloCpp/Classes/AppDelegate.cpp
samples/HelloCpp/Classes/HelloWorldScene.cpp
2012-10-11 16:12:22 +08:00
minggo
6b9affae65
Merge pull request #1402 from Horcruxes/patch-1
...
Update cocos2dx/platform/ios/CCFileUtils.mm
2012-09-29 00:35:35 -07:00
Horcruxes
cb66f1673e
Update cocos2dx/platform/ios/CCFileUtils.mm
...
fixing cannot read data using CCArray::createWithContentsOfFile
2012-09-27 12:31:53 +10:00
walzer
c9772c76ec
fix compilation error in xcodebuild command line, which are caused by ios6 deprecated marcos and enums
2012-09-27 00:44:40 +08: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
Sergey Vikhirev
05eb4352e8
Remove retina specific methods and logic
2012-09-24 14:22:02 +04:00
Donald Alan Morrison
dec9fff7a7
UITextAlignment deprecated for NSTextAlignment.
...
UITextAlignment on NSTextAlignment is injective, not surjective.
There is an equivalence relationship for a subset of NSTextAlignment.
http://en.wikipedia.org/wiki/One-to-one_function
2012-09-22 20:56:10 -07:00
Donald Alan Morrison
216ebab0e1
Minor English Spelling Corrections, etc.
2012-09-15 14:19:14 -07:00
Donald Alan Morrison
7c750dc9c5
Minor changes to comments. One integer literal changed to float literal.
2012-09-14 15:26:38 -07:00
Walzer
b1572beb0b
fixed #1453 , fix a typo in platform/ios/CCGL.h
...
#include <OPenGLES/ES2/glext.h> is fixed to #include <OpenGLES/ES2/glext.h>
2012-09-10 15:05:56 +08:00