minggo
|
924ba1bdca
|
issue #2304:accelerometer fix of mac
|
2013-06-20 10:56:13 +08:00 |
James Chen
|
c0d44cb2e4
|
fixed #2129: Rename m_iVar to _var, remove CC prefixes.
|
2013-06-15 14:03:30 +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
|
75b9913c92
|
LabelTTF vertical alignment fixed on OS X
vertical alignment was broken on OS X.
top and bottom were switched.
|
2013-06-11 14:59:40 -07:00 |
Maciej Czerniak
|
1e71ea85f3
|
add Polish language support
|
2013-06-11 16:46:38 +02:00 |
Michael Chinen
|
9471c51201
|
set up keyboard handling for mac
|
2013-06-07 20:29:02 +09:00 |
Ricardo Quesada
|
479062fdb7
|
on dealloc, log "this" with %p, not %x.
Also adds %p where it was missing.
And make a few fixes on the iOS project
|
2013-06-05 18:21:05 -07:00 |
Ben Ward
|
0f8fa2e5a4
|
Fixed tabbing.
|
2013-06-04 10:45:20 +08:00 |
Ben Ward
|
73b8050fa1
|
Fixed linebreaks on Mac OSX
|
2013-06-04 10:45:07 +08:00 |
franck
|
3fab093f5b
|
adding Norwegian language support
|
2013-05-29 10:16:22 +02:00 |
minggo
|
ea5d7bc5ad
|
Merge pull request #2361 from tiantian20007/dictStuff
Implement CCDictionary::writeToFile();
|
2013-05-06 23:17:11 -07: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 |
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 |
billy1380
|
cdfe693583
|
- changed cocos2d mac project to support universal build and x86
- fixed issues associated with that
|
2013-03-23 16:04:51 +00:00 |
Jozef Prídavok
|
b7ca4656b6
|
Flush log messages.
|
2013-02-28 16:17:49 +01:00 |
minggo
|
81b349d9ce
|
fixed #1637:fix mac retina display and labelttf
|
2013-02-27 11:10:42 +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
|
edfe4c2a0c
|
issue #1712: Adding empty CCDevice.cpp for linux, mac and marmalade.
|
2013-02-17 16:26:59 +08:00 |
Ben Ward
|
5f6ce9db92
|
Adding Portuguese and Arabic language support
|
2013-02-11 15:29:56 +00: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 |
minggo
|
8511e75745
|
fixed #1689:fixed a compiling error
|
2013-02-04 16:17:59 +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
|
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
|
2e421304ca
|
Merge pull request #1911 from dumganhar/iss1683-ccfileutils
issue #1683: Updating CCFileUtils for Blackberry and Marmalade.
|
2013-01-28 05:43:41 -08:00 |
minggo
|
249b935be8
|
fix some warnins
|
2013-01-28 20:34:52 +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
|
632f99b611
|
issue #1683: Updating CCFileUtils for MAC.
|
2013-01-28 17:54:49 +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
|
345f18ebeb
|
issue #1683: Refactoring CCFileUtils::setResourceRootPath for BB, Linux, MAC.
|
2013-01-28 10:48:47 +08:00 |
James Chen
|
c24ca63a0c
|
issue #1683: Making CCApplication::setResourceRootPath deprecated.
|
2013-01-28 10:36:37 +08:00 |
James Chen
|
f2dad83610
|
issue #1683: Refactoring CCFileUtils for MAC port.
|
2013-01-27 20:53:32 +08:00 |
James Chen
|
314445e1ca
|
Refectored CCFileUtils for MAC port.
|
2013-01-25 11:12:38 +08:00 |
dualface
|
0b25220f22
|
update libwebp to 2.1
add support RGB888, RGB565,RGBA4444
|
2012-12-30 02:12:02 +08:00 |
dualface
|
39c4765423
|
fix for mac
|
2012-12-29 14:17:52 +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
|
96ecb05ca9
|
issue #1564: make tests run on mac osx
|
2012-11-23 14:22:50 +08:00 |
James Chen
|
da7f3f2969
|
issue #1530: Added empty implementation of 'CCAccelerometer::setAccelerometerInterval' for win32,blackberry,linux,mac and marmalade ports.
|
2012-11-16 15:56:51 +08:00 |
minggo
|
9d530c8d54
|
fix a compiling error
|
2012-10-26 12:04:45 +08:00 |
James Chen
|
c797af0fe9
|
fixed #1522: CCEGLView class of desktop platforms should override CCEGLViewProtocol::setScissorInPoints.
|
2012-10-24 10:03:19 +08:00 |
minggo
|
9cf3f4c5f6
|
Merge pull request #1474 from wenbin1989/gles20
Add kLanguageKorean to ccLanguageType and getCurrentLanguage()
|
2012-10-21 18:49:42 -07:00 |
minggo
|
f40b6ac4eb
|
fixed #1515: implement zoom function on mac os
|
2012-10-19 11:33:06 +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 |
dualface
|
4aa74d8f5e
|
[Mac] fix CCLuaLog crash
|
2012-09-13 10:26:47 +08:00 |
YuLei
|
8fa431fe0a
|
[Mac] remove CCEGLView::purgeSharedOpenGLView()
|
2012-09-10 16:50:45 +08:00 |
YuLei
|
7ba88dca4c
|
[Mac] fix: after call CCApplication::setResourceRootPath(), CCFileUtils::fullPathFromRelativePath() not check resourceDirectory
|
2012-09-06 09:44:40 +08:00 |
YuLei
|
a5e34ee754
|
[Mac] add CCApplication:setResourceRootPath(), CCApplication:setStartupScriptFilename()
|
2012-09-05 16:15:09 +08:00 |
YuLei
|
39b019b2cb
|
[Mac] fix CC_ASSERT error
[Mac] add CC_DISABLE_ASSERT check
[cocos2d-x] CCSprite::createWithSpriteFrame() check pSpriteFrame
|
2012-09-04 11:16:59 +08:00 |
YuLei
|
09b0d9c843
|
[Mac] fix memory leaks
|
2012-09-04 02:06:04 +08:00 |
YuLei
|
a25b1b3f2f
|
[Mac] fix memory leaks
|
2012-09-04 01:22:06 +08:00 |
YuLei
|
03374fa83b
|
add CCApplicationProtocol:setStartupScriptFilename(), getStartupScriptFilename()
CCFileUtils:setResourceDirectory() add isWorkdingDir argument
|
2012-09-03 18:05:59 +08:00 |
YuLei
|
da79992275
|
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
|
2012-09-02 00:38:57 +08:00 |
James Chen
|
06f240fa5e
|
Moved '#include <stdint.h>' to 'platform/ios(android,linux,blackberry)/CCStdC.h' since win32 don't have a stdint.h.
|
2012-08-29 14:49:02 -07:00 |
YuLei
|
f14eccb6e5
|
[Mac] add miss CCLuaLog
|
2012-08-29 18:40:42 +08:00 |
Donald Alan Morrison
|
5075a83271
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Conflicts:
cocos2dx/kazmath/src/ray2.c
|
2012-08-25 00:00:27 -07:00 |
Donald Alan Morrison
|
857608495c
|
Plugged CoreFoundation memory leaks identified by Static Analyzer.
|
2012-08-24 23:34:20 -07:00 |
Donald Alan Morrison
|
9f1899978e
|
Fixed potential memory leak identified by Static Analyzer.
|
2012-08-24 21:39:41 -07:00 |
minggo
|
0c5cec0056
|
fixed #1441:fix a logical error in CCFileUtils::fullPathFromRelativePath()
|
2012-08-23 14:26:39 +08:00 |
minggo
|
07ddd43695
|
issue #1437:make CCApplication::sharedApplication() return pointer
|
2012-08-21 15:28:43 +08:00 |
minggo
|
cfdc50fb60
|
issue #1437:make CCEGLView::sharedOpenGLView() return pointer
|
2012-08-21 14:58:31 +08:00 |
ningxu
|
84a946f676
|
Update cocos2dx/platform/mac/CCGL.h
add VAO support
|
2012-08-20 23:07:43 +08:00 |
minggo
|
bcf61cdf26
|
issue #1405:use enum to distinguish target
|
2012-08-16 10:21:15 +08:00 |
minggo
|
c31415b7bd
|
issue #1405:resolution supports on mac
|
2012-08-09 14:34:20 +08:00 |
Nat Weiss
|
9f0be2de05
|
Added Mac cpp HelloWorld and Tests.
|
2012-07-24 19:07:31 -07:00 |
Nat Weiss
|
fcfea04bbc
|
iPad detection is now where it belongs in CCApplication.
|
2012-07-21 11:46:42 -07:00 |
Nat Weiss
|
a4760698ca
|
Determines whether to use iPad graphics statically, so if the window is resized the graphics loaded are consistent.
|
2012-07-21 11:35:28 -07:00 |
Nat Weiss
|
dc7ce1cd0f
|
Improved mac file utils and event responsiveness.
|
2012-07-21 02:19:03 -07:00 |
Nat Weiss
|
d4b6d1262b
|
Adding Mac support!
|
2012-07-20 21:23:40 -07:00 |
natural-law
|
d4dbedca4d
|
fixed #451,remove the code of support mac platform.
1. Remove the EventDispatcher.
2. Refactor CCLayer, CCMenu and CCParticleSystemPoint.
3. Modify the project file of win32, wophone and android.
|
2011-04-11 11:24:10 +08:00 |
natural-law
|
6bde512cbe
|
[android]issue #268,support more fonts on cocos2d-android.
|
2011-01-21 17:32:11 +08:00 |
walzer
|
ad5ee3c9f6
|
Merge remote branch 'remotes/origin/upto-0.99.5' Fix some conflicts manually.
|
2011-01-17 16:21:11 +08:00 |
minggo
|
7e30615d02
|
issue #304 Remove codes for controlling frame rate.
|
2011-01-10 15:13:30 +08:00 |
minggo
|
a391c8ef99
|
fixed some errors for iphone platform
|
2011-01-07 10:25:32 +08:00 |
natural-law
|
0d2d746aec
|
Fix bugs.Run tests in cocos2d-uphone successful.
|
2011-01-05 17:01:08 +08:00 |
natural-law
|
1b37dd27ad
|
Fix bugs.Run HelloWorld successful.
|
2011-01-05 11:24:52 +08:00 |
natural-law
|
711f3a2906
|
modify YES to true,and No to false.
|
2010-12-31 17:56:46 +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
|
b0e5c06d37
|
Merge branch 'upto-0.99.5' of https://github.com/minggo/cocos2d-x into minggo-upto-0.99.5
|
2010-12-30 10:36:17 +08:00 |
minggo
|
da00d82117
|
fix some error in CCGrid and CCDirector.h
|
2010-12-30 10:28:13 +08:00 |
minggo
|
7b804d985b
|
merge yangws-upto-0.99.5 into upto-0.99.5
|
2010-12-30 10:25:35 +08:00 |
minggo
|
dc55c164ba
|
fixed #292
|
2010-12-29 18:01:37 +08:00 |
yangws
|
5e377f9368
|
issue #281 CCParticleSystemPoint.h upto-0.99.5
|
2010-12-28 11:09:40 +08:00 |
minggo
|
33ad2881b7
|
merge mingo-upto-0.99.5 to upto-0.99.5
|
2010-12-27 11:06:44 +08:00 |
natural-law
|
01cd90f2cc
|
update layers_scenes_transition_nodes to 0.99.5.
|
2010-12-27 09:40:45 +08:00 |
natural-law
|
6ee16ce878
|
update menu_nodes to 0.99.5
|
2010-12-25 11:15:19 +08:00 |
minggo
|
e7231f232c
|
fixed #276
|
2010-12-24 15:53:51 +08:00 |
minggo
|
d6fb209861
|
merged from minggo-upto-0.995 to upto-0.99.5
|
2010-12-24 15:21:57 +08:00 |
minggo
|
f92b0d514e
|
fixed #273
|
2010-12-24 15:04:26 +08:00 |