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

6741 Commits

Author SHA1 Message Date
James Chen 294509c4c0 Merge branch 'master' of https://github.com/dumganhar/cocos2d-x into myccfileutils 2013-01-23 19:52:17 +08:00
James Chen d28a29ab98 Merge pull request #1884 from dumganhar/iss1678-ccnode-doxygen 
fixed #1678: Fixed a typo, and regenerated luabinding codes.
 2013-01-23 00:00:45 -08:00
James Chen f2303b854a Fixed a typo, and regenerated luabinding codes. 2013-01-23 15:59:13 +08:00
James Chen c92d00dfa1 Merge pull request #1857 from walzer/master 
fixed #1678: Well documented CCNode member functions and variables.
 2013-01-22 23:35:14 -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 2b9f79efc0 Merge pull request #1882 from dumganhar/memoryleak-action 
Fixed memory leaks in CCActionCatmullRom class.
 2013-01-22 22:41:44 -08:00
James Chen b5efd699bf Fixed a memory leak in ActionsTest. 2013-01-23 14:40:11 +08:00
James Chen 317ac3dd95 Fixed memory leaks in CCActionCatmullRom class. 2013-01-23 14:38:46 +08:00
James Chen de8a237d73 Merge pull request #1881 from dumganhar/linux-fix 
fixed #1676: Refactoring Makefile and eclipse project configuration for LINUX port.
 2013-01-22 03:22:41 -08:00
James Chen 8ec1a66db4 Removed glew-1.7.0.tgz. 2013-01-22 18:34:51 +08:00
James Chen 3f57b01f94 Fix for 32bit. 2013-01-22 18:30:16 +08:00
James db77c2079e Updated make-all-linux-probject.sh. 
Checked whether packages were installed.
 2013-01-22 17:23:05 +08:00
James 1d7650767b Updated Makefile and project configurations for linux port. 2013-01-22 16:45:35 +08:00
James Chen 1eecf7fbb6 Merge pull request #1874 from MarcelBloemendaal/master 
fixed #1674: Calling wrong initializer in CCScale9Sprite.
 2013-01-22 00:01:54 -08:00
James Chen 219657ee1a Merge pull request #1872 from moadib/android_manifest_gles20 
fixed #1673: Added <uses-feature android:glEsVersion="0x00020000"/> to AndroidManifest.
 2013-01-21 23:52:32 -08:00
James 680fbe3517 Fixed compilation errors for linux port. 2013-01-22 15:21:37 +08:00
James Chen ca5e7b45b1 Merge pull request #1879 from dumganhar/iss1639-custom-property 
Updated the comments for CCBMemberVariableAssigner.
 2013-01-21 23:14:16 -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 564001b76b Merge pull request #1878 from dumganhar/lua-fix 
fixed compilation errors for lua projects. Rebuilt LuaCocos2d.cpp.
 2013-01-21 22:46:03 -08:00
James Chen 5a41e1fc86 fixed compilation errors for lua project. Rebuild LuaCocos2d.cpp. 2013-01-22 14:40:54 +08:00
James Chen a3dbfaafd3 Merge pull request #1856 from funkaster/master 
fixed #1660: Some fixes to the js debugger.
 2013-01-21 17:54:39 -08:00
James Chen c6aff359d5 Merge pull request #1875 from ivzave/lnxgitfix 
keep working tree clean after build (linux)
 2013-01-21 06:24:36 -08:00
ivzave e3246d93ac add sqlite3 to dependencies 2013-01-21 18:01:57 +04:00
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