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

6687 Commits

Author SHA1 Message Date
minggo e2bf772997 Merge pull request #1869 from minggo/iss1639_CCBReader 
fixed #1639:add CCBEaseInstant
 2013-01-20 19:19:26 -08:00
minggo 4baf92760b fixed #1639:add CCBEaseInstant 2013-01-21 11:18:06 +08:00
James Chen 8d8a1159dd Merge pull request #1868 from dumganhar/iss1553-cccontrolbutton-leak 
fixed #1553: fixed a memory leak in CCControlButton.
 2013-01-20 18:18:38 -08:00
James Chen 571d86d51d fixed #1553: fixed a memory leak in CCControlButton. 2013-01-21 10:16:07 +08:00
minggo 0533c8cb58 Merge pull request #1866 from minggo/iss1664-atlasnode 
fixed #1664:fixed a logical error in CCAtlasNode::setOpacityModifyRGB()
 2013-01-18 00:41:59 -08:00
minggo 6379b61400 fixed #1664:fixed a logical error in CCAtlasNode::setOpacityModifyRGB() 2013-01-18 16:40:42 +08:00
James Chen 56382ec753 Merge pull request #1865 from dumganhar/master 
Updated the submodule reference of cocos2d-js-tests.
 2013-01-17 20:02:21 -08:00
James Chen ce4f508025 Added Scale9Sprite js tests. 2013-01-18 12:00:43 +08:00
James Chen 47823b2497 Updated the submodule reference of cocos2d-js-tests. 2013-01-18 11:58:38 +08:00
minggo fcecd43f55 Merge pull request #1862 from Horcruxes/master 
getFileData("a.png") doesn't work on iOS.
 2013-01-17 17:46:23 -08:00
Michael Ding 088e568c8e Update cocos2dx/platform/ios/CCFileUtils.mm 
fix the problem when calling CCFileUtils::sharedFileUtils()->getFileData("a.png") doesn't work.
 2013-01-18 09:27:22 +11:00
James Chen c8dfa45993 Merge pull request #1859 from dumganhar/crystal-game 
issue #1661: Adding jsb sample game CrystallCraze.
 2013-01-17 01:09:18 -08:00
James Chen 31e91e554e issue #1661: Added CrystalCraze for win32 and fix some compilation errors. 2013-01-17 17:07:18 +08:00
minggo 3e482e30d3 Merge pull request #1861 from minggo/iss1547-ccmenuitem 
fixed #1547:set selected menu item to null when it is removed from a menu
 2013-01-16 23:06:53 -08:00
minggo a7dca5c05a fixed #1547:set selected menu item to null when it is removed from a menu 2013-01-17 15:04:48 +08:00
James Chen 9bbc130ea5 issue #1661: Adding CrystallCraze for iOS and Android. 2013-01-17 12:54:10 +08:00
James Chen 822dde27ef Merge pull request #1858 from dumganhar/iss1662-particle-fullpath 
fixed #1662: Getting full path will fail if texture name in the plist is without relative path.
 2013-01-16 19:48:52 -08:00
James Chen f70e4db254 fixed #1662: Getting full path will fail if texture name in the plist is without relative path. 2013-01-17 11:42:41 +08:00
James Chen cc2865e294 Merge pull request #1852 from dumganhar/iss1660-js-debugger 
issue #1660: Adding debug support for js
 2013-01-15 22:37:46 -08:00
James Chen 3a183d120b issue #1660: Disabled js debugger by default since lack of `js_bindings_dbg.h` file. 2013-01-16 14:35:19 +08:00
Rolando Abarca e94d8d1693 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 
Conflicts:
	scripting/javascript/bindings/ScriptingCore.h
	scripting/javascript/bindings/js_bindings_config.h
 2013-01-15 16:52:47 -08:00
James Chen eb2fcf1efd Merge pull request #1847 from dumganhar/gles20 
fixed #1468: Exported CCPoint, CCSize and CCRect.
 2013-01-15 03:10:50 -08:00
James Chen 375666fd6c fixed #1468: Exported CCPoint, CCSize and CCRect. 2013-01-15 18:59:35 +08:00
James Chen e750c6e163 Merge pull request #1846 from dumganhar/iss1650-doxgen-ccdictionary 
issue #1650: Adding detailed doxgen comments for CCDictionary.
 2013-01-15 02:49:51 -08:00
