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

7769 Commits

Author SHA1 Message Date
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
giginet 750918d058 Fix CCRepeat#create argument 2013-02-23 09:03:28 +09:00
Zhe Wang 67ca006508 Merge pull request #2031 from walzer/master 
project-creator, fix a typo
 2013-02-22 06:25:18 -08:00
walzer 79be62a932 issue #1733, fix a typo in dumping usage. 2013-02-22 22:24:05 +08:00
giginet 70612a722b Fix CCRepeat#create is recieved bad argument on Lua binding. 
CCRepeat#create must be recieved CCFiniteTimeAction as first argument.
But, CCActionInterval recieved in LuaCocos2d.cpp
 2013-02-22 20:24:22 +09:00
minggo 2d225437e5 Update samples/Cpp/AssetsManagerTest/README.md 2013-02-22 17:26:21 +08:00
Zhe Wang 3024b79eb2 Merge pull request #2029 from walzer/project-creator 
Refactor project-creator, uses json files to config each platform's behaviour.
 2013-02-22 00:41:45 -08:00
walzer b534ff16e7 issue #1733, don't remove projects if it exists. 2013-02-22 16:33:24 +08:00
walzer 3dcee98cb8 issue #1733, use json config files instead of python modules for multi-platforms. 2013-02-22 16:32:12 +08:00
James Chen 2b7c4348dc Update AUTHORS 2013-02-22 16:20:24 +08:00
James Chen 49fc92e112 Update AUTHORS 2013-02-22 16:19:52 +08:00
James Chen 1d8a49ad90 Merge pull request #2028 from dumganhar/jianghua-patch 
fixed #1743: Adding an additional transform for CCNode.
 2013-02-22 00:18:02 -08:00
James Chen fdf8595353 tab -> 4 space. 2013-02-22 16:16:16 +08:00
James Chen 476e3801eb tab -> 4 space. 2013-02-22 16:15:17 +08:00
minggo 32fbced31f issue #1489:modify sample code and add readme 2013-02-22 16:02:53 +08:00
James Chen b54b924923 fixed #1743: Adding an additional transform for CCNode. 2013-02-22 16:01:49 +08:00
James Chen 46ee771e1c Merge branch 'master' of https://github.com/jxhgzs/cocos2d-x into jianghua-patch 2013-02-22 13:46:00 +08:00
James Chen ce424a9e1b Merge pull request #2027 from CocosRobot/updategeneratedsubmodule_1361506320 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-02-21 20:51:13 -08:00
CocosRobot e3745b0078 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-02-22 12:12:11 +08:00
James Chen 4bdebc6e3d Merge pull request #2026 from dumganhar/master 
Removed some unused codes.
 2013-02-21 19:59:56 -08:00
James Chen 8921d92143 Removed some unused codes. 2013-02-22 11:58:52 +08:00
James Chen ace8fb7d55 Merge pull request #2025 from CocosRobot/updategeneratedsubmodule_1361501669 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-02-21 19:05:22 -08:00
minggo ed1cbb94c2 Merge https://github.com/cocos2d/cocos2d-x into iss1489-AssetsManager 2013-02-22 11:04:40 +08:00
James Chen b230afa6bf Update AUTHORS 2013-02-22 11:04:13 +08:00
minggo 91f5972b42 issue 1489:add AssetsManager 2013-02-22 11:04:09 +08:00
James Chen b50515c5bc Merge pull request #1873 from ThePickleMan/master 
fixed #1742: Added 'rotationIsDir' property to ParticleSystem.
 2013-02-21 19:02:39 -08:00
minggo 1df0095993 fix a bug of CCUserDefault 2013-02-22 11:01:57 +08:00
CocosRobot 397457aa68 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-02-22 10:54:39 +08:00
minggo 86e9cfb782 Update AUTHORS 2013-02-22 10:10:30 +08:00
minggo 33b857c3f7 Merge pull request #1984 from billy1380/master 
CCLens3d can be concave
 2013-02-21 18:08:47 -08:00
minggo c4f0adaa93 Merge pull request #2024 from folecr/filesystem_cleanup 
Filesystem cleanup
 2013-02-21 18:01:50 -08:00
James Chen a3b4bdaecd Update AUTHORS 2013-02-22 09:57:54 +08:00