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

6426 Commits

Author SHA1 Message Date
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
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
Rohan Kuruvilla b3c6f1a2e1 Adding bindings for CCBReader and other improvements. 
1. Added additional CCBReader bindings, including callback support for animationCompleted
2. Improved design for JS CallbackWrappers
3. Added bindings for pDistance
4. Updating cocos2dx.ini
 2012-11-01 15:34:23 +08:00
James Chen 9606592075 Merge pull request #1529 from dumganhar/gles20 
Updated the project configuration of TestJavascript for win32 and android port.
 2012-11-01 00:23:04 -07:00
James Chen d9fd274f16 Updated the project configuration of TestJavascript for win32 and android port. 2012-11-01 15:19:14 +08:00
Rohan Kuruvilla ea92936c1f Adding bindings for CCBReader and other improvements. 
1. Added additional CCBReader bindings, including callback support for animationCompleted
2. Improved design for JS CallbackWrappers
3. Added bindings for pDistance
4. Updating cocos2dx.ini
 2012-11-01 00:08:01 -07:00
Rohan Kuruvilla 89e40a2c98 Adding support for animationCompletedJSCallback in CCBReader 2012-11-01 00:08:00 -07:00
Rohan Kuruvilla a9473f1e8a Changing mAnimationManagers and bringing CCBReader implementation closer to cocos2d-iphone CCBReader 2012-11-01 00:07:34 -07:00
Rohan Kuruvilla a751e6b60d Upgrading CCBuilder Reader test files to version 4 (Including support for Javascript) 2012-11-01 00:06:24 -07:00
Rohan Kuruvilla dc51a78981 Updating bindings for CCBReader. It is now very similar to cocos2d-iphone CCBReader bindings 2012-11-01 00:06:24 -07:00
Rohan Kuruvilla 2fbb748b7c Adding sections for CCBReader bindings generation as well as renaming other bindings 2012-11-01 00:06:24 -07:00
minggo de7026bab2 Merge pull request #1528 from minggo/gles20 
update xcode template and version string
 2012-10-31 21:10:44 -07:00
minggo 21900c26db update xcode template and version string 2012-11-01 12:06:15 +08:00
James Chen 87cf8912d3 Merge pull request #1527 from dumganhar/gles20 
fixed #1543: The CCLayerGradient background of CocosBuilderTest can't be shown.
 2012-10-31 03:02:30 -07:00