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

1251 Commits

Author SHA1 Message Date
yangxiao d34a9f68f2 check ParticleModelRender to avoid crash 2015-02-15 16:39:58 +08:00
yangxiao 5547d85add missing file 2015-02-15 11:41:14 +08:00
yangxiao f9f532ef65 missing file 2015-02-15 11:16:46 +08:00
yangxiao 33a0cc310a wrong filename 2015-02-15 11:01:11 +08:00
yangxiao 6172302a9b ref path add extensions 2015-02-13 16:57:00 +08:00
yangxiao 0f27e0c31a add to ext.h 2015-02-13 16:16:30 +08:00
yangxiao 954fd52493 rename folder and fix warning 2015-02-12 17:54:27 +08:00
yangxiao 2bae6b5351 check created vertex and index buffer 2015-02-12 17:15:48 +08:00
yangxiao 026ce1a288 modify according to minggo 2015-02-12 16:51:02 +08:00
yangxiao 8f290b2d24 modify according to minggo 2015-02-12 16:09:08 +08:00
yangxiao c114d5d496 add particle to linux project 2015-02-12 11:00:48 +08:00
yangxiao 79a0c0152a add 3d particle (Particle Universe) 2015-02-11 18:14:22 +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
Nite Luo 0bddeb88c8 Disable 3D rendering support for commands that needs to execute in order 2015-01-15 14:57:51 -08:00
Nite Luo 4a440e66c9 Refactor draw command 2015-01-15 14:00:49 -08: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 b0a6cf1182 Use standard cmake control variable to control static or dynamic build BUILD_SHARED_LIBS 2014-11-18 17:48:54 +03: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
Vladimir Timofeev eb0159b2b7 Unify usage of chipmunk library 
* cmake/Modules/FindChipmunk.cmake now can find prebuilt chipmunk libs
* follow USE_CHIPMUNK variable (although at the moment cocos can't build without chipmunk)
* come cleanups and formatting
 2014-11-15 13:17:23 +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
yangxiao cfb6a7846f Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-10-17 18:08:55 +08:00
yangxiao 66dd0807eb add isVisibleByVisitingCamera check when visit 2014-10-17 18:07:45 +08:00
Dhilan007 ccbc668427 Improve Android.mk 2014-10-17 10:13:33 +08: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 a91ae61071 added check for WinRT and WP8 2014-10-14 16:46:23 -07:00
Dale Stammen cca5d90cbe added winrt and wp8 platforms. Cleaned up platform checks 2014-10-14 16:45:43 -07:00
Dale Stammen fd638f00b7 removed old WP8 project files 2014-10-14 14:09:52 -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
martell 73980195c0 wp8: use CC_STATIC because libs are static 2014-10-09 06:33:46 +01:00
martell c3172bef50 Finalise Windows cmake support for mingw-w64 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:22:09 +01:00