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

884 Commits

Author SHA1 Message Date
James Chen a998062c57 issue #1194: Updated project configuration for android. Null pointer checking in CCNode::removeFromParentAndCleanup. 2012-05-02 12:04:27 +08:00
minggo f37d3dd5d3 issue #1201: simplify writing of Android.mk 2012-05-02 12:00:39 +08:00
James Chen 63a8bbf0d9 issue #1194: Updated ios project configurations after adding CCTextureWatcher. 2012-05-02 10:39:39 +08:00
James Chen de35aaa101 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1194_tex_wat 2012-05-02 09:49:12 +08:00
James Chen c5f7f15090 issue #1194: Added extension namespace, all extension classes are in cocos2d::extension namespace, added CCTextureWatcher and CCListView. 2012-04-27 18:47:49 +08:00
minggo a4e8c9ad17 fixed #931: refactor CCImage and CCTexture2D 2012-04-27 18:37:11 +08:00
minggo a1570e931f issue #931:make convert to rgb565 and A8 correct 2012-04-27 15:53:29 +08:00
James Chen 1d94ba05a0 fixed #1189: updated linebreak and tab(4 space) for all source files. 2012-04-25 18:17:04 +08:00
James Chen 568bdce6c1 fixed #1188: Removed some unused files. 2012-04-25 17:46:29 +08:00
James Chen 8e5668472f issue #1188: Updated project configuration for ios platform. 2012-04-25 17:33:28 +08:00
James Chen 0f36a89c7e issue #1188: Refactor directory. Compile successfully on android and win32(vs2008 debug). 2012-04-25 16:18:04 +08:00
James Chen c1bc4fd65a fixed #1177: Updated ios project configuration. 2012-04-24 17:42:06 +08:00
James Chen 26763c200b Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1177_platform 
Conflicts:
	tests/proj.ios/test.xcodeproj/project.pbxproj
 2012-04-24 15:44:53 +08:00
minggo 1e20f2b6db fixed #1185: reload image data and recreate buffer of object when backing to foreground 2012-04-24 15:02:18 +08:00
James Chen af86a52f27 issue #1177:Updated some files for ios port. 2012-04-23 15:40:46 +08:00
James Chen 521155e9e2 issue #1177: Added some common methods for CCPoint,CCSize,CCRect. Added MutiTouchTest demo. 2012-04-23 14:30:38 +08:00
James Chen 0c6d21c0f9 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1177_platform 2012-04-20 17:34:47 +08:00
James Chen 909a759ff6 issue #1177: Updated android project configuration. 2012-04-20 17:33:28 +08:00
minggo f3d97bd9b6 fixed #1180: synchronize CCConfiguration 2012-04-20 11:39:12 +08:00
minggo cbfca9d763 add execution permission 2012-04-20 10:54:58 +08:00
James Chen dbeb7423ad Merge branch 'iss1176_refactor' of https://github.com/dumganhar/cocos2d-x into iss1176_refactor 2012-04-19 17:53:15 +08:00
James Chen f619c3e006 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1176_refactor 
Conflicts:
	cocos2dx/misc_nodes/CCRenderTexture.cpp
 2012-04-19 17:51:58 +08:00
minggo 4e4a26a2db Merge pull request #855 from minggo/iss1150_rendertexture_crash 
use texture format kCCTexture2DPixelFormat_RGBA8888 to save image
 2012-04-19 02:05:04 -07:00
minggo 92043b4db3 fixed #1150: use texture format kCCTexture2DPixelFormat_RGBA8888 to save image 2012-04-19 17:01:24 +08:00
James Chen e28c77b574 issue #1176: Updated ios project configuration. 2012-04-19 15:26:24 +08:00
James Chen 5b50baffd4 issue #1176: Updated ios project. 2012-04-19 15:03:41 +08:00
James Chen 230b8a386b issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 
with four spaces. Also,
1. Used macro NS_CC_BEGIN instead of namespace cocos2d {, NS_CC_END instead
of }.
2. Removed some unused files.
3. Renamed the name of some folders, for example,
"test.android"-->"proj.android" .
 2012-04-19 14:35:52 +08:00
James Chen 4068be84e9 Refactored project folders. 2012-04-19 11:46:08 +08:00
James Chen 32b53623c7 Removed some unused folders regard to WOPHONE. 2012-04-19 10:52:53 +08:00
James Chen 783b2fe79b Removed some unused codes regard to WOPHONE. 2012-04-19 10:46:37 +08:00
James Chen 42007ea71c deleted some unused codes. 2012-04-18 14:15:11 +08:00
James Chen e673bfae90 fixed #1114: Updated SchedulerTest and ShaderTest. Used CCControlSlider instead of UISlider. Added some resources. 2012-04-18 13:58:24 +08:00
James Chen c501255a7a Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1114_CCControlExt 2012-04-18 09:40:08 +08:00
James Chen f8dfe1fca0 issue #1114: Updated ShaderTest.Added ShaderBlur. 2012-04-17 18:31:31 +08:00
minggo cfdc5edf87 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1139_screen_black 2012-04-17 17:55:59 +08:00
minggo 04c0d794af fixed #1139: fix the bug that screen becomes black when backing to foreground on Android 2012-04-17 17:55:26 +08:00
James Chen 14c10a470a Updated project configuration for android platform. 2012-04-17 16:41:07 +08:00
James Chen 92e44f1c78 Updated ios project configuration. 2012-04-17 16:14:32 +08:00
James Chen 413bc3c343 Finished CCControlSwitch.Added CCActionTween. 2012-04-17 16:00:18 +08:00
James Chen d4f1dcfc44 finished CControlColourPickerTest. 
moved extension resources to 'extensions' folder.
 2012-04-17 11:12:05 +08:00
