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
minggo
88952396e4
Merge branch 'ptr_int_casting_issue' of https://github.com/ByungChoi/cocos2d-x into ptr_int
2012-09-24 15:16:30 +08:00
minggo
37f508b415
Merge pull request #1327 from Weeds/gles20
...
[linux] font rendering enhancements
2012-09-23 19:58:48 -07: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
Byung Choi
68f38914b1
fixes #1359 , MSVC's stdint absence
2012-09-22 17:36:36 +09:00
minggo
dca626eab0
Merge pull request #1357 from ByungChoi/linux_makefile
...
Linux makefile
2012-09-21 02:12:45 -07:00
minggo
0a1f0369e6
fixed #1481 : merge Nicolas's pull request and do some bug fixes
2012-09-21 17:01:19 +08:00
minggo
29fad4d570
Merge branch 'gles20-android-refactoring' of https://github.com/nicolasgramlich/cocos2d-x into merge_nicolas
2012-09-21 11:05:31 +08:00
minggo
31c6f46b6a
Merge pull request #1329 from dualface/gles20
...
update luabinding for overloaded functions, fix mac CCLuaLog crash ...
2012-09-20 01:11:36 -07:00
Byung Choi
4a4ef87163
Fixes #1317 by http://gcc.gnu.org/wiki/Visibility
2012-09-19 04:59:33 +09:00
Nicolas Gramlich
cd4b22a503
Merge branch 'gles20-official' into patch-5
2012-09-18 10:50:15 -07:00
moadib
6df8233b03
Fixed statement which works but incorrect from point of C++ rules applied to ternary operator and can cause compilation error on compiler different from MSVC
2012-09-18 13:15:05 +04:00
dualface
ded6e3edcf
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-09-17 17:55:41 +08:00
Andre Rudlaff
394b64d61f
[linux] fixed font rendering artifacts
...
This patch fixes the black pixels
around fonts when rendered using
CCLabelTTF.
see http://www.cocos2d-x.org/issues/706
This fix is for linux only, but may
be applied to other platforms as well
2012-09-17 02:33:23 +02:00
Andre Rudlaff
44ccc40269
[linux] use fontconfig to select system fonts
...
This patch removes the hardcoded font paths
from the linux project and uses fontconfig
to find the best match for a given font-family
The implementation also adds the possibility
to load a font file from the applications
resource directory
2012-09-18 00:57:29 +02:00
minggo
eab52552be
Merge pull request #1320 from NatWeiss/fixccthread
...
Fixes CCThread.cpp so it is not included for Mac builds.
2012-09-15 18:47:42 -07:00
Donald Alan Morrison
216ebab0e1
Minor English Spelling Corrections, etc.
2012-09-15 14:19:14 -07:00
Nat Weiss
febafa6e82
Fixes CCThread.cpp so it is not included for Mac builds.
...
The Mac platform already has it's own CCThread.mm.
2012-09-15 00:37:12 -07:00
Donald Alan Morrison
b29f9a7f3b
Missed one spelling error.
2012-09-14 15:41:42 -07:00
Donald Alan Morrison
b8412f3b7e
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-09-14 15:27:55 -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
Nicolas Gramlich
f03c0caaf9
Added proper JNIEXPORT/JNICALL markers to android platform jni bindings.
2012-09-13 09:34:30 -07:00
Walzer
150ef1f320
Update cocos2dx/platform/win32/CCEGLView.cpp
2012-09-13 15:53:57 +08:00
Walzer
5718dc1397
fixed #1474 , check OpenGL version of win32
...
When OpenGL version is too old to run 2dx (<1.5), popup a warning dialog to warn users.
2012-09-13 15:52:46 +08:00
dualface
4aa74d8f5e
[Mac] fix CCLuaLog crash
2012-09-13 10:26:47 +08:00
Nicolas Gramlich
675d0adce5
Merge with gles20-official.
2012-09-12 16:51:01 -07:00
flamingo
bb82930789
Update cocos2dx/platform/win32/CCEGLView.cpp
...
extra endings in linux logging
2012-09-12 22:17:56 +04:00
James Chen
b6e4c98334
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into dualface-lua
2012-09-11 14:03:33 +08:00
moadib
97a11c0e06
Handle window close event on Linux platform
2012-09-10 17:53:33 +04:00
James Chen
2f51246bbd
Merge branch 'gles20' of https://github.com/dualface/cocos2d-x into dualface-lua
2012-09-10 17:01:00 +08:00
James Chen
6a1aae95aa
Merge branch 'gles20' of https://github.com/dualface/cocos2d-x into dualface-lua
...
Conflicts:
cocos2dx/proj.mac/cocos2dx.xcodeproj/project.pbxproj
2012-09-10 17:00:22 +08:00
YuLei
8fa431fe0a
[Mac] remove CCEGLView::purgeSharedOpenGLView()
2012-09-10 16:50:45 +08: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
Nicolas Gramlich
4c7705171a
Android JAVA refactoring. Android JNI Cleanup.
2012-09-07 17:23:04 -07:00
YuLei
58ea948cc8
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-09-07 19:21:15 +08:00
dualface
08f5617fde
[Win32] fix: CCLuaLog crash when dump large message (>16K)
2012-09-07 10:41:54 +08:00
dualface
a8aa299c2a
Merge remote-tracking branch 'origin/gles20' into gles20
2012-09-07 10:16:57 +08:00
dualface
4968ab126f
[Win32] fix CCLuaLog() crash
2012-09-07 10:15:17 +08:00
YuLei
3679f742cb
Merge branch 'gles20' of github.com:dualface/cocos2d-x into gles20
2012-09-06 09:50:52 +08:00
dualface
eae5f7368e
[Win32] fix: after call CCApplication::setResourceRootPath(), CCFileUtils::fullPathFromRelativePath() not check resourceDirectory
2012-09-06 09:49:38 +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
dualface
affcb70ecc
add CCApplication::setResourceRootPath()
...
add CCApplication::setStartupScriptFilename()
2012-09-05 14:38:39 +08:00
YuLei
6115769044
restore CCApplicationProtocol.h and CCFileUtils.h
2012-09-05 13:36:27 +08:00
dualface
1dc7c48cf6
[Win32] add CC_DISABLE_ASSERT check
2012-09-04 11:34:55 +08:00
dualface
3befb0ffdc
Merge remote-tracking branch 'origin/gles20' into gles20
2012-09-04 11:20:33 +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
yodesoft
95f204cd17
Add font table to handler font info, eg. family_name, style_name, filename
2012-09-04 10:48:02 +08:00
dualface
2160e56cb1
[Win32] fix CCFileUtils:fullPathFromRelativePath() check m_isWorkingDirectory
2012-09-04 02:41:16 +08:00
YuLei
09b0d9c843
[Mac] fix memory leaks
2012-09-04 02:06:04 +08:00