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

8150 Commits

Author SHA1 Message Date
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
Neo Kim 93195ebe17 Modified a preprocessor line which distinguishes device platform in CCEditBox test code. 2013-02-25 15:44:38 +09:00
minggo c8baa94753 issue #1489: update ios libcurl and add android project 2013-02-25 14:33:04 +08:00
James Chen 19ef02ffa5 Merge pull request #2039 from dumganhar/iss1747-jsb-animation 
fixed #1747: Crash occurs when passing null to cc.AnimationFrame.initWithSpriteFrame.
 2013-02-24 22:27:40 -08:00
James Chen 9c9e64283e fixed #1747: Crash occurs when passing null to cc.AnimationFrame.initWithSpriteFrame. 2013-02-25 14:20:38 +08:00
Neo Kim d42d847fb3 Added 'setPlaceholderFont()' to CCEditBox 2013-02-25 15:05:38 +09:00
James Chen 953cbcc82b Update AUTHORS 2013-02-25 10:33:03 +08:00
jiang xiaohua 3d451400db delete search path 2013-02-25 10:30:34 +08:00
jiang xiaohua 5a5e25a1fa delete searpath 2013-02-25 10:28:37 +08:00
minggo 27f093ea12 Merge branch 'iss1489-AssetsManager' of https://github.com/minggo/cocos2d-x into iss1489-AssetsManager 2013-02-25 10:26:26 +08:00
minggo 1ae332ac0b Merge https://github.com/cocos2d/cocos2d-x into iss1489-AssetsManager 2013-02-25 10:25:24 +08:00
minggo c36f85ae7e Merge pull request #2038 from minggo/iss1731-lua-declaration 
fixed #1731:change struct to class
 2013-02-24 18:22:42 -08:00
minggo 32c9e0379a fixed #1731:change struct to class 2013-02-25 10:22:03 +08:00
James Chen 831ec120ff Merge pull request #2033 from xyhl515/master 
fixed #1746: Added VS2012 Express template installing support.
 2013-02-24 18:13:28 -08:00
Zhe Wang 7e0edac72d Merge pull request #2037 from walzer/master 
don't need to remove assets/Image/test_*.pvr.gz files in multi-platform-cpp template
 2013-02-24 00:16:23 -08:00
walzer 37779a2e1a don't need to remove assets/Images/test_*.pvr.gz files in multi-platform-cpp template 2013-02-24 16:15:05 +08:00
James Chen 791e0b2b52 Merge pull request #2034 from dumganhar/jsb-tableviewtest 
New jsb tests (TableViewTest).
 2013-02-23 06:10:47 -08:00
James Chen a09220dfc8 New jsb tests (TableViewTest). 2013-02-23 22:09:20 +08:00
xyhl515 6cc1bdcb0f Merge remote-tracking branch 'origin/master' 2013-02-23 21:28:10 +08:00
xyhl515 1eed0b5663 Add VS2012 Express For Windows Desktop support in install-templiates-msvc.bat 2013-02-23 21:21:58 +08:00
James Chen af75651abc Update AUTHORS 2013-02-23 10:35:58 +08:00
James Chen 634a98d19a Merge pull request #2030 from giginet/cocos2dx-pull-request 
fixed #1745: Fix CCRepeat#create is recieved bad argument on Lua binding.
 2013-02-22 18:33:14 -08:00