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

8096 Commits

Author SHA1 Message Date
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
Ed Bartley 079ab91ca5 Merge branch 'gles20' of github.com:cocos2d/cocos2d-x into gles20 2012-11-02 20:45:46 -04:00
Ed Bartley 4ec9793769 TableView updates to provide more touch input to CCTableViewDelegate 2012-11-02 20:26:43 -04: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
James Chen f031a09e77 Added cc.TMXLayer.getTileFlagsAt to jsbindings. 2012-11-02 15:21:44 +08:00
James Chen d8580f77a2 Updated project configuration for TestJavascript, added UnitTest.js. 2012-11-02 15:20:42 +08:00
James Chen b401730c1a Updated the submodule reference of cocos2d-html5-test. 2012-11-02 15:14:29 +08:00
James Chen 05b1b7c2c3 Updated cocos2dx.ini. Renamed some methods exported to js. 2012-11-02 15:13:12 +08:00
walzer cc136b751d Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-11-02 11:45:41 +08:00
James Chen ac860d431d Merge pull request #1537 from dumganhar/iss1526-static 
fixed #1526: Using spiderMonkey library in cocos2d-iphone.
 2012-11-01 20:27:55 -07:00
James Chen 24385b04a6 fixed #1526: Updated MoonWorriors project configuration for iOS port. 2012-11-02 11:25:24 +08:00
minggo 7723fb806e Merge pull request #1536 from minggo/gles20 
update CHANGELOG
 2012-11-01 20:25:17 -07:00
James Chen c8e21be7ec issue #1526: Using spiderMonkey library in cocos2d-iphone. 2012-11-02 11:24:34 +08:00
minggo 6f6345d3a6 update CHANGELOG 2012-11-02 11:23:50 +08:00
James Chen c4a07c7aa6 Merge pull request #1535 from dumganhar/iss1526-static 
issue #1526: Moved implementations of static functions to source files.
 2012-11-01 19:29:37 -07:00
James Chen 2f5f7a601b issue #1526: Moved implementations of static functions in CCActionEase.h, CCLabelBMFont.h to CCActionEase.cpp, CCLabelBMFont.cpp. 2012-11-02 10:06:48 +08:00
Rohan Kuruvilla 09248f3667 Updating CCBReader to latest version from cocos2d-iphone. Includes support for script callbacks 2012-11-01 17:52:07 -07:00
James Chen 0abcd694c6 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into test-js-device-crash 2012-11-01 22:19:20 +08:00
James Chen 0ace12fc52 issue #1526: Moved implementations of static functions in CCParticleExample.h, CCLayer.h to CCParticleExample.cpp, CCLayer.cpp. 2012-11-01 22:17:12 +08:00
minggo 82269fb4c9 Merge pull request #1533 from minggo/gles20 
move the implementation of static method into .cpp file
 2012-11-01 07:13:46 -07:00
minggo d16a6bbe2f issue #1526:move implementation of static methond into .cpp file 2012-11-01 22:12:13 +08:00
wenbin1989 470fcacc81 Add error handler when read image data using libjpeg. 
Fix errors when read image using libjpeg.
Fix errors when read image with broken data using libjpeg.
 2012-11-01 21:45:51 +08:00
minggo 3a2ec0af2f Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-11-01 17:43:55 +08:00
minggo 19d29287b9 update changelog 2012-11-01 17:40:00 +08:00
James Chen 84b642d186 Merge pull request #1531 from dumganhar/iss1530-js-improvements 
issue #1530: Picked some JSBinding improvements in PR #1499
 2012-11-01 01:09:39 -07:00
James Chen d2a9acd227 issue #1530: Two memory leaks fixes. 2012-11-01 16:06:05 +08:00
James Chen 45005c6cd9 issue #1530: Set COCOS2D_DEBUG macro to 1 in Application.mk for MoonWarriors project, otherwise there are many outputs in logcat window. 2012-11-01 15:56:05 +08:00
James Chen 026662ee5f issue #1530: Assigned JSVAL_VOID to member variables for JSCallbackWrapper class. 2012-11-01 15:45:22 +08:00
minggo d5afc69393 Merge pull request #1530 from minggo/gles20 
fix compiling error on linux 64 bit
 2012-11-01 00:43:24 -07:00
minggo 95d3f87bd7 fix compiling error on linux 64 bit 2012-11-01 15:38:48 +08:00