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

7057 Commits

Author SHA1 Message Date
minggo 3e3f5b83aa fixed #1703:update xcode template 2013-02-06 16:41:44 +08:00
minggo ed332770c3 fixed #1703:remove depence of libxml2 for vs project 2013-02-06 16:37:20 +08:00
James Chen e547735730 fixed #1770: Adding the library of webp for linux 32bit. 2013-02-06 16:33:54 +08:00
minggo 22930fe303 issue #1703:fix conflicts when synchronized to latest codes 2013-02-06 16:19:43 +08:00
minggo 60d36ed3aa issue #1703:fix conflicts when synchronized to latest codes 2013-02-06 16:18:37 +08:00
minggo 901220b126 Merge pull request #1961 from dumganhar/iss1770-webp 
issue #1770: Adding Webp  support
 2013-02-06 00:17:35 -08:00
James Chen 8c261c1789 issue #1770: Updating linux makefile. 2013-02-06 15:59:29 +08:00
James Chen 561f6ca435 issue #1770: Adding webp image format support for linux 64bit. 2013-02-06 15:47:23 +08:00
minggo e05877515a issue #1703: remove dependence of libxml2 for vs project 2013-02-06 14:20:43 +08:00
minggo 396230bb77 issue #1703:remove dependence of libxml2 for marmalade and linux 2013-02-06 14:16:06 +08:00
minggo 9a7cca5ed4 issue #1703:remove dependence of libxml2 2013-02-06 14:12:52 +08:00
minggo fcc6ed89ae add tinyxml2 to mac and marmalade project 2013-02-06 13:57:16 +08:00
minggo 3d9a0dc99d issue #1703:add tinyxml2 codes into vs project 2013-02-06 13:49:35 +08:00
James Chen c7fdb1e637 Merge branch 'iss1770-webp' of https://github.com/dumganhar/cocos2d-x into iss1770-webp 2013-02-06 13:07:22 +08:00
James Chen cc690c5a86 issue #1770: Adding webp support for mac port. 2013-02-06 13:06:48 +08:00
minggo e136476fb3 issue #1703:add tinyxml2 in makefile 2013-02-06 11:55:36 +08:00
minggo 682910b5f8 Merge https://github.com/cocos2d/cocos2d-x into tinyxml 2013-02-06 11:53:58 +08:00
James Chen 95dc349b77 issue #1770: Adding webp support for win32. 2013-02-06 11:23:10 +08:00
minggo 7d02925d7e issue #1703:include tinyxml2 files in android/iOS project 2013-02-06 11:15:54 +08:00
James Chen 1e5431bcc5 issue #1770: Adding webp support for blackberry and marmalade. 2013-02-06 10:52:13 +08:00
minggo 6e3409a30c issue #1703:move tinyxml2 to cocos2dx/support 2013-02-06 10:18:31 +08:00
James Chen a94e1b2a9d issue #1770: Webp works ok on Android and iOS. 2013-02-05 18:18:53 +08:00
James Chen 64248386a2 issue #1770: Updating iOS project configuration and adding WEBP test demo. 2013-02-05 11:37:13 +08:00
James Chen 57f32c7bfc issue #1770: Adding test_image.webp. 2013-02-05 11:36:32 +08:00
James Chen da91e97e17 Merge branch 'add_webp_support' of https://github.com/dualface/cocos2d-x into iss1770-webp 
Conflicts:
	scripting/javascript/bindings/generated
 2013-02-05 11:22:53 +08:00
James Chen c42ef7e44a Merge pull request #1953 from dualface/add_CCFileUtils_Lua_support 
issue #1687: Adding CCFileUtils Lua support. Adding CCFileUtils::addSearchPath, addSearchResolutionsOrder.
 2013-02-04 18:59:49 -08:00
minggo ca0b9ca521 Merge pull request #1957 from thomaslee/initwithimage-without-release 
Don't call release() if CCTexture2D::initWith* fails
 2013-02-04 02:12:32 -08:00
Tom Lee 4023fcc094 Return false instead of NULL 2013-02-04 01:38:22 -08:00
minggo 5f9e0b5ac2 Merge branch 'tinyxml2' of https://github.com/martell/cocos2d-x into tinyxml 2013-02-04 17:24:22 +08:00
Tom Lee 610aeb28cf Don't call release() if initWith* fails 2013-02-04 01:04:54 -08:00
minggo 0465a950c7 Merge pull request #1951 from dumganhar/iss1697-render-texture 
issue #1697: fixed two logical errors in CCRenderTexture::initWithWithAndHeight.
 2013-02-04 00:28:54 -08:00
minggo 3953434678 Merge pull request #1956 from minggo/iss1689-add-CCLuaObjcBridge 
Iss1689 add cc lua objc bridge
 2013-02-04 00:20:18 -08:00
minggo 8c1a639c59 Merge branch 'iss1689-add-CCLuaObjcBridge' of https://github.com/minggo/cocos2d-x into iss1689-add-CCLuaObjcBridge 2013-02-04 16:19:21 +08:00
minggo 8511e75745 fixed #1689:fixed a compiling error 2013-02-04 16:17:59 +08:00
minggo 1ea0570620 Merge pull request #1955 from minggo/iss1689-add-CCLuaObjcBridge 
modify lua samples to make them work correctly
 2013-02-03 23:12:10 -08:00
minggo 5163ef0d07 Merge pull request #5 from dumganhar/iss1689-add-CCLuaObjcBridge 
issue #1689: Adding some missing files for win32.
 2013-02-03 23:04:52 -08:00
James Chen 4506214cef issue #1689: Adding some missing files. 2013-02-04 15:01:44 +08:00
minggo 07cd6d2bb2 issue #1689:modify lua samples to make them work correctly 2013-02-04 14:50:45 +08:00
dualface 5904512ac6 add CCFileUtils Lua support 2013-02-04 12:41:24 +08:00
minggo a771bc8183 issue #1689:modify lua Android.mk 2013-02-04 12:02:21 +08:00
dualface c13965c939 remove duplicate codes 2013-02-04 11:52:16 +08:00
James Chen 7f81db038c issue #1697: fixed two logical error in CCRenderTexture::initWithWithAndHeight. 2013-02-04 11:33:13 +08:00
minggo 744bfb3cb2 Merge pull request #1945 from dualface/add_CCLuaObjcBridge 
add CCLuaObjcBridge
 2013-02-03 19:32:17 -08:00
dualface 74e497bb2b restore CCLuaEngine missed methods 2013-02-04 11:28:09 +08:00
James Chen b5bd48eaee Merge pull request #1948 from dumganhar/master 
Using new api of CCFileUtils for SimpleGame.
 2013-02-02 23:40:29 -08:00
James Chen a22986bc82 Using new api of CCFileUtils for SimpleGame. 2013-02-03 15:38:44 +08:00
James Chen 46902ee399 Merge pull request #1947 from CocosRobot/updategeneratedsubmodule_1359874540 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-02-02 23:00:06 -08:00
CocosRobot d3086850c7 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-02-03 14:55:53 +08:00
James Chen fe4d3adfdd Merge pull request #1946 from dumganhar/master 
issue #1687: Updating iOS template after refactoring CCFileUtils.
 2013-02-02 21:59:09 -08:00
James Chen 23acb3eacd issue #1687: Updating iOS template after refactoring CCFileUtils. 2013-02-03 13:56:44 +08:00