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

152 Commits

Author SHA1 Message Date
samuele3hu c3ad458a26 Update comment for Lua 2015-03-30 15:47:47 +08:00
pandamicro 897416eb4e cocos2d/cocos2d-js#1313: Remove dangerous code in AssetsManagerEx::setStoragePath 2015-01-30 11:12:35 +08:00
pandamicro 5e8baa4f39 Fix AssetsManagerEx small issues 2015-01-23 12:10:32 +08:00
kompjoefriek ca48c5e5dd Fixed lots of compiler warnings 
- signed / unsigned mismatches
- using int as bool
- Removed throw() from CCFrame.h, why is explained here:
http://www.gotw.ca/publications/mill22.htm
 2015-01-23 02:02:33 +01:00
andyque 412e76a626 add fixme 2015-01-04 15:16:22 +08:00
andyque 7328c2eea0 fix linux compile error 2015-01-04 15:16:22 +08:00
andyque 60ec08eef4 upgrade libcurl for iOS 2014-12-31 10:18:44 +08:00
pandamicro 5755cc69e9 Fix a small compilation issue 2014-12-30 10:11:30 +08:00
pandamicro ffd7c30c87 Polish restart implementation 2014-12-30 10:09:56 +08:00
pandamicro 1e32d0fb80 Added getSearchPaths API in Manifest 2014-12-28 11:55:31 +08:00
minggo 6db7cfb68b Merge pull request #9039 from pandamicro/v3_origin 
#9061: Polish AssetsManagerEx, bug fixes and feature added
 2014-11-27 22:01:03 +08:00
pandamicro ef76724f19 #9061: Add check for instantiation 2014-11-26 14:39:56 +08: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
pandamicro f4e61f5620 Issue #9061: Add std::nothrow 2014-11-14 10:44:18 +08:00
martell d8be5a8af4 fix includes so that minizip builds correctly on Mingw-w64 2014-11-13 23:27:04 +00:00
pandamicro bf45accf8e Revert "Issue #9061: Made Manifest::getAssets public for assets process after update finished" 
This reverts commit 8652864242.
 2014-11-13 10:53:38 +08:00
pandamicro 68e5132107 Issue #9061: Fix issue about compare logic 2014-11-10 19:23:41 +08:00
pandamicro 8652864242 Issue #9061: Made Manifest::getAssets public for assets process after update finished 2014-11-10 16:52:20 +08:00
pandamicro e167f0889b Issue #9061: Fix no success notification for empty download queue issue 2014-11-10 16:51:41 +08:00
pandamicro ead867559c Issue #9061: Fix local manifest more recent than cached manifest issue 2014-11-10 16:51:08 +08:00
pandamicro aca5930711 Fixed #9038: parseVersion shouldn't set Manifest loaded flag 2014-11-06 23:08:34 +08:00
Vladimir Timofeev 2835b094da Cleanup order of fields initialization. 
Make initialization order to match declarations.
This change twice reduces number of warnings when compiling on MacOS X with Xcode 6.1
Warnings was like "Field 'XXXX' will be initialized after field 'YYYY'"
 2014-10-30 17:28:41 +03:00
samuele3hu d997f72be2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager 
nter
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2014-10-16 10:59:58 +08:00
samuele3hu 3f667fac85 Update the related AssetsManagerEx files and related project configure 2014-10-16 10:28:52 +08:00
Dale Stammen d8d94d214b added missing file methods for winrt/wp8 2014-10-14 17:49:25 -07:00
Dale Stammen cca5d90cbe added winrt and wp8 platforms. Cleaned up platform checks 2014-10-14 16:45:43 -07:00
pandamicro 4e9e40363f Feature #4977: Fix an issue about checkUpdate function 2014-10-09 19:55:11 +08:00
pandamicro a26e91f839 no message 2014-10-09 18:30:39 +08:00
minggo 3679d66c8e remove unneeded includes 2014-08-29 15:39:52 +08:00
Ricardo Quesada 3dda35b4ef Adds `std::nothrow` to `new` 
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
 2014-08-27 16:31:57 -07:00
胖梁 c673955d5d uncompress false means zip wrong, download again 2014-08-12 20:13:52 +08:00
胖梁 0b93cc40d7 when http code 301,302, can follow rediect 2014-08-12 20:12:23 +08:00
Huabing.Xu c7bfc934fd windows works now 2014-07-24 12:57:39 +08:00
Dhilan007 6cff8cb564 fixed warn and replace NULL with nullptr. 2014-07-10 00:45:27 +08:00
James Chen 5615717617 issue #4729: NULL -> nullptr in constructor or setXXX(NULL) 2014-04-10 00:36:43 +08:00
Dale Stammen 60d967b5f6 added CC_PLATFORM_WINRT and WP8 2014-03-22 06:13:27 -07:00
Denis 3595a4f31b -fixed memleak 2014-02-12 16:48:18 +03:00
Daniel T. Borelli 8ffb05b6c9 Linux fix missing file -> rename dir loadSceneEditorFileTest to LoadScene...; add string::npos; const correctness 2014-01-04 19:26:16 -03:00
Omer Saeed f831a2f1b9 Fixes to asset manager in the MASTER branch 2013-12-17 20:09:21 +05:00
minggo 1502fef7e4 use Schedule::performFunctionInCocosThread 2013-12-06 14:15:01 +08:00
minggo c78ce63f14 use ThreadHelper::runOnGLThread() in AssetsManager 2013-11-28 11:06:08 +08:00
minggo 38eabaf315 fix warning 2013-11-14 14:09:12 +08:00
minggo 23b2bdb6eb Merge pull request #4137 from HoGarfield/AssetsManager.uncompress 
[ci skip]Adding test whether the file directory exists when uncompressing file entry,if does not exist then create directory
 2013-11-13 18:39:42 -08:00
boyu0 fb04c9e574 issue #2770: fix some warning 2013-11-13 11:22:34 +08:00
James Chen 394f4e703b Reverting AssetsManager::update. 2013-11-11 17:06:32 +08:00
boyu0 6c1144ee79 issue #2770: fix some warning 2013-11-11 12:49:38 +08:00
garfield_ho 2c76d8c150 There are not directory entry in some case.So we need to test whether the file directory exists when uncompressing file entry, if does not exist then create directory 2013-11-08 11:23:06 +08:00
samuele3 790be0decc issue #3037:Modify vs2012 config 2013-11-04 14:43:22 +08:00
samuelhu be1f17ca0f issue #3037:Add assetsmananger lua binding and a releated test sample 2013-10-22 16:14:49 +08:00
minggo 8f7a489a4d issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
minggo 6fc2be62f5 issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
minggo f3f24e3bbd issue #2905:use - to connect multiple words 2013-10-12 13:54:16 +08:00