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

47 Commits

Author SHA1 Message Date
minggo 42e6232113 fix typo and memory leak 2014-12-26 14:25:55 +08:00
minggo 94d70358b7 make FileUtils extendable 2014-12-26 11:34:31 +08:00
yinjimmy 744a9043f9 set default resource root path & writable path 2014-12-25 20:33:47 +08:00
minggo dd5659b6eb Merge pull request #9401 from minggo/iss9398-not-close-dir 
invoke closedir after invoke opendir
 2014-12-08 18:10:41 +08:00
minggo c067338c17 closedir when succeed 2014-12-08 11:36:11 +08:00
minggo 74c80296aa invoke closedir after invoke opendir 2014-12-08 09:58:58 +08:00
Dale Stammen 1d908f94ab fixed renameFile for wp8 and winrt to pass file and assetmangers tests 2014-12-05 18:12:25 -08:00
Park June Chul be60a33d25 fix C4129 warning 2014-11-25 04:52:44 +09:00
Ricardo Quesada 9fedb14354 Fixes for FileUtils 
compiles after previous patch
 2014-11-21 14:52:13 -08:00
Bartosz Duszel fbd27dff9c changed few loops for C++11 range-based for loop 2014-11-21 20:12:55 +01:00
Vladimir Timofeev 1e8aeb7fd2 Minizip 
1. Add cmake module for finding minizip in system
2. Check that system installed minizip recent enough for us
3. As right minizip exists only for MSYS2 (mingw), use our embedded version on all other platforms
4. Correctly include minizip as <minizip/unzip.h> if it is found from system (make it compatible to current build system, so by default all should stay same)
5. Remove one unused include of unzip.h
 2014-11-16 22:41:37 +03:00
jicheol-ryu c94a9ea01a fix bugs - potential memory leak. 
const std::string text = std::string((char*)ch,0,len); is using next
string constructor.
string (const string& str, size_t pos, size_t len = npos);
memory leak can occur while type converting char to string.

So we have to use next string constructor.
string (const char* s, size_t n);

http://www.cplusplus.com/reference/string/string/string/
 2014-11-12 00:06:30 +01:00
Dale Stammen 6fb69870f9 fixed compiler warnings for winrt code 2014-10-27 10:57:57 -07:00
samuele3hu 3f667fac85 Update the related AssetsManagerEx files and related project configure 2014-10-16 10:28:52 +08:00
samuele3hu a0c8ffb943 Modify Xcode project’s configure 2014-10-15 14:32:11 +08:00
martell 0d26b33eaa mingw64: mirgrate to upstream minizip 2014-10-11 04:39:42 +01:00
Dhilan007 7fb448e90f add 'static' for global function 2014-10-10 15:13:05 +08:00
Dhilan007 250875b081 fixed compile error 2014-10-10 14:03:20 +08:00
Dhilan007 6a8c4f4194 Fixed FileUtils::removeFile doesn't work on iOS 2014-10-10 11:59:35 +08:00
Dale Stammen ef58fa7fd4 fixed winrt file functions to pass app certification tests. 2014-09-26 11:38:17 -07:00
huanghsiwu 41b4ba8307 fix v3.3beta wp8 compile error --rename viriable in CCFileUtils.cpp 2014-09-22 09:42:33 +08:00
huanghsiwu f73f1a5379 fix wp8 directory control bug --modify 2014-09-19 16:52:11 +08:00
huanghsiwu d42cec0708 fix wp8 directory control bug 2014-09-19 15:54:18 +08:00
mailgyc 9e8b32b3c4 fix: ParticleSystem "set not pop-up message box when load image failed" doesn't work 
isPopupNotify() doesn't work
 2014-09-15 14:06:04 +08:00
Ricardo Quesada c149bfca00 Adds MARK: TODO: FIXME: in code 
Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
 2014-08-29 12:54:24 -07:00
huangshiwu 6ce16546b5 winrt compile fix -addtional 2014-08-08 10:47:14 +08:00
huangshiwu 8ee4340db3 fix winrt complie error 2014-08-07 18:38:11 +08:00
huangshiwu b7aa046cd2 wp8 compile fix -additional 2014-08-07 14:09:22 +08:00
huangshiwu 0016c7af70 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_wp8fix 2014-08-07 11:58:01 +08:00
huangshiwu 24d68305e1 WP8 compile fix 2014-08-07 11:56:28 +08:00
Ningyu aebe8317bd spaces 2014-07-29 17:22:13 +08:00
Ningyu d5242ef4fa add 
SpriteFrameCache::addSpriteFramesWithFileContent()
SpriteFrameCache::removeSpriteFramesFromFileContent()
 2014-07-29 17:06:43 +08:00
minggo 9efbd6e4ef Merge pull request #7600 from pandamicro/FileUtils_FILE_API 
Refactor #5580: Improve searchFullPathForFilename and comments
 2014-07-28 11:34:13 +08:00
pandamicro 823bd437d8 Refactor #5580: Improve searchFullPathForFilename and comments 2014-07-28 11:14:11 +08:00
minggo b0c922d91e Merge pull request #7188 from pandamicro/FileUtils_FILE_API 
Refactor #5580: Add new file&directory apis into FileUtils and test cases
 2014-07-24 22:18:10 +08:00
pandamicro d2c6602dea Refactor #5580: Merge createDirectories to createDirectory 2014-07-21 16:51:48 +08:00
pandamicro b614854cf9 Refactor #5580: Improve createDirectories 2014-07-18 15:09:00 +08:00
minggo 43fe305cc9 Merge pull request #7283 from taug/v3 
could add seach path and resolution order path in front.
 2014-07-17 10:34:45 +08:00
boyu0 c7fec217ba Change atof() to utils::atof() 2014-07-14 20:45:24 +08:00
pandamicro d597a535c1 Refactor #5580: Make isDirectoryExist support relative path 2014-07-08 18:26:11 +08:00
tangnan dd81e009f8 could add seach path and resolution order path in front. 2014-07-02 10:29:09 +08:00
pandamicro d5bed908d3 Refactor #5580: Fix some issues 2014-06-24 14:51:01 +08:00
pandamicro ee82e9aaba Refactor #5580: Fix Win32 compile issue 2014-06-23 11:13:33 +08:00
pandamicro d90116a8da Refactor #5580: Add new file&directory apis into FileUtils 2014-06-20 18:01:34 +08:00
Hanju Kim 05b992c628 Bug fix 2014-05-31 00:13:08 +02:00
Hanju Kim 28b95bd54a * Skip UTF8 BOM if it exists 
* Fix when string isn't terminated if fread() reads less size than paramter at FileUtils getData
 2014-05-31 00:06:56 +02:00
Ricardo Quesada 0f67247325 Squashed commit of the following: 
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 14:33:49 2014 -0700

    Yeah... everything compiles on win32 and wp8

commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 13:58:38 2014 -0700

    CCIME moved to base

    and compiles on Android

commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 13:02:57 2014 -0700

    compiles Ok for Windows Phone 8

commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 12:25:31 2014 -0700

    fixes for Windows Phone 8

commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 11:15:13 2014 -0700

    Compiles on Win32

commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 10:08:31 2014 -0700

    Compiles on linux!

commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 09:30:42 2014 -0700

    moves cocos/2d/platform -> cocos/platform

commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 08:24:41 2014 -0700

    Merge remote-tracking branch 'cocos2d/v3' into files

commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu May 15 19:36:23 2014 -0700

    files in the correct directory
 2014-05-16 14:36:00 -07:00