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

8349 Commits

Author SHA1 Message Date
Bin Zhang d657524859 Merge pull request #1 from lihex/master 
Add twitter social share plugin
 2013-04-24 01:03:23 -07:00
lihex 661977645e Add HelloSocial sample 2013-04-24 16:00:36 +08:00
lihex ae7dab15b6 Submit twitter share plugin implement 2013-04-24 15:59:54 +08:00
lihex 4e24ce40ea Submit protocol of social share plugin 2013-04-24 15:58:57 +08:00
James Chen 2c69ce8d80 fixed #2075: Updating multi-platform template project settings. 2013-04-24 15:56:37 +08:00
zhangbin 1af72075bc Merge branch 'master' of https://github.com/natural-law/cocos2d-x 2013-04-24 15:43:53 +08:00
James Chen abacdc9921 tabify for makefile. 2013-04-24 15:15:25 +08:00
James Chen 8e5610fc58 issue #2075: Updating Makefile of TestCpp for native client port. 2013-04-24 15:00:53 +08:00
James Chen 6c1890f8ab issue #2075: Updating TestCpp project setting for marmalade and linux. 2013-04-24 14:58:11 +08:00
minggo c0582d9d40 Merge pull request #2435 from minggo/master 
fix memory leak in FontTest
 2013-04-23 23:53:13 -07:00
minggo c6dfee706c fix memory leak in FontTest 2013-04-24 14:49:52 +08:00
James Chen 7b138c6be9 issue #2075: Adding spinetest in TestCpp for win32. 2013-04-24 14:48:39 +08:00
James Chen 6b4420e7ec issue #2075: Updating extensions project for linux, native client and marmalade. 2013-04-24 14:37:22 +08:00
James Chen f7947d25bc fixed #2075: Updating iOS template. 2013-04-24 14:36:32 +08:00
James Chen 7755b025ee Adding spine/spine-cocos2dx.h to cocos-ext.h. 2013-04-24 14:36:11 +08:00
James Chen 0c3cb27113 issue #2075: Updating TestCpp for mac. 2013-04-24 14:34:41 +08:00
James Chen 2d1172814d issue #2075: Adding spine editor support. Adding a new test 'SpineTest' in TestCpp, adding the parse code in "extensions/spine". It works only on iOS now. 2013-04-24 13:57:34 +08:00
zhangbin 297e32c20d Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2013-04-24 09:59:46 +08:00
zhangbin 8d60e11a9f Update the JS binding for plugin 2013-04-24 09:43:40 +08:00
James Chen 84ec031fcf Merge pull request #2427 from CocosRobot/updategeneratedsubmodule_1366690273 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-04-22 23:14:03 -07:00
CocosRobot ca30ce7462 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-23 12:11:31 +08:00
James Chen 69c1c2ff2f Merge pull request #2426 from dumganhar/master 
fix a typo in js_cocos2dx_CCTMXLayer_getTiles.
 2013-04-22 19:58:44 -07:00
James Chen e84cf9ef83 Correct log output in js_cocos2dx_CCTMXLayer_getTiles 2013-04-23 10:57:55 +08:00
James Chen 30c6915449 fix a typo. 2013-04-23 10:52:51 +08:00
James Chen c7c1415cd6 Merge pull request #2425 from dumganhar/iss2076-setResolutionScale 
fixed #2076: Adding a method CCBReader::setResolutionScale for setting resolution scale manually
 2013-04-22 19:50:20 -07:00
James Chen 685fe16e10 fixed #2076: Adding a method CCBReader::setResolutionScale for setting resolution scale manually 2013-04-23 10:39:59 +08:00
minggo f99ffcd6df Merge pull request #2424 from minggo/master 
don't include unneeded header file
 2013-04-22 19:23:01 -07:00
minggo d4efbcfcef don't include unneeded header file 2013-04-23 10:10:14 +08:00
minggo 15f55ef5cd Merge pull request #2421 from natural-law/master 
issue #1723 : Update the iOS projects in plugin, and remove the win32 projects.
 2013-04-22 02:27:40 -07:00
zhangbin 42ca70937f Update the iOS projects in plugin, and remove the win32 projects. 2013-04-22 17:11:45 +08:00
minggo 25a0927bf7 Merge pull request #2419 from natural-law/master 
Add protocol Ads & plugin Admob
 2013-04-22 01:51:35 -07:00
minggo ec43617469 Merge pull request #2420 from minggo/2073-userdefault_memory_leak_ 
fixed #2073: fix memory leak in CCUserDefault
 2013-04-22 01:46:00 -07:00
minggo d89792fdc6 fixed #2073: fix memory leak in CCUserDefault 2013-04-22 16:43:05 +08:00
zhangbin 155064edfa Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2013-04-22 11:19:22 +08:00
zhangbin abd6f3c906 Add sample code HelloAds for android platform 2013-04-22 11:17:31 +08:00
zhangbin 6a48e8145d Add plugin admob for android platform. 2013-04-22 10:40:29 +08:00
zhangbin 79870ded6a Add ads protocol. 2013-04-22 10:38:14 +08:00
Sergey Shambir 41f5538ff4 Added CC_DISABLE_COPY macro 2013-04-20 15:13:19 +04:00
Sergey Shambir 3ae98978d4 Added CC_FORMAT_PRINTF to CCString 
Added for CCString::initWithFormat() and CCString::createWithFormat().
Fixed warnings.
 2013-04-19 14:00:16 +04:00
James Chen dc0e89e839 Merge pull request #2411 from CocosRobot/updategeneratedsubmodule_1366363642 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-04-19 02:29:15 -07:00
CocosRobot 8d8a2293a1 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-19 17:27:38 +08:00
James Chen bbdb09dc68 Merge pull request #2410 from dumganhar/iss2071-jsb-getTiles 
fixed #2017: Binding cc.TMXLayer.getTiles() manually.
 2013-04-19 02:26:30 -07:00
James Chen 20b0e41b78 fixed #2017: Binding cc.TMXLayer.getTiles manually. 2013-04-19 17:25:24 +08:00
James Chen dee0f37983 issue #2071: Updating cocos2dx.ini, skipping auto-generating cc.TMXLayer.getTiles(), it needs be bound manually . 2013-04-19 17:23:39 +08:00
James Chen 985b3a100e Merge pull request #2408 from sergey-shambir/gcc_warning 
Fixed GCC warning on narrowing conversion
 2013-04-19 02:14:00 -07:00
zhangbin 46b9090241 Solve the bug in ant build. 2013-04-19 16:20:40 +08:00
zhangbin 78c1cb809e Add the base sample code for ads 2013-04-19 16:19:04 +08:00
Sergey Shambir 5541816ef6 Fixed GCC warning on narrowing conversion 2013-04-19 12:09:26 +04:00
Sergey Shambir e5b2f300f9 Added CC_FORMAT_PRINTF(x,y) macro to warn on CCLog() format errors 
Uses printf format. Enabled for GCC and clang.
 2013-04-19 11:54:08 +04:00
James Chen fd0e4a80df Merge pull request #2405 from dumganhar/master 
Removing unused file(uthash.h) in JSB projects.
 2013-04-18 20:10:38 -07:00