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

8106 Commits

Author SHA1 Message Date
James Chen 7a45e1ddd1 Merge pull request #2322 from dumganhar/iss1592-update-uthash 
fixed #1592: Updating uthash to v1.9.8.
 2013-04-07 23:31:31 -07:00
James Chen 0bab4609ab fixed #1592: Removing some marco definitions in CCTexture2D.pkg. 2013-04-08 14:14:35 +08:00
zhangbin 8e4567a784 Add custom ignore file for plugin directory 2013-04-08 14:10:46 +08:00
James Chen 4e2819e86d Fixing a warning. 2013-04-08 13:51:24 +08:00
James Chen 1e0cdee9d4 Merge pull request #2321 from natural-law/master 
fixed #1471: Update JS binding for plugin.
 2013-04-07 21:07:23 -07:00
zhangbin 6b69b57c72 Add sample code for using plugin by JS script. 2013-04-08 11:58:52 +08:00
James Chen 831dfb6ade Merge remote-tracking branch 'origin/iss1592-update-uthash' into iss1592-update-uthash 2013-04-08 11:56:10 +08:00
James Chen 2c3427dcee issue #1592: Fixing complication errors for windows port. 2013-04-08 11:56:04 +08:00
James Chen ea4603a057 issue #1592: Removing uthash.h in scripting/javascript/bindings. Using the version in cocos2d-x/cocos2dx/support/data_support/uthash.h. 2013-04-08 11:55:35 +08:00
James Chen 7c6cb8c8cd commit latest uthash.h utlist.h 2013-04-08 10:59:41 +08:00
zhangbin 5f986064fb Update the JS Binding tools for new directory structure. 2013-04-08 10:54:51 +08:00
minggo d126cd8e5f Update AUTHORS 2013-04-08 10:09:23 +08:00
minggo ad68b3d5ed Merge pull request #2288 from mchinen/master 
Android: fix emulator for OpenGL ES 2.0
 2013-04-07 19:08:00 -07:00
minggo 26d69fa9b2 Update AUTHORS 2013-04-08 10:03:56 +08:00
minggo b72bfdfcb3 Merge pull request #2318 from Yodesoft/master 
Reduce function call in nativeInitBitmapDC to improve performance.
 2013-04-07 19:01:09 -07:00
James Chen 9dfe6ba04f Merge pull request #2319 from natural-law/master 
fixed #1471: Plugin system design.
 2013-04-07 18:59:38 -07:00
yodesoft 8f4b04aef7 Merge remote-tracking branch 'upstream/master' 2013-04-07 21:12:07 +08:00
zhangbin e0c60b87f7 Remove the environment config for plugin. 2013-04-07 18:42:38 +08:00
zhangbin a0b9ae1e0a Commit the tools for game developers. 2013-04-07 17:27:11 +08:00
yodesoft 4d5dff6172 Reduce function call in nativeInitBitmapDC to improve performance. 2013-04-07 17:17:19 +08:00
zhangbin 49096ce98e Submit the sample code HelloIIAP. 2013-04-07 17:07:33 +08:00
zhangbin d012d5513a Add plugin code into cocos2d-x engine. 2013-04-07 16:58:26 +08:00
James Chen 7939a214a2 Merge pull request #2317 from dumganhar/master 
fixed #2005: Adding CurrentLanguageTest for Testlua.
 2013-04-07 01:35:32 -07:00
James Chen 1a44f776f8 fixed #2005: Adding CurrentLanguageTest for Testlua. 2013-04-07 16:34:07 +08:00
James Chen 46e4272e29 Merge pull request #2316 from dumganhar/master 
fixed #2004: Adding UserDefaultTest for TestLua.
 2013-04-07 01:21:34 -07:00
James Chen 268bd4dfad fixed #2004: Adding UserDefaultTest for TestLua. 2013-04-07 16:20:43 +08:00
James Chen 53e2f529c8 Merge pull request #2315 from dumganhar/master 
[TestLua] The menu item of Tests which is not supported will be disabled.
 2013-04-07 01:08:15 -07:00
James Chen 1913b2b3a5 [TestLua] The menu item of Tests which is not supported will be disabled. 2013-04-07 16:06:53 +08:00
James Chen fce5deb0ec Refactoring mainmenu.lua. 2013-04-07 15:56:05 +08:00
James Chen ef731879f1 Merge pull request #2291 from dumganhar/iss1944-remove-associate-nativeobj 
fixed #1944: The subclass of cc.Sprite,cc.Layer... doesn't need cc.associateWithNative anymore.
 2013-04-06 20:20:33 -07:00
James Chen 1d0bc28eae Merge pull request #2313 from CocosRobot/updategeneratedsubmodule_1365304396 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-04-06 20:18:53 -07:00
CocosRobot 3871129c1f cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-07 11:13:28 +08:00
James Chen 630921947d Merge pull request #2312 from dumganhar/master 
Updating cxx-generator reference.
 2013-04-06 20:10:03 -07:00
James Chen bf84fb565d Updating cxx-generator reference. 2013-04-07 11:07:16 +08:00
James Chen 684c659ba7 Merge pull request #2311 from dumganhar/iss2002-more-luatest 
fixed #2002: Adding Texture2dTest, RenderTexture, ZwoptexTest, FontTest, CocosDenshionTest and EffectsAdvancedTest for TestLua
 2013-04-06 19:45:28 -07:00
James Chen 6e1cf1e951 fixed #2002: Adding EffectsAdvancedTest for TestLua. 2013-04-07 10:38:56 +08:00
minggo 7456c5d791 Update AUTHORS 2013-04-07 10:12:04 +08:00
minggo 2436d87cb3 Merge pull request #2256 from waiter/master 
Add CCRemoveSelf Action
 2013-04-06 19:09:17 -07:00
Zhe Wang eb4c9868d3 Merge pull request #2310 from walzer/master 
improve tools/closure-compiler/obfuscate.py to be more reliable
 2013-04-06 07:04:16 -07:00
walzer 4456bb8294 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2013-04-06 22:01:09 +08:00
walzer 799e36d3a9 improve obfuscate.py to be more reliable. 2013-04-06 22:00:52 +08:00
James Chen 85b0fd306a Adding CocosDenshionTest. 2013-04-06 14:32:46 +08:00
James Chen 63c0ede945 Removing a comment. 2013-04-06 14:00:59 +08:00
James Chen 5171e11765 Adding FontTest for TestLua. 2013-04-06 14:00:17 +08:00
zhanghaojie 4c67fd979e fix property anchorPoint of CCScale9Sprite 
fix property anchorPoint of CCScale9Sprite doesn't work in ccb. Because initSpriteFrame method reset anchor point
 2013-04-05 23:58:23 +08:00
James Chen 17b948367a Adding ZwoptexTest. 2013-04-05 23:34:46 +08:00
James Chen e754909c5f Adding RenderTexture test for TestLua. 2013-04-05 17:13:46 +08:00
James Chen 2bff6d6480 Adding Texture2dTest. And format some lua codes. 2013-04-05 16:13:04 +08:00
Sergej Tatarincev 1510354568 Support variable cell sizes in CCTableView 2013-04-04 17:57:43 +03:00
James Chen af6f0c1616 Update AUTHORS 2013-04-04 10:00:49 +08:00