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

7471 Commits

Author SHA1 Message Date
James Chen 0d70e6f92f issue #1753: Win32 works ok. 2013-02-27 15:45:23 +08:00
minggo 088bc959f6 issue #1686:synchronize CCRenderTexture.cpp 2013-02-27 15:44:36 +08:00
minggo 94076a5b9c issue #1686:synchronize CCSprite.cpp 2013-02-27 15:30:49 +08:00
James Chen 8f58f082f3 Updated the submodule reference of cxx-generator. 2013-02-27 15:17:19 +08:00
James Chen 473e8e6139 issue #1753: Upgrading SpiderMonkey to Firefox19.0, iOS works ok. 2013-02-27 15:16:49 +08:00
minggo f571d66ed7 issue #1686:synchronize CCNode.cpp 2013-02-27 14:48:19 +08:00
minggo 8ed8def97f Merge branch 'iss1686-sync-rc0a' of https://github.com/dumganhar/cocos2d-x into iss1686-synchronize 2013-02-27 14:25:24 +08:00
minggo 8288e2124e issue #1686:synchronize CCTextureCache.cpp 2013-02-27 11:35:38 +08:00
minggo 28388deee3 Merge https://github.com/cocos2d/cocos2d-x into iss1686-synchronize 2013-02-27 11:23:29 +08:00
minggo d83c1f5c4c Merge pull request #2054 from minggo/iss1637-retina-issue 
fixed #1637:fix mac retina display and labelttf
 2013-02-26 19:12:30 -08:00
minggo 81b349d9ce fixed #1637:fix mac retina display and labelttf 2013-02-27 11:10:42 +08:00
minggo 7a45599fc2 Merge pull request #2052 from minggo/iss1752-link-error 
fixed #1752:use unstripped version to resolve link error
 2013-02-26 18:45:45 -08:00
minggo d983dd505c fixed #1752:use unstripped version to resolve link error 2013-02-27 10:44:34 +08:00
James Chen 7dc64fc9a6 issue #1686: sync to CCLayer 2013-02-27 09:38:30 +08:00
James Chen d572a53a1d Merge pull request #2050 from dumganhar/tableview-touch-fix 
fixed #1751: Clicking outside of CCTableViewCell will also get response when container size is smaller than view size.
 2013-02-26 06:56:08 -08:00
James Chen 87935ac436 tableview touch area fix. 2013-02-26 19:59:14 +08:00
minggo 0ffb506607 issue #1686:synchronize CCTexturePVR.cpp 2013-02-26 18:08:51 +08:00
minggo 9d07778bb0 issue #1686:synchronize CCTMXXMLParser.cpp 2013-02-26 17:42:18 +08:00
minggo 98249b4754 issue #1686:synchronize CCTransition.cpp 2013-02-26 17:12:57 +08:00
minggo 25fd256dbd issue #1686:format codes 2013-02-26 17:03:29 +08:00
minggo 4fc6e1070b issue #1686:synchronize cocos2d.cpp 2013-02-26 16:55:23 +08:00
minggo 5a1e16f105 Merge pull request #2048 from minggo/iss1489-AssetsManager 
add namespace to AssetsManager
 2013-02-26 00:45:06 -08:00
minggo e0991fbd67 fixed #1489:add namespace to AssetsManager 2013-02-26 16:43:46 +08:00
minggo a07f2b1e03 Merge pull request #2047 from minggo/iss1489-AssetsManager 
assets manager works ok
 2013-02-26 00:32:01 -08:00
minggo d35af7b6fe fixed #1489:sample works ok 2013-02-26 16:29:52 +08:00
minggo 7941d70a04 fix a bug of CCUserDefault 2013-02-26 12:44:20 +08:00
James Chen 59e1bcb154 Merge pull request #2045 from dumganhar/iss1750-editbox-pos 
fixed #1750: [iOS] CCEditBox's position is incorrect when it's added to a non-fullscreen CCNode.
 2013-02-25 19:24:18 -08:00
James Chen efdb9180e4 fixed #1750: [iOS] CCEditBox's position is incorrect when it's added to a non-fullscreen CCNode. 2013-02-26 11:16:26 +08:00
minggo 8713072c40 Merge branch 'iss1489-AssetsManager' of https://github.com/minggo/cocos2d-x into iss1489-AssetsManager 2013-02-26 10:29:37 +08:00
minggo eb79135aab issue #1489:clear version code before getting it 2013-02-26 10:29:31 +08:00
James Chen 201fda1f58 Update AUTHORS 2013-02-25 22:55:13 +08:00
James Chen 3e669d1ac6 Merge pull request #2044 from dumganhar/iss1749-editbox 
fixed #1749: Adds 'setFont' and 'setAnchorPoint' to CCEditBox.
 2013-02-25 06:53:26 -08:00
James Chen 0ece3056ee fixed #1749: Fixed compilation errors for win32. 2013-02-25 22:50:15 +08:00
James Chen 56797db85c fixed #1749: Mac platform works ok. 2013-02-25 22:33:16 +08:00
James Chen 5fafaa8b67 Merge branch 'master' of https://github.com/neokim/cocos2d-x 
Conflicts:
	scripting/javascript/bindings/generated
 2013-02-25 22:18:57 +08:00
James Chen 26942c1b88 Merge pull request #2042 from dumganhar/master 
Adds AssetsManagerTest in cocos2d-win32.vc2012.sln.
 2013-02-25 03:10:17 -08:00
James Chen 739048e6f2 Adds AssetsManagerTest in cocos2d-win32.vc2012.sln. 2013-02-25 19:09:19 +08:00
minggo b58e9cf297 Merge pull request #2040 from minggo/iss1489-AssetsManager 
Iss1489 assets manager
 2013-02-25 02:40:16 -08:00
minggo 6102e97fed Merge pull request #6 from dumganhar/iss1489-AssetsManager 
Adds AssetsManager support for win32.
 2013-02-25 02:38:41 -08:00
James Chen 5f645cefba issue #1489: ZEXPORT -> CC_DLL for unzip.h. 2013-02-25 18:35:18 +08:00
minggo fcf4bb9bef Merge https://github.com/cocos2d/cocos2d-x into iss1489-AssetsManager 2013-02-25 18:12:38 +08:00
James Chen 2eab8f75d4 Merge branch 'iss1489-AssetsManager' of https://github.com/dumganhar/cocos2d-x into minggo-iss1489-AssetsManager 2013-02-25 18:09:05 +08:00
James Chen a6b24cd40b Merge pull request #9 from minggo/iss1489-AssetsManager 
issue #1489: Updates with upstream.
 2013-02-25 02:08:03 -08:00
James Chen 17d9837b45 Adds AssetsManager support for win32. 2013-02-25 18:03:38 +08:00
minggo 24584f04fb issue #1489:add some log 2013-02-25 17:50:32 +08:00
minggo 442e8ea0cc issue #1489:android works ok 2013-02-25 16:58:10 +08:00
James Chen e3daa6c9af Merge branch 'iss1489-AssetsManager' of https://github.com/minggo/cocos2d-x into minggo-iss1489-AssetsManager 2013-02-25 16:23:02 +08:00
James Chen 797a675490 Merge pull request #2041 from dumganhar/master 
Updates libcurl with ssl support for win32.
 2013-02-25 00:19:17 -08:00
James Chen 8e819ac32c Updates libcurl with ssl support for win32. 2013-02-25 16:16:57 +08:00
minggo 9b7712295b issue #1489:rename AssetsManagerProtocol to AssetsManagerDelegate 2013-02-25 15:02:21 +08:00