James Chen
|
31681e005e
|
CCFileUtils::fullPathFromRelativePath -> fullPathForFilename.
|
2013-01-29 10:40:44 +08:00 |
James Chen
|
6baeee3ff9
|
Adding LOG in CCFIleUtils::fullPathForFilename for Marmalade port.
|
2013-01-29 10:27:36 +08:00 |
James Chen
|
2694cb150b
|
CCFileUtils::s|gSearchPath -> CCFileUtils::s\gSearchPaths.
|
2013-01-29 09:56:38 +08:00 |
James Chen
|
d5237d637d
|
Absolute path check for blackberry.
|
2013-01-29 00:42:21 +08:00 |
James Chen
|
1f0b422112
|
Fix a typo.
|
2013-01-28 23:40:56 +08:00 |
James Chen
|
c160d3ed0a
|
Using full path in CCFileUtils::getFileData.
|
2013-01-28 23:37:04 +08:00 |
James Chen
|
7c89086173
|
Merge remote-tracking branch 'cocos2d-x/master'
|
2013-01-28 23:29:41 +08:00 |
James Chen
|
341193eec6
|
Updating comments for CCFileUtils.
|
2013-01-28 23:28:14 +08:00 |
minggo
|
3ea562b4ad
|
fix some logical errors and compiling errors
|
2013-01-28 23:19:57 +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 |
James Chen
|
f0fc414a81
|
Fixing a bug in CCLabelTTF.cpp, checking the return value of CCTexture2D::initWithString.
|
2013-01-28 21:17:43 +08:00 |
James Chen
|
75d926f810
|
issue #1683: Fixing complication errors for blackberry.
|
2013-01-28 21:16:01 +08:00 |
minggo
|
05363ee8dd
|
Merge pull request #1908 from minggo/master
fix some warnings
|
2013-01-28 04:36:01 -08:00 |
minggo
|
249b935be8
|
fix some warnins
|
2013-01-28 20:34:52 +08:00 |
James Chen
|
59f2ae13f8
|
issue #1683: Updating CCFileUtils for Blackberry and Marmalade.
|
2013-01-28 20:12:48 +08:00 |
James Chen
|
6bceb2ac6f
|
Merge remote-tracking branch 'cocos2d-x/master' into iss1683-ccfileutils
|
2013-01-28 19:54:02 +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
|
0d8756c900
|
Merge pull request #1907 from dumganhar/iss1683-ccfileutils
issue #1683: Updating CCFileUtils.cpp for Win32.
|
2013-01-28 03:51:59 -08:00 |
James Chen
|
031380d4e9
|
issue #1683: Updating CCFileUtils.cpp for Win32.
|
2013-01-28 19:49:34 +08:00 |
James Chen
|
c5975dd7c4
|
Merge pull request #1905 from dumganhar/iss1683-ccfileutils
issue #1683: Fixed compilation errors for linux.
|
2013-01-28 02:34:24 -08:00 |
James Chen
|
733a334ec2
|
issue #1683: Fixed compilation errors for linux.
|
2013-01-28 18:32:34 +08:00 |
James Chen
|
57eb58df42
|
Merge pull request #1904 from dumganhar/iss1683-ccfileutils
issue #1683: Adding FileUtilsTest.Adding default search path if developer didn't pass it.
|
2013-01-28 01:57:46 -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 |
minggo
|
cd75f37d06
|
change version string
|
2013-01-28 15:24:13 +08:00 |
James Chen
|
13881ba8a8
|
issue #1683: Updating CCApplication.h/.cpp for linux.
|
2013-01-28 11:56:56 +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
|
78c16fdd22
|
issue #1683: Fixing absolute path check for Android.
|
2013-01-28 10:23:19 +08:00 |
James Chen
|
f2dad83610
|
issue #1683: Refactoring CCFileUtils for MAC port.
|
2013-01-27 20:53:32 +08:00 |
James Chen
|
d532670640
|
Removing some CCLOG.
|
2013-01-27 20:16:46 +08:00 |
James Chen
|
09cef5511a
|
issue #1683: Updating CCFileUtils.
|
2013-01-26 23:24:41 +08:00 |
James Chen
|
be6c0c9d9b
|
Updated CCFileUtils of linux.
|
2013-01-26 23:20:40 +08:00 |
James Chen
|
119115502d
|
issue #1683: Making some api of CCFileUtils more c++ friendly by using std::vector rather than CCArray.
|
2013-01-26 22:31:57 +08:00 |
James Chen
|
ca9e96213f
|
issue #1683: Commented one LOG.
|
2013-01-26 15:02:04 +08:00 |
martell
|
0e3560bcd5
|
final fix.. tested
|
2013-01-26 06:27:49 +00:00 |
James Chen
|
d9fd3c6c60
|
issue #1683: Fixed an issue about OPENGLES ERROR 501 Warning in CCTextureAtlas.cpp.
|
2013-01-26 14:20:24 +08:00 |
James Chen
|
3328cfd6a4
|
Refactoring some logic of CCFileUtils.
|
2013-01-26 14:19:14 +08:00 |
James Chen
|
522e860205
|
issue #1683: Fixed a bug in file lookup for Android.
|
2013-01-26 12:10:55 +08:00 |
martell
|
05bece9d07
|
added ccuserdefault tinyxml2 ver
|
2013-01-26 02:41:27 +00:00 |
James Chen
|
f71df5a873
|
Fixed an issue in CCFileUtils::setResourceDirectory for android.
|
2013-01-25 23:01:47 +08:00 |
James Chen
|
2c399de28e
|
issue #1683: Moved CCFileUtils::setResourceDirectory. And fix a compatible issue for android.
|
2013-01-25 22:55:20 +08:00 |
James Chen
|
2235f745d3
|
issue #1683: Fixed compilation error for Win32.
|
2013-01-25 22:30:16 +08:00 |
James Chen
|
ef131beed1
|
Merge pull request #1885 from dumganhar/refactor-ccfileutils
issue #1683 :Refactoring CCFileUtils.TO BE DONE:
Making the api of CCFileUtils more c++ friendly.
|
2013-01-25 05:55:10 -08:00 |
James Chen
|
fde39c6dcb
|
Adding cache support for CCFileUtils.
|
2013-01-25 21:52:35 +08:00 |
James Chen
|
55af1fd3bf
|
Removing unneeded codes in CCFileUtils.mm for iOS port.
|
2013-01-25 21:17:28 +08:00 |
James Chen
|
a1574fe9f6
|
Reverted this commit (be305f84b6 ) since i didn't find the crash.
|
2013-01-25 20:59:58 +08:00 |
James Chen
|
6f3b22031f
|
Using new API of getting full path for file name.
|
2013-01-25 20:51:52 +08:00 |
martell
|
684b46dd74
|
Initial Import of tinyxml2 to replace libxml2
|
2013-01-25 10:39:54 +00:00 |
James Chen
|
b3f54f6c1d
|
Merge remote-tracking branch 'origin/refactor-ccfileutils' into refactor-ccfileutils
|
2013-01-25 17:23:58 +08:00 |
James Chen
|
70b8e624d6
|
Merge pull request #8 from rohankuruvilla/fileutils_test
Merged @Rohan's improvements for CCFileUtils.
|
2013-01-25 01:20:51 -08:00 |
minggo
|
dcaa3900a4
|
fixed #1679: use unstripped libs for armeabi-v7a
|
2013-01-25 14:49:25 +08:00 |
James Chen
|
805067b046
|
Refactored CCFileUtils for blackberry port.
|
2013-01-25 14:09:56 +08:00 |
James Chen
|
314445e1ca
|
Refectored CCFileUtils for MAC port.
|
2013-01-25 11:12:38 +08:00 |
Rohan Kuruvilla
|
9750bbab95
|
removing absolute path lookup in fullPathForFilename
|
2013-01-24 19:04:27 -08:00 |
Rohan Kuruvilla
|
f5c74d9022
|
Adding support for getInstance in Cocos2dxGLSurfaceView, to allow for running tasks on GL Thread
|
2013-01-24 18:37:24 -08:00 |
Rohan Kuruvilla
|
be305f84b6
|
Fixing bug where it doesn't use embedded texture data, if texture filename is not available
|
2013-01-24 18:37:23 -08:00 |
Rohan Kuruvilla
|
287b5575f4
|
Changing architecture of CCFileUtils
|
2013-01-24 18:37:23 -08:00 |
James Chen
|
cefef60e11
|
Refactored CCFileUtils for Marmalade port.
|
2013-01-24 17:38:43 +08:00 |
James Chen
|
73389d68d5
|
Refactor CCFileUtils for Linux port.
|
2013-01-24 16:44:13 +08:00 |
James Chen
|
e954ce4f75
|
Made compatibility with old api CCFileUtils::setResourceDirectory.
|
2013-01-24 14:07:48 +08:00 |
James Chen
|
7589be6fb7
|
Refactoring CCFileUtils for win32. CrystalCraze works ok on WIN32 now.
|
2013-01-24 13:56:50 +08:00 |
James Chen
|
dcf1127d31
|
Merge branch 'master' into refactor-ccfileutils
|
2013-01-24 11:21:23 +08:00 |
Ed Bartley
|
908035bdee
|
Fixed a CCMenu bug that prevented the touch priority from being set to the value specified by a call to CCMenu::setTouchPriority(int).
|
2013-01-23 14:00:23 -05:00 |
James Chen
|
46f38c57fb
|
issue #1661: CrystalCraze works ok on android.
|
2013-01-24 00:32:22 +08:00 |
James Chen
|
8cfd912a06
|
CrystalCraze works ok on iOS.
|
2013-01-23 23:17:44 +08:00 |
James Chen
|
388e1d82c3
|
Added resource structure which is the same as cocos2d-iphone.
|
2013-01-23 22:29:00 +08:00 |
James Chen
|
294509c4c0
|
Merge branch 'master' of https://github.com/dumganhar/cocos2d-x into myccfileutils
|
2013-01-23 19:52:17 +08:00 |
James Chen
|
f2303b854a
|
Fixed a typo, and regenerated luabinding codes.
|
2013-01-23 15:59:13 +08:00 |
James Chen
|
c92d00dfa1
|
Merge pull request #1857 from walzer/master
fixed #1678: Well documented CCNode member functions and variables.
|
2013-01-22 23:35:14 -08:00 |
James Chen
|
2b9f79efc0
|
Merge pull request #1882 from dumganhar/memoryleak-action
Fixed memory leaks in CCActionCatmullRom class.
|
2013-01-22 22:41:44 -08:00 |
James Chen
|
317ac3dd95
|
Fixed memory leaks in CCActionCatmullRom class.
|
2013-01-23 14:38:46 +08:00 |
James Chen
|
de8a237d73
|
Merge pull request #1881 from dumganhar/linux-fix
fixed #1676: Refactoring Makefile and eclipse project configuration for LINUX port.
|
2013-01-22 03:22:41 -08:00 |
James Chen
|
8ec1a66db4
|
Removed glew-1.7.0.tgz.
|
2013-01-22 18:34:51 +08:00 |
James Chen
|
3f57b01f94
|
Fix for 32bit.
|
2013-01-22 18:30:16 +08:00 |
James
|
1d7650767b
|
Updated Makefile and project configurations for linux port.
|
2013-01-22 16:45:35 +08:00 |
James Chen
|
219657ee1a
|
Merge pull request #1872 from moadib/android_manifest_gles20
fixed #1673: Added <uses-feature android:glEsVersion="0x00020000"/> to AndroidManifest.
|
2013-01-21 23:52:32 -08:00 |
James
|
680fbe3517
|
Fixed compilation errors for linux port.
|
2013-01-22 15:21:37 +08:00 |
ivzave
|
03f1efff78
|
ignore unpacked glew
|
2013-01-21 18:01:57 +04:00 |
walzer
|
db59b047f0
|
remove "inline" keyword from set/getPositionX/Y() methods to make the compilation property without additional flags.
|
2013-01-21 20:57:06 +08:00 |
moadib
|
e39829269d
|
Added <uses-feature android:glEsVersion="0x00020000" /> to AndroidManifest.xml
|
2013-01-21 13:03:55 +04:00 |
walzer
|
b1285ca7a7
|
CCNode: add [set|get]Position[X|Y](void) back.
|
2013-01-21 16:26:33 +08:00 |
walzer
|
996d2be2b6
|
CCNode: add [set|get]Position[X|Y](void) back.
|
2013-01-21 16:26:02 +08:00 |
James Chen
|
b810aac103
|
issue #1667: Updated the comments for CCFileUtils.h.
|
2013-01-21 10:11:57 +08:00 |
James Chen
|
30b2a8a882
|
issue #1867: Updated CCFileUtils.cpp for android.
|
2013-01-18 22:18:55 +08:00 |
James Chen
|
9eb149efda
|
Updated CCFileUtils.mm.
|
2013-01-18 22:14:03 +08:00 |
James Chen
|
bc76cf09c4
|
Added filename lookup support for win32.
|
2013-01-18 21:54:48 +08:00 |
walzer
|
8657da80a6
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2013-01-18 18:06:51 +08:00 |
James Chen
|
0a42829428
|
issue #1667: Adding file name lookup support for iOS and Android, TBD: Other platform supports.
|
2013-01-18 18:05:32 +08:00 |
minggo
|
6379b61400
|
fixed #1664:fixed a logical error in CCAtlasNode::setOpacityModifyRGB()
|
2013-01-18 16:40:42 +08:00 |
minggo
|
fcecd43f55
|
Merge pull request #1862 from Horcruxes/master
getFileData("a.png") doesn't work on iOS.
|
2013-01-17 17:46:23 -08:00 |
Michael Ding
|
088e568c8e
|
Update cocos2dx/platform/ios/CCFileUtils.mm
fix the problem when calling CCFileUtils::sharedFileUtils()->getFileData("a.png") doesn't work.
|
2013-01-18 09:27:22 +11:00 |
James Chen
|
c8dfa45993
|
Merge pull request #1859 from dumganhar/crystal-game
issue #1661: Adding jsb sample game CrystallCraze.
|
2013-01-17 01:09:18 -08:00 |
James Chen
|
31e91e554e
|
issue #1661: Added CrystalCraze for win32 and fix some compilation errors.
|
2013-01-17 17:07:18 +08:00 |
minggo
|
3e482e30d3
|
Merge pull request #1861 from minggo/iss1547-ccmenuitem
fixed #1547:set selected menu item to null when it is removed from a menu
|
2013-01-16 23:06:53 -08:00 |
minggo
|
a7dca5c05a
|
fixed #1547:set selected menu item to null when it is removed from a menu
|
2013-01-17 15:04:48 +08:00 |
James Chen
|
f70e4db254
|
fixed #1662: Getting full path will fail if texture name in the plist is without relative path.
|
2013-01-17 11:42:41 +08:00 |
walzer
|
7b16494862
|
well documented CCNode
|
2013-01-17 11:20:25 +08:00 |
James Chen
|
375666fd6c
|
fixed #1468: Exported CCPoint, CCSize and CCRect.
|
2013-01-15 18:59:35 +08:00 |
James Chen
|
5d7cc39edd
|
issue #1650: Inline function needs to be implemented in header file on Android platform.
|
2013-01-15 18:15:14 +08:00 |
James Chen
|
547f95d761
|
issue #1650: Made the destructor of CCDictElement as public method.
|
2013-01-15 17:20:04 +08:00 |
James Chen
|
c3d697a0f8
|
issue #1650: Adding detailed doxgen comments for CCDictionary.
|
2013-01-15 17:09:25 +08:00 |
ivzave
|
806398519a
|
repair CCTransitionSplitCols & CCTransitionSplitRows
|
2013-01-15 00:49:05 +04:00 |
minggo
|
78fc7cb5b5
|
Merge pull request #1840 from walzer/gles20
Doxygen sample in CCSprite.h
|
2013-01-14 06:07:50 -08:00 |
walzer
|
4ae43e5901
|
fix typos in doxygen of CCSprite and CCProtocol
|
2013-01-14 21:51:47 +08:00 |
minggo
|
90a4653530
|
Merge pull request #1839 from fnz/gles20
Fix addImageAsync iOS memory leak
|
2013-01-14 03:22:11 -08:00 |
walzer
|
c9c227873f
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
|
2013-01-14 17:07:07 +08:00 |
walzer
|
1ab552b482
|
Add a sample doxygen sample in CCSprite.h and CCProtocol.h
|
2013-01-14 16:54:20 +08:00 |
Victor K
|
bf01df0f52
|
Fix addImageAsync iOS memory leak
Bug: http://www.cocos2d-x.org/issues/1087
Thread: http://www.cocos2d-x.org/boards/6/topics/17031
|
2013-01-14 15:32:30 +07:00 |
James Chen
|
6733f786a5
|
fixed #1649: Reverted some invokings of function that returns const reference.
|
2013-01-14 16:06:18 +08:00 |
James Chen
|
22ebf3a5e5
|
Merge remote-tracking branch 'cocos2d-x/gles20' into iss1649-return-const
|
2013-01-14 15:52:42 +08:00 |
James Chen
|
6565fa92cc
|
fixed #1649: Changed return type to const reference for member variable access.
|
2013-01-14 15:51:53 +08:00 |
minggo
|
c08c982f89
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1468-ccpoint
|
2013-01-14 15:07:21 +08:00 |
minggo
|
984b304ec5
|
issue #1468:change CCPoint CCSize CCRect from class to struct
|
2013-01-14 14:45:16 +08:00 |
James Chen
|
0fd16e7b31
|
Merge pull request #1827 from folecr/assert_fix
fixed #1654: Assert fix for android.
|
2013-01-13 22:15:11 -08:00 |
johnangel
|
a1155f52e6
|
Merge remote branch 'upstream/gles20' into gles20
|
2013-01-11 21:48:47 +01:00 |
folecr
|
58874dc7a5
|
CCAssert uses CC_ASSERT directly
* ... after call to cc_assert_script_compatible()
* CCAssert will now report the correct line number
|
2013-01-10 12:26:12 -08:00 |
johnangel
|
16269d952d
|
Detect VS2012 Update 1
|
2013-01-10 11:55:30 +01:00 |
James Chen
|
9f322d9646
|
fix a typo.
|
2013-01-10 15:58:52 +08:00 |
folecr
|
e3cf517f32
|
Assert implementation for Android
* __android_log_assert is not stable
* Uses __android_log_print instead
|
2013-01-09 18:51:49 -08:00 |
folecr
|
c0ecad31fe
|
Consistent use of CCAssert
* Remove @
* Use CCAssert instead of CC_ASSERT (number of parameters differ between the two)
|
2013-01-08 14:11:34 -08:00 |
johnangel
|
e32a193561
|
Setting Windows app title for non-Debug mode, also.
|
2013-01-07 12:17:50 +01:00 |
johnangel
|
674bb8e728
|
Setting PlatformToolSet to v110_xp instead of default v110 in Visual Studio 2012 for Windows XP support, leaving default v100 in Visual Studio 2010.
|
2013-01-07 11:51:05 +01:00 |
James Chen
|
b662d5c569
|
fixed #1620: Added license. Removed LocalStorage.h from cocos-ext.h.
|
2013-01-07 18:06:53 +08:00 |
James Chen
|
3fa771f0c4
|
fixed #1620: Using sqlite3 to implement sys.LocalStorage for iOS and android.
|
2013-01-07 17:22:06 +08:00 |
James Chen
|
266e6e8acc
|
fixed #1641: The coins in Watermelon Me fail to animate in cocos2d-x JS binding.
|
2013-01-05 18:54:08 +08:00 |
James Chen
|
9ef74bef80
|
fixed #1636: Deleted CC_ENABLE_CHIPMUNK_INTEGRATION and CC_ENABLE_BOX2D_INTEGRATION in ccConfig.h since they are moved to extension, it doesn't depend on engine any more.
Added platform macro for CCEditBoxImpl* files.
|
2013-01-05 11:10:24 +08:00 |
dualface
|
37a0f19c46
|
remove RGB565 support
|
2013-01-04 23:34:24 +08:00 |
minggo
|
539bb56256
|
Merge pull request #1799 from tks2shimizu/gles20
Added CCFloat, CCDouble and CCBool
|
2013-01-03 19:32:35 -08:00 |
James Chen
|
f95d1677df
|
Merge branch 'gles20' of https://github.com/dducharme/cocos2d-x into iss-blackberry
|
2013-01-04 09:52:01 +08:00 |
James Chen
|
b50bf716a2
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
|
2013-01-03 19:58:10 +08:00 |
James Chen
|
760a8c1d39
|
fix a compilation error for android.
|
2013-01-03 19:56:34 +08:00 |
Dale Ducharme
|
611db78b39
|
Removing grskia dependancy and adding in freetype support to the builds.
|
2013-01-02 18:53:31 -05:00 |
fape
|
29a2f273b1
|
reorganize third party libs
|
2012-12-29 23:56:14 +01:00 |
fape
|
4421b6bf7a
|
remove unused libs
|
2012-12-29 23:53:39 +01:00 |
dualface
|
d9ef93bbe5
|
fix some issues
|
2012-12-30 02:14:30 +08:00 |
dualface
|
0b25220f22
|
update libwebp to 2.1
add support RGB888, RGB565,RGBA4444
|
2012-12-30 02:12:02 +08:00 |
dualface
|
1dcb3742e9
|
fix for win32
|
2012-12-29 17:43:34 +08:00 |
James Chen
|
d2ad820a48
|
fixed #1627: Adding view name for sample applications.
|
2012-12-29 14:50:00 +08:00 |
dualface
|
39c4765423
|
fix for mac
|
2012-12-29 14:17:52 +08:00 |
dualface
|
806138d990
|
fix some issues
|
2012-12-29 13:58:02 +08:00 |
James Chen
|
9bd302e35b
|
fixed #1627: VS version check in project file.
|
2012-12-29 13:54:46 +08:00 |
James Chen
|
b120874a87
|
fix compilation errors.
|
2012-12-29 11:23:31 +08:00 |
Tomoaki Shimizu
|
1293c8a6c2
|
added licence
|
2012-12-29 11:32:27 +09:00 |
dualface
|
b50e4cdf2b
|
add WebP support
|
2012-12-29 10:27:43 +08:00 |
James Chen
|
f2f3aa55bf
|
Merge branch 'gles20' of https://github.com/johnangel/cocos2d-x into iss-vs2012
Conflicts:
samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj
samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj
samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj
samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj
samples/Javascript/TestJavascript/proj.win32/TestJavascript.vcxproj
samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj
samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj
samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj
scripting/javascript/bindings/generated
scripting/lua/proj.win32/liblua.vcxproj
|
2012-12-29 09:48:22 +08:00 |
Tomoaki Shimizu
|
b4edd167af
|
The variable name was changed.The check of pRet was added.
|
2012-12-28 12:24:28 +09:00 |
Tomoaki Shimizu
|
87146d82e1
|
Added CCFloat, CCDouble and CCBool
|
2012-12-27 23:15:13 +09:00 |
James Chen
|
f159df2e13
|
Compilation warning fix for CCAssert macro.
|
2012-12-27 16:48:02 +08:00 |
minggo
|
4cdc984b0e
|
Merge pull request #1797 from dumganhar/gles20
fixed #1597: TestCpp crashes when running ActionEaseTest after running ParticlesTest.
|
2012-12-27 00:10:53 -08:00 |