James Chen
|
26a02804d9
|
Added some resources. Updated Texture2dTest.cpp.
|
2012-06-28 17:34:50 +08:00 |
James Chen
|
94e78f2dec
|
Merge pull request #1072 from dumganhar/gles20
Reverted build_native.sh.
|
2012-06-28 02:00:03 -07:00 |
James Chen
|
aba33b5bda
|
Reverted build_native.sh.
|
2012-06-28 16:58:32 +08:00 |
minggo
|
254c2066f2
|
Merge pull request #1071 from minggo/gles20
add product name for iOS
|
2012-06-27 22:53:00 -07:00 |
minggo
|
5b08a5996c
|
add product name for iOS
|
2012-06-28 13:52:10 +08:00 |
minggo
|
b291bad46f
|
Merge pull request #1070 from minggo/gles20
modify code sign
|
2012-06-27 22:41:55 -07:00 |
minggo
|
e3771a8ad4
|
modify code sign
|
2012-06-28 13:41:05 +08:00 |
minggo
|
7a6a05bcdf
|
Merge pull request #1069 from minggo/gles20
some modification
|
2012-06-27 21:05:52 -07:00 |
minggo
|
51b5912f46
|
add resources for retina
|
2012-06-28 12:00:36 +08:00 |
minggo
|
3c43dfb6fe
|
disable retina
|
2012-06-28 11:50:11 +08:00 |
minggo
|
7348fa12c3
|
update CHANGELOG and delete some unneeded files
|
2012-06-28 11:47:54 +08:00 |
James Chen
|
e4702a40b6
|
Merge pull request #1068 from dumganhar/gles20
fixed #1370: Create project script can't work correctly on android.
|
2012-06-27 20:06:50 -07:00 |
James Chen
|
fc8ab2e80e
|
fixed #1370: Create project script can't work correctly on android.
|
2012-06-28 11:05:34 +08:00 |
Walzer
|
5d0bcc2bc7
|
Merge remote-tracking branch 'parent/gles20' into gles20
|
2012-06-28 10:49:23 +08:00 |
James Chen
|
897f92a4c5
|
Merge pull request #1067 from dumganhar/gles20
fixed #1369: Invoking CCLabelTTF:setPosition(x,y) in lua script causes crash
|
2012-06-27 09:07:57 -07:00 |
James Chen
|
edca0871a6
|
fixed #1369: Invoking CCLabelTTF:setPosition(x,y) in lua script causes crash.
|
2012-06-28 00:05:45 +08:00 |
James Chen
|
00b36359fc
|
Merge pull request #1066 from dumganhar/gles20
fixed #1368: Implement EffectsAdvancedTest (Effect4)
|
2012-06-27 05:53:27 -07:00 |
James Chen
|
86942aedb4
|
fixed #1368: Implement EffectsAdvancedTest (Effect4). Added some comments.
|
2012-06-27 20:50:47 +08:00 |
James Chen
|
c3fce65f7f
|
Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20
|
2012-06-27 20:01:05 +08:00 |
James Chen
|
33e32e987c
|
Implement EffectsAdvancedTest (Effect4).
|
2012-06-27 18:44:25 +08:00 |
James Chen
|
f11fa550fb
|
Merge pull request #1065 from dumganhar/gles20
fixed #1367: Updated ShaderTest.cpp, TileMapTest.cpp, CCLableBMFont.cpp
|
2012-06-27 02:12:07 -07:00 |
James Chen
|
13793a9d75
|
fixed #1367: Updated ShaderTest.cpp, TileMapTest.cpp.
|
2012-06-27 17:08:50 +08:00 |
James Chen
|
a20a80323b
|
fixed #1367: using CCString::createWithContentOfFile in CCBMFontConfiguration::parseConfigFile.
|
2012-06-27 17:04:54 +08:00 |
James Chen
|
2d581e5018
|
Merge pull request #1064 from dumganhar/gles20
fixed #1367: Refactor "createWith***" to "create".
|
2012-06-27 01:50:03 -07:00 |
James Chen
|
88a3428f5e
|
fixed #1366: Updated vs2010 project configuration.
|
2012-06-27 16:37:41 +08:00 |
James Chen
|
bde351dda7
|
fixed a bug in CCSpriteFrame::getTexture.
if( m_strTextureFilename.length() <= 0 ) // logic error, must be > 0
{
return CCTextureCache::sharedTextureCache()->addImage(m_strTextureFilename.c_str());
}
|
2012-06-27 15:04:42 +08:00 |
James Chen
|
a901b0bb12
|
fixed #1367: Refactor "createWith***" to "create".
|
2012-06-27 14:21:29 +08:00 |
James Chen
|
36f7eed544
|
Merge pull request #1063 from dumganhar/gles20
fixed #1366: testjs will crash on win32. Resolved by updating spiderMonkey to v1.8.5.
|
2012-06-26 18:35:55 -07:00 |
James Chen
|
270d9f545d
|
Updated testjs project setting.
|
2012-06-27 00:10:27 +08:00 |
James Chen
|
934a50c673
|
fixed #1366: testjs will crash on win32. Resolved by updating spiderMonkey to v1.8.5.
|
2012-06-26 23:26:16 +08:00 |
minggo
|
c4d877b29d
|
Merge pull request #1062 from minggo/gles20
modify cocos2d-x version
|
2012-06-26 00:38:39 -07:00 |
minggo
|
4f5d1d06e5
|
modify cocos2d-x version
|
2012-06-26 15:37:47 +08:00 |
James Chen
|
6edd1029e7
|
Merge pull request #1061 from dumganhar/gles20
Updated fps_images.png for testjs project.
|
2012-06-25 23:28:52 -07:00 |
James Chen
|
8e8da6c195
|
Updated fps_images.png for testjs project.
|
2012-06-26 14:27:57 +08:00 |
James Chen
|
b40102b77e
|
Merge pull request #1060 from dumganhar/gles20
fixed #1365: Some files of Resources folder which is copied by build_native.sh will lost authority in cygwin.
|
2012-06-25 21:55:15 -07:00 |
James Chen
|
f6026d2ba3
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
|
2012-06-26 12:09:48 +08:00 |
James Chen
|
95a2696b6b
|
fixed #1365: Some files of Resources folder which is copied by build_native.sh will lost authority in cygwin.
|
2012-06-26 12:09:23 +08:00 |
minggo
|
e4608df89d
|
Merge pull request #1059 from minggo/gles20
enable depth test when running test case:Bug-1159
|
2012-06-25 20:10:26 -07:00 |
minggo
|
765da0c80a
|
enable depth test when running test case:Bug-1159
|
2012-06-26 11:09:37 +08:00 |
minggo
|
1fe64da7de
|
Merge pull request #1058 from minggo/gles20
fixed #1364:add paused state
|
2012-06-25 20:03:57 -07:00 |
minggo
|
16310cb544
|
fixed #1364:add paused state
|
2012-06-26 11:02:19 +08:00 |
James Chen
|
ec5ba08a97
|
Merge pull request #1057 from dumganhar/gles20
fixed #1344: win32 template cannot work after synchronizing to rc2
|
2012-06-24 21:11:54 -07:00 |
James Chen
|
04a155fd9c
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
|
2012-06-25 11:55:52 +08:00 |
James Chen
|
28ba42db87
|
fixed #1344: win32 template cannot work after synchronizing to rc2
|
2012-06-25 11:55:12 +08:00 |
minggo
|
13f066f942
|
Merge pull request #1055 from minggo/iss1343_xcode
fixed #1343: make xcode template work ok
|
2012-06-21 21:01:24 -07:00 |
minggo
|
55eca9f516
|
fixed #1343: make xcode template work ok
|
2012-06-22 12:00:27 +08:00 |
Walzer
|
95707e9884
|
Update gles20
|
2012-06-21 14:04:04 +08:00 |
James Chen
|
8cb4252354
|
Merge pull request #1053 from dumganhar/gles20
Removed virtual attribute for callback functions in HelloWorldScene.h. And updated templates.
|
2012-06-20 22:59:39 -07:00 |
James Chen
|
1d0b7c40e4
|
Removed virtual attribute for callback functions in HelloWorldScene.h.
Updated templates.
|
2012-06-21 13:56:56 +08:00 |
James Chen
|
b7c1e24112
|
Merge pull request #1052 from dumganhar/gles20
fixed a typo in CCScene.h.
|
2012-06-20 22:50:05 -07:00 |