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

8126 Commits

Author SHA1 Message Date
GGGGamer a858613de1 memory leak when preloadEffect 2013-04-24 12:10:18 +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
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
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
James Chen f129b94e2d Removing unused file(uthash.h) in JSB projects. 2013-04-19 11:09:02 +08:00
James Chen 827f3d6482 Update AUTHORS 2013-04-19 10:46:56 +08:00
James Chen d37a43e100 Merge pull request #2398 from lgb/float_comparison_issue 
fixed #1935: Float comparison must not use "==" in the equal function of CCPoint and CCSize, we should compare float number by using epsilon and absolute difference.
 2013-04-18 19:44:17 -07:00
minggo 37dc03b7d6 Merge pull request #2404 from minggo/assetmanager 
fix a compiling error
 2013-04-18 19:36:03 -07:00
minggo f9aa710c36 fix a compiling error 2013-04-19 10:34:40 +08:00
James Chen 69d73d476e Update AUTHORS 2013-04-19 10:25:48 +08:00
James Chen 7bf9b3858e Merge pull request #2402 from brawsome/master 
fixed #2069: Adding new macro CCB_MEMBERVARIABLEASSIGNER_GLUE_WEAK to CCBMemberVariableAssigner.h
 2013-04-18 19:24:53 -07:00
James Chen e1e6f7acb9 Update AUTHORS 2013-04-19 10:03:45 +08:00
James Chen f100ad632e Merge pull request #2403 from dumganhar/iss2068-cctextfield-secure 
fixed #2068: Adding a secureTextEntry property. Enabling this property causes the TextField to display the entered text as bullets.
 2013-04-18 19:00:26 -07:00
James Chen ec50d34622 fixed #2068: Tab ~> 4 spaces. 2013-04-19 09:59:08 +08:00
James Chen 9ecaacf59b fixed #2068: Updating source format. 2013-04-19 09:55:29 +08:00
James Chen b91c5f099c fixed #2068: Fixing a compilation error on win32 since "•" couldn't be recognized by vs compiler. 2013-04-19 09:49:55 +08:00
Andrew Goulding 98a7b9636d Added CCB_MEMBERVARIABLEASSIGNER_GLUE_WEAK 
We've found it useful to use CCB_MEMBERVARIABLEASSIGNER_GLUE_WEAK in
situations where we don't want CCObject derived pointers retained. It's
also useful if you want to assign a pointer dynamically cast to an
abstract base class such as CCLabelProtocol.
 2013-04-19 08:06:25 +10:00
James Chen 861e8e42f7 Merge branch 'master' of https://github.com/MarcelBloemendaal/cocos2d-x into MarcelBloemendaal-master 2013-04-18 16:21:17 +08:00
James Chen 0ea0ad6382 Update AUTHORS 2013-04-18 15:32:18 +08:00
James Chen 612a8a309f Merge pull request #2193 from Weeds/feature-screen-dimensions 
fixed #2065: Adding kResolutionFixedHeight and kResolutionFixedWidth resolution policy.
 2013-04-18 00:31:13 -07:00
James Chen 69549de17b Merge pull request #2397 from dumganhar/master 
Removing an unused comment in ccaffinetransform_to_jsval.
 2013-04-17 23:14:28 -07:00
James Chen 556d95d922 Removing an unused comment in ccaffinetransform_to_jsval. 2013-04-18 14:13:26 +08:00
James Chen 5c67372615 Merge pull request #2396 from CocosRobot/updategeneratedsubmodule_1366264667 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-04-17 23:00:27 -07:00
CocosRobot 5ead6d7322 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-18 13:58:01 +08:00
James Chen 7e7de97706 Merge pull request #2395 from dumganhar/iss2064-js-node-tranf 
fixed #2064: Exposing cc.Node.nodeTo***Transform to JS since it's used in CocoFrameworkJS.
 2013-04-17 22:57:00 -07:00