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

6765 Commits

Author SHA1 Message Date
ivzave 737fc4ce9e do not overwrite existing resources in TestLua 2013-01-21 18:01:57 +04:00
ivzave 03f1efff78 ignore unpacked glew 2013-01-21 18:01:57 +04:00
Marcel Bloemendaal 696ea07495 Fixed CCScale9Sprite::create(caInsets, file); 
Fixed calling of wrong initializer in CCScale9Sprite, the create(CCRect
capInsets, const char* file). It used to call initWithFile(file,
capInsets), but this is the initializer for a file and a frame rect.
The initializer with capInsets has the capInsets rect as the first
argument. This caused unexpected behaviour.
 2013-01-21 14:55:45 +01:00
James Chen a470489f7c fixed #1639: The target of Custom property needs to be self. 2013-01-21 21:09:03 +08:00
walzer db59b047f0 remove "inline" keyword from set/getPositionX/Y() methods to make the compilation property without additional flags. 2013-01-21 20:57:06 +08:00
James Chen c0d568da9b fixed #1639: Added custom property support for CCBReader. 2013-01-21 18:37:17 +08:00
moadib e39829269d Added <uses-feature android:glEsVersion="0x00020000" /> to AndroidManifest.xml 2013-01-21 13:03:55 +04:00
walzer b1285ca7a7 CCNode: add [set|get]Position[X|Y](void) back. 2013-01-21 16:26:33 +08:00
walzer 996d2be2b6 CCNode: add [set|get]Position[X|Y](void) back. 2013-01-21 16:26:02 +08:00
walzer c184567329 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2013-01-21 16:00:39 +08:00
minggo ba111316a7 Merge pull request #1871 from dumganhar/iss-ccb-leak 
fixed #1670: Fixed memory leak in CCBReader.
 2013-01-20 23:01:20 -08:00
James Chen 4a68e4ab89 fixed #1670: Fixed memory leak in CCBReader. 2013-01-21 14:40:29 +08:00
James Chen 23aaf40e20 Merge pull request #1870 from dumganhar/pr1757 
Fixed a crash for call runAnimation() in CCBAnimationManagerDelegate::completedAnimationSequenceNamed
 2013-01-20 19:39:37 -08:00
James Chen 7aa1c0152e Updated AUTHORS. 2013-01-21 11:37:14 +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 e2bf772997 Merge pull request #1869 from minggo/iss1639_CCBReader 
fixed #1639:add CCBEaseInstant
 2013-01-20 19:19:26 -08:00
minggo 4baf92760b fixed #1639:add CCBEaseInstant 2013-01-21 11:18:06 +08:00
James Chen 8d8a1159dd Merge pull request #1868 from dumganhar/iss1553-cccontrolbutton-leak 
fixed #1553: fixed a memory leak in CCControlButton.
 2013-01-20 18:18:38 -08:00
James Chen 571d86d51d fixed #1553: fixed a memory leak in CCControlButton. 2013-01-21 10:16:07 +08:00
James Chen b810aac103 issue #1667: Updated the comments for CCFileUtils.h. 2013-01-21 10:11:57 +08:00
James Chen 30b2a8a882 issue #1867: Updated CCFileUtils.cpp for android. 2013-01-18 22:18:55 +08:00
James Chen 9eb149efda Updated CCFileUtils.mm. 2013-01-18 22:14:03 +08:00
James Chen c60fe0cce5 Updated cocos2d-js-tests. 2013-01-18 21:59:46 +08:00
James Chen bc76cf09c4 Added filename lookup support for win32. 2013-01-18 21:54:48 +08:00
walzer 8657da80a6 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2013-01-18 18:06:51 +08:00
James Chen 0a42829428 issue #1667: Adding file name lookup support for iOS and Android, TBD: Other platform supports. 2013-01-18 18:05:32 +08:00
minggo 0533c8cb58 Merge pull request #1866 from minggo/iss1664-atlasnode 
fixed #1664:fixed a logical error in CCAtlasNode::setOpacityModifyRGB()
 2013-01-18 00:41:59 -08:00
