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

5909 Commits

Author SHA1 Message Date
minggo 6159a8b592 issue #1555:add CCClippingNode 2012-11-08 17:55:25 +08:00
minggo 168cde4099 Merge pull request #1560 from dumganhar/iss1556-particle 
fixed #1556: Set a defaut texture for CCParticleFire, CCParticleFireworks, etc.
 2012-11-07 22:18:31 -08:00
James Chen 6d1a7e089b fixed #1556: Removed CCParticleFire::create(const char* pListFile) since particle can be constructed from plist by CCParticleSystemQuad::create(plist). 2012-11-08 12:55:32 +08:00
James Chen 4d48e79d47 fixed #1556: Added a newline at the end of firePngData.h file. 2012-11-08 12:06:02 +08:00
James Chen 4a37c8fa8b fixed #1556: Set a defaut texture for CCParticleFire, CCParticleFireworks, etc. 
Added some static constructors.
 2012-11-08 12:03:49 +08:00
Walzer ea1a8b1b19 add Win 8 Metro and WP8 description into readme 2012-11-08 10:59:05 +08:00
minggo 908cc5e2bd Merge pull request #1559 from minggo/iss1545-not-use-macro 
fixed #1545:remove the usage of CREATE_FUNC
 2012-11-07 18:51:04 -08:00
minggo 4efdbca23b fixed #1545:remove the usage of CREATE_FUNC 2012-11-08 10:41:14 +08:00
minggo f9dac4d804 Update AUTHORS 2012-11-07 13:43:01 +08:00
minggo 3f3d09fabb Merge pull request #1532 from wenbin1989/gles20 
Add error handler when read image data using libjpeg.
 2012-11-06 20:10:21 -08:00
James Chen 7fe15d7571 Merge pull request #1556 from dumganhar/gles20 
Updated the submodule reference of "cocos2d-html5-tests" to the latest version.
 2012-11-06 01:07:15 -08:00
James Chen 6f377855e4 Updated the submodule reference of "cocos2d-html5-tests" to the latest version. 2012-11-06 17:06:04 +08:00
James Chen 7f098d803d Merge pull request #1555 from CocosRobot/updategeneratedsubmodule_1352192487 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2012-11-06 01:03:15 -08:00
CocosRobot b72c48f4c5 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2012-11-06 17:01:34 +08:00
James Chen 2193940b27 Merge pull request #1554 from dumganhar/gles20 
issue #1549: Fix some issues.
[1]Added "executeAccelerometerEvent" for CCScriptEngineProtocol class. Exported Accelerometer event to JS.
[2]Updated cocos2dx.ini. Renamed some functions.
[3]Added "ccdictionary_to_jsval" function, now TMXOrthoObjectsTest and TMXIsoObjectsTest don't crash.
 2012-11-06 01:00:31 -08:00
James Chen 449c719d96 issue #1549: Added "ccdictionary_to_jsval" function, now TMXOrthoObjectsTest and TMXIsoObjectsTest don't crash. 2012-11-06 16:11:45 +08:00
James Chen 26af535521 issue #1549: Updated cocos2dx.ini. Renamed some functions. 2012-11-06 14:19:27 +08:00
James Chen 21e4f80fbd Added "executeAccelerometerEvent" for CCScriptEngineProtocol class. Exported Accelerometer event to JS. 2012-11-06 14:18:13 +08:00
James Chen 5f28ef38c7 Merge pull request #1553 from CocosRobot/updategeneratedsubmodule_1352167965 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2012-11-05 18:13:52 -08:00
CocosRobot 5efdb93ef7 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2012-11-06 10:12:52 +08:00
James Chen 7af32050b3 Merge pull request #1552 from dumganhar/gles20 
Updated the submodule references of "tools/cxx-generator" and "cocos2d-html5-test"
 2012-11-05 18:11:52 -08:00
James Chen 5226fbac27 Updated the submodule reference of "samples/TestJavascript/cocos2d-html5-tests". 2012-11-06 10:10:25 +08:00
James Chen 0f3e0daeab Updated the submodule reference of "tools/cxx-generator". 2012-11-06 10:08:48 +08:00
James Chen 9c23065508 Merge pull request #1551 from dumganhar/gles20 
issue #1549: Using new JS API for MoonWarriors.
 2012-11-05 07:29:17 -08:00
James Chen ceb4371f12 issue #1549: Using new JS API for MoonWarriors. 
Updated the logics of js_cocos2dx_CCMenuItemSprite_create and js_cocos2dx_CCMenuItemImage_create.
 2012-11-05 23:22:59 +08:00