James Chen 044729dab9 Updated CCControlExtension 2012-04-16 23:16:03 +08:00
James Chen 959acd556f first commit CCControlExtension. 2012-04-16 18:58:43 +08:00
James Chen be129913a8 issue #1166: Updated the project configuration for VS2010, android, ios port. 2012-04-16 13:02:44 +08:00
James Chen a71e5be0d8 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20_optimize_data 
Conflicts:
	cocos2dx/shaders/CCGLProgram.cpp
 2012-04-16 12:45:47 +08:00
James Chen 9ace0d2fdc Fixed memory leaks in CCString and CCDictionary, Updated CCFileUtils_ios.mm.Remove inline prefix for some member function of CCString, so that make it compiled successfully on android and ios. 2012-04-16 10:57:37 +08:00
Phenix Yu e623cd6357 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 
Conflicts:
	cocos2dx/include/CCTexture2D.h
	cocos2dx/include/ccMacros.h
	cocos2dx/textures/CCTexture2D.cpp
	lua/cocos2dx_support/LuaCocos2d.cpp
 2012-04-15 15:46:01 +08:00
James Chen d01f1277af optimize data struct. 2012-04-14 19:11:57 +08:00
minggo 34c805590f Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1156_director 2012-04-13 14:11:58 +08:00
minggo b43d5aa654 fixed #1156 syn CCDirector 2012-04-13 14:11:35 +08:00
James Chen e9e6256815 Merge pull request #839 from dumganhar/gles20 
fixed #1160: Renamed 'CGFloat' to 'CCFloat'.
 2012-04-12 23:10:57 -07:00
James Chen 94e056d964 fixed #1160: Renamed 'CGFloat' to 'CCFloat'. 2012-04-13 14:09:02 +08:00
James Chen 91b4d52c31 Merge pull request #838 from dumganhar/gles20 
fixed #1159: Updated "CallFuncND + auto remove" test demo.
 2012-04-12 20:56:05 -07:00
James Chen 47af0886d3 fixed #1159: Updated "CallFuncND + auto remove" test demo. 2012-04-13 11:54:29 +08:00
minggo 028cf7874e issue #1156: remove unneeded macros and functions 2012-04-13 11:22:17 +08:00
minggo 7cf16dbb32 Merge pull request #836 from minggo/touch_case 
fix TouchesTest crashed on Android and iOS
 2012-04-12 18:47:41 -07:00
minggo 3fbfeeb7e8 fixed #1142: fix TouchesTest crashed on Android and iOS 2012-04-13 09:45:31 +08:00
James Chen 2b5af66974 updated win32 projects configuration release version. 2012-04-10 23:09:58 +08:00
James Chen ba37e0e42f Merge pull request #834 from dumganhar/gles20 
fixed #1138: Fixed a memory leak in CCTextureCache::addPVRImage.
 2012-04-10 03:45:27 -07:00
James Chen b6cc0658f3 invalid pointer check in void TexturePVRRGB888::onEnter(). 2012-04-10 18:43:00 +08:00
James Chen 429e0bcb46 Merge pull request #832 from dumganhar/gles20 
fixed #1136: Fixed some bugs as follows:
1. Using std::string parameter as the key of CCDictionary
2. Deep copy for CCDictionary and CCArray, the classes of elements's type must implement copyWithZone.
3. Added toBool() function to CCString.
4. Retina support for all platforms.
5. Include "CCString.h" and "cocoa/CCNS.h" in cocos2d.h.
6. Added a new constructor(CCArray::CCArray(unsigned int capacity)) for CCArray. And fixed a bug in CCArray.
7. Fixed a memory leak in CCLabelBMFont.cpp.
8. Fixed an error in strings.xml.
 2012-04-10 02:46:38 -07:00
James Chen 675f2b5dd0 Updated strings.xml 2012-04-10 16:21:23 +08:00
minggo c9b1943559 create folder for shader 2012-04-10 15:30:11 +08:00
James Chen 6cd69523c8 Merge pull request #829 from dumganhar/iss1094_gles20_particlebat 
issue #1094: Make ParticleBatchNode works on win32 and fixed some issues as follows:
1. renamed CCPoolManager::getInstance() to CCPoolManager::sharedPoolManager(), and added CCPoolManager::purgePoolManager() method. Using pointer rather than global variable to make a singleton.
2.fixed a memory leak in CCParticleSystem.
3.init CCSprite::m_pobBatchNode at the beginning of CCSprite::initWithTexture.
4.Add CCAssert in ccArrayRemoveObjectAtIndex.
5.Use new method to allocate CCDirector.
 2012-04-08 19:45:38 -07:00
