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

7856 Commits

Author SHA1 Message Date
zhangbin 8e4567a784 Add custom ignore file for plugin directory 2013-04-08 14:10:46 +08:00
zhangbin 6b69b57c72 Add sample code for using plugin by JS script. 2013-04-08 11:58:52 +08:00
zhangbin 5f986064fb Update the JS Binding tools for new directory structure. 2013-04-08 10:54:51 +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
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 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
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
James Chen af6f0c1616 Update AUTHORS 2013-04-04 10:00:49 +08:00
James Chen 038720a1b2 Merge pull request #2290 from Yodesoft/master 
fixed #2000: Improve font rendering performance for linux platform.
 2013-04-03 18:59:37 -07:00
James Chen 54529f4cf1 Merge pull request #2305 from CocosRobot/updategeneratedsubmodule_1365005271 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-04-03 17:52:40 -07:00
CocosRobot 0338a3e504 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-04 00:08:15 +08:00
James Chen ff1568d813 Update AUTHORS 2013-04-03 22:38:51 +08:00
James Chen 425b95152c Merge pull request #2295 from SevInf/master 
fixed #1999: CCEditBox iOS enchantments/bugfixes
 2013-04-03 07:37:29 -07:00
Sergej Tatarincev 202edc1597 CCEditBox test for separate font name/size setters 2013-04-03 17:20:01 +03:00
James Chen a470a76d0b Merge pull request #2303 from dumganhar/master 
Updating SceneTest.lua.
 2013-04-03 03:32:04 -07:00
James Chen 031e77ccbe Updating SceneTest.lua. 2013-04-03 18:31:00 +08:00
James Chen 984f0b59eb Merge pull request #2301 from dumganhar/iss1998-lua-SceneTest 
fixed #1998: Adding SceneTest and IntervalTest for TestLua.
 2013-04-03 03:15:35 -07:00
James Chen 818a570b7f fixed #1998: Adding SceneTest.lua for TestLua. 2013-04-03 18:14:03 +08:00
James Chen 229d4329a5 fixed #1997: Adding IntervalTest for TestLua. 2013-04-03 17:00:05 +08:00
James Chen de863965cc Merge pull request #2300 from dumganhar/iss1814-lua-menu-test 
fixed #1814: [LUA] Adding MenuTest for Testlua.
 2013-04-03 01:32:36 -07:00
James Chen 2d9f8ca8de fixed #1814: MenuTest for Testlua is ok. 2013-04-03 16:29:16 +08:00
James Chen 5fec94e563 Merge pull request #2297 from dumganhar/iss1994-actionmanager-test 
fixed #1994: Adding actionManagerTest.lua.
 2013-04-02 21:00:10 -07:00
James Chen 686775300d fixed #1994: ActionManagerTest.lua is ok. 2013-04-03 11:59:17 +08:00
James Chen 8d5ec65cc8 Update AUTHORS 2013-04-03 11:18:15 +08:00
James Chen c173208b10 Merge pull request #2296 from rtissera/jni_fixes 
fixed #1996: JNI fixes, added missing JNIEXPORT / JNICALL declarations
 2013-04-02 20:15:52 -07:00
James Chen f1d48b41e2 issue #1944: Fixing a typo. 2013-04-03 10:39:40 +08:00
James Chen ad555e70fb issue #1944: Removing commented codes in cc.associateWithNative. 2013-04-03 10:39:15 +08:00
James Chen 6d6bc03465 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss1944-remove-associate-nativeobj 2013-04-03 10:27:01 +08:00
James Chen c54ee96705 issue #1994: Adding actionManagerTest.lua. 2013-04-03 10:20:12 +08:00
Romain Tisserand 15d4e75cdb JNI fixes, added missing JNIEXPORT / JNICALL declarations 
This is needed if compiling with custom visibility settings (example :
-fvisibility=hidden)
 2013-04-02 22:15:12 +02:00
Sergej Tatarincev 17caacbeb5 Resize CCEditBox subviews when contentSize changes 
1. Place placeholder and text labels correctly;
2. Resize native view when parent content size changes.
 2013-04-02 16:34:33 +03:00
Sergej Tatarincev 380ec78fcd Allow to set EditBox font name and size separately 2013-04-02 16:31:30 +03:00