Nicolas Gramlich
|
36e6d94d46
|
Added setter for dimensions of CCLabelTTF (According to: 302dd76b4f87ddb18cc571ebec3be0811ea534ca).
|
2012-05-30 16:49:51 -07:00 |
Nicolas Gramlich
|
d0f101b820
|
Added missing ASSERT_FAIL_UNEXPECTED_PROPERTY in CCNOdeLoader::onHandlePropTypeSize.
|
2012-05-30 16:14:02 -07:00 |
Nicolas Gramlich
|
6b3fa4abb6
|
Added CCLabelTTFLoader.
|
2012-05-30 15:38:20 -07:00 |
Nicolas Gramlich
|
5578521a69
|
Fixed CCLabelBMFontLoader (according to changes in: 827ee160b5 ).
|
2012-05-30 15:37:36 -07:00 |
Nicolas Gramlich
|
c754dac31b
|
Added missing case kCCBPropTypeFontTTF in CCNodeLoader::parseProperties.
|
2012-05-30 15:36:00 -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 |
Nicolas Gramlich
|
a7d4fa619d
|
Removed CCBReader to avoid conflicts.
|
2012-05-30 11:30:53 -07:00 |
Nicolas Gramlich
|
56ea340314
|
Current state of the CCB(I)Reader (dysfunctional due to CCLabelBMFont problems).
|
2012-05-30 11:28:50 -07:00 |
minggo
|
5ad2bec3d8
|
Merge pull request #946 from minggo/gles20
fix some bug
|
2012-05-30 03:33:19 -07:00 |
minggo
|
a698f9bf69
|
fix some bug
|
2012-05-30 18:31:20 +08:00 |
James Chen
|
89ea703dad
|
Merge pull request #945 from dumganhar/gles20
fixed #1279: NodeNonOpaqueTest can't be shown correctly.
|
2012-05-30 03:31:11 -07:00 |
James Chen
|
6be44ad7b0
|
fixed #1279: NodeNonOpaqueTest can't be shown correctly.
|
2012-05-30 18:30:11 +08:00 |
James Chen
|
24a001a282
|
Merge pull request #944 from dumganhar/gles20
Updated TouchesTest.
|
2012-05-30 01:57:34 -07:00 |
James Chen
|
922f7544ad
|
Updated TouchesTest.
|
2012-05-30 16:55:46 +08:00 |
James Chen
|
7a32a27f1e
|
Merge pull request #943 from dumganhar/gles20
fixed #1277: CCToggleVisibility should implement copyWithZone.
|
2012-05-30 01:36:13 -07:00 |
James Chen
|
cbb45c7ecd
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
|
2012-05-30 16:35:08 +08:00 |
James Chen
|
93d1879a56
|
fixed #1277: CCToggleVisibility should implement copyWithZone.
|
2012-05-30 16:34:42 +08:00 |
James Chen
|
4a4a99caa0
|
Merge pull request #942 from dumganhar/gles20
issue #1275: Memory leaks in CCBReader and ActionsTest.
|
2012-05-30 01:28:28 -07:00 |
James Chen
|
5b4495d982
|
Opened assert for CCTexture2D::setTexParameters and generateMipmap.
|
2012-05-30 16:26:47 +08:00 |
James Chen
|
bd248b5ac0
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
|
2012-05-30 16:09:52 +08:00 |
James Chen
|
7115a7f3c9
|
issue #1275: Memory leaks in CCBReader and ActionsTest.
|
2012-05-30 16:09:19 +08:00 |
minggo
|
80389d0611
|
Merge pull request #941 from minggo/gles20
fix some bugs
|
2012-05-30 00:44:22 -07:00 |
minggo
|
4428810fd5
|
fixed some bugs
|
2012-05-30 15:42:29 +08:00 |
James Chen
|
b662784730
|
Merge pull request #940 from dumganhar/gles20
fixed #1273: Crash appears after clicking closed button in TextureCacheTest.
|
2012-05-29 23:31:36 -07:00 |
James Chen
|
265cb135ad
|
fixed #1273: Passed 'this' to unscheduleSelector rather than 'g_sharedTextureCache'.
|
2012-05-30 14:27:30 +08:00 |
James Chen
|
895de701ba
|
fixed #1273: Crash appears after clicking closed button in TextureCacheTest. Also fixed a bug about memory leak in CCEGLView.cpp(win32). And updated build-win32.bat.
|
2012-05-30 14:24:59 +08:00 |
minggo
|
8203cf00ba
|
use fonts/fps_images.png
|
2012-05-30 13:37:36 +08:00 |
minggo
|
378091823b
|
Merge pull request #939 from minggo/gles20
fixed #1266: use flag O_CREAT when creating named semaphore
|
2012-05-29 20:22:36 -07:00 |
minggo
|
07c46bb445
|
fixed #1266: use flag O_CREAT when creating named semaphore
|
2012-05-30 11:21:36 +08:00 |
James Chen
|
45ff7e5e5f
|
Merge pull request #937 from dumganhar/gles20
fixed #1240: Updated vs2008 project setting (release target).
|
2012-05-29 03:31:08 -07:00 |
James Chen
|
ff0dde984c
|
fixed #1240: Updated vs2008 project setting (release target).
|
2012-05-29 18:29:56 +08:00 |
James Chen
|
1dee3632d7
|
Merge pull request #936 from dumganhar/gles20
fixed #1240: Updated vs2010 project setting.
|
2012-05-29 03:09:32 -07:00 |
James Chen
|
b4fad0bb2b
|
fixed #1240: Updated vs2010 project setting (release target).
|
2012-05-29 18:06:52 +08:00 |
James Chen
|
228bc1e044
|
fixed #1240: Updated vs2010 project setting.
|
2012-05-29 17:50:27 +08:00 |
James Chen
|
d5ba86c845
|
Merge pull request #935 from dumganhar/iss1270_warning
fixed #1270: Fixed some warning on win32.
|
2012-05-29 02:30:09 -07:00 |
James Chen
|
4864640816
|
fixed #1270: Re-generated LuaCocos2d.cpp.
|
2012-05-29 17:25:18 +08:00 |
James Chen
|
d44c193170
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1270_warning
|
2012-05-29 17:17:39 +08:00 |
James Chen
|
1075b05fa6
|
Merge pull request #934 from dumganhar/gles20
fixed #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces.
|
2012-05-29 02:15:58 -07:00 |
James Chen
|
1ddb5d51b5
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
|
2012-05-29 17:13:21 +08:00 |
James Chen
|
ec0b0d18c7
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1270_warning
|
2012-05-29 17:12:38 +08:00 |
James Chen
|
ad50d6ee57
|
fixed #1270: Fixed some warning on win32.
|
2012-05-29 17:11:33 +08:00 |
minggo
|
b2cf68194a
|
Merge pull request #933 from minggo/gles20
fixed #1177: modify project setting
|
2012-05-29 01:26:48 -07:00 |
minggo
|
a09bbbd0ba
|
fixed #1177: modify project setting, because CCStd.h is moved into platform/ios
|
2012-05-29 16:23:57 +08:00 |
James Chen
|
19c96632b5
|
fixed #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces.
|
2012-05-29 16:21:23 +08:00 |
James Chen
|
e3df8eabb8
|
Merge pull request #932 from dumganhar/gles20
fixed #1177: Updated Android.mk.
|
2012-05-29 01:12:44 -07:00 |
James Chen
|
c1cb8b0e24
|
fixed #1177: Updated Android.mk.
|
2012-05-29 15:56:08 +08:00 |
James Chen
|
a8cee2d1af
|
Merge pull request #931 from dumganhar/gles20
fixed #1177: Moved CCStdC.h/.cpp to relevant platform folder.
|
2012-05-29 00:54:11 -07:00 |
James Chen
|
6e2c257e43
|
fixed #1177: Updated win32 project configuration.
|
2012-05-29 15:52:38 +08:00 |
James Chen
|
5f5af82254
|
fixed #1177: Moved CCStdC.h/.cpp to relevant platform folder.
|
2012-05-29 15:51:13 +08:00 |