James Chen b4d74700e4 Merge branch 'iss1094_gles20_particlebat' of https://github.com/dumganhar/cocos2d-x into new_ipad 
Conflicts:
	tests/tests/ParticleTest/ParticleTest.cpp
 2012-04-09 10:28:21 +08:00
James Chen 3d601048c6 Merge pull request #831 from dumganhar/new_ipad 
fixed #1095: IOS screen resolution(iphone, iphone-retina, ipad, ipad-retina) support.
 2012-04-08 19:02:16 -07:00
Phenix Yu a05757f741 update for msvc2010 2012-04-09 00:10:12 +08:00
minggo 355e27dada merge commit 928a28e37d3469fcd41aff14cb136b1415f2fc86 2012-04-08 14:16:29 +08:00
Walzer 203f40a00d add shader files correctly in test.xcodeproj, fix a warning in CCLabelBMFont.cpp, 2012-04-06 23:33:42 +08:00
James Chen 931c42a621 Updated some files. 2012-04-04 21:58:04 +08:00
James Chen c759f29d76 Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20 2012-03-29 10:11:42 +08:00
James Chen c6457dfed8 issue #1056: Updated ios project configuration. 2012-03-29 10:09:41 +08:00
James Chen bb7485621e issue #1056: Updated ParticleTest, CCParticleSystem, CCParticleSystemQuad. 2012-03-28 21:44:28 +08:00
James Chen 0f1ab7ab37 issue #1056: Updated SpriteTest, reverted the last parameter of glDrawElement in CCTextureAtlas.cpp and CCParticleSystemQuad.cpp. 2012-03-27 10:55:13 +08:00
James Chen d36933d542 issue #1056: Update ios project. 2012-03-26 20:29:50 +08:00
James Chen d67ea955f2 Delete some shader files. 2012-03-26 20:03:54 +08:00
James Chen 85c13998ee issue #1056: Added CCTransitionProgress class, Updated Texture2dTest, TileMapTest, TransitionsTest. 2012-03-26 16:46:23 +08:00
James Chen 6f5603cfe6 issue #1056: Updated CCTexture2dTest. Added CCTextureAsyncTest. 2012-03-23 18:16:47 +08:00
James Chen 9c9230a43f #issue #1056: Updated SpriteTest. 2012-03-23 17:31:28 +08:00
James Chen 2a459e23a6 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-03-23 10:27:35 +08:00
James Chen 0ef65d1ed5 issue #1056: Renamed CC_COCOSNODE_RENDER_SUBPIXEL to CC_NODE_RENDER_SUBPIXEL in CCNode.cpp 2012-03-23 10:26:36 +08:00
minggo 728835c77b Merge pull request #806 from minggo/SpriteTest 
Sprite test
 2012-03-22 19:25:24 -07:00
minggo ad8d7cdeff SpriteTest 2012-03-23 10:23:02 +08:00
James Chen 900de7328a Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-03-22 18:29:26 +08:00
James Chen c5d0b1ca6f issue #1056: Updated ParticleTest. 2012-03-22 18:29:07 +08:00
minggo a8eaf85cfb Merge pull request #804 from minggo/RenderTextureTest 
Rendertexturetest
 2012-03-22 01:37:58 -07:00
minggo 39ba6b4618 issue #1506: RenderTextureTest 2012-03-22 16:36:03 +08:00
minggo 56f27c495b Merge pull request #803 from minggo/MotionStreak 
issue #1506: MotionStreakTest
 2012-03-21 23:33:03 -07:00
minggo 6b7716770e issue #1506: MotionStreakTest 2012-03-22 14:32:32 +08:00
James Chen 3a50022399 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-03-22 14:24:08 +08:00
James Chen b1f293e089 issue #1056: Updated MenuTest. Added CCArray::arrayWithObject function. 2012-03-22 14:22:06 +08:00
minggo 2aa61bf798 issue #1506: LyaerTest 2012-03-22 13:59:47 +08:00
minggo 85de198511 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into test_sync 2012-03-22 11:49:04 +08:00
minggo 3d10006d6f issue #1506: implement CCLabelTest 2012-03-22 11:48:37 +08:00
James Chen 925fee4820 issue #1056: Added kazmath license file. Used CCCallFuncN instead of CCCallBlock and updated ActionsTest. 2012-03-22 11:26:39 +08:00
James Chen 3a287db954 issue #1056: Update ActionsTest. 2012-03-22 10:27:28 +08:00
minggo b1607b2106 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into test_sync 2012-03-22 09:41:03 +08:00
minggo e8b7bc7c7e issue #1056: LabelTest 2012-03-22 09:40:32 +08:00
James Chen 2e8bae8ebf issue #1056: Update Android.mk. Make tests project being compiled successfully. 2012-03-21 22:49:58 +08:00
James Chen 6f4a01f454 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-03-21 17:35:39 +08:00
James Chen f529bcd659 issue #1056: Move some singletons to CCDirector. It is easily managed by CCDirector. 2012-03-21 17:35:20 +08:00