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

6838 Commits

Author SHA1 Message Date
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 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
minggo cd75f37d06 change version string 2013-01-28 15:24:13 +08:00
minggo 846f054694 update changelog 2013-01-28 15:22:48 +08:00
James Chen f69ef6182c issue #1683: Adding FileUtilsTest. 2013-01-28 15:17:20 +08:00
James Chen 13881ba8a8 issue #1683: Updating CCApplication.h/.cpp for linux. 2013-01-28 11:56:56 +08:00
minggo e45cc7d548 Merge pull request #1901 from dumganhar/iss1683-ccfileutils 
issue #1683: Making some API of CCFileUtils more c++ friendly by using std::vector rather than CCArray.
 2013-01-27 18:53:20 -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 c19b9885fe Adding COCOS2D_DEBUG=1 for sample projects. 2013-01-28 10:22:32 +08:00
James Chen fa7175f6f7 issue #1683: Using full path in CocosDenshion API. 2013-01-27 21:10:53 +08:00
James Chen f2dad83610 issue #1683: Refactoring CCFileUtils for MAC port. 2013-01-27 20:53:32 +08:00
James Chen c80d438110 issue #1683: Exporting `fullPathForFilename` to Lua. 2013-01-27 20:26:04 +08:00
James Chen d532670640 Removing some CCLOG. 2013-01-27 20:16:46 +08:00
James Chen 7c27cbfd22 Updating Makefile of CocosDenshion for linux port. 2013-01-27 19:57:54 +08:00
James Chen eec0ba3c19 Getting full path in before playing sound. 2013-01-27 19:20:49 +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 af1eb5fa87 issue #1683: Updated Appdelegate.cpp for CocosPlayer. 2013-01-26 22:57:12 +08:00
James Chen e73e2f4387 issue #1683: Updated the name of CocosPlayer project. 2013-01-26 22:35:30 +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
James Chen eeb5e7a115 Updated JS Tests. 2013-01-26 14:45:26 +08:00
James Chen 688f9b2546 Updated JS Tests. 2013-01-26 14:29:06 +08: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 3f3bb7a444 Merge pull request #1900 from dumganhar/master 
issue #1683: Fixed a bug in file lookup for Android and updated JS Tests.
 2013-01-25 20:13:46 -08:00
James Chen a28a5907c3 Updated JS Tests. 2013-01-26 12:11:16 +08:00
James Chen 522e860205 issue #1683: Fixed a bug in file lookup for Android. 2013-01-26 12:10:55 +08:00
James Chen 2e524b54c8 Merge pull request #1898 from dumganhar/refactor-ccfileutils 
Fixed an issue in CCFileUtils::setResourceDirectory for android.
 2013-01-25 07:02:48 -08:00
James Chen f71df5a873 Fixed an issue in CCFileUtils::setResourceDirectory for android. 2013-01-25 23:01:47 +08:00
James Chen 7eb182b506 Merge pull request #1897 from dumganhar/refactor-ccfileutils 
issue #1683: Moved CCFileUtils::setResourceDirectory. And fixed a compatible issue for android.
 2013-01-25 06:56:59 -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 0073613a09 Merge pull request #1896 from CocosRobot/updategeneratedsubmodule_1359124823 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-01-25 06:45:51 -08:00
CocosRobot fdda0fa285 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-01-25 22:40:36 +08:00