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

68 Commits

Author SHA1 Message Date
Sam Clegg 38878b084b Fix all compiler warnings produced by gcc. 
This allows the linux and NaCl builds (and perhaps others)
to be compiles with -Wall and -Werror, and it makes the build
output much less noisy.
 2013-03-05 17:01:00 -08:00
hailong 2f0e10cd74 CCBReader error with generated animations 
synchronous with cocos2d-iPhone
 2013-02-19 12:27:39 +08:00
Darragh Coy 5902de93ce Committing a fix for a potential unaligned memory access crash in CCBReader::readFloat(), 
caused by incorrect compiler optimisations/assumptions surrounding the use of memcpy().
 2013-02-06 14:44:15 -08:00
James Chen 6f3b22031f Using new API of getting full path for file name. 2013-01-25 20:51:52 +08:00
James Chen 6a31f4edaf Fixed a logical error in CCNodeLoader.cpp. 2013-01-25 11:04:41 +08:00
James Chen 9042e814ff Merge pull request #1883 from dumganhar/iss-ccb-leak 
fixed #1670: fixed retain interaction. Only CCNode should retain CCAnimationManager, CCAnimationManger shouldn't retain CCNode.
 2013-01-22 23:23:55 -08:00
James Chen 37f91c5c1d Comment the unneeded codes. 2013-01-23 15:18:13 +08:00
James Chen 83ea9e5e2c fixed #1670: fixed retain interaction. Only CCNode should retain CCAnimationManager, CCAnimationManger shouldn't retain CCNode. 2013-01-23 15:14:40 +08:00
James Chen c5214dd485 Updated the comments for CCBMemberVariableAssigner. 2013-01-22 15:10:30 +08:00
James Chen 0187bb6504 Merge pull request #1876 from dumganhar/iss1639-custom-property 
fixed #1639: Added custom property support for CCBReader.
 2013-01-21 23:03:53 -08:00
James Chen a470489f7c fixed #1639: The target of Custom property needs to be self. 2013-01-21 21:09:03 +08:00
James Chen c0d568da9b fixed #1639: Added custom property support for CCBReader. 2013-01-21 18:37:17 +08:00
James Chen 4a68e4ab89 fixed #1670: Fixed memory leak in CCBReader. 2013-01-21 14:40:29 +08:00
James Chen 0c10eff039 Merge branch 'gles20' of https://github.com/tiantian20007/cocos2d-x into pr1757 2013-01-21 11:33:47 +08:00
minggo 4baf92760b fixed #1639:add CCBEaseInstant 2013-01-21 11:18:06 +08:00
James Chen 6733f786a5 fixed #1649: Reverted some invokings of function that returns const reference. 2013-01-14 16:06:18 +08:00
minggo 7a1f445bff issue #1639:set visible to correct value 2013-01-05 18:35:11 +08:00
tiantian dc49561357 Fix crash for call runAnimation() in CCBAnimationManagerDelegate::completedAnimationSequenceNamed; Set mRunningSequence to NULL before any runAnimation() call; 2012-12-13 13:21:58 +08:00
minggo d5533fcf15 fix a type information in CCBAnimationManager 2012-12-10 11:30:07 +08:00
minggo 58a187f774 do some bug fixes 2012-12-04 18:44:32 +08:00
James Chen 478791a472 Added CCBReader::setCCBRootPath. 2012-12-03 18:27:50 +08:00
James Chen 0333981c94 Suffix check. 2012-11-30 14:16:38 +08:00
James Chen d27ab38be9 fixed some warning and make win32 release version compiled ok. 2012-11-29 18:04:33 +08:00
James Chen 10195d0215 fixed #1582: A logic bug in CCBAnimationManager::setAnimatedProperty. 2012-11-29 11:07:06 +08:00
James Chen 95ccf17739 Bind some functions for js: 
void runAnimationsForSequenceNamedTweenDuration(const char *pName, float fTweenDuration);
    void runAnimationsForSequenceNamed(const char *pName);
    void runAnimationsForSequenceIdTweenDuration(int nSeqId, float fTweenDuraiton);
 2012-11-28 11:49:20 +08:00
James Chen de8be8561e minor fix for a comment. 2012-11-27 11:05:52 +08:00
James Chen 8d55abd432 fix touch event lost on Win32, the reason is that: 
Cocos2d-x is using touch event callback for all platforms, it's different from cocos2d-iphone which uses mouse event for Mac port. So we just need to touch event by using kCCBPlatformIOS.
 2012-11-27 11:03:12 +08:00
James Chen 9bd3014137 Fixed CocosBuilderTest/AnimationTest crash, fixed some memory leaks in CCBReader.cpp. 2012-11-27 10:26:40 +08:00
James Chen e0948a4817 fixed #1576: Sync CCBReader to latest version, CCString* --> std::string, CocosBuilderTest crash fixes. 2012-11-26 21:51:05 +08:00
James Chen 7c1e860d78 issue #1573: Added CocosDragonJS. Made it compiled ok on iOS,android and win32. 2012-11-23 15:09:03 +08:00
Rohan Kuruvilla 36bbd80b68 Adding changes to CCBreader 2012-11-23 15:08:55 +08:00
James Chen ebd522e3fa issue #1564: Return a new object instead of 'const reference' for some get methods. 2012-11-20 16:34:55 +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
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 dc51a78981 Updating bindings for CCBReader. It is now very similar to cocos2d-iphone CCBReader bindings 2012-11-01 00:06:24 -07:00
minggo f17545a1ae fix a compile error 2012-09-24 15:26:18 +08:00
minggo 88952396e4 Merge branch 'ptr_int_casting_issue' of https://github.com/ByungChoi/cocos2d-x into ptr_int 2012-09-24 15:16:30 +08:00
James Chen e4cee68688 Added libExtensions.lib for TestJavascript vs2010 project. 
Removed some calling of 'USING_NS_CC;' in extensions.
 2012-09-24 11:47:33 +08:00
James Chen a413496a1a Delete 'cocos2d::' since extension is the sub-namespace of cocos2d. 2012-09-24 11:08:10 +08:00
James Chen 426915dd4a fixed some compilation error for win32 platform. 2012-09-24 11:05:15 +08:00
Byung Choi 2ed9119d4f fixed pointer to int casting warnings and errors, based on stdint 2012-09-22 03:02:29 +09:00
minggo 0a1f0369e6 fixed #1481: merge Nicolas's pull request and do some bug fixes 2012-09-21 17:01:19 +08:00
Rohan Kuruvilla 100a7a1883 Adding sample game wrapper using CCBReader. Also includes small modification to CCBReader 2012-09-20 18:02:17 -07:00
Rohan Kuruvilla 0fc7feb3f0 Updating CCBReader to support Scripting Owners 2012-09-20 14:45:34 -07:00
M.W. Park d042e8557d fixed CCSpriteLoader's flipX bug. 2012-09-20 12:47:45 +09:00
M.W. Park b4b9a1be2b fixed log output. 2012-09-20 12:32:37 +09:00
James Chen 9fabf3a45b fixed #1470: Made CCBReader support cocosbuilder v2.1-beta0. 2012-09-19 18:41:50 +08:00
minggo 4bc5e9e415 issue #1470:fix more logical errors 2012-09-18 17:55:03 +08:00
minggo a0feb5f289 issue #1470:fix some logical errors 2012-09-18 17:04:10 +08:00