Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,736 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

8736 Commits

Author SHA1 Message Date
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
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
minggo bc67dfd6cf Merge https://github.com/cocos2d/cocos2d-x 2013-01-28 19:48:21 +08:00
James Chen 717668d2ba Merge pull request #1906 from CocosRobot/updategeneratedsubmodule_1359373396 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-01-28 03:47:56 -08:00
minggo dab38a0254 Merge https://github.com/cocos2d/cocos2d-x 2013-01-28 19:45:51 +08:00
minggo d5523be808 fix some repo 2013-01-28 19:44:07 +08:00
CocosRobot 3450e75789 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-01-28 19:43:29 +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
James Chen 16ef70c069 issue #1683: Updating FileUtilsTest.cpp. 2013-01-28 17:43:53 +08:00
minggo f6f46790c1 Merge pull request #1903 from minggo/master 
update changelog and version string
 2013-01-27 23:26:19 -08:00