minggo 6379b61400 fixed #1664:fixed a logical error in CCAtlasNode::setOpacityModifyRGB() 2013-01-18 16:40:42 +08:00
James Chen 56382ec753 Merge pull request #1865 from dumganhar/master 
Updated the submodule reference of cocos2d-js-tests.
 2013-01-17 20:02:21 -08:00
James Chen ce4f508025 Added Scale9Sprite js tests. 2013-01-18 12:00:43 +08:00
James Chen 47823b2497 Updated the submodule reference of cocos2d-js-tests. 2013-01-18 11:58:38 +08:00
minggo fcecd43f55 Merge pull request #1862 from Horcruxes/master 
getFileData("a.png") doesn't work on iOS.
 2013-01-17 17:46:23 -08:00
Michael Ding 088e568c8e Update cocos2dx/platform/ios/CCFileUtils.mm 
fix the problem when calling CCFileUtils::sharedFileUtils()->getFileData("a.png") doesn't work.
 2013-01-18 09:27:22 +11:00
James Chen c8dfa45993 Merge pull request #1859 from dumganhar/crystal-game 
issue #1661: Adding jsb sample game CrystallCraze.
 2013-01-17 01:09:18 -08:00
James Chen 31e91e554e issue #1661: Added CrystalCraze for win32 and fix some compilation errors. 2013-01-17 17:07:18 +08:00
minggo 3e482e30d3 Merge pull request #1861 from minggo/iss1547-ccmenuitem 
fixed #1547:set selected menu item to null when it is removed from a menu
 2013-01-16 23:06:53 -08:00
minggo a7dca5c05a fixed #1547:set selected menu item to null when it is removed from a menu 2013-01-17 15:04:48 +08:00
James Chen 9bbc130ea5 issue #1661: Adding CrystallCraze for iOS and Android. 2013-01-17 12:54:10 +08:00
James Chen 822dde27ef Merge pull request #1858 from dumganhar/iss1662-particle-fullpath 
fixed #1662: Getting full path will fail if texture name in the plist is without relative path.
 2013-01-16 19:48:52 -08:00
James Chen f70e4db254 fixed #1662: Getting full path will fail if texture name in the plist is without relative path. 2013-01-17 11:42:41 +08:00
walzer 7b16494862 well documented CCNode 2013-01-17 11:20:25 +08:00
Rolando Abarca a265120f4c cc namespace 2013-01-16 14:07:51 -08:00
Rolando Abarca bc19f40239 Merge branch 'gles20' 2013-01-16 14:02:40 -08:00
Rolando Abarca 7ab43b9dfc adds missing runLoop for cc2dx (debug) 2013-01-16 14:02:05 -08:00
Rolando Abarca 49432ef742 removes old header file reference 2013-01-16 13:42:41 -08:00
James Chen cc2865e294 Merge pull request #1852 from dumganhar/iss1660-js-debugger 
issue #1660: Adding debug support for js
 2013-01-15 22:37:46 -08:00
James Chen 3a183d120b issue #1660: Disabled js debugger by default since lack of `js_bindings_dbg.h` file. 2013-01-16 14:35:19 +08:00
Rolando Abarca e94d8d1693 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 
Conflicts:
	scripting/javascript/bindings/ScriptingCore.h
	scripting/javascript/bindings/js_bindings_config.h
 2013-01-15 16:52:47 -08:00
James Chen eb2fcf1efd Merge pull request #1847 from dumganhar/gles20 
fixed #1468: Exported CCPoint, CCSize and CCRect.
 2013-01-15 03:10:50 -08:00
James Chen 375666fd6c fixed #1468: Exported CCPoint, CCSize and CCRect. 2013-01-15 18:59:35 +08:00