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 |
James Chen
|
5274fc378d
|
fixed a typo in CCScene.h.
|
2012-06-21 13:48:57 +08:00 |
minggo
|
d849ff1860
|
Merge pull request #1051 from ngocdaothanh/patch-1
"node" -> "create"
|
2012-06-20 22:42:20 -07:00 |
Ngoc Dao
|
28cc77008d
|
"node" -> "create"
|
2012-06-21 14:33:27 +09:00 |
minggo
|
5b701e1d3d
|
Merge pull request #1050 from minggo/iss1338_cocosdenshion
fix a crash bug
|
2012-06-20 20:44:44 -07:00 |
minggo
|
5cc1f7d230
|
fixed #1338:stop animation when entering background and start animation when comming to foreground
|
2012-06-21 11:42:49 +08:00 |
Walzer
|
9eab0c19f8
|
add groups to all classes for doxygen
|
2012-06-20 18:09:11 +08:00 |
Walzer
|
d7162fcfc5
|
Add groups in all classes for doxygen. Upgrade doxygen to 0.8.1
|
2012-06-20 18:07:27 +08:00 |
James Chen
|
0960c4988a
|
Merge pull request #1049 from dumganhar/gles20
fixed #1292: Renamed CCFileUtils::popupNotify to CCFileUtils::setPopupNotify
|
2012-06-19 23:39:18 -07:00 |
James Chen
|
f8ebbccb98
|
fixed #1292: Renamed CCFileUtils::popupNotify to CCFileUtils::setPopupNotify
|
2012-06-20 14:38:13 +08:00 |
James Chen
|
d3b73b3df4
|
Merge pull request #1048 from dumganhar/gles20
fixed #1336: Updated comment information for deprecated apis.
|
2012-06-19 23:34:07 -07:00 |
James Chen
|
24e3ec7499
|
fixed #1336: Updated comment information for deprecated apis.
|
2012-06-20 14:31:36 +08:00 |
James Chen
|
940ae5b05b
|
Merge pull request #1047 from dumganhar/gles20
fixed #1336: Used CC_DEPRECATED_ATTRIBUTE macro to mark deprecated interfaces.
|
2012-06-19 22:56:48 -07:00 |
James Chen
|
f748b87268
|
fixed #1336: Updated HelloWorldScene.cpp
|
2012-06-20 13:56:09 +08:00 |
James Chen
|
2af75ecd65
|
fixed #1336: HelloCocosBuilder/HelloCocosBuilderLayer.cpp
|
2012-06-20 12:08:34 +08:00 |
James Chen
|
d3d3288e09
|
fixed #1336: Updated CCScene.h.
|
2012-06-20 12:03:50 +08:00 |
James Chen
|
411ae21cee
|
fixed #1336: Updated lua bindings.
|
2012-06-20 11:59:35 +08:00 |
James Chen
|
b818c0afa6
|
fixed #1336: Used CC_DEPRECATED_ATTRIBUTE macro to mark deprecated interfaces.
|
2012-06-20 11:48:31 +08:00 |
James Chen
|
6f9c124277
|
Merge pull request #1046 from dumganhar/gles20-ccbi
fixed #1335: Memory leaks in cocos2dx and CCBReader.
|
2012-06-19 02:41:35 -07:00 |