James Chen 5d7cc39edd issue #1650: Inline function needs to be implemented in header file on Android platform. 2013-01-15 18:15:14 +08:00
James Chen 547f95d761 issue #1650: Made the destructor of CCDictElement as public method. 2013-01-15 17:20:04 +08:00
James Chen c3d697a0f8 issue #1650: Adding detailed doxgen comments for CCDictionary. 2013-01-15 17:09:25 +08:00
James Chen ed91017e58 Merge pull request #1845 from dumganhar/gles20 
Updated Xcode template.
Also, added restriction marco CC_TARGET_PLATFORM == CC_PLATFORM_MAC for CCEditBox of MAC port.
This can avoid compilation errors if other platforms include these files.
 2013-01-14 23:13:11 -08:00
James Chen e761856b4d Added restriction marco `CC_TARGET_PLATFORM == CC_PLATFORM_MAC` for CCEditBox of MAC port. 
This can avoid compilation errors if other platforms include these files.
 2013-01-15 15:11:20 +08:00
James Chen e9d899942f Updated Xcode template. 2013-01-15 15:08:36 +08:00
James Chen 988f70e298 Merge pull request #1843 from dumganhar/gles20 
Updated the submodule reference of cocos2d-js-tests.
 2013-01-14 19:39:08 -08:00
James Chen a1854bdb58 Updated the submodule reference of cocos2d-js-tests. 2013-01-15 11:37:04 +08:00
minggo 5251fcb25d Merge pull request #1841 from ivzave/tran_split_fix 
repair CCTransitionSplitCols & CCTransitionSplitRows
 2013-01-14 18:29:20 -08:00
James Chen 03631b4e09 Merge pull request #1842 from dumganhar/gles20 
fixed #1653: Updated the configuration files of jsbinding.
 2013-01-14 18:20:11 -08:00
James Chen 26a91c8f75 Updated the submodule reference of cocos2d-js-tests. 2013-01-15 10:17:29 +08:00
James Chen 8a4d7cfe12 fixed #1653: Updated the configuration files of jsbinding. 2013-01-15 10:17:01 +08:00
Zhe Wang bf156e6329 Update README.mdown 
update supported platforms and supported programming languages.
 2013-01-15 09:59:28 +08:00
James Chen 121519b7cd Merge pull request #1831 from dumganhar/iss1653-jsb-int 
fixed #1653: Handling correctly when parsing int value in JSB.
 2013-01-14 17:49:57 -08:00
ivzave 806398519a repair CCTransitionSplitCols & CCTransitionSplitRows 2013-01-15 00:49:05 +04:00
minggo 78fc7cb5b5 Merge pull request #1840 from walzer/gles20 
Doxygen sample in CCSprite.h
 2013-01-14 06:07:50 -08:00
walzer 4ae43e5901 fix typos in doxygen of CCSprite and CCProtocol 2013-01-14 21:51:47 +08:00
minggo 591cd4a401 Update AUTHORS 2013-01-14 19:24:27 +08:00
minggo 90a4653530 Merge pull request #1839 from fnz/gles20 
Fix addImageAsync iOS memory leak
 2013-01-14 03:22:11 -08:00
walzer c9c227873f Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2013-01-14 17:07:07 +08:00
walzer 1ab552b482 Add a sample doxygen sample in CCSprite.h and CCProtocol.h 2013-01-14 16:54:20 +08:00
Victor K bf01df0f52 Fix addImageAsync iOS memory leak 
Bug: http://www.cocos2d-x.org/issues/1087
Thread: http://www.cocos2d-x.org/boards/6/topics/17031
 2013-01-14 15:32:30 +07:00
James Chen 51fb96f268 Merge pull request #1838 from dumganhar/iss1649-return-const 
fixed #1649: Changed return type to const reference for member variable access.
 2013-01-14 00:08:57 -08:00
James Chen 6733f786a5 fixed #1649: Reverted some invokings of function that returns const reference. 2013-01-14 16:06:18 +08:00
James Chen 22ebf3a5e5 Merge remote-tracking branch 'cocos2d-x/gles20' into iss1649-return-const 2013-01-14 15:52:42 +08:00
James Chen 6565fa92cc fixed #1649: Changed return type to const reference for member variable access. 2013-01-14 15:51:53 +08:00