James Chen
|
170fb32b6c
|
Updating CCFileUtils.cpp for BlackBerry.
|
2013-01-29 15:07:36 +08:00 |
James Chen
|
f0c2d310ee
|
Updating Android Template.
|
2013-01-29 15:03:36 +08:00 |
James Chen
|
b4b2ab4f24
|
Merge pull request #1921 from dumganhar/master
Adding CrystalCraze to vs2012 solution.
|
2013-01-28 22:39:26 -08:00 |
James Chen
|
4c3cf23bda
|
Adding CrystalCraze to vs2012 solution.
|
2013-01-29 14:37:54 +08:00 |
minggo
|
fbcb33eefd
|
make CCRect accept width<0 and height<0
|
2013-01-29 14:03:03 +08:00 |
James Chen
|
dd3435c953
|
Merge pull request #1920 from dumganhar/master
Updating JS Test, Removing wav files in Published-Android.
|
2013-01-28 21:34:44 -08:00 |
James Chen
|
c1d0f29f6c
|
Updating JS Test, Removing wav files in Published-Android.
|
2013-01-29 13:33:49 +08:00 |
James Chen
|
fac6f6cf31
|
Merge pull request #1919 from dumganhar/master
Fixed a bug in TestCpp/EffectsAdvancedTest. Adding getPosition method for Len3DTarget.
|
2013-01-28 21:02:08 -08:00 |
James Chen
|
cc58eda2d7
|
Merge remote-tracking branch 'cocos2d-x/master'
|
2013-01-29 13:00:18 +08:00 |
James Chen
|
001d3382a9
|
[TestCpp/EffectsAdvancedTest] Adding getPosition method for Len3DTarget.
|
2013-01-29 12:59:43 +08:00 |
James Chen
|
66fa36ce9e
|
Merge pull request #1918 from dumganhar/master
Updating CocosDenshion eclipse project for linux.
|
2013-01-28 20:10:39 -08:00 |
James Chen
|
e18c6a73c2
|
Updating CocosDenshion eclipse project for linux.
|
2013-01-29 12:07:05 +08:00 |
minggo
|
fbc507a0e3
|
Merge pull request #1917 from dumganhar/master
CCFileUtils::fullPathFromRelativePath -> fullPathForFilename.
|
2013-01-28 18:53:48 -08:00 |
James Chen
|
0c01711293
|
Comments some LOGs in CCFileUtils::fullPathForName.
|
2013-01-29 10:48:31 +08:00 |
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
|
db61976a71
|
Merge pull request #1916 from dumganhar/master
CCFileUtils::s|gSearchPath -> CCFileUtils::s|gSearchPaths.
|
2013-01-28 18:02:16 -08:00 |
James Chen
|
bf571ace53
|
Updating JS Tests.
|
2013-01-29 09:59:16 +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
|
c7ef5a7683
|
Merge pull request #1915 from dumganhar/master
Using full path in CCFileUtils::getFileData.
|
2013-01-28 07:43:33 -08:00 |
James Chen
|
1f0b422112
|
Fix a typo.
|
2013-01-28 23:40:56 +08:00 |
James Chen
|
4d0e840301
|
Merge branch 'master' of https://github.com/dumganhar/cocos2d-x
|
2013-01-28 23:37:52 +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
|
064d819ddb
|
Merge pull request #1914 from minggo/master
fix some logical errors and compiling errors
|
2013-01-28 07:21:11 -08:00 |
minggo
|
3ea562b4ad
|
fix some logical errors and compiling errors
|
2013-01-28 23:19:57 +08:00 |
James Chen
|
72dde5db5f
|
Merge remote-tracking branch 'origin/master'
|
2013-01-28 22:48:49 +08:00 |
James Chen
|
df88c717a7
|
Updating vs2012 solution.
|
2013-01-28 22:47:51 +08:00 |
James Chen
|
9b559c9157
|
Updating build-win32.bat.
|
2013-01-28 22:40:30 +08:00 |
minggo
|
af9e8782b8
|
Merge pull request #1913 from minggo/master
fix some errors of xcode template
|
2013-01-28 06:36:36 -08:00 |
minggo
|
da5b71932f
|
fix some errors of xcode template
|
2013-01-28 22:35:38 +08:00 |
James Chen
|
df630920d3
|
Merge pull request #1912 from dumganhar/master
Updating build-win32.bat.
|
2013-01-28 06:23:41 -08:00 |
James Chen
|
c02ad243fe
|
Updating build-win32.bat.
|
2013-01-28 22:22:20 +08:00 |
minggo
|
6e8b384d20
|
add sqlite link for xcode template
|
2013-01-28 22:18:51 +08:00 |
minggo
|
ba9308089c
|
fix some errors in xcode template
|
2013-01-28 21:53:55 +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 |
minggo
|
fae7d5beeb
|
Merge pull request #1910 from minggo/master
fix some warnings
|
2013-01-28 05:42:46 -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
|
52a4b15659
|
remove unneeded codes
|
2013-01-28 20:57:49 +08:00 |
minggo
|
5eb8ca30fb
|
fix some warings
|
2013-01-28 20:52:56 +08:00 |
minggo
|
8d889cd0be
|
Merge pull request #1909 from minggo/master
add correct resource into CocosDragon iOS project
|
2013-01-28 04:47:31 -08:00 |
minggo
|
aaf4b14ddf
|
add fileLookup.plist for CocosDragon iOS project
|
2013-01-28 20:46:15 +08:00 |
minggo
|
9e5d0100fe
|
remove unneeded resource for CocosDragon iOS project
|
2013-01-28 20:41:43 +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 |