James Chen 8d13269950 Merge pull request #1550 from dumganhar/iss1549-js-test 
issue #1549: Update the submodule reference of 'cocos2d-html5-tests' to the latest version.
 2012-11-05 03:00:30 -08:00
James Chen 1596603377 issue #1549: Update the submodule reference of 'cocos2d-html5-tests' to the latest version. 2012-11-05 18:59:42 +08:00
James Chen 289915b3a2 Merge pull request #1549 from CocosRobot/updategeneratedsubmodule_1352112593 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2012-11-05 02:55:25 -08:00
CocosRobot 7de31acd38 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2012-11-05 18:50:00 +08:00
James Chen 3d815da9db Merge pull request #1548 from dumganhar/iss1549-js-test 
issue #1549: Synchronizing to the latest cocos2d-html5-test
 2012-11-05 02:48:51 -08:00
James Chen 57f4e82f75 issue #1549: Made the window size same as cocos2d-html5 (800x450) on win32. 2012-11-05 18:46:23 +08:00
James Chen 4a6d922ea4 issue #1549: Updated tools/tojs/cocos2dx.ini. 2012-11-05 18:45:39 +08:00
James Chen 10ba589ed5 issue #1549: * Arguments in callbacks: 
instead of: callback(this, func), it is now:callback( func, [this] )
 2012-11-05 18:44:28 +08:00
James Chen b72f922287 issue #1549: Sync jsb_constants_cocos2d.js and jsb_constants_cocosbuilder.js to -iphone version. 2012-11-05 18:43:12 +08:00
James Chen 270676b74d issue #1549: Added some functions for CCNode. 
virtual void removeFromParent();
virtual void removeChild(CCNode* child);
virtual void removeChildByTag(int tag);
virtual void removeAllChildren();
 2012-11-05 18:41:52 +08:00
James Chen 2b734c6e04 Merge pull request #1547 from dumganhar/gles20 
fixed #1548: Updated libcurl header files to 7.26.0 on iOS.
 2012-11-04 21:16:46 -08:00
James Chen 26547c7b30 fixed #1548: Updated libcurl header files to 7.26.0 on iOS. 2012-11-05 13:13:46 +08:00
James Chen d77e0cd993 Merge pull request #1543 from CocosRobot/updategeneratedsubmodule_1351853805 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2012-11-02 05:04:03 -07:00
CocosRobot da457732b9 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2012-11-02 18:56:53 +08:00
James Chen d4b6217c6c Merge pull request #1542 from dumganhar/iss1530-js-improvements 
Merged PR #1499 (JS Improvements)
 2012-11-02 03:34:14 -07:00
James Chen f88aa5058d Merge branch 'gles20' of https://github.com/rohankuruvilla/cocos2d-x into rohan-ccb 
Conflicts:
	scripting/javascript/bindings/cocos2d_specifics.cpp
	scripting/javascript/bindings/cocos2d_specifics.hpp
	tools/tojs/cocos2dx.ini
 2012-11-02 18:15:25 +08:00
minggo d064947c16 Update CHANGELOG 2012-11-02 16:16:12 +08:00
James Chen faae05e0b4 Merge pull request #1541 from dumganhar/gles20 
Updated js template for iOS.
 2012-11-02 01:10:27 -07:00
James Chen fa071d3082 Updated js template for iOS. 2012-11-02 16:09:45 +08:00
James Chen b2bbe176a8 Merge pull request #1540 from dumganhar/gles20 
Sorted the sources of MoonWarriors and TestJavascript by type to make iO...
 2012-11-02 00:54:15 -07:00
James Chen d14d536953 Sorted the sources of MoonWarriors and TestJavascript by type to make iOS project more beautiful. 2012-11-02 15:52:28 +08:00
James Chen 90f1c0224f Merge pull request #1539 from CocosRobot/updategeneratedsubmodule_1351841918 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2012-11-02 00:43:58 -07:00
CocosRobot 2bba105453 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2012-11-02 15:38:46 +08:00
James Chen ec1b7ea4bb Merge pull request #1538 from dumganhar/gles20 
Updated something as follows:
[1] Updated cocos2dx.ini. Renamed some methods exported to js.
[2] Updated the submodule reference of cocos2d-html5-test.
[3] Updated project configuration for TestJavascript, added UnitTest.js.
[4] Added cc.TMXLayer.getTileFlagsAt to jsbindings.
[5] Updated TestJavascript/bindings/jsb_constants_cocos2d.js.
 2012-11-02 00:26:00 -07:00
James Chen e2ee4f560c Updated TestJavascript/bindings/jsb_constants_cocos2d.js. 2012-11-02 15:22:58 +08:00