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

6761 Commits

Author SHA1 Message Date
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
James Chen e8bf21e6a6 fixed #1543: The CCLayerGradient background of CocosBuilderTest can't be shown. 2012-10-31 18:00:51 +08:00
James Chen 711de87808 Merge pull request #1526 from dumganhar/gles20 
Updated sample/TestCpp/Resources/animations/grossini-aliases.plist.
 2012-10-31 02:30:20 -07:00
James Chen 379b70c15d Updated sample/TestCpp/Resources/animations/grossini-aliases.plist. 2012-10-31 17:08:28 +08:00
James Chen c3ebf837a8 Merge pull request #1521 from dualface/gles20 
fixed #1540: fix win32 CCLuaLog memory leaks, and invalid Console UTF8 output.
 2012-10-31 00:26:49 -07:00
James Chen df4f55db9c Merge pull request #1525 from dumganhar/gles20 
Updated AUTHORS.
 2012-10-31 00:16:50 -07:00
James Chen 6f8187a20e Updated AUTHORS. 2012-10-31 15:15:37 +08:00
James Chen 188f59a16c Merge pull request #1524 from dumganhar/gles20 
fixed #1538: Logic error in CCControlHuePicker::checkSliderPosition.
 2012-10-30 23:37:37 -07:00
James Chen 1a512488fa fixed #1538: Logic error in CCControlHuePicker::checkSliderPosition. 
The distance between current location and center should compare with radius rather than dimension.
 2012-10-31 14:32:24 +08:00
YuLei Liao 4fe16a262b fix incorrect delete 2012-10-31 14:08:28 +08:00
minggo 2a796567e0 Merge pull request #1523 from minggo/gles20 
invoke base class's onExit() to avoid memory leak
 2012-10-30 20:35:02 -07:00
minggo ad64beb769 invoke base class's onExit() to avoid memory leak 2012-10-31 11:33:53 +08:00
James Chen 5cecdb2eee Merge pull request #1522 from dumganhar/iss1537-ff17.0.b3 
fixed #1537: Upgraded spiderMonkey library to FF17.0b3, and updated some api calling in ScriptingCore.cpp.
 2012-10-30 20:12:52 -07:00
James Chen b1ec3c8ab5 fixed #1537: Upgraded spidermonkey to FF17.0beta3 for win32 and iOS ports. 2012-10-31 11:03:42 +08:00
YuLei Liao 01866ddc95 fix win32 CCLuaLog memory leaks, and invalid Console UTF8 output 2012-10-31 11:02:36 +08:00
James Chen 8edf9826b1 issue #1537: Made samples/MoonWarriors/proj.android/build_native.sh executable. 2012-10-31 10:40:42 +08:00
James Chen 5141c83fd1 issue #1537: Upgraded spiderMonkey library to FF17.0b3 for android port. 2012-10-31 10:33:43 +08:00
James Chen bdbb70bea5 Merge branch 'gles20' of https://github.com/funkaster/cocos2d-x into js-surith-gnu 2012-10-31 10:04:35 +08:00
James Chen 6f2364b769 Merge pull request #1520 from FlowerpotGames/gles20 
fixed #1536: CCControl* should not respond to touches if the control is not visible.
 2012-10-30 18:54:05 -07:00
Ed Bartley f424da2a7e * CCControl* should not respond to touches if the control is not visible. 2012-10-30 11:10:05 -04:00
minggo f7df5b7df9 Merge pull request #1519 from minggo/gles20 
Do some fix while testing
 2012-10-30 03:23:48 -07:00
minggo af12b8dfc2 revert CCSpriteBatchNode::removeSpriteFromAtlas() 2012-10-30 18:20:47 +08:00
James Chen 0f69da10b2 Merge pull request #1518 from dumganhar/gles20 
Updated jenkins_scripts/mac/android/generate-js-cxx-bindings.sh.
 2012-10-30 02:56:01 -07:00
James Chen 1538ad4e78 Updated jenkins_scripts/mac/android/generate-js-cxx-bindings.sh. 
The local repo needs to be updated in Jenkins command before executing this script.
So commented some codes.
 2012-10-30 17:54:48 +08:00