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

6673 Commits

Author SHA1 Message Date
Rolando Abarca a265120f4c cc namespace 2013-01-16 14:07:51 -08:00
Rolando Abarca bc19f40239 Merge branch 'gles20' 2013-01-16 14:02:40 -08:00
Rolando Abarca 7ab43b9dfc adds missing runLoop for cc2dx (debug) 2013-01-16 14:02:05 -08:00
Rolando Abarca 49432ef742 removes old header file reference 2013-01-16 13: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
minggo b640b6c206 Merge pull request #1837 from minggo/iss1468-ccpoint 
Iss1468 ccpoint
 2013-01-13 23:18:35 -08:00
minggo c08c982f89 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1468-ccpoint 2013-01-14 15:07:21 +08:00
minggo 984b304ec5 issue #1468:change CCPoint CCSize CCRect from class to struct 2013-01-14 14:45:16 +08:00
James Chen 0fd16e7b31 Merge pull request #1827 from folecr/assert_fix 
fixed #1654: Assert fix for android.
 2013-01-13 22:15:11 -08:00
James Chen 441d1d9920 Update AUTHORS 2013-01-14 11:35:13 +08:00
James Chen 49ead245d9 Merge pull request #1824 from johnangel/gles20 
fixed #1627: Enable Windows XP support in Visual Studio 2012 Update 1.
 2013-01-13 19:32:09 -08:00
Rolando Abarca 320068930e more debug stuff 2013-01-11 14:29:40 -08:00
Rolando Abarca 47c003ae54 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2013-01-11 14:01:42 -08:00
Rolando Abarca 5df4b4d997 adding debug support for js 2013-01-11 14:01:36 -08:00
johnangel a1155f52e6 Merge remote branch 'upstream/gles20' into gles20 2013-01-11 21:48:47 +01:00
James Chen 800e65b6fc fixed #1653: Using JSB_PRECONDITION2 to check return value in js_bindings_ccbreader.cpp and js_bindings_chipmunk_manual.cpp. 2013-01-11 22:00:42 +08:00
James Chen 1a659bdacb issue #1653: Updated the submodule of cxx-generator. 2013-01-11 21:46:45 +08:00
James Chen 777a327945 Updated cocos2d-js-tests. 2013-01-11 21:27:04 +08:00
James Chen 09f2f56d41 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1653-jsb-int 2013-01-11 20:46:23 +08:00