4612 Commits

Author	SHA1	Message	Date
minggo	90448ec7d0	issue #1269:fix some compiling error because of including error header files	2012-06-19 16:20:46 +08:00
minggo	2666df9472	issue #1269:mrege latest code and fix conflict	2012-06-19 13:57:33 +08:00
minggo	9ec29d715a	issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx	2012-06-19 13:50:11 +08:00
James Chen	9fa74721a7	fixed #1334: Add ScrollViewTest to CocosBuilderTest.	2012-06-19 10:34:15 +08:00
Nicolas Gramlich	6f26ea7a56	Added actual implementation of CCScrollViewLoader. Added ScrollViewTest to CococsBuilderTest.	2012-06-18 13:59:45 -07:00
Nicolas Gramlich	227683bfa4	Cleaned up CCNodeLoaders by using the Marco instead of having a boilerplate createCCNode method in all the cpp files.	2012-06-18 13:33:19 -07:00
minggo	6d0608d0f1	fixed #1333: add CCScrollView for iOS	2012-06-18 19:24:47 +08:00
James Chen	3cf0f3555c	issue #1330: Removed virtual for callback functions.	2012-06-16 15:22:23 +08:00
James Chen	73c9707d5d	CCBIReader fixes + building and running flawless on iOS and Android. ... Made it works on win32.	2012-06-16 12:48:20 +08:00
Nicolas Gramlich	13bcf2180c	Merge with gles20.	2012-06-15 16:26:10 -07:00
Nicolas Gramlich	c38bfd0a24	Updated xcode project file.	2012-06-15 16:16:08 -07:00
Nicolas Gramlich	d175884f79	Added ParticleSystemTest.	2012-06-15 14:48:36 -07:00
James Chen	cc572ab8e7	fixed #1329: Moved all java files part of engine into a certain directory, then all projects refer to them.	2012-06-15 18:15:43 +08:00
James Chen	24cc0796b6	Merge branch 'cocos2dxandroidlibrary' of https://github.com/folecr/cocos2d-x into folecr_android	2012-06-15 17:47:04 +08:00
minggo	899022d107	fixed #1292:fix some bugs that caused by modify function name	2012-06-15 17:39:13 +08:00
James Chen	595a402c83	fixed #1292:make some function names more readable.	2012-06-15 16:47:30 +08:00
James Chen	0afdfe33da	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20	2012-06-15 15:25:37 +08:00
James Chen	c17091ac70	fixed #1310: Updated vs2010 project configuration after synchronizing to rc2.	2012-06-15 15:24:22 +08:00
minggo	266a5e5e66	Merge pull request #1028 from minggo/iss1292_moidify_function_name ... issue #1292:make some function names more readable	2012-06-15 00:14:13 -07:00
minggo	d0f905992a	issue #1292:make some function names more readable	2012-06-15 15:10:40 +08:00
James Chen	159b91b6cd	Fixed a logic error in ActionScaleTest.	2012-06-15 13:56:27 +08:00
James Chen	bc150ea5a9	fixed #1327: Exported 'create' method for lua bindings.	2012-06-15 11:46:51 +08:00
folecr	6fc2dc5ed9	Use Java code instead of XML to define layout ... * Android layout for cocos apps are very simple (full screen) * Avoids creation of R.java for loading the layout * Can package entire library in jar * Remove unused layout resource	2012-06-14 19:52:45 -07:00
minggo	c965c8d770	fixed 1181: synchronize latest codes	2012-06-15 10:27:52 +08:00
folecr	d651da6f0d	Tests : Ant build project files	2012-06-14 19:21:03 -07:00
folecr	d86e088e9f	Tests : Use cocos2dandroid library ... * Remove code and resources that are now in a library * Add library as a dependency for HelloWorld * Use cocos2dx_default_ resources	2012-06-14 19:21:03 -07:00
Nicolas Gramlich	8d7dce0999	Added glue macros to reduce boilerplate code when implementing CCBSelectorResolver and CCBMemberVariableAssigner. Added LabelTest, MenuTest and SpriteTest.	2012-06-14 18:16:54 -07:00
Nicolas Gramlich	a7ad34864f	CocosBuilderTest: Simplified the 'XYZLoader' classes to be header only, with nice and short macros to do the boilderplate stuff.	2012-06-14 14:23:53 -07:00
minggo	221be759c6	issue #1324: merge James Chen's codes	2012-06-14 18:54:05 +08:00
minggo	9d9e2579e3	issue #1181: save render texture when comming to background	2012-06-14 18:37:57 +08:00
James Chen	052d8ea931	fixed #1324: Added some create methods. Compiling successfully on win32 by vs2008.	2012-06-14 18:32:44 +08:00
James Chen	3a410c14a1	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create ... Conflicts: cocos2dx/extensions/CCBReader/CCBReader_v2.cpp cocos2dx/extensions/CCControlExtension/CCScale9Sprite.cpp cocos2dx/label_nodes/CCLabelBMFont.cpp cocos2dx/menu_nodes/CCMenuItem.cpp cocos2dx/menu_nodes/CCMenuItem.h cocos2dx/misc_nodes/CCRenderTexture.h cocos2dx/tileMap_parallax_nodes/CCTileMapAtlas.cpp tests/tests/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder.cpp tests/tests/LabelTest/LabelTest.cpp	2012-06-14 17:36:31 +08:00
Nicolas Gramlich	cc5eabeb28	ButtonTestLayer: Now showing the CCControlEvent information on screen. Fixed CCLOG -> CCLog (because CCLOG doesn't show up on Android.).	2012-06-14 01:32:52 -07:00
James Chen	23574172ff	issue #1324: Added create() for static member functions that new an autorelease object, updated cocoa folder.	2012-06-14 16:05:58 +08:00
James Chen	3f7b44fc23	issue #1324: Added create() for static member functions that new an autorelease object	2012-06-14 15:13:16 +08:00
Nicolas Gramlich	cdd1fb50ac	Moved from std::string to CCString *. Since the std::string utility methods in CCBReader were buggy on Android (for unknown reasons). Made string utility methods in CCBReader static. Android build now working equivalent to iOS build. *YAY*	2012-06-14 00:01:01 -07:00
Nicolas Gramlich	5550d9f2b0	Merge with gles20.	2012-06-13 15:56:52 -07:00
Nicolas Gramlich	3e61e1f014	Updated Android build files to new CCBReader. Fixed a bunch of compiler errors/warnings when building for Android.	2012-06-13 15:25:59 -07:00
Nicolas Gramlich	29b22adccc	Batch converted manual 'using namespace cocos2d(::extension);' to USING_NS_CC(_EXT);. CocosBuilderExample: Made HelloCococsBuilderLayer selectors work. Made ButtonTestLayer work.	2012-06-13 14:19:13 -07:00
minggo	9321a8d025	fixed #1322: vertical alignment works ok on android	2012-06-13 18:33:44 +08:00
minggo	f80fd0c232	Merge pull request #1015 from minggo/gles20 ... issue #1310:synchronize some codes	2012-06-12 19:46:45 -07:00
minggo	b282d52a65	issue #1310:synchronize some codes	2012-06-13 10:41:04 +08:00
Nicolas Gramlich	895604f42e	Unified Header Guards. Added CCNodeLoaderListener, simulating the didLoadFromCCB selector.	2012-06-12 11:59:49 -07:00
James Chen	d2a16c2b76	issue #1310: Updated MotionStreakTest.	2012-06-12 18:27:36 +08:00
James Chen	e943dbf2fd	issue #1310: Updated TileMapTest, TransitionsTest, ZwoptexTest.	2012-06-12 18:22:48 +08:00
James Chen	2be8ba120c	issue #1310: Updated vs2008 project setting.	2012-06-12 18:15:25 +08:00
James Chen	6d4b80a826	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20	2012-06-12 18:13:02 +08:00
James Chen	dab90107b9	issue #1310: Updated SchedulerTest.	2012-06-12 18:12:45 +08:00
James Chen	92f0364dca	Merge pull request #1008 from dumganhar/gles20 ... issue #1310: Reverted floatr to CCTimer.	2012-06-12 02:09:10 -07:00
James Chen	08fc714a7f	issue #1310: Reverted floatr to CCTimer.	2012-06-12 17:07:54 +08:00
minggo	1d77d53af3	Merge pull request #1007 from minggo/gles20 ... issue #1310: synchronize some codes	2012-06-12 01:57:24 -07:00
minggo	9fbe1fef96	issue #1310: synchronize some codes	2012-06-12 16:56:34 +08:00
James Chen	c8b5ad0440	issue #1310: Updated RotateWorldTest and SceneTest.	2012-06-12 16:22:25 +08:00
James Chen	23519ef85c	issue #1310: Updated ParallaxTest and RenderTextureTest.	2012-06-12 15:55:23 +08:00
James Chen	1c0f391e03	issue #1310: Updated ParticleTest.	2012-06-12 15:40:31 +08:00
James Chen	ae1ea76ca1	issue #1310: Updated NodeTest.	2012-06-12 15:22:42 +08:00
James Chen	f5b2a5d33d	issue #1310: Updated LayerTest.	2012-06-12 15:14:01 +08:00
James Chen	b770010c41	issue #1310: Updated LabelTest. Added init method for CCLabelBMFont. Fixed a bug in CCLabelAtlas::initWithString. ... In CCSpriteBatchNode::initWithTexture, when capacity is equal to 0, set it to default value.	2012-06-12 14:33:53 +08:00
James Chen	ef8ec1a941	issue #1310: Added some resources for tests project.	2012-06-12 14:32:57 +08:00
James Chen	9185f771f1	issue #1310: Added some resources for tests project.	2012-06-12 14:29:15 +08:00
minggo	916b276607	issue #1310: synchronize CCTexturePVR	2012-06-12 12:02:15 +08:00
James Chen	974f0d714d	issue #1310: Updated FontTest. And fixed a compilation error in FontTest.	2012-06-12 11:16:31 +08:00
Nicolas Gramlich	1f2652a8d7	Made CCBIReaderTest finally work completely. =) Also added support for having a root path when loading a ccb-file (i.e. when you have the two directories, one for the ccb files, one for the spritesheets. <- With a common ancestor.)	2012-06-11 18:31:11 -07:00
Nicolas Gramlich	4c8351f304	Removed Zombie files.	2012-06-11 15:00:11 -07:00
Nicolas Gramlich	342c65e293	Added CCBIReaderTest, which doesn't work since XCode sucks big time, not finding a simple file.	2012-06-11 14:57:30 -07:00
Nicolas Gramlich	58b53be708	Merge with gles20.	2012-06-11 11:50:32 -07:00
Nicolas Gramlich	4378731418	Merge with gles20.	2012-06-11 10:43:07 -07:00
minggo	ccbfd24c21	issue #1310: synchronize ActionManagerTest ActionEaseTest ActionsProgressTest ActionsTest	2012-06-11 18:25:57 +08:00
James Chen	2ce7c86c50	fixed #1315: TileMapTest can't be shown correctly in retina mode.	2012-06-11 14:44:32 +08:00
James Chen	33ea7905a5	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 ... Conflicts: cocos2dx/platform/ios/CCFileUtils.mm	2012-06-11 11:01:36 +08:00
James Chen	c95cbb1774	issue #1310: Used CCLabelAtlas instead of CCLabelBMFont to display FPS,SPF status. ... Updated CCFileUtils, added some method, such as sharedFileUtils/purgeFileUtils/purgeCachedEntries. Fixed a bug in CCDirector, made retina mode work correctly.	2012-06-11 10:59:57 +08:00
minggo	94235d3602	issue #1310: make tests and HelloWorld work ok	2012-06-11 10:41:52 +08:00
James Chen	c9dc60b0f7	issue #1310: fixed a bug in CCSpriteFrameCache.cpp. Disable retina mode for tests project.	2012-06-08 17:58:21 +08:00
James Chen	371b3f9938	issue #1310: Tests project updated!.	2012-06-08 17:34:15 +08:00
minggo	cc16320445	issue #1310: syncronize actions	2012-06-08 13:55:28 +08:00
minggo	6cf8ea283d	Merge pull request #973 from minggo/iss1278_effect_android ... fixed #1278: stop effect when unloading effect	2012-06-06 00:41:26 -07:00
minggo	1ff04700b5	fixed #1278: stop effect when unloading effect	2012-06-06 15:38:25 +08:00
James Chen	37aa196c73	Removed some unused codes.	2012-06-06 14:31:49 +08:00
James Chen	6bb2941ec9	fixed #1300: Typo: CC_ENABLE_CACHE_TEXTTURE_DATA -> CC_ENABLE_CACHE_TEXTURE_DATA	2012-06-06 10:06:51 +08:00
minggo	dc24094b5f	fixed #1290:use Shaders folder in correct way	2012-06-04 11:41:03 +08:00
James Chen	cfbf29ccfc	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1282_ati	2012-06-01 13:47:23 +08:00
James Chen	ebcc78497f	fixed #1282: Can not run samples on windows if the display card is ATI. Use opengl directly. Reverted all project configurations to Unicode characterset to avoid textinput error.	2012-06-01 13:44:28 +08:00
minggo	93b5fc37c7	typo fix	2012-06-01 12:04:04 +08:00
James Chen	9be586e4ec	Updated main.cpp for each project of android.	2012-05-31 10:13:05 +08:00
minggo	5ad2bec3d8	Merge pull request #946 from minggo/gles20 ... fix some bug	2012-05-30 03:33:19 -07:00
minggo	a698f9bf69	fix some bug	2012-05-30 18:31:20 +08:00
James Chen	922f7544ad	Updated TouchesTest.	2012-05-30 16:55:46 +08:00
James Chen	bd248b5ac0	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20	2012-05-30 16:09:52 +08:00
James Chen	7115a7f3c9	issue #1275: Memory leaks in CCBReader and ActionsTest.	2012-05-30 16:09:19 +08:00
minggo	8203cf00ba	use fonts/fps_images.png	2012-05-30 13:37:36 +08:00
James Chen	ff0dde984c	fixed #1240: Updated vs2008 project setting (release target).	2012-05-29 18:29:56 +08:00
James Chen	b4fad0bb2b	fixed #1240: Updated vs2010 project setting (release target).	2012-05-29 18:06:52 +08:00
James Chen	1ddb5d51b5	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20	2012-05-29 17:13:21 +08:00
minggo	a09bbbd0ba	fixed #1177: modify project setting, because CCStd.h is moved into platform/ios	2012-05-29 16:23:57 +08:00
James Chen	19c96632b5	fixed #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces.	2012-05-29 16:21:23 +08:00
James Chen	a00db6e072	fixed #1240: Updated ios project configuration.	2012-05-25 17:00:33 +08:00
James Chen	c902e884f4	fixed #1240: Moved particle files to Particle folder. Fixed a bug in tiff decoding. Refactored CCTextureCache::adddImage.	2012-05-25 16:52:47 +08:00
James Chen	6477a02022	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1240_tiff	2012-05-25 11:00:20 +08:00
James Chen	0b8a75e982	fixed #1240: Used dynamic libtiff library for win32. Fixed some warnings. Added tiff test in Texture2dTest.	2012-05-25 10:58:28 +08:00
minggo	138de3171f	Merge pull request #912 from minggo/merge_nicolasgramlich ... Merge pull request by nicolasgramlich	2012-05-23 19:56:05 -07:00
minggo	0ba62c3854	issue #1246:use CCLabelBMFont instead of CCLabelTTF in CCDirector.cpp	2012-05-24 10:48:39 +08:00
James Chen	a5b63d8f6c	fixed #1251: Added CocosBuilderTest to the test project for VS2008.	2012-05-23 11:41:42 +08:00
Nicolas Gramlich	a62e017977	Made MenuTest use a differently names labelatlas to avoid collision with fps_images.fnt/png.	2012-05-22 13:26:20 -07:00
Walzer	7dadd8128c	rename tests/Resource/CocosBuilder to CocosBuilder_v1	2012-05-11 21:22:50 +08:00
Walzer	dc18dc0942	test ccb v2 format, add relative-position support	2012-05-11 20:53:30 +08:00
Walzer	ae12434128	fixed #1205, rename CCCustomClass to CCCustomClassProtocol, add windows support.	2012-05-08 11:30:08 +08:00
Walzer	f10b94fd15	issue #1205, CCBReader works on both iOS & Android now; public APIs of CCBReader are reduced; ccb files in subfolder is supported.	2012-05-07 22:52:58 +08:00
Walzer	1a73064055	issue #1205, refactor the tricky cpp reflection to easier approach, add cocos2d::extension namespace for CCBReader, add doxygen comments. Todo: CCB support on android	2012-05-07 18:14:15 +08:00
Walzer	c76e3c0936	remove CppReflection, add CCBCustomClass and CCBCustomClassFactory to implement reflection, leave some jobs to class HelloCocosBuilder: public CCBCustomClass. The approach is not so tricky, much easier to understand now.	2012-05-07 17:05:17 +08:00
Walzer	07276c3bba	Merge commit '184b31efa3aaa340621f5aa736d3b16e6ad97327' into gles20	2012-05-05 15:49:11 +08:00
Walzer	6b374881f0	Merge branch 'gles20' of http://github.com/cocos2d/cocos2d-x into gles20	2012-05-05 10:07:21 +08:00
Walzer	f70855e959	fixed #1229, reduce the requirement of gles20 branch from NDK android-10 to android-8 level (official android 2.2 image, the lowest version which supports OpenGL ES 2.0), remove EGL dependency.	2012-05-05 10:06:41 +08:00
Walzer	be2fa353a7	Merge commit '1afd7f2701b5e9fec0d2a4fd514d1d4e069b3830' into gles20	2012-05-05 09:55:06 +08:00
minggo	1afd7f2701	Merge pull request #893 from minggo/iss1217_EaseAction_reverse ... Iss1217 ease action reverse	2012-05-04 01:26:56 -07:00
minggo	14b923409a	fixed #1217: implement reverse() for all subclass of CCEaseAction that missing it	2012-05-04 16:22:50 +08:00
James Chen	bf0da624b4	issue #1191: Updated win32 templates, tested by vs2008 and vs2010. Updated win32 project configurations for VS2O10.	2012-05-04 11:16:57 +08:00
Walzer	ebaf1da460	issue 1205, CCBReader. Not perfect yet, I will use CCNotificationCenter to improve SET macro/assign var to parent.	2012-05-03 15:29:27 +08:00
Walzer	2fc1322cc8	update copyright and license declaration of CCCBReader relative files	2012-05-03 14:43:27 +08:00
Walzer	5faaab0d16	add CocosBuilderTest into extension test. fix a bug in CCLayerGradient::updateColor	2012-05-03 12:17:28 +08:00
Walzer	160b0aba88	Merge commit 'b7b21f3dc2e2c541a06fdd381b6b43d213a90093' into gles20	2012-05-03 12:02:13 +08:00
Walzer	9e62412ce9	issue #1205, add CCBReader, CppReflection, CocosBuilderTestCase	2012-05-03 11:58:53 +08:00
James Chen	82439733c5	fixed #1204: Made CCEGLView::Create(on win32) as a private function. Updated ExtensionsTest. ... And updated the format of source files(changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces).	2012-05-03 10:12:00 +08:00
James Chen	136866bc12	issue #1204: Updated tests/proj.win32/main.cpp	2012-05-02 18:56:03 +08:00
James Chen	395dbc90aa	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1204_initInstance ... Conflicts: lua/cocos2dx_support/LuaCocos2d.cpp	2012-05-02 18:23:16 +08:00
James Chen	5fc72581cb	issue #1204: Removed CCApplication::initInstance.	2012-05-02 17:50:26 +08:00
minggo	c048fe77c6	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1201_android_build	2012-05-02 14:41:49 +08:00
James Chen	77d9b811be	issue #1194: Updated ChipmunkAccelTouchTest.	2012-05-02 14:06:40 +08:00
James Chen	abdc94ae3c	Merge branch 'iss1194_tex_wat' of https://github.com/dumganhar/cocos2d-x into iss1194_tex_wat	2012-05-02 12:05:39 +08:00
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
minggo	e75e35b23f	issue #1506: add ShaderTest source code	2012-03-21 17:27:13 +08:00
minggo	6242656049	issue #1506: fix a confict	2012-03-21 17:23:33 +08:00
minggo	92c30a328e	issue #1506: implement ShaderTest	2012-03-21 17:02:52 +08:00
James Chen	159b677dc0	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20	2012-03-21 16:09:26 +08:00
James Chen	8ad598241f	issue #1056: Update Tests project for ios platform.	2012-03-21 16:05:24 +08:00
James Chen	9b4a42c494	issue #1056: Update Box2dTest and ChipmunkAccelTouchTest.	2012-03-21 15:54:48 +08:00
James Chen	2ac2da9c97	issue #1056: 1. Removed ChipmunkTest, added ChipmunkAccelTouchTest. ... 2. Added Box2DTest and Box2DTestBed. Tested on win32.	2012-03-21 15:43:35 +08:00
minggo	bb908f5a5e	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into ActionsEaseTest	2012-03-21 13:36:51 +08:00
minggo	f6c113993a	issue #1506: rename CocosNodeTest to NodeTest and SC	2012-03-21 13:36:24 +08:00
James Chen	8ef5e4ae3b	issue #1056: Update the configuration of ios project.Sort the the project folder.	2012-03-21 11:07:31 +08:00
James Chen	321771a7ea	issue #1056: Added gles2.0 support for ios platform.	2012-03-21 10:05:23 +08:00
minggo	a3441a39e7	issue #1056: rename EaseTatinosTest to ActionsEaseTest and SC	2012-03-20 18:07:42 +08:00
minggo	7ccb38556e	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into android_gles20	2012-03-20 16:10:53 +08:00
minggo	74aaf4c6ca	issue #1056:gles20 runs ok on android	2012-03-20 16:10:12 +08:00
James Chen	ae2b3307fa	Merge pull request #779 from dumganhar/iss1056_CCDict ... issue #1056: Removed CCMutableArray and CCMutableDictionary template, offered CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost.	2012-03-20 00:07:58 -07:00
James Chen	6ce06bd906	issue #1056: Remove CCMutableArray and CCMutableDictionary template, offer CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost.	2012-03-20 15:04:53 +08:00
minggo	39738e4270	issue #1056: implement ActionsProgressTest and run ok on win32	2012-03-19 18:20:32 +08:00
minggo	68809fd5ed	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20	2012-03-19 13:54:34 +08:00
James Chen	e021ae9821	#1056: issue #1056: synchronise cocos2d-iphone-2.0-rc0a, update some files.	2012-03-16 17:56:19 +08:00
James Chen	275891dfb0	issue #1056: synchronise cocos2d-iphone-2.0-rc0a	2012-03-16 13:42:53 +08:00
minggo	41fad74017	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20	2012-03-15 10:05:42 +08:00
James Chen	8aa3f7f9ae	issue #1056: TestCases works ok except Box2dTest and ChipmunkTest.	2012-03-14 18:11:25 +08:00
folecr	6336df4024	Fix test to match newer API	2012-03-13 23:07:42 -07:00
Wartortle	7321d33aaf	Added support files for Accelerometer Simulation for iPhone Simulator and ... Unimotion Ref: http://code.google.com/p/accelerometer-simulator/wiki/Home Ref: https://github.com/gmarik/unimotion	2012-03-08 11:23:47 +00:00
minggo	645d561276	fixed #737: remove view id	2012-03-08 12:40:27 +08:00
minggo	7890333505	fixed #721: cocosdenshion can play local file on android	2012-03-06 16:56:30 +08:00
James Chen	d3dedd19f2	fixed #995: Modify project configure for marmalade port after adding extension support and refactor resource folder.	2012-03-01 17:38:31 +08:00
James Chen	dfd5adb3bd	fixed #994: add support for bbndk2.0 on blackberry platform.	2012-03-01 16:52:17 +08:00
James Chen	7daeb5cd86	fixed #984: Use static library for cocos2dx project on platforms(bada and qnx) that use gcc compiler. Because dynamic_cast may fail if you use a gcc compiler.	2012-02-28 14:59:46 +08:00
James Chen	6d97e3e381	fixed #972: update ios project configures.	2012-02-16 11:48:09 +08:00
James Chen	2c599d31b5	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss972_CCNotificationCenter	2012-02-15 17:02:47 +08:00
James Chen	ac98d22367	update ios project configures for ios, and modify xcode4's template	2012-02-15 16:59:47 +08:00
James Chen	e1413dff5e	update linux project configure	2012-02-15 15:57:09 +08:00
James Chen	a2a5af3348	update bada and qnx project settings	2012-02-15 13:52:41 +08:00
James Chen	3422696145	1.modify some project setting for bada ... 2.rename some files	2012-02-14 22:35:51 +08:00
James Chen	abefe50ef7	modify marmalade project setting	2012-02-14 18:25:20 +08:00
James Chen	f8ff388e8d	rename Resource(in HelloLua and HelloWorld project) and Res(in tests project) to Resources. ... test ok on win32 and android	2012-02-14 18:04:56 +08:00
minggo	e75dbf2bd9	Merge pull request #724 from minggo/iss957_text_input ... fixed #957: avoid to go to background when inputting test	2012-02-14 00:07:51 -08:00
minggo	fd9f73f43e	fixed #957: avoid to go to background when inputting test	2012-02-14 16:02:41 +08:00
James Chen	c3d23a7923	issue #972: Modify project setting for all platforms. Use new icons for ios template.	2012-02-14 15:13:54 +08:00
James Chen	65b1b20c8d	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss972_CCNotificationCenter ... Conflicts: cocos2dx/proj.win32/cocos2d-win32.vcxproj.filters tests/test.win32/test.win32.vcxproj.filters	2012-02-14 11:43:04 +08:00
James Chen	4b9ee55145	issue #972: modify project settings for linux and marmalade.	2012-02-10 13:39:39 +08:00
minggo	8b855a917f	issue #973: refactor lua support	2012-02-10 12:02:46 +08:00
James Chen	81ec2c8586	issue #972: add support for CCNotificationCenter, and add the test demo for it. ... modify the project setting for VS2008 and VS2010	2012-02-10 11:48:33 +08:00
minggo	3c41164b23	Merge pull request #716 from minggo/iss971_rtti ... build cocos2dx as static lib and remove some unneeded codes	2012-02-09 18:35:28 -08:00
minggo	6ae40fc12f	fixed #971: build cocos2dx as static lib	2012-02-10 10:31:56 +08:00
minggo	481f1c2532	fix a typo error	2012-02-09 18:17:25 +08:00
minggo	357c825fa5	issue #971: set JavaVM at JNI_Onload()	2012-02-09 16:27:15 +08:00
minggo	153d2b8192	issue #971: build cocos2dx as static lib and remove some unneeded codes	2012-02-09 15:49:14 +08:00
minggo	ee08c4629e	Merge pull request #714 from minggo/ndk_module ... fixed #970: use modules in the android ndk build	2012-02-07 19:16:01 -08:00
minggo	52de292e20	fixed #970: use modules in the android ndk build	2012-02-08 11:14:47 +08:00
minggo	29c18c67ca	Merge pull request #712 from minggo/ndk_module ... Use modules in the Android NDK build	2012-02-06 22:36:45 -08:00
minggo	9249328afb	fixed #970: use modules in the Android NDK build	2012-02-07 14:34:30 +08:00
dumganhar	ee2139023a	Merge pull request #708 from Wartortle/master ... fixed #969: Addition of Accelerometer Simulation for Win32.	2012-02-06 18:57:41 -08:00
minggo	a7c96b5371	fixed #954: correct accelerometer data when set orientation to portrait in tablet	2012-02-07 10:19:40 +08:00
Wartortle	aa06de2fb3	Second half of commit for adding Accelerometer simulation to Win32.	2012-02-06 11:38:53 +00:00
minggo	591b7d0619	fixed #933: profile CCUserDefault	2012-02-02 14:18:13 +08:00
minggo	1ae8f001b8	Merge pull request #702 from minggo/iss947_closed_loop ... fixed #947: fixed a closed loop	2012-02-01 02:22:02 -08:00
minggo	5e39489c71	fixed #947: fixed a closed loop	2012-02-01 18:18:31 +08:00
minggo	56677be235	Merge pull request #701 from minggo/iss964_label ... fixed #964: compute correct height of a charactor	2012-02-01 02:05:50 -08:00
minggo	7b67c04f2f	fixed #964: compute correct height of a charactor	2012-02-01 18:04:12 +08:00
dumganhar	64c892de79	Merge pull request #697 from dducharme/dalebranch ... fixed #962: Updating the following: CocosDenshion - now using OpenAL exclusively for audio, added ogg/vorbis support there Accelerometer - fixing the accelerometer for different initial orientations of the device Application - paying attention to the locale of the device and setting the current language accordingly CCEGLView - paying attention to navigator events (menu, application go to background, application enters foreground), fixed up orientation code, fixed up screen event pointer code	2012-01-31 18:44:09 -08:00
minggo	a2efab73a0	fixed #959: make touch id correct on android	2012-01-31 14:49:02 +08:00
Dale Ducharme	32e4cc1af2	Updating the following: ... CocosDenshion - now using OpenAL exclusively for audio, added ogg/vorbis support there Accelerometer - fixing the accelerometer for different initial orientations of the device Application - paying attention to the locale of the device and setting the current language accordingly CCEGLView - paying attention to navigator events (menu, application go to background, application enters foreground), fixed up orientation code, fixed up screen event pointer code	2012-01-30 20:27:58 -05:00
minggo	6c2277757a	fixed #958: delete SelectorProtocol and implement it in CCObject	2012-01-30 17:47:47 +08:00
gzito	fe79a2c5d2	Merge branch 'master' of git://github.com/cocos2d/cocos2d-x	2012-01-28 10:54:31 +01:00
dumganhar	a23893507d	fixed 952: make CCLabelBMFont support other language, such as chinese, korean, japanese.	2012-01-18 18:43:41 +08:00
gzito	9e180e9c01	Added true type fonts file for Marmalade version	2012-01-17 10:53:47 +01:00
gzito	c87881ff94	Added Marmalade support to TextInputTest and HelloLua samples	2012-01-15 15:57:10 +01:00
dumganhar	3f7ab5a58f	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into modify_linux_port	2012-01-12 19:17:31 +08:00
dumganhar	ef753afb6b	modify eclipse project setting for linux port	2012-01-12 19:15:23 +08:00
minggo	df668c9785	Merge pull request #675 from minggo/test ... fixed #930: linux supports jpg format file	2012-01-12 01:51:16 -08:00
minggo	0e03c8ca21	fixed #930: linux supports jpg format file	2012-01-12 17:46:53 +08:00
minggo	3905e5a47b	Merge pull request #670 from minggo/test ... fixed #941: limit background music volume in [0, 1.0]	2012-01-11 01:57:27 -08:00
minggo	40b1798f41	fixed #941: limit background music volume in [0, 1.0]	2012-01-11 17:56:11 +08:00
dumganhar	4848dc9c46	fix a bug in SimpleAudioEngine.cpp on bada platform ... use float value to change volume	2012-01-11 17:24:46 +08:00
minggo	86997d6709	fixed #940: replace icons and background pictures	2012-01-10 16:45:49 +08:00
dumganhar	317f23f498	fixed #939: Add create_qnx_project.vbs and add project references	2012-01-09 19:06:49 +08:00
minggo	1bd3601b11	fixed #937: use gnustl_static instead of stlport_static to resolve compiling error on android x86 platform	2012-01-04 18:02:32 +08:00
minggo	08e0be754b	fixed #926: retain/release in Paddle	2011-12-28 15:13:02 +08:00
minggo	d82471478d	add run permition	2011-12-23 11:17:20 +08:00
minggo	edbbe25a98	issue #888: remove the setting for android building	2011-12-23 10:40:02 +08:00
minggo	b7fbd4fc13	issue #919: supporting global variable	2011-12-20 16:50:39 +08:00
minggo	857ce1d505	fixed #921: fix a bug that accelerometer axes inverted in android tablet	2011-12-19 16:29:26 +08:00
dumganhar	af221f8710	fixed #918: modify filter of airplay to marmalade.	2011-12-16 11:08:37 +08:00
dumganhar	8298e0b6ff	Merge branch 'master' of https://github.com/styck/cocos2d-x into pullrequest#611 ... Conflicts: tests/test.marmalade/test.mkb	2011-12-15 13:03:07 +08:00
dumganhar	265558d9c7	Merge branch 'dev' of https://github.com/guavagames/cocos2d-x into pullrequest#619	2011-12-15 11:36:42 +08:00
Didiet Noor	0f8da500c2	Restored Accidentally removed marmalade line from CocosDenshion Test	2011-12-15 02:05:25 +08:00
Didiet Noor	8c69c70fc3	Fixed Path Issues on QNX, CocosDenshion Test back to original	2011-12-15 00:31:17 +08:00
Didiet Noor	f5d41d21b2	Added CDT Project and Modifying CocosDenshion for QNX	2011-12-14 21:26:47 +08:00
Walzer	7d01aa0c74	HelloWorld, Test and HelloLua can succefully compiled by xcodebuild commenline with -sdk iphonesimulator4.3 now. The key is GCC_VERSION="", you can not skip this null value, otherwise the commendline will use GCC4.2 as default, can generate tons of errors.	2011-12-13 22:25:51 +08:00
dumganhar	4b9cbb85ff	#issue 908: Merge marmalade to latest cocos2d-x source ... Merge branch 'master' of https://github.com/gzito/cocos2d-x into marmalade Conflicts: cocos2dx/platform/CCFileUtils.cpp cocos2dx/platform/CCPlatformConfig.h cocos2dx/support/zip_support/ioapi.cpp	2011-12-12 17:46:21 +08:00
dumganhar	baf3755142	remove some '__QNX__' macros	2011-12-12 16:14:12 +08:00
dumganhar	dea2713f51	fixed #907: add blackberry port ... Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into blackberry Conflicts: cocos2dx/platform/CCSAXParser.h	2011-12-12 11:49:49 +08:00
minggo	95b43ac563	Merge pull request #614 from minggo/issue892_RTTI ... Use RTTI to simplify codes	2011-12-11 19:40:34 -08:00
minggo	8c5c3300aa	Merge pull request #612 from dumganhar/issue904 ... Issue904	2011-12-11 19:33:07 -08:00
styck	b1cdb6543d	Updated ccLanguageType CCApplication::getCurrentLanguage() to return the current language ... Added tests for Marmalade and enabled language and font testing	2011-12-11 17:18:01 -08:00
gzito	47e108a8c5	Added marmalade support, removed airplay	2011-12-11 10:19:41 +01:00
styck	bcf63d0e96	Merged from gitbub.gom/gzito, marmalade support, remove airplay	2011-12-10 20:59:48 -08:00
gzito	f27f9180ff	Merge remote-tracking branch 'remotes/styck/master'	2011-12-10 11:10:59 +01:00
Giovanni Zito	287f480c97	Added initWithString (TTF) and jpeg support	2011-12-09 22:05:12 +01:00
dumganhar	1c9ecabd89	modify all projects config	2011-12-09 17:03:11 +08:00
dumganhar	5dea9b8205	fix a crash bug in SimpleAudioEngine.cpp ... update helloworld and tests main.cpp and AppDelegate.cpp files	2011-12-09 15:54:35 +08:00
styck	34759f4411	Enabled the CCUserDefault for Marmalade - works now that libxml2 is being used.	2011-12-08 20:47:42 -08:00
styck	7350fa9bb5	Updated based on G.Zito feedback	2011-12-08 19:51:19 -08:00
dumganhar	b398d75e21	modify tests 'Res' link to 'Resource', remove the coupling between CocosDenshion and Cocos2dx	2011-12-09 10:32:00 +08:00
Giovanni Zito	c5b0a76742	Added support to play more than one sound fx at once	2011-12-08 19:27:20 +01:00
Giovanni Zito	0a7a000c2d	Changed symbols from "airplay" to "marmalade", added files and folders for marmalade	2011-12-08 12:21:48 +01:00
dumganhar	b11bcacea8	modify Device-Debug project setting, finished running on device!	2011-12-08 18:22:06 +08:00
Giovanni Zito	1eb8ba656e	Added marmalade folder	2011-12-08 11:15:20 +01:00
dumganhar	fa07d16f73	switch to WVGA	2011-12-08 11:07:17 +08:00
dumganhar	de7754697f	fixed #904: use relative path for bada 2.0 projects	2011-12-07 18:26:38 +08:00
minggo	a3986a9e21	issue 892: add cpp flag to support rtti on android	2011-12-07 16:51:54 +08:00
styck	96d400d918	Replace expat with libxml2, added libxml2 libraries and header files. Library built from: https://github.com/marmalade/marmalade-libxml2 ... Refactored Accelerometer to match other platforms Updated SimpleAudioEngine.cpp with new functions. (NOT tested). Updated app.icf for latest Marmalade Update deprecated function calls. Removed CCSAXParser_aiplay.cpp - not used, uses default in platform.	2011-12-06 18:32:36 -08:00
dumganhar	520e3365c1	modify some project settings	2011-12-06 16:17:49 +08:00
dumganhar	dfbf2c0cdb	add tests project for blackberry	2011-12-06 15:03:14 +08:00
minggo	2f6fb5b189	Merge pull request #602 from minggo/master ... change file structure in xcode view	2011-12-01 00:28:17 -08:00
minggo	d92bdcc40d	change file structure in xcode view	2011-12-01 16:27:11 +08:00
dumganhar	6973525319	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base	2011-12-01 14:19:07 +08:00
dumganhar	ef8e34f9a1	fix a bug in ZwoptexTest. ... step: click ZwoptexTest, back to mainmenu, enter SpriteTest, next to 'SpriteFrame Alias Name' will cause assert.	2011-12-01 14:15:10 +08:00
minggo	ec70d1d240	Merge pull request #600 from dumganhar/master_base ... fix a bug in IntervalTest	2011-11-30 22:05:07 -08:00
dumganhar	f02ce4b15a	fix a bug in IntervalTest	2011-12-01 13:56:20 +08:00
minggo	34d10fb3db	Merge pull request #598 from dumganhar/master_base ... DemoModernArt test crash on bada	2011-11-30 20:45:36 -08:00
minggo	cddaa3fea2	fixed #885: make SimpleAudioEngine::setEffectVolume() take effect immediately on android	2011-12-01 12:12:14 +08:00
dumganhar	bdddc188aa	fix a bug that DemoModernArt crash on bada	2011-12-01 12:04:43 +08:00
dumganhar	0ae54cc0fd	comment setIsAccelerometerEnabled( true ); in Box2dView.cpp, Box2dTestBed do not use Accelerometer.	2011-11-30 17:37:09 +08:00
dumganhar	262d5969c3	fixed #883: fix a bug in SpriteTest.	2011-11-30 17:29:16 +08:00
minggo	adfec68577	fixed #850: update Box2d for linux	2011-11-29 17:12:21 +08:00
minggo	c99d254c01	issue #850: update box2d for iOS and android	2011-11-29 15:16:16 +08:00
dumganhar	5a984bcc29	Merge branch 'master_base' into box2d2.2.1	2011-11-28 18:32:38 +08:00
dumganhar	3442d17dbe	fixed #880: implement preLoadBackgroundMusic on bada, fix the bug that playEffect repeatly can't work. Modify CC_ASSERT macro define.	2011-11-28 18:05:38 +08:00
dumganhar	cad4ff05f3	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base ... Conflicts: cocos2dx/textures/CCTextureCache.cpp	2011-11-28 15:43:13 +08:00
Walzer	ab7db20809	Fix a typo, CCSprite::get/setHornorParnetTransform to get/setHonorParnetTransform	2011-11-26 17:20:12 +08:00
dumganhar	10f5082a83	update box2d to version2.2.1	2011-11-25 18:30:27 +08:00
minggo	bd595516b8	issue #781: add new functions for sound	2011-11-25 09:56:06 +08:00
dumganhar	e87b00db67	add pthread support for bada 1.0	2011-11-24 17:26:04 +08:00
dumganhar	07da67f253	Merge branch 'master' into master_base ... Conflicts: cocos2dx/menu_nodes/CCMenu.cpp	2011-11-24 11:52:16 +08:00
dumganhar	2bd49545fa	add bada1.0 pthread support	2011-11-24 00:07:50 +08:00
dumganhar	035d7326db	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-11-23 21:43:40 +08:00
minggo	6aedc258b4	fixed #838: tests and HelloLua support x86	2011-11-23 15:51:30 +08:00
minggo	8b20639d75	issue #838: HelloWorld support x86	2011-11-23 11:02:18 +08:00
minggo	bc60ed7856	issue #854: optimize CCTextureCache::addImageAsync()	2011-11-22 16:47:24 +08:00
minggo	efa9275d7f	save the codes for testing	2011-11-21 12:04:21 +08:00
minggo	d48da20b0f	synchrolize to master	2011-11-18 18:53:53 +08:00
U-zhangxm-PC\zhangxm	d84b6c25be	issue #223: merge bada branch and fix some error	2011-11-18 18:45:05 +08:00
minggo	775c7ff847	Merge pull request #573 from minggo/iss854_pthread ... support pthread	2011-11-17 18:40:30 -08:00
minggo	0676714436	issue #854: add TextureCacheTest into makefile	2011-11-17 18:32:52 -08:00
minggo	522386a6b7	issue #854: pthread work ok on iOS	2011-11-18 09:55:47 +08:00
minggo	81b8fc0ce8	fixed #854: fix a bug of CCTextureCache	2011-11-17 14:34:41 +08:00
minggo	cb75465913	issue #854: add test case for CCTextureCache	2011-11-17 10:10:13 +08:00
minggo	dd8a2deeaf	fixed #758: fix the bug that TTF fonts cause low memory on android	2011-11-16 11:40:24 +08:00
dumganhar	0d6ea61b76	fixed some bug:1.setDeviceOrientation, chipmunkDemo glOrthof	2011-11-07 18:18:10 +08:00
dumganhar	e9a2818d0d	use wvga setting, add SYSTEM_SERVICE	2011-11-02 01:11:06 +08:00
dumganhar	012052b089	modify project configure	2011-10-25 14:32:26 +08:00
dumganhar	4b653c89d1	modify project configure	2011-10-25 14:12:42 +08:00
dumganhar	146d3e1536	modify project config	2011-10-24 14:22:09 +08:00
dumganhar	2c87e5e17e	use default manifest.xml	2011-10-24 11:01:39 +08:00
dumganhar	3aef823bd5	rename sdk1.2 to sdk1.0	2011-10-24 11:00:11 +08:00
dumganhar	59a14973ef	change splash and icon to cocos2d	2011-10-24 10:54:08 +08:00
dumganhar	eb901be664	project config change	2011-10-21 09:49:57 +08:00
dumganhar	da794c1613	Merge branch 'master' into bada	2011-10-21 09:28:29 +08:00
dumganhar	fdbb989ce5	make sdk1.2 to sdk1.0	2011-10-20 18:31:10 +08:00
Walzer	67bbbb2800	1. relative to bug #754, FontTest should use "fonts/abc.ttf" as external ttf name ... 2. fixed a tiny bug, FontTest can show font name on the top correctly	2011-10-20 14:56:39 +08:00
Walzer	707e22a2c8	fixed bug #754, particle test crashes on ios 4.3.3 & 5.0. Adding "fonts' into Resoures as "group" instead of "folder" cause this bug, but it can work on 4.3 and lower version.	2011-10-19 22:20:13 +08:00
Walzer	e3c39fe835	fixed #753, visual orientation is wrong on ios5 simulator	2011-10-19 21:43:25 +08:00
minggo	8aa014d3cd	Merge pull request #558 from minggo/iss755 ... fixed #743	2011-10-19 05:05:23 -07:00
minggo	2490388f28	remove unneeded packages	2011-10-19 20:03:18 +08:00
minggo	68d03de677	fixed #743: let nativeInit() get correct screensize when running on device with software android buttons	2011-10-19 19:55:23 +08:00
minggo	7e8e7c7e87	Merge pull request #557 from minggo/iss755 ... fixed #755	2011-10-19 02:03:19 -07:00
minggo	2d3bfd4a1a	fixed #755: get x y coordinate from existing array to avoid crashing on sunsumg devices	2011-10-19 17:01:35 +08:00
minggo	e9c133351d	Merge pull request #554 from minggo/master ... make script more strongable	2011-10-18 23:27:56 -07:00
minggo	cc1c29c0ca	Merge branch 'master' of https://github.com/minggo/cocos2d-x	2011-10-18 23:21:53 -07:00
minggo	3a17163897	make script more strongable	2011-10-18 23:21:39 -07:00
Walzer	ae411f9503	fix some warnings detected by xcode4.2, fix a stupid typo in RayCasts.h	2011-10-18 17:41:19 +08:00
dumganhar	3c4c4e515a	modify project settings	2011-10-18 11:11:09 +08:00
minggo	43d64360cf	Merge branch 'master' of https://github.com/minggo/cocos2d-x	2011-10-17 14:22:53 +08:00
minggo	1ccfcc1e94	change effect file	2011-10-17 14:22:10 +08:00
minggo	9a834585bb	modify the path to relative path in project setting	2011-10-16 20:53:48 -07:00
minggo	80cd3266df	make HelloWorld and tests work ok on linux with eclipse	2011-10-16 02:21:17 -07:00
dumganhar	ee53c29e5c	switch to 2.0 WVGA	2011-10-16 13:23:48 +08:00
minggo	a56145d613	change include path of HelloWorld vs2010 configuration, add CurrentLanguageTest into tests of vs2010 configuration	2011-10-16 12:00:44 +08:00
minggo	be1f4e3042	fixed #749: fix the crash of SpriteNilTexture, a test case of SpriteTest.	2011-10-11 15:36:18 +08:00
dumganhar	f8617bc372	update project	2011-10-10 14:33:29 +08:00
dumganhar	6a878daa89	change params of glOrthof	2011-10-10 14:33:18 +08:00
dumganhar	eb9cb31ca4	use shared lib for cocos2dx project	2011-10-09 18:15:31 +08:00
dumganhar	2f00b8ff1c	update to sdk2.0.2	2011-10-09 01:11:33 +08:00
dumganhar	fdea17b4f9	don't use DeviceOrientation, save orientation before running DirectorTest	2011-10-08 18:17:01 +08:00
dumganhar	f97de356e7	add release version	2011-10-08 11:47:32 +08:00
dumganhar	beaa489406	add scale support	2011-09-30 17:19:16 +08:00
dumganhar	78a06652e3	modify cocosDenshionTest resouce path	2011-09-30 09:43:23 +08:00
dumganhar	a7b8610c62	delete gbk_uni_tb.dat	2011-09-30 09:39:45 +08:00
dumganhar	9ff00c7c83	use utf-8 for displaying chinese ... remove Gbk_Unicode.c Gbk_Unicode.h	2011-09-29 17:29:38 +08:00
dumganhar	db4d51496e	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into bada ... Conflicts: cocos2dx/platform/CCAccelerometer_platform.h cocos2dx/platform/CCApplication_platform.h cocos2dx/platform/CCArchOptimalParticleSystem.h cocos2dx/platform/CCEGLView_platform.h cocos2dx/platform/CCPlatformConfig.h cocos2dx/platform/CCSAXParser.h cocos2dx/platform/CCStdC.h tests/AppDelegate.cpp tests/tests/Box2DTestBed/Tests/EdgeShapes.h	2011-09-29 16:03:37 +08:00
dumganhar	bd2266fe4c	use timer as gameloop, can change FPS by using setAnimationInterval ... modify some project setting	2011-09-29 15:52:16 +08:00
dumganhar	c681889e05	add test.bada 1.2 project	2011-09-29 10:25:24 +08:00
dumganhar	cda492593c	modify gameloop method ... modify some project setting	2011-09-29 02:32:01 +08:00
dumganhar	de545096de	modify bada project setting	2011-09-28 18:21:17 +08:00
minggo	8c63344c16	merge cocos2d-x master	2011-09-28 15:32:30 +08:00
minggo	3912be7f9d	not get value of ok button from xml file	2011-09-28 15:27:31 +08:00
minggo	446bd86fce	make HelloWorld and tests runs ok on linux	2011-09-27 22:56:06 -07:00
minggo	4b02dc3e45	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-09-27 20:37:58 -07:00
minggo	4ad422defd	make tests run ok on linux android	2011-09-27 20:36:21 -07:00
dumganhar	7cc86e741d	delete old cocosDenshion and tests project	2011-09-28 09:47:58 +08:00
dumganhar	d31859d8d3	add test.bada/sdk2.0	2011-09-28 09:41:58 +08:00
dumganhar	9f97e9473d	add lib folder for Target-Release	2011-09-28 09:40:16 +08:00
dumganhar	223e32f17c	add lib folder for Target-Debug and Target-Release	2011-09-28 09:39:46 +08:00
dumganhar	260c2fc920	move old 1.2 project to sdk1.2 folder ... add sdk2.0 project	2011-09-28 09:36:18 +08:00
minggo	7b423eb708	remove unneened link	2011-09-27 17:51:13 +08:00
dumganhar	f0f780a84f	add empty lib folder for test project	2011-09-27 17:32:51 +08:00
minggo	d4283b1f11	Merge branch 'linux_port'	2011-09-27 17:01:51 +08:00
minggo	6e08502e9d	fixed #736: remove android:installLocation in AndroidManifest.xml	2011-09-27 16:56:45 +08:00
minggo	13e17ab80e	make tests build ok on linux android	2011-09-27 01:51:29 -07:00
minggo	c7f75fc570	make box2d build ok on linux	2011-09-26 23:30:40 -07:00
dumganhar	5a4ad2f11e	modify test project setting for bada	2011-09-26 17:52:32 +08:00
laschweinski	88905c4a16	add box2d and chipmunk eclipse project ... do the similar modification in project configuration in test.	2011-09-23 12:07:09 +08:00
dumganhar	eeb0956fb8	add linux makefiles	2011-09-20 14:38:12 +08:00
dumganhar	c93be8b828	modify <cstdio> to <stdio.h> ... delete old project files	2011-09-20 12:39:44 +08:00
dumganhar	8cb568f7fa	add some files for bada test project	2011-09-20 12:38:05 +08:00
dumganhar	cac08c8f1e	add tests project for bada	2011-09-20 10:29:07 +08:00
minggo	5ff9bd0c9e	remame BitMapTotalHeight to bitmapTotalHeight	2011-09-19 18:15:47 +08:00
dumganhar	c94adc58b9	changed bada projects directory, add bada macro	2011-09-19 17:53:45 +08:00
seanlin	6d8225b7bd	fixed #724, different results of CCLabelTTF on android & win32	2011-09-19 16:47:39 +08:00
dumganhar	3c795073e0	Merge branch 'master' into bada ... Conflicts: HelloWorld/iphone/HelloWorld.xcodeproj/project.pbxproj cocos2dx/CCamera.cpp cocos2dx/cocoa/NSData.cpp cocos2dx/label_nodes/CCBitmapFontAtlas.cpp cocos2dx/platform/CCFileUtils_platform.h cocos2dx/platform/CCXApplication_platform.h cocos2dx/platform/CCXCocos2dDefine_platform.h cocos2dx/platform/CCXEGLView_platform.h cocos2dx/platform/CCXMath.h cocos2dx/platform/CCXUIAccelerometer_platform.h cocos2dx/platform/CCXUIImage_platform.h cocos2dx/platform/ccxCommon_platform.h cocos2dx/platform/config_platform.h cocos2dx/platform/platform.h cocos2dx/support/base64.cpp cocos2dx/tileMap_parallax_nodes/CCTMXXMLParser.cpp tests/AppDelegate.cpp tests/test.iphone/test.iphone.xcodeproj/project.pbxproj	2011-09-19 13:42:08 +08:00
dumganhar	eadaba8930	modify CCRect::CCRectMake to CCRectMake in CCTMXLayer.cpp ... modify HelloWorld project setting, use relative path remove lib/linux/Debug/*.so and lib/linux/Release/*.so remove some temp files	2011-09-19 10:51:05 +08:00
minggo	c24d1d3fd6	Merge branch 'LinuxPort' of https://github.com/laschweinski/cocos2d-x into linux_port	2011-09-16 13:53:18 +08:00
laschweinski	a4bfa976b3	change the base resource path	2011-09-16 10:23:57 +08:00
laschweinski	b9ce266ee3	the same as the last one	2011-09-15 18:25:06 +08:00
minggo	ae403153c7	fixed #719: update java code to HelloLua & tests	2011-09-15 16:18:50 +08:00
minggo	194f47bc54	fixed #718: get button value from string.xml & add copyright for java codes	2011-09-15 14:17:07 +08:00
Macarse	208bce312e	Replaced LinearLayout with FrameLayout	2011-09-13 20:25:07 -03:00
Macarse	afd1a7a6d9	External storage	2011-09-13 05:42:34 -03:00
RongHong	53227073a7	fixed #696 to modify some end() usilization	2011-09-06 11:43:09 +08:00
laschweinski	91f8ed7eb4	CCParticleSystemPoint now derive from CCParticleSystemQuade in linux	2011-09-05 11:57:10 +08:00
laschweinski	1fc09448a4	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into LinuxPort ... Conflicts: cocos2dx/actions/CCActionInstant.cpp cocos2dx/include/CCActionInstant.h	2011-09-04 14:38:53 +08:00
liswei	ab2a6cb2bb	fixed #702 tests crashs at the start on wophone device	2011-08-30 15:59:06 +08:00
laschweinski	b0660dd578	update eclipse project file	2011-08-29 10:28:00 +08:00
laschweinski	f86cba983f	test debug and release	2011-08-28 17:09:40 +08:00
laschweinski	1ac3fdebca	deleted: Box2D/Box2DConfig.cmake ... deleted: Box2D/CMakeLists.txt new file: CocosDenshion/.cproject new file: CocosDenshion/.project deleted: HelloCocos2dx/AndroidDebug/Classes/AppDelegate.d deleted: HelloCocos2dx/AndroidDebug/Classes/AppDelegate.o deleted: HelloCocos2dx/AndroidDebug/Classes/HelloWorldScene.d deleted: HelloCocos2dx/AndroidDebug/Classes/HelloWorldScene.o deleted: HelloCocos2dx/AndroidDebug/Classes/subdir.mk deleted: HelloCocos2dx/AndroidDebug/android/jni/helloworld/main.d deleted: HelloCocos2dx/AndroidDebug/android/jni/helloworld/main.o deleted: HelloCocos2dx/AndroidDebug/android/jni/helloworld/subdir.mk deleted: HelloCocos2dx/AndroidDebug/libHelloCocos2dx.so deleted: HelloCocos2dx/AndroidDebug/makefile deleted: HelloCocos2dx/AndroidDebug/objects.mk deleted: HelloCocos2dx/AndroidDebug/sources.mk deleted: HelloCocos2dx/AndroidRelease/Classes/AppDelegate.d deleted: HelloCocos2dx/AndroidRelease/Classes/AppDelegate.o deleted: HelloCocos2dx/AndroidRelease/Classes/HelloWorldScene.d deleted: HelloCocos2dx/AndroidRelease/Classes/HelloWorldScene.o deleted: HelloCocos2dx/AndroidRelease/Classes/subdir.mk deleted: HelloCocos2dx/AndroidRelease/android/jni/helloworld/main.d deleted: HelloCocos2dx/AndroidRelease/android/jni/helloworld/main.o deleted: HelloCocos2dx/AndroidRelease/android/jni/helloworld/subdir.mk deleted: HelloCocos2dx/AndroidRelease/libHelloCocos2dx.so deleted: HelloCocos2dx/AndroidRelease/makefile deleted: HelloCocos2dx/AndroidRelease/objects.mk deleted: HelloCocos2dx/AndroidRelease/sources.mk deleted: HelloCocos2dx/Classes/AppDelegate.cpp deleted: HelloCocos2dx/Classes/AppDelegate.h deleted: HelloCocos2dx/Classes/HelloWorldScene.cpp deleted: HelloCocos2dx/Classes/HelloWorldScene.h deleted: HelloCocos2dx/Linux/main.cpp deleted: HelloCocos2dx/Linux/main.h deleted: HelloCocos2dx/Resource/CloseNormal.png deleted: HelloCocos2dx/Resource/CloseSelected.png deleted: HelloCocos2dx/Resource/HelloWorld.png deleted: HelloCocos2dx/Resource/Icon.png deleted: HelloCocos2dx/Resource/app.config.txt deleted: HelloCocos2dx/android/AndroidManifest.xml deleted: HelloCocos2dx/android/build.properties deleted: HelloCocos2dx/android/build.xml deleted: HelloCocos2dx/android/build_native.sh deleted: HelloCocos2dx/android/default.properties deleted: HelloCocos2dx/android/gen/org/cocos2dx/application/R.java deleted: HelloCocos2dx/android/jni/helloworld/main.cpp deleted: HelloCocos2dx/android/local.properties deleted: HelloCocos2dx/android/proguard.cfg deleted: HelloCocos2dx/android/res/drawable-hdpi/icon.png deleted: HelloCocos2dx/android/res/drawable-ldpi/icon.png deleted: HelloCocos2dx/android/res/drawable-mdpi/icon.png deleted: HelloCocos2dx/android/res/layout/game_demo.xml deleted: HelloCocos2dx/android/res/layout/helloworld_demo.xml deleted: HelloCocos2dx/android/res/values/strings.xml deleted: HelloCocos2dx/android/src/org/cocos2dx/application/ApplicationDemo.java deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxAccelerometer.java deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxActivity.java deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxBitmap.java deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxMusic.java deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxRenderer.java deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxSound.java modified: HelloWorld/Classes/AppDelegate.cpp deleted: HelloWorld/Linux/CloseNormal.png deleted: HelloWorld/Linux/CloseSelected.png deleted: HelloWorld/Linux/HelloWorld.png deleted: HelloWorld/Linux/Icon.png deleted: HelloWorld/Linux/Materhorn.ttf deleted: HelloWorld/Linux/app.config.txt deleted: HelloWorld/Linux/cocos2dx-hello deleted: HelloWorld/Linux/libcocos2dx.so modified: cocos2dx/.cproject modified: lib/linux/Debug/libcocos2d.so modified: lib/linux/Release/libcocos2d.so modified: template/android/mycopy_files.sh new file: tests/test.linux/.cproject new file: tests/test.linux/.project modified: tests/tests/ChipmunkTest/cocos2dChipmunkDemo.cpp modified: tests/tests/controller.cpp modified: tests/tests/tests.h	2011-08-28 14:33:04 +08:00
laschweinski	606c8803bc	modified: CocosDenshion/Linux/FmodAudioPlayer.cpp ... modified: CocosDenshion/Linux/FmodAudioPlayer.h deleted: HelloWorld/AppDelegate.cpp deleted: HelloWorld/AppDelegate.h deleted: HelloWorld/HelloWorldScene.cpp deleted: HelloWorld/HelloWorldScene.h modified: cocos2dx/.cproject modified: cocos2dx/actions/CCActionInstant.cpp modified: cocos2dx/include/CCActionInstant.h modified: lib/android/Debug/libcocos2d.so modified: lib/android/Release/libcocos2d.so modified: lib/linux/Debug/libcocos2d.so modified: lib/linux/Debug/libcocosdenshion.so modified: lib/linux/Release/libcocos2d.so modified: lib/linux/Release/libcocosdenshion.so HelloWorld/AndroidDebug/ HelloWorld/AndroidRelease/ HelloWorld/Classes/ HelloWorld/android/assets HelloWorld/postCompiled.sh cocos2dx/platform/third_party/linux/ installLinuxLib.sh tests/Res/gui_close.WAV	2011-08-25 19:04:29 +08:00
root	11679d9723	Merge branch 'master' into LinuxPort	2011-08-23 11:49:46 +08:00
root	d57d9ca6f6	modified: cocos2dx/.cproject ... modified: cocos2dx/CCConfiguration.cpp modified: cocos2dx/CCConfiguration.h modified: cocos2dx/actions/CCActionGrid3D.cpp modified: cocos2dx/platform/Linux/CCAplication_linux.cpp modified: cocos2dx/platform/Linux/CCAplication_linux.h modified: cocos2dx/platform/Linux/CCImage_Linux.cpp modified: mycreate-android-project.sh new file: post.sh modified: template/android/mycopy_files.sh modified: tests/AppDelegate.cpp new file: tests/test.linux/Res deleted: tests/test.linux/Res/Hello.png deleted: tests/test.linux/Res/Images/BoilingFoam.plist deleted: tests/test.linux/Res/Images/BurstPipe.plist deleted: tests/test.linux/Res/Images/Comet.plist deleted: tests/test.linux/Res/Images/Comet.png deleted: tests/test.linux/Res/Images/ExplodingRing.plist deleted: tests/test.linux/Res/Images/Flower.plist deleted: tests/test.linux/Res/Images/Fog.png deleted: tests/test.linux/Res/Images/Galaxy.plist deleted: tests/test.linux/Res/Images/HelloWorld.png deleted: tests/test.linux/Res/Images/Icon.png deleted: tests/test.linux/Res/Images/LavaFlow.plist deleted: tests/test.linux/Res/Images/Pea.png deleted: tests/test.linux/Res/Images/Phoenix.plist deleted: tests/test.linux/Res/Images/PlanetCute-1024x1024.png deleted: tests/test.linux/Res/Images/SendScoreButton.png deleted: tests/test.linux/Res/Images/SendScoreButtonPressed.png deleted: tests/test.linux/Res/Images/SpinningPeas.plist deleted: tests/test.linux/Res/Images/SpinningPeas.png deleted: tests/test.linux/Res/Images/Spiral.plist deleted: tests/test.linux/Res/Images/SpookyPeas.plist deleted: tests/test.linux/Res/Images/SpookyPeas.png deleted: tests/test.linux/Res/Images/Upsidedown.plist deleted: tests/test.linux/Res/Images/atlastest.png deleted: tests/test.linux/Res/Images/b1-hd.png deleted: tests/test.linux/Res/Images/b1.png deleted: tests/test.linux/Res/Images/b2-hd.png deleted: tests/test.linux/Res/Images/b2.png deleted: tests/test.linux/Res/Images/background.png deleted: tests/test.linux/Res/Images/background1-hd.png deleted: tests/test.linux/Res/Images/background1.png deleted: tests/test.linux/Res/Images/background2-hd.png deleted: tests/test.linux/Res/Images/background2.png deleted: tests/test.linux/Res/Images/background3-hd.png deleted: tests/test.linux/Res/Images/background3.png deleted: tests/test.linux/Res/Images/ball-hd.png deleted: tests/test.linux/Res/Images/ball.png deleted: tests/test.linux/Res/Images/bitmapFontTest3.fnt deleted: tests/test.linux/Res/Images/bitmapFontTest3.png deleted: tests/test.linux/Res/Images/blocks-hd.png deleted: tests/test.linux/Res/Images/blocks.png deleted: tests/test.linux/Res/Images/btn-about-normal.png deleted: tests/test.linux/Res/Images/btn-about-selected.png deleted: tests/test.linux/Res/Images/btn-highscores-normal.png deleted: tests/test.linux/Res/Images/btn-highscores-selected.png deleted: tests/test.linux/Res/Images/btn-play-normal.png deleted: tests/test.linux/Res/Images/btn-play-selected.png deleted: tests/test.linux/Res/Images/bugs/RetinaDisplay.jpg deleted: tests/test.linux/Res/Images/bugs/bug886.jpg deleted: tests/test.linux/Res/Images/bugs/bug886.png deleted: tests/test.linux/Res/Images/bugs/circle-hd.plist deleted: tests/test.linux/Res/Images/bugs/circle-hd.png deleted: tests/test.linux/Res/Images/bugs/circle.plist deleted: tests/test.linux/Res/Images/bugs/circle.png deleted: tests/test.linux/Res/Images/bugs/corner.png deleted: tests/test.linux/Res/Images/bugs/edge.png deleted: tests/test.linux/Res/Images/bugs/fill.png deleted: tests/test.linux/Res/Images/bugs/picture-hd.png deleted: tests/test.linux/Res/Images/bugs/picture.png deleted: tests/test.linux/Res/Images/close-hd.png deleted: tests/test.linux/Res/Images/close.png deleted: tests/test.linux/Res/Images/debian.plist deleted: tests/test.linux/Res/Images/f1-hd.png deleted: tests/test.linux/Res/Images/f1.png deleted: tests/test.linux/Res/Images/f2-hd.png deleted: tests/test.linux/Res/Images/f2.png deleted: tests/test.linux/Res/Images/fire-grayscale.png deleted: tests/test.linux/Res/Images/fire.png deleted: tests/test.linux/Res/Images/fps_images.png deleted: tests/test.linux/Res/Images/grossini-hd.png deleted: tests/test.linux/Res/Images/grossini.png deleted: tests/test.linux/Res/Images/grossini_128x256_mipmap.pvr deleted: tests/test.linux/Res/Images/grossini_dance_01.png deleted: tests/test.linux/Res/Images/grossini_dance_02.png deleted: tests/test.linux/Res/Images/grossini_dance_03.png deleted: tests/test.linux/Res/Images/grossini_dance_04.png deleted: tests/test.linux/Res/Images/grossini_dance_05.png deleted: tests/test.linux/Res/Images/grossini_dance_06.png deleted: tests/test.linux/Res/Images/grossini_dance_07.png deleted: tests/test.linux/Res/Images/grossini_dance_08.png deleted: tests/test.linux/Res/Images/grossini_dance_09.png deleted: tests/test.linux/Res/Images/grossini_dance_10.png deleted: tests/test.linux/Res/Images/grossini_dance_11.png deleted: tests/test.linux/Res/Images/grossini_dance_12.png deleted: tests/test.linux/Res/Images/grossini_dance_13.png deleted: tests/test.linux/Res/Images/grossini_dance_14.png deleted: tests/test.linux/Res/Images/grossini_dance_atlas-hd.png deleted: tests/test.linux/Res/Images/grossini_dance_atlas-mono.png deleted: tests/test.linux/Res/Images/grossini_dance_atlas.png deleted: tests/test.linux/Res/Images/grossini_dance_atlas_nomipmap.png deleted: tests/test.linux/Res/Images/grossini_pvr_rgba4444.pvr deleted: tests/test.linux/Res/Images/grossini_pvr_rgba8888.pvr deleted: tests/test.linux/Res/Images/grossinis_sister1-hd.png deleted: tests/test.linux/Res/Images/grossinis_sister1-testalpha.png deleted: tests/test.linux/Res/Images/grossinis_sister1-testalpha.ppng deleted: tests/test.linux/Res/Images/grossinis_sister1.png deleted: tests/test.linux/Res/Images/grossinis_sister2-hd.png deleted: tests/test.linux/Res/Images/grossinis_sister2.png deleted: tests/test.linux/Res/Images/landscape-1024x1024.png deleted: tests/test.linux/Res/Images/logo-mipmap.pvr deleted: tests/test.linux/Res/Images/logo-nomipmap.pvr deleted: tests/test.linux/Res/Images/menuitemsprite.png deleted: tests/test.linux/Res/Images/paddle-hd.png deleted: tests/test.linux/Res/Images/paddle.png deleted: tests/test.linux/Res/Images/particles-hd.png deleted: tests/test.linux/Res/Images/particles.png deleted: tests/test.linux/Res/Images/pattern1.png deleted: tests/test.linux/Res/Images/piece.png deleted: tests/test.linux/Res/Images/powered.png deleted: tests/test.linux/Res/Images/r1-hd.png deleted: tests/test.linux/Res/Images/r1.png deleted: tests/test.linux/Res/Images/r2-hd.png deleted: tests/test.linux/Res/Images/r2.png deleted: tests/test.linux/Res/Images/snow.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-0.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-1.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-2.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-3.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-4.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-5.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-6.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-7.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-0.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-1.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-2.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-3.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-4.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-5.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-6.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-7.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-0.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-1.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-2.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-3.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-4.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-5.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-6.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-7.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-0.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-1.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-2.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-3.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-4.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-5.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-6.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-7.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-0.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-1.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-2.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-3.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-4.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-5.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-6.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-7.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-0.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-1.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-2.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-3.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-4.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-5.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-6.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-7.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-0.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-1.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-2.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-3.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-4.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-5.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-6.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-7.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-0.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-1.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-2.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-3.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-4.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-5.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-6.png deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-7.png deleted: tests/test.linux/Res/Images/spritesheet1.png deleted: tests/test.linux/Res/Images/stars-grayscale.png deleted: tests/test.linux/Res/Images/stars.png deleted: tests/test.linux/Res/Images/stars2-grayscale.png deleted: tests/test.linux/Res/Images/stars2.png deleted: tests/test.linux/Res/Images/streak.png deleted: tests/test.linux/Res/Images/test-rgba1.png deleted: tests/test.linux/Res/Images/test_blend.png deleted: tests/test.linux/Res/Images/test_image-bad_encoding.pvr deleted: tests/test.linux/Res/Images/test_image.jpeg deleted: tests/test.linux/Res/Images/test_image.png deleted: tests/test.linux/Res/Images/test_image.pvr deleted: tests/test.linux/Res/Images/test_image.pvrraw deleted: tests/test.linux/Res/Images/test_image_a8.pvr deleted: tests/test.linux/Res/Images/test_image_ai88.pvr deleted: tests/test.linux/Res/Images/test_image_bgra8888.pvr deleted: tests/test.linux/Res/Images/test_image_i8.pvr deleted: tests/test.linux/Res/Images/test_image_pvrtc2bpp.pvr deleted: tests/test.linux/Res/Images/test_image_pvrtc4bpp.pvr deleted: tests/test.linux/Res/Images/test_image_rgb565.pvr deleted: tests/test.linux/Res/Images/test_image_rgba4444.pvr deleted: tests/test.linux/Res/Images/test_image_rgba4444.pvr.ccz deleted: tests/test.linux/Res/Images/test_image_rgba4444.pvr.gz deleted: tests/test.linux/Res/Images/test_image_rgba4444_mipmap.pvr deleted: tests/test.linux/Res/Images/test_image_rgba5551.pvr deleted: tests/test.linux/Res/Images/test_image_rgba8888.pvr deleted: tests/test.linux/Res/Images/texture1024x1024.png deleted: tests/test.linux/Res/Images/texture2048x2048.png deleted: tests/test.linux/Res/Images/texture512x512.png deleted: tests/test.linux/Res/TileMaps/fixed-ortho-test2.png deleted: tests/test.linux/Res/TileMaps/hexa-test.tmx deleted: tests/test.linux/Res/TileMaps/hexa-tiles.png deleted: tests/test.linux/Res/TileMaps/iso-test-bug787.tmx deleted: tests/test.linux/Res/TileMaps/iso-test-movelayer.tmx deleted: tests/test.linux/Res/TileMaps/iso-test-objectgroup.tmx deleted: tests/test.linux/Res/TileMaps/iso-test-vertexz.tmx deleted: tests/test.linux/Res/TileMaps/iso-test-zorder.tmx deleted: tests/test.linux/Res/TileMaps/iso-test.png deleted: tests/test.linux/Res/TileMaps/iso-test.tmx deleted: tests/test.linux/Res/TileMaps/iso-test1.tmx deleted: tests/test.linux/Res/TileMaps/iso-test2-uncompressed.tmx deleted: tests/test.linux/Res/TileMaps/iso-test2.png deleted: tests/test.linux/Res/TileMaps/iso-test2.tmx deleted: tests/test.linux/Res/TileMaps/iso.png deleted: tests/test.linux/Res/TileMaps/levelmap.tga deleted: tests/test.linux/Res/TileMaps/ortho-objects.tmx deleted: tests/test.linux/Res/TileMaps/ortho-test1.png deleted: tests/test.linux/Res/TileMaps/ortho-test1_bw.png deleted: tests/test.linux/Res/TileMaps/ortho-test2.png deleted: tests/test.linux/Res/TileMaps/orthogonal-test-movelayer.tmx deleted: tests/test.linux/Res/TileMaps/orthogonal-test-vertexz.tmx deleted: tests/test.linux/Res/TileMaps/orthogonal-test-zorder.tmx deleted: tests/test.linux/Res/TileMaps/orthogonal-test1.tmx deleted: tests/test.linux/Res/TileMaps/orthogonal-test1.tsx deleted: tests/test.linux/Res/TileMaps/orthogonal-test2.tmx deleted: tests/test.linux/Res/TileMaps/orthogonal-test3.tmx deleted: tests/test.linux/Res/TileMaps/orthogonal-test4-hd.tmx deleted: tests/test.linux/Res/TileMaps/orthogonal-test4.tmx deleted: tests/test.linux/Res/TileMaps/orthogonal-test5.tmx deleted: tests/test.linux/Res/TileMaps/orthogonal-test6-hd.tmx deleted: tests/test.linux/Res/TileMaps/orthogonal-test6.tmx deleted: tests/test.linux/Res/TileMaps/test-object-layer.tmx deleted: tests/test.linux/Res/TileMaps/tiles-hd.png deleted: tests/test.linux/Res/TileMaps/tiles.png deleted: tests/test.linux/Res/TileMaps/tmw_desert_spacing-hd.png deleted: tests/test.linux/Res/TileMaps/tmw_desert_spacing.png deleted: tests/test.linux/Res/animations/dragon_animation-hd.png deleted: tests/test.linux/Res/animations/dragon_animation.png deleted: tests/test.linux/Res/animations/ghosts.plist deleted: tests/test.linux/Res/animations/ghosts.png deleted: tests/test.linux/Res/animations/grossini-aliases.plist deleted: tests/test.linux/Res/animations/grossini-aliases.png deleted: tests/test.linux/Res/animations/grossini.plist deleted: tests/test.linux/Res/animations/grossini.plist.xml deleted: tests/test.linux/Res/animations/grossini.png deleted: tests/test.linux/Res/animations/grossini.ztp deleted: tests/test.linux/Res/animations/grossini_blue.plist deleted: tests/test.linux/Res/animations/grossini_blue.png deleted: tests/test.linux/Res/animations/grossini_family.plist deleted: tests/test.linux/Res/animations/grossini_family.png deleted: tests/test.linux/Res/animations/grossini_gray.plist deleted: tests/test.linux/Res/animations/grossini_gray.png deleted: tests/test.linux/Res/app.config.txt deleted: tests/test.linux/Res/background.mp3 deleted: tests/test.linux/Res/effect1.wav deleted: tests/test.linux/Res/effect2.ogg deleted: tests/test.linux/Res/fonts/A Damn Mess.ttf deleted: tests/test.linux/Res/fonts/Abberancy.ttf deleted: tests/test.linux/Res/fonts/Abduction.ttf deleted: tests/test.linux/Res/fonts/Paint Boy.ttf deleted: tests/test.linux/Res/fonts/Schwarzwald Regular.ttf deleted: tests/test.linux/Res/fonts/Scissor Cuts.ttf deleted: tests/test.linux/Res/fonts/arial16.fnt deleted: tests/test.linux/Res/fonts/arial16.png deleted: tests/test.linux/Res/fonts/bitmapFontTest.fnt deleted: tests/test.linux/Res/fonts/bitmapFontTest.png deleted: tests/test.linux/Res/fonts/bitmapFontTest2.fnt deleted: tests/test.linux/Res/fonts/bitmapFontTest2.png deleted: tests/test.linux/Res/fonts/bitmapFontTest3.fnt deleted: tests/test.linux/Res/fonts/bitmapFontTest3.png deleted: tests/test.linux/Res/fonts/bitmapFontTest4.fnt deleted: tests/test.linux/Res/fonts/bitmapFontTest4.png deleted: tests/test.linux/Res/fonts/bitmapFontTest5.fnt deleted: tests/test.linux/Res/fonts/bitmapFontTest5.png deleted: tests/test.linux/Res/fonts/fps_images-hd.png deleted: tests/test.linux/Res/fonts/fps_images.png deleted: tests/test.linux/Res/fonts/futura-48.fnt deleted: tests/test.linux/Res/fonts/futura-48.png deleted: tests/test.linux/Res/fonts/konqa32-hd.fnt deleted: tests/test.linux/Res/fonts/konqa32-hd.png deleted: tests/test.linux/Res/fonts/konqa32.fnt deleted: tests/test.linux/Res/fonts/konqa32.png deleted: tests/test.linux/Res/fonts/larabie-16-hd.png deleted: tests/test.linux/Res/fonts/larabie-16.png deleted: tests/test.linux/Res/fonts/tuffy_bold_italic-charmap-hd.png deleted: tests/test.linux/Res/fonts/tuffy_bold_italic-charmap.png deleted: tests/test.linux/Res/music.mid deleted: tests/test.linux/Res/zwoptex/grossini-generic.plist deleted: tests/test.linux/Res/zwoptex/grossini-generic.png deleted: tests/test.linux/Res/zwoptex/grossini.plist deleted: tests/test.linux/Res/zwoptex/grossini.png CocosDenshion/AndroidDebug/ CocosDenshion/AndroidRelease/ HelloCocos2dx/AndroidDebug/2 HelloCocos2dx/android/assets HelloCocos2dx/postCompiled.sh installLinuxLib.sh	2011-08-23 11:28:04 +08:00
minggo	ae21fcaf48	[android] fixed #670: pause & resume effect when app enter background & foreground	2011-08-22 16:58:54 +08:00
laschweinski	ff5222fff8	some files missiong(eclipse with git is too hard to play)	2011-08-21 19:00:26 +08:00
laschweinski	abc856ac6d	add box2d test	2011-08-19 15:37:57 +08:00
laschweinski	60e794fcc8	add files include test and cocosDenshion	2011-08-19 14:43:19 +08:00
minggo	0a9f6c1f09	Merge pull request #478 from minggo/iss684 ... add test for displaying current language	2011-08-18 23:19:00 -07:00
laschweinski	871abb4a32	Merge branch 'master' into LinuxPort	2011-08-19 13:20:23 +08:00
laschweinski	ad305648c0	modified: cocos2dx/misc_nodes/CCRenderTexture.cpp ... modified: cocos2dx/platform/CCGL.h modified: cocos2dx/platform/CCImage.cpp CocosDenshion/Linux/ CocosDenshion/third_party/ HelloWorld/Linux/ cocos2dx/.settings/ cocos2dx/platform/Linux/ tests/test.linux/	2011-08-19 13:07:50 +08:00
minggo	11e9acb7c8	fixed #684: add test for displaying current language	2011-08-19 11:32:30 +08:00
minggo	733e582d12	fixed #684: add test for displaying current language	2011-08-19 11:26:14 +08:00
laschweinski	e3ea2bd136	modified: tests/tests/CocosDenshionTest/CocosDenshionTest.cpp ... modified: tests/tests/controller.cpp modified: tests/tests/tests.h CocosDenshion/Linux/ CocosDenshion/third_party/ HelloWorld/Linux/ cocos2dx/.settings/ cocos2dx/platform/Linux/ tests/test.linux/	2011-08-18 22:11:19 +08:00
minggo	edb8b4639d	fixed #685: add label test for displaying Chinese characters	2011-08-18 18:40:24 +08:00
minggo	ab781654d7	all tests works ok on vs2010 & fix a bug that HelloLua may crashed on win32 when it eixt	2011-08-17 18:24:36 +08:00
laschweinski	dbf3a94200	modified: HelloWorld/HelloWorldScene.cpp ... modified: tests/AppDelegate.cpp HelloWorld/Linux/ cocos2dx/.settings/ cocos2dx/platform/Linux/ tests/test.linux/	2011-08-17 18:09:51 +08:00
laschweinski	5d20ebe24b	modified: HelloWorld/AppDelegate.cpp ... modified: HelloWorld/HelloWorldScene.cpp modified: cocos2dx/cocoa/CCNS.cpp modified: cocos2dx/include/CCActionInstant.h modified: cocos2dx/misc_nodes/CCRenderTexture.cpp modified: cocos2dx/particle_nodes/CCParticleSystemQuad.cpp modified: cocos2dx/platform/CCAccelerometer_platform.h modified: cocos2dx/platform/CCApplication_platform.h modified: cocos2dx/platform/CCArchOptimalParticleSystem.h modified: cocos2dx/platform/CCCommon.cpp modified: cocos2dx/platform/CCEGLView_platform.h modified: cocos2dx/platform/CCGL.cpp modified: cocos2dx/platform/CCGL.h modified: cocos2dx/platform/CCImage.cpp modified: cocos2dx/platform/CCPlatformConfig.h modified: cocos2dx/platform/CCPlatformMacros.h modified: cocos2dx/platform/CCSAXParser.h modified: cocos2dx/platform/CCStdC.h modified: cocos2dx/support/CCUserDefault.cpp modified: cocos2dx/support/data_support/ccCArray.h modified: tests/AppDelegate.cpp deleted: tests/Res/music.mid modified: tests/tests/controller.cpp modified: tests/tests/tests.h HelloWorld/Linux/ cocos2dx/.settings/ cocos2dx/platform/Linux/ tests/test.linux/	2011-08-17 11:36:54 +08:00
Walzer	0881668cc2	fixed #661. Thanks to GMTDev's previous resolvtion. And I fix the compilation error in the his patch: add float m_fContentScaleFactor declaration into CCTMXLayer.h, fix tile->setPositionIn to tile->setPosition. I just run TiledMapTest in retina mode, it works well	2011-08-15 12:10:11 +08:00
minggo	9a884ffda6	[iOS] fixed #668: CCLabelBMFont looks ok in retina mode	2011-08-10 15:07:34 +08:00
minggo	d386116255	[iOS]fixed #667: call AppDelegate::applicationDidEnterBackground() & AppDeleaget::applicationWillEnterForeground() when application enter background & enter foreground	2011-08-10 10:24:06 +08:00
minggo	5e5151b41e	Merge pull request #459 from minggo/iss643 ... [android] swap axes according to the orientation	2011-08-09 00:55:34 -07:00
minggo	ada4c2af80	[android] fixed #643: swap axes according to the orientation	2011-08-09 15:50:42 +08:00
minggo	08797014e9	fix a bug that cause error when loading libtest.so on android	2011-08-09 13:56:09 +08:00
Walzer	945e5fde00	issue #633, add test case for play effect repeatly, force the volume of effect&bgm between 0.0~1.0 in SimpleAudioEngine.mm.	2011-08-08 21:40:33 +08:00
minggo	2b5635898a	fixed #665: add test of RenderTextureSave	2011-08-08 14:06:03 +08:00
minggo	7a0e8b4a0a	Merge pull request #457 from minggo/iss642 ... fixed #642: CCRenderTexture::saveBuffer() works ok on iOS	2011-08-07 20:08:16 -07:00
minggo	41ea2e98a1	fixed #642: CCRenderTexture::saveBuffer() works ok on iOS	2011-08-08 11:01:47 +08:00
RongHong	5f08bb24fe	Merge branch 'master' into 608	2011-08-05 10:59:40 +08:00
minggo	76da5f2e84	fixed #656: remove unneeded methods & android can let user set resource path	2011-08-04 17:19:58 +08:00
minggo	ee0c6e56d7	Merge pull request #447 from minggo/master ... [android] fixed #655: fix a bug that CCLabelTTF lost the last characters	2011-08-03 21:13:12 -07:00
minggo	7fc0dae3d9	[android] fixed #655: fix a bug that CCLabelTTF lost the last characters	2011-08-04 12:08:12 +08:00
liswei	897dd54b12	fixed #347 add ttf support in win32	2011-08-04 11:23:59 +08:00
minggo	90f403d8a2	Merge pull request #441 from liswei/issue347 ... issue #347 add ttf support in wophone	2011-08-02 03:16:06 -07:00
liswei	79cf8167dc	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into issue347	2011-08-02 18:04:23 +08:00
liswei	188b168d30	issue #347 add ttf support in wophone	2011-08-02 18:02:27 +08:00
minggo	906e6ba519	issue #645: fix a bug of animation test	2011-08-02 15:57:04 +08:00
minggo	09dc164fff	issue #645: update to v1.0.1	2011-08-02 15:45:27 +08:00
minggo	a3b4043755	issue #347: add tests for FontTest & it works ok on android	2011-07-29 15:57:27 +08:00
RongHong	c1fdf9afb5	issue #608 rendertexture disappears after going to background	2011-07-28 17:32:09 +08:00
minggo	648117ebb5	issue #347: android can use ttf file	2011-07-28 17:20:37 +08:00
RongHong	8afa3a9be1	fixed #619 CCFadeTo may crashed on android	2011-07-27 16:21:00 +08:00
minggo	657fe9a17d	[android] fixed #625: remove gz file in assets & use uncompressed pvr file instead	2011-07-27 11:51:19 +08:00
minggo	d446702f14	issue #633: revert CocosDenshionTest	2011-07-26 16:16:34 +08:00
minggo	1bb9e8139a	issue 33: iOS & Android support looping playing effect	2011-07-26 15:52:41 +08:00
minggo	b308effdc5	[android] fixed #631: Send \n to engine when user input nothing	2011-07-26 11:41:28 +08:00
minggo	13a1629299	fixed #624: insert white space in front of \n	2011-07-22 12:10:41 +08:00
minggo	eb2cf3afd0	[win32] add Texture2DTest to vs2010	2011-07-20 16:00:21 +08:00
natural-law	32e7ee6e2f	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-07-20 15:35:52 +08:00
natural-law	6a8b563feb	fixed #621, Add Texture2dTest in tests project.	2011-07-20 15:35:20 +08:00
minggo	0c495628ea	Merge pull request #405 from minggo/iss618 ... invoke java code(System.exit()) to finish programe	2011-07-19 02:20:36 -07:00
minggo	640d811809	[android] fixed #618: invoke java code(System.exit()) to finish programe	2011-07-19 16:01:22 +08:00
Walzer	bc44855091	issue #536, integrate the CCTexturePVR to project, update from 0.99.5 to 1.0.0, compile successfully on ios & android. Haven't test on other platforms yet.	2011-07-19 15:14:59 +08:00
minggo	dd42936bb3	[android] fixed #610: remove the support of ndk-r4	2011-07-14 10:37:40 +08:00
Walzer	679f4afe06	fixed #604. When I modify the sdk from "iphonesimulator4.1" to "Lastest iOS", the summary & info come out. How magic... It case waste me 4 hours!!!	2011-07-13 18:04:53 +08:00
minggo	1a25dd83a5	Merge pull request #398 from natural-law/master ... fixed #599	2011-07-13 01:35:41 -07:00
natural-law	8ad7236ca2	fixed #599, Resolve the wrong orientation when exit the TouchesTest.	2011-07-13 16:17:50 +08:00
Walzer	62b52b37be	Merge remote branch 'origin/master'	2011-07-13 16:13:20 +08:00
Walzer	1b1fd7446c	[maramalade] add new test cases (bugs, DirectorTests) into test.mkb. Both HelloWorld & Tests are tested on marmalade	2011-07-13 16:00:22 +08:00
minggo	692d8450c2	Merge pull request #397 from minggo/master ... fix a bug of orientation	2011-07-13 00:36:52 -07:00
minggo	a26fb13604	fix a bug of orientation	2011-07-13 15:32:03 +08:00
natural-law	9755ff59aa	When click the "BACK" button in test case Bug-899. The button "MainMenu" is not visible if the device support retina.	2011-07-13 14:37:06 +08:00
minggo	d5850224e4	[win32] modify configuration of vs2101 release version	2011-07-13 12:05:02 +08:00
minggo	fcb2006fdc	Merge pull request #392 from natural-law/master ... fixed #599	2011-07-12 03:10:27 -07:00
minggo	faa1c8ee16	Merge pull request #393 from minggo/master ... [win32] modify for vs2010	2011-07-12 03:09:44 -07:00
minggo	760ec3201e	[win32] modify for vs2010	2011-07-12 18:05:44 +08:00
natural-law	7b10874d5e	The menu of BugsTest position is wrong when exit one bug test.	2011-07-12 18:02:40 +08:00
natural-law	d4e575c4b2	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-07-12 17:47:24 +08:00
natural-law	e6bc8d7c98	fixed #599, Resolve the wrong orientation when exit the TouchesTest.	2011-07-12 17:46:57 +08:00
liswei	21ce679992	resolve the effect of PageTransitionForward&PageTransitionBackward ,via to add setDepthTest.	2011-07-12 17:35:15 +08:00
natural-law	e8ac968b3b	Add the resource files to the ios project which used by BugsTest. And clean a warning in TileMapTest.cpp.	2011-07-12 15:56:42 +08:00
natural-law	8b5282a0cf	fixed #603, The test case TMXGIDObjectsTest in TileMapTest not crash any more.	2011-07-12 14:21:29 +08:00
minggo	d48c3fdfb1	upgrade to 1.0.0-final 07-11	2011-07-12 11:20:41 +08:00
natural-law	58733417e0	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-07-11 15:17:24 +08:00
natural-law	fcbe0443be	Resolve a bug in ZipUtils.cpp. And modify the Makefile of tests on wophone.	2011-07-11 15:16:29 +08:00
minggo	21b1af5f1c	Merge pull request #377 from minggo/master ... [Android] break string & wrap word	2011-07-11 00:09:43 -07:00
minggo	fb436a6339	[Android] break string & wrap word	2011-07-11 15:02:41 +08:00
Walzer	28bf48f665	issue #569 #601, fix ChipmunkTest/Sensors crash after update to Chipmunk v5.3.5	2011-07-11 11:21:11 +08:00
Walzer	aa12ea838e	Merge remote branch 'origin/master'	2011-07-11 10:34:47 +08:00
Walzer	63ffc574d7	fixed #601, update Chipmunk from 5.3.4 to 5.3.5. Only tested on iOS now.	2011-07-11 10:34:03 +08:00
natural-law	7bc3983f04	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-07-11 10:12:07 +08:00
natural-law	36474b2131	Add DirectorTest and BugsTest on wophone.	2011-07-11 10:11:40 +08:00
Walzer	4e12ba3015	Merge pull request #374 from axmx/master ... [airplay] fix - it solves the problems related to incorrect memory allocation..	2011-07-10 00:44:30 -07:00
Max Aksenov	7f07574630	[airplay] fix - if you do not use this "MemFlags0 = USE_STACK_ALLOCATOR" then it solves the problems related to incorrect memory allocation ... I tested it on Marmalade Mac Simulator and IPad device. Not tested on Maramlade Windows Simulator....	2011-07-09 13:05:22 -07:00
minggo	2066cebd08	Merge pull request #371 from natural-law/master ... Add DirectorTest and BugsTest on android.	2011-07-08 03:49:30 -07:00
minggo	487ba5c02d	merge confict	2011-07-08 18:29:03 +08:00
minggo	87adeb6f92	upgrade xcode3 template	2011-07-08 18:24:58 +08:00
natural-law	1ffa7fbc19	Add DirectorTest and BugsTest on android.	2011-07-08 18:13:03 +08:00
Walzer	e39fca389f	Merge remote branch 'origin/master'	2011-07-08 18:01:52 +08:00
Walzer	944b03df5c	issue #599 orientation is wrong in ios tests. Most test cases are ok now, but it still have problem when TouchesTest back to MainMenu.	2011-07-08 18:01:28 +08:00
natural-law	1bdce00740	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x ... Conflicts: cocos2dx/include/ccConfig.h	2011-07-08 17:08:57 +08:00
minggo	6c37f42414	Merge pull request #368 from minggo/master ... fixed #586	2011-07-08 01:46:54 -07:00
minggo	4e5306a46b	fixed #596	2011-07-08 16:27:13 +08:00
natural-law	cba538d5d0	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-07-08 15:58:14 +08:00
natural-law	602c5f1894	fixed #595	2011-07-08 15:57:46 +08:00
Walzer	5c8b04bc25	fixed #585	2011-07-08 14:48:25 +08:00
Walzer	08b26402d5	fixed #594, but find a new bug #597	2011-07-08 14:27:37 +08:00
natural-law	0cb3b0ce06	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-07-08 11:23:03 +08:00
natural-law	ca4281904a	fixed #574, Add bugs test case.	2011-07-08 11:22:35 +08:00
minggo	b08788d810	change the return value of CCSkewBy::reverse() & CCScaleBy::reverse() to CCActionInterval*	2011-07-07 15:41:42 +08:00
minggo	8ca8f4d9bc	fixed #569: change the free sequence to avoid bug	2011-07-07 15:20:13 +08:00
natural-law	26513d6b7e	issue #574, Add DirectorTest for win32.	2011-07-07 14:55:11 +08:00
minggo	211878dc44	add animation	2011-07-07 10:24:01 +08:00
minggo	ff50997eb0	issue #574	2011-07-06 14:56:05 +08:00
Walzer	80c819d8b6	Merge remote branch 'origin/master'	2011-07-04 16:25:29 +08:00
Walzer	d325f1991e	[ios] 1. debug builds can run on device (add “Valid Architectures") 2. add correct header search paths for HelloLua release build	2011-07-04 16:25:11 +08:00
natural-law	7d7f3a9241	fixed #562, Upgrade folder sprite_nodes to rc3.	2011-07-01 16:11:31 +08:00
natural-law	4d5dab4a40	fixed #558, Upgrade folder layers_scenes_transitions_nodes to rc3.	2011-07-01 11:26:26 +08:00
minggo	25b3b15151	Merge pull request #339 from minggo/iss549 ... [Android] fixed #549: Add comments for playEffect()	2011-06-30 18:28:08 -07:00
minggo	67b85322ed	[Android] fixed #549: Add comments for playEffect()	2011-07-01 09:24:40 +08:00
minggo	12f816687d	Merge pull request #336 from liswei/master ... update wophone setup project (such as helloworld,tests)	2011-06-29 20:08:01 -07:00
minggo	2a39fe0aa4	Merge pull request #335 from minggo/iss547 ... [Android] fixed #547: line wrap OK on Android	2011-06-29 19:46:25 -07:00
liswei	39fb944297	update wophone setup project (such as helloworld,tests)	2011-06-30 09:36:51 +08:00
minggo	6c47f53b13	[Android] fixed #547: line wrap OK on Android	2011-06-29 15:45:30 +08:00
liswei	b23409a942	fixed #545 [Wophone] The effect of ChipmunkTest is wrong. ... reset glOrthof param value in wophone	2011-06-29 15:24:04 +08:00
minggo	e8853583df	Merge pull request #329 from minggo/master ... Fix some bug	2011-06-27 18:23:26 -07:00
minggo	7099b24ccb	Merge pull request #326 from liswei/issue521 ... issue #521 set depthtest value for true ,then set depthtest value for false	2011-06-27 18:20:10 -07:00
yangws	3b6265aa58	Compile ok on vs2010	2011-06-27 17:02:58 +08:00
minggo	5e15545dbd	[Android] fix an error when string is	2011-06-27 16:01:25 +08:00
liswei	bb59728543	issue #521 set depthtest value for true ,then set depthtest value for false	2011-06-27 15:34:26 +08:00
minggo	686b9ae179	fix the test title	2011-06-27 15:22:55 +08:00
natural-law	72f17ecbdf	fixed #542, Record the volume user specified though the background music is not playing.	2011-06-27 11:43:27 +08:00
Walzer	688131c958	[android] in main.cpp, change view->create(320,480) to (480,320) to fit the lastest modification, in both HelloWorld, HelloLua, Tests	2011-06-25 12:11:40 +08:00
Walzer	00568c229a	[android] back to shared library link	2011-06-25 11:21:16 +08:00
minggo	8440d6a267	[android] fixed #364: show string correct & line break ok	2011-06-24 13:55:00 +08:00
minggo	10cdd7f798	[android] fixed #364: line break ok on Android	2011-06-23 14:44:20 +08:00
minggo	71c13b34bf	Merge https://github.com/cocos2d/cocos2d-x into iss535	2011-06-22 17:00:11 +08:00
minggo	1122a7c7d0	[android] use Android widget Bitmap other than skia to drawstring	2011-06-22 16:58:50 +08:00
Walzer	96996d4d52	Merge pull request #311 from yangws/master ... Sync java code in Helloworld and tests and Add icon for Helloworld and tests on Android..	2011-06-22 01:11:49 -07:00
Walzer	1485a35338	update tests.xcodeproject to add lua support in cocos2dx lib. I finished it in xcode4 but don't know if this xcodeproject file will work on xcode4	2011-06-22 15:36:53 +08:00
yangws	01f277674e	Add icon for Helloworld and tests on Android.	2011-06-22 13:59:31 +08:00
yangws	4d8596169e	Sync java code in Helloworld and tests.	2011-06-22 11:37:42 +08:00
minggo	022e2b9998	issue #528: refactor ok on win32	2011-06-20 17:31:38 +08:00
minggo	25de09e34b	lua support ok on win32	2011-06-15 15:50:16 +08:00
minggo	8003de7468	update to latest code and merge	2011-06-14 11:01:38 +08:00
Walzer	f600846d4b	Merge http://github.com/flyingpacer/cocos2d-x, resolve conflicts in cocos2dx/CCScheduler.cpp	2011-06-08 11:08:29 +08:00
RongHong	67eb87abfe	To fix the crash when the gles version is too low	2011-06-08 10:02:07 +08:00
RongHong	a13e8ae859	1.修正gles版本过低时会崩溃的问题 ... 2.修正unscheduleAllSelectors（）中遍历哈希表导致崩溃的问题	2011-06-03 15:22:50 +08:00
liswei	49410a2a07	Merge branch 'XXX'	2011-06-03 10:52:19 +08:00
liswei	54780b8cb7	fixed #521, Fix the effect of PageTurn3D.	2011-06-03 10:51:21 +08:00
minggo	83e1e0ebd1	tests run ok when it don't enable lua	2011-06-01 20:29:05 +08:00
minggo	a8b6b850de	use precompile macro to cantrol if enable lua support	2011-06-01 17:51:08 +08:00
yangws	7e2d1d5c48	fixed #490 Text input on android use a different way, TextInputTest OK now.	2011-05-30 16:36:12 +08:00
Walzer	58a63f7ec0	[airplay] following MaxAksenov's suggestion, I set HelloWorld & Tests to landscape as default. Users had to rotate the simulator in airplay's surface configuration.	2011-05-30 14:14:19 +08:00
Walzer	11c401e3ea	[ios] setDepthTest(false) for EffectsTest	2011-05-26 21:01:16 +08:00
Walzer	bf95e4e7a5	Merge pull request #286 from natural-law/master ... [android] fixed #510	2011-05-26 01:39:11 -07:00
natural-law	7e716f9d80	[android] fixed #510, Delete the onDestroy method override in TestsDemo.java	2011-05-26 16:34:10 +08:00
yangws	476d86283f	Remove unnecessary code for digit in Cocos2dxGLSurfaceView.java.	2011-05-26 14:35:44 +08:00
minggo	dfbb0096e8	Merge pull request #283 from natural-law/master ... Compile tests OK on wophone.	2011-05-24 18:45:18 -07:00
natural-law	8ab7057fe6	Resolve the memory leak of tests.	2011-05-24 18:00:59 +08:00
natural-law	f89a93fcf8	Compile tests OK on wophone.	2011-05-24 17:52:24 +08:00
yangws	c757dd4aeb	fixed #503 new chipmunk code compiled ok on vs2010.	2011-05-24 16:18:47 +08:00
yangws	d93a2f046e	android can input number form soft keyboard.	2011-05-23 16:30:45 +08:00
yangws	ec23d7ed55	fixed #508 Dynamic switch retina display support.	2011-05-23 16:21:31 +08:00
yangws	533949a736	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-05-23 10:11:13 +08:00
Walzer	6b24b6fb8d	issue #503, i forget to add chipmunk_private.h into xcodeproj	2011-05-21 21:35:05 +08:00
Walzer	e8835ee4c2	issue #503, add chipmunk new files into win32 vcproj	2011-05-21 17:10:29 +08:00
Walzer	335d02a556	issue #503, android version build & run ok.	2011-05-21 16:45:55 +08:00
Walzer	a9027574eb	issue #503, ChipmunkTest & ios xcodeproject upgraded, run on ios simulator ok	2011-05-21 16:19:01 +08:00
yangws	c9f66665ec	temp commit.	2011-05-20 17:47:06 +08:00
unknown	b940676cab	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 489	2011-05-19 20:55:39 +08:00
minggo	ff1017d86f	Merge pull request #276 from minggo/iss496 ... [android] fixed #496 fixed #497	2011-05-18 23:18:37 -07:00
minggo	073260e0a9	[android] fixed #496 fixed #497: tests and HelloWorld work ok on Android3.0	2011-05-19 11:26:57 +08:00
Walzer	2dd11490ad	Merge pull request #274 from yangws/master ... Fixed some bugs on wophone and modify CClog output utf-8 string on win32 and wophone emulator.	2011-05-18 18:51:38 -07:00
yangws	5173738f37	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-05-18 11:08:44 +08:00
yangws	7a6a891242	fixed bugs: the image stoped when switch app fore/background several times. The background music not stoped when app enter background some time.	2011-05-18 11:08:18 +08:00
minggo	6cf0a9d4f4	[android] fixed #494: fix a wrong function name	2011-05-18 10:54:52 +08:00
yangws	aba77f4cae	issue #489 modified for vs2008.	2011-05-13 14:13:30 +08:00
Walzer	c7fb183dcb	[airplay] After exclude CurlTest & CCUserDefault, UserDefaultTest, HelloWorld & Tests can be compiled successfully now.	2011-05-12 21:58:11 +08:00
Walzer	4da5a0eb71	[android] move the TextField position to visable while soft keyboard popup	2011-05-12 21:32:57 +08:00
Walzer	f17a8f6226	Merge pull request #271 from minggo/iss488 ... [Android] CCUserDefault works ok on android2.2	2011-05-12 05:40:15 -07:00
minggo	d8f3b0c25b	[android] CCUserDefault works ok on android2.2	2011-05-12 18:32:13 +08:00
Walzer	bf04194877	Merge pull request #269 from yangws/master ... center CCTextField in TextInputTest	2011-05-12 01:59:39 -07:00
Walzer	7874ec5305	Merge pull request #270 from yangws/vs2010 ... compile ok in vs2010	2011-05-12 01:59:24 -07:00
yangws	c73c1a9ab6	compile ok in vs2010	2011-05-12 16:15:10 +08:00
yangws	01c5048203	set TextInputTest CCTextField to center.	2011-05-12 14:45:44 +08:00
natural-law	2855a9cefb	Fix the bug discovered by wophone test: ... 1. Can't play music & effect on wophone device. 2. UserDefaultTest is in the wrong path in test.wophone.vcproj.	2011-05-12 14:19:58 +08:00
minggo	a50fe1b95b	Merge pull request #267 from natural-law/master ... Modify the TextInputTest code to clean the memory leak.	2011-05-11 20:01:23 -07:00
natural-law	cc6367a835	Modify the TextInputTest code to clean the memory leak.	2011-05-12 10:54:33 +08:00
Walzer	7f0c35b158	Merge remote branch 'origin/master'	2011-05-12 10:52:33 +08:00
Walzer	10d94fb170	fixed #486, setDepthTest(true) in TileMapTest, while setDepthTest(false) in TransitionsTest. TransitionFlip will not flickers any more :)	2011-05-12 10:52:10 +08:00
natural-law	a7db186d06	Modify the test code for the right device orientation.	2011-05-12 10:11:58 +08:00
Walzer	58e9876124	change the position of TextField in TextInputTest	2011-05-11 22:15:51 +08:00
Walzer	074e127756	Merge pull request #265 from yangws/master ... fixed a bug: TextInputTestWithAction crash.	2011-05-11 05:22:38 -07:00
yangws	7dad88c556	fixed a bug: TextInputTestWithAction crash.	2011-05-11 18:45:53 +08:00
Walzer	d0ff1f274e	Merge pull request #264 from yangws/master ... fixed a bug: TextInputTextWithAction can't stop CCTextFieldTTF's action when click enter button.	2011-05-11 03:28:16 -07:00
Walzer	60f1468f57	Merge pull request #263 from yangws/input_android ... fixed a bug: delete twice when delete button click once.	2011-05-11 03:27:45 -07:00
yangws	b8a9db98dc	fixed a bug: TextInputTextWithAction can't stop CCTextFieldTTF's action when click enter button.	2011-05-11 18:22:55 +08:00
yangws	e436e177de	fixed a bug: delete twice when delete button click once.	2011-05-11 17:33:59 +08:00
yangws	21c8628e68	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input2 ... Conflicts: cocos2dx/platform/wophone/CCApplication_wophone.h tests/tests/tests.h	2011-05-10 16:09:26 +08:00
yangws	3f8293dffb	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input ... Conflicts: HelloWorld/wophone/HelloWorld.wophone.vcproj tests/test.wophone/copy_res.bat	2011-05-06 17:45:39 +08:00
minggo	6c69107f33	fixed #455: CCUserDefault works ok on iOS	2011-05-06 17:01:41 +08:00
yangws	ced029257f	temp commit	2011-05-06 16:38:09 +08:00
minggo	7e40957e04	Merge https://github.com/cocos2d/cocos2d-x into iss455	2011-05-06 16:29:44 +08:00
minggo	80f739942d	issue #455 : compile CCUserDefault on iOS	2011-05-06 16:29:35 +08:00
minggo	33648a9e9b	issue #455: add compile CCUserDefault to WoPhone, but not test, because the path will change later	2011-05-06 16:14:07 +08:00
minggo	2c0bd49513	issue #455: CCUserDefault ok on win32 & Android	2011-05-06 15:31:51 +08:00
yangws	b95ef2f242	chipmunk test ok.	2011-05-06 12:30:52 +08:00
natural-law	846b529e49	[wophone] fixed #482, Modify the resource data path for the new WoPhone-SDK.	2011-05-06 10:13:12 +08:00
yangws	0fe61642f6	issue #478 text input ok.	2011-05-05 18:17:50 +08:00
Walzer	dcdad9a81a	Merge pull request #250 from yangws/481 ... fixed #481 DisableKeyLock and DisableBackLightAutoTurnOff when BackLightTurnOn.	2011-05-05 00:53:10 -07:00
Walzer	c7e25d305a	Merge pull request #248 from yangws/input ... Split TextInputTest to Default test and Action test. Compile ok on vs2010	2011-05-05 00:50:48 -07:00
yangws	7c5a6d779c	fixed #481 DisableKeyLock and DisableBackLightAutoTurnOff when BackLightTurnOn.	2011-05-05 11:51:13 +08:00
Carlos Sessa	9d08f9582c	Added the possibility of extending Cocos2dxGLSurfaceView and providing a initView() method	2011-05-04 11:18:26 -03:00
yangws	a5da2bd226	Split TextInputTest to Default test and Action test. Compile ok on vs2010.	2011-05-04 14:13:15 +08:00
Walzer	5dc7ef2ffc	sort the TestCases alphabetically in project.pbxproj	2011-05-03 14:48:25 +08:00
Walzer	2b8799d3ac	Merge pull request #246 from yangws/input. ... Modify tests doesn't change orientation every test scene.	2011-05-02 23:00:35 -07:00
yangws	e723a424d8	Modify tests doesn't change orientation every test scene.	2011-05-03 11:37:30 +08:00
minggo	0db248e1f1	Merge pull request #245 from yangws/input. ... TextInputTest on on ios.	2011-05-02 18:48:48 -07:00
yangws	2b94d7d9ce	TextInputTest on on ios.	2011-04-29 18:09:54 +08:00
yangws	170933b4c5	CCTextFieldTTF test code ok on win32.	2011-04-29 16:46:29 +08:00
minggo	b00c54dc64	Merged pull request #243 from minggo/iss477. ... [android] fixed #477: set default ndk version to ndk-r5	2011-04-28 19:29:15 -07:00
minggo	bb4fc1c446	[android] fixed #477: set default ndk version to ndk-r5	2011-04-29 09:59:05 +08:00
Walzer	031a750f95	[ios] issue #456, add curl into header search path for Release build.	2011-04-29 09:39:35 +08:00
yangws	d73699aabb	[ios] tests add RootViewController for rotate with ui object.	2011-04-28 14:19:12 +08:00
yangws	323c065934	make test can compile on wophone and airplay.	2011-04-28 10:31:51 +08:00
yangws	f8dc140840	change CCLabelTTF accept string from gb2312 to utf8.	2011-04-27 18:19:47 +08:00
yangws	73a3f776f0	android lanscope keyboard ok.	2011-04-27 17:01:27 +08:00
yangws	e895d9d073	TextInputTest compile ok on android and merge last master code. ... Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input Conflicts: HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxRenderer.java HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj cocos2dx/platform/android/Cocos2dJni.cpp tests/test.android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java tests/test.android/src/org/cocos2dx/lib/Cocos2dxRenderer.java tests/test.ios/test.xcodeproj/project.pbxproj tests/test.win32/test.win32.vcproj	2011-04-26 18:04:07 +08:00
yangws	a73ccaf0e3	Cocos2dxGLSurfaceView little modify.	2011-04-26 16:40:49 +08:00
yangws	9b08f4add6	keyboard notification message on ios and TextFieldTTF test code OK.	2011-04-26 16:33:20 +08:00
minggo	1c248b9955	Merge branch 'iss462' of https://github.com/minggo/cocos2d-x	2011-04-25 16:07:16 +08:00
minggo	f11acc5e31	[android] pause/resume gl render thread when the activity is paused or remused	2011-04-25 15:53:08 +08:00
minggo	99733c602d	[android] fixed #462: call applicationDidEnterBackground and applicationWillEnterBackground on android	2011-04-25 15:13:24 +08:00
Walzer	6a11f73999	Merge branch 'iss468' of https://github.com/natural-law/cocos2d-x	2011-04-25 14:44:21 +08:00
natural-law	7231120b16	fixed #468, Implement CCProfiler & CCProfilingTimer. And use them in PerformanceNodeChildrenTest.	2011-04-25 14:30:30 +08:00
moadib	85afa22195	[android] fixed typo in CCEGLView method name	2011-04-24 18:52:21 +04:00
yangws	252f3efe1a	CCIMEDispatcher works on android.	2011-04-22 16:33:41 +08:00
natural-law	df00c32d5b	fixed #466. [wophone] Modify the template and the Makefile.ARM file for wophone.	2011-04-22 11:49:14 +08:00
natural-law	e2ce006db2	fixed #466. [wophone] Refactor the CCFileUtils for the new packing approach.	2011-04-22 10:57:46 +08:00
natural-law	acb4bb5a16	Merge branch 'master' into iss428 ... Conflicts: template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj	2011-04-21 14:58:58 +08:00
natural-law	5d2ac1fc0c	fixed #428, Use CCArray instead of CCMutableArray as the parameter type of CCNode::m_pChildren.	2011-04-21 14:46:15 +08:00
minggo	e5441a4fc2	fixed #450: can set default pixel format other than RGBA8888	2011-04-20 15:34:33 +08:00
minggo	4ffe24fc8e	Merge branch 'iss374' of https://github.com/natural-law/cocos2d-x into natural-law-iss374	2011-04-19 13:45:56 +08:00
minggo	c38af3c28d	fixed #456: integrate libcurl into cocos2dx	2011-04-19 10:57:44 +08:00
minggo	a4e9f1c18d	libcurl works ok on ios	2011-04-18 14:12:41 +08:00
minggo	37e7fad0d3	issue #456: add curl test & libcurl.so works ok on android	2011-04-15 17:15:05 +08:00
minggo	a165663b4c	[andorid] merge Macarse-inflateViews into master and sychrolize it to HelloWorld	2011-04-12 15:37:44 +08:00
minggo	8e85f56f97	Merge branch 'inflateViews' of https://github.com/Macarse/cocos2d-x into Macarse-inflateViews	2011-04-12 15:12:48 +08:00
minggo	d8115cacea	[android] fixed #453: cocosdenshion can replace the background music	2011-04-12 14:43:21 +08:00
minggo	0b7ca9c865	fixed #449: remove the code that suppots mac platform	2011-04-11 17:04:45 +08:00
Macarse	0203141aaf	Now the size depends on the GLView size	2011-04-11 00:28:12 -03:00
Macarse	da78032542	Added the possibility of inflating Cocos2dxGLSurfaceView from an xml	2011-04-10 17:57:17 -03:00
walzer	0173d0c3b7	Merge branch 'master' of https://github.com/minggo/cocos2d-x	2011-04-07 16:57:58 +08:00
minggo	1f6bbacb0a	[android] fix a bug of cocosdenshion::rewindBackgroundMusic()	2011-04-07 15:59:01 +08:00
walzer	63f323456c	Merge branch '0.8.2_vc10' of https://github.com/yangws/cocos2d-x	2011-04-07 15:16:30 +08:00
natural-law	b72b5306d2	Fix problems discovered when test: ... 1. Add include file in ccConfig.h 2. Resolve the memory leak in PerformanceSpriteTest. 3. Delete the 2048 * 2048 texture test case in PerformanceTextureTest.	2011-04-07 14:30:35 +08:00
yangws	455ec071b3	VC2010 compile ok.	2011-04-07 14:20:04 +08:00
natural-law	1af4aa1138	[android] fixed #374,Modify the approach of cache the textures when EGL rendering context lost.	2011-04-06 16:29:58 +08:00
Max Aksenov	290367c867	[airplay] fix screen orientation bugs (pointer not properly worked) on devices ( checked on IOS IPad/IPhone), when orientation was changed.	2011-04-04 01:54:34 -07:00
walzer	cb65469103	[airplay] move .mkf to proj.airplay folder, improve SimpleAudioEngine implementation, integrate chipmunk	2011-04-04 00:40:39 +08:00
walzer	3a16b76d00	remove duplicate frameworks in test.xcodeproj	2011-04-03 10:13:06 +08:00
walzer	28fbfb04dc	Merge branch 'iss349' of https://github.com/natural-law/cocos2d-x into natural-law-iss349	2011-04-03 09:30:26 +08:00
natural-law	72f11cb421	[ios]fixed #349,Modify the method of parse *.plist files in order to deal with *.plist files in binary format.	2011-04-02 11:32:15 +08:00
minggo	8fbfc2773a	Merge branch 'issue_440' of https://github.com/minggo/cocos2d-x into minggo-issue_440	2011-04-01 17:19:30 +08:00
Marat Yakupov	ac84278dae	[android] #443 implemented CCKeypadDelegate on android	2011-04-01 11:27:06 +04:00
minggo	2c539a1df5	[android] fixed #440: CCMessage works ok on android	2011-04-01 11:35:26 +08:00
walzer	79229c82e8	Merge remote branch 'origin/master'	2011-03-31 17:56:21 +08:00
walzer	6c2f66792f	issue #422, add CocosDenshion implementation on airplay port. But it doesn't work correctly.	2011-03-31 17:53:35 +08:00
yangws	16254a2de1	fixed #440 CCMessageBox works on ios.	2011-03-31 11:08:46 +08:00
minggo	768c356343	merge natural-law-iss411 into master	2011-03-31 10:48:00 +08:00
natural-law	c8b0d391cd	fixed #411,Add ZwoptexTest on ios, wophone, android and airplay.Fix the bug in ios templates which generated by merge.	2011-03-30 15:21:18 +08:00
walzer	2b12ef4f56	issue #411, add Zwoptex.cpp/.h & test resource into tests.xcodeproj	2011-03-30 14:54:42 +08:00
walzer	35d94eb3a5	Merge branch 'iss411' of https://github.com/natural-law/cocos2d-x into natural-law-iss411	2011-03-30 10:44:34 +08:00
walzer	6d30c123d7	Merge branch 'issue_367' of https://github.com/minggo/cocos2d-x into minggo-issue_367	2011-03-29 15:53:11 +08:00
walzer	5811fb7c76	Merge branch 'issue_422' of https://github.com/minggo/cocos2d-x into minggo-issue_422	2011-03-29 15:50:28 +08:00
minggo	27d5a670b5	[android] fixed #367: make the compiling sequece of HelloWorld and tests don't depend on alphabet order	2011-03-29 15:26:50 +08:00
natural-law	987da86c01	Merge branch 'master' into iss411 ... Conflicts: tests/test.win32/test.win32.vcproj tests/tests/controller.cpp tests/tests/tests.h	2011-03-29 14:26:31 +08:00
minggo	c686047f83	[android] fixed #422: multitouch for android	2011-03-29 14:20:05 +08:00
natural-law	5f7357bf09	fixed #391,CCSpriteFrameCache support *.plist files with format value is not 0.	2011-03-29 11:56:14 +08:00
natural-law	1991a65b0b	Merge branch 'master' into iss391 ... Conflicts: HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj cocos2dx/proj.win32/cocos2d-win32.vcproj cocos2dx/proj.wophone/Makefile.ARM cocos2dx/proj.wophone/cocos2d-wophone.vcproj template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj tests/test.ios/test.xcodeproj/project.pbxproj	2011-03-29 10:20:57 +08:00
natural-law	e38d3a2277	Merge branch 'master' into iss434 ... Conflicts: cocos2dx/platform/airplay/CCFileUtils_airplay.h template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj	2011-03-28 17:06:32 +08:00
walzer	2f573a784e	fixed #435, CocosDenshion crashes at foreground/background switching	2011-03-27 22:17:18 +08:00
natural-law	cee82fe9fa	issue #434,refactor class CCFileUtils on android and ios.	2011-03-26 17:24:37 +08:00
yangws	cd6352adec	add new files to vc2010 project.	2011-03-25 17:41:54 +08:00
walzer	2bd28bd2dd	issue #390, add PerformanceTest into airplay port. But, oops, I cannot see anything in these test except "back to mainmenu".	2011-03-25 16:46:36 +08:00
walzer	9c1d462275	Merge branch '430' of https://github.com/yangws/cocos2d-x into yangws-430	2011-03-25 14:23:05 +08:00
walzer	a205df20a4	issue #390, manually merge from Bin's work.	2011-03-25 13:59:08 +08:00
yangws	be966dbddb	fixed #430 Solved bug by replacing glColor4ub with glColor4f.	2011-03-25 13:50:57 +08:00
walzer	db4fb7cc9c	issue #427, refactor ios port ok.	2011-03-24 17:51:29 +08:00
walzer	b9c56f1728	issue #427, try to add CCSAXParser.h	2011-03-24 16:16:49 +08:00
natural-law	55143e3b9e	issue #391,implement functions:CCRectFromString, CCPointFromString and CCSizeFromString.	2011-03-24 10:38:08 +08:00
walzer	ef7fe5afd1	[airplay] issue #379, fix search header paths with cause compilation error on release build	2011-03-24 10:19:52 +08:00
walzer	ed492bbd1e	[airplay] first commit of airplay port. Thanks for Аксёнов Максим's contribution!	2011-03-23 22:16:20 +08:00
natural-law	96d7cedadb	issue #411,implement the zwoptex test.	2011-03-22 14:59:10 +08:00
walzer	594dab24fc	Merge branch 'iss419' of https://github.com/natural-law/cocos2d-x into natural-law-iss419	2011-03-21 17:29:09 +08:00
natural-law	09be3e8fe5	[ios]fix #419,Enable the depth test when EAGLView is created.	2011-03-21 17:15:20 +08:00
walzer	9854370db3	fixed #410, recheck the search header paths & libraries paths in xcode3 templates	2011-03-21 12:00:48 +08:00
walzer	ffeb116542	Merge branch 'issue_400' of https://github.com/minggo/cocos2d-x into minggo-issue_400	2011-03-18 16:32:20 +08:00
minggo	7b71a565ed	fixed #400: change project.pbxproj of HelloWorld and test to include CCCamera.cpp	2011-03-18 16:09:21 +08:00
walzer	d8c28d3754	Merge branch 'issue_409' of https://github.com/minggo/cocos2d-x into minggo-issue_409	2011-03-18 15:59:01 +08:00
minggo	47173778cc	fixed #409: rename NSArray UIAlignment	2011-03-18 14:31:29 +08:00
walzer	e62ff6c815	Merge branch 'issue_405' of https://github.com/minggo/cocos2d-x into minggo-issue_405	2011-03-18 14:08:52 +08:00
walzer	c15c1719ba	fixed #410, recheck the header search path & library search path in HelloWorld, Tests, and all xcode3 templates	2011-03-18 14:06:04 +08:00
minggo	617d484257	[android] fixed #405: pause BMG music when tap HOME and resume it when it is active	2011-03-18 11:12:06 +08:00
walzer	724ac1d0a9	Merge branch 'issue_403' of https://github.com/minggo/cocos2d-x into minggo-issue_403	2011-03-18 10:08:43 +08:00
minggo	7c52a521fa	fixed #403: change UIEvent to CCEvent	2011-03-18 09:39:34 +08:00
yangws	12254f95f0	fixed #395 Add initInstance code for all platform in msvc templates.	2011-03-17 11:27:51 +08:00
yangws	61e2f56439	Add Retina display resource for tests. ... Modify CCDrawingPrimitives.cpp for retina display support.	2011-03-15 15:12:50 +08:00
minggo	7571e1a51c	Merge branch 'dev' of https://github.com/natural-law/cocos2d-x into natural-law-dev	2011-03-15 09:29:47 +08:00
walzer	db1f54ee45	[ios] HelloWorld.jpg ->.png, xcode project from iOS4.1 to 4.2 "Lastest iOS"	2011-03-14 18:31:16 +08:00
natural-law	6d028007c2	Fix the bug of CCAnimationCache and CCSpriteFrame.Run SpriteTest successful.	2011-03-11 17:00:10 +08:00
minggo	723dd89fb7	Merge branch 'dev' of https://github.com/minggo/cocos2d-x into dev	2011-03-11 12:03:53 +08:00
minggo	69dcaddb51	Merge branch 'dev' of https://github.com/yangws/cocos2d-x into yangws-dev	2011-03-11 12:01:58 +08:00
minggo	9fa282c65c	[android] fix some bug and remove unneeded files	2011-03-11 11:56:33 +08:00
yangws	f0661a2679	fix 4 bugs: ... 1 call CCTextureCache::purgeSharedTextureCache() to release cached texture when enableRetinaDisplay is called. 2 enableRetinaDisplay performence correctly. 3 Modify libcocos2d project pre-link event performence corretly when the source in the path which contain white blacks. 4 Modify HiResTest, that can switch resouce dynamicly now.	2011-03-11 11:04:22 +08:00
unknown	8e429c422d	Build-win32.bat OK on win7	2011-03-10 21:11:14 +08:00
unknown	795f1b985f	Add VC2010 project files on win32	2011-03-10 19:50:17 +08:00
minggo	9a67fa6df1	Merge branch 'dev' of https://github.com/yangws/cocos2d-x into yangws-dev	2011-03-10 17:16:15 +08:00
natural-law	93aebbc469	[wophone]fixed #386,Resolve the compile conflict on wophone sdk.Modify the makefiles for wophone.	2011-03-10 14:24:13 +08:00
yangws	3fc701f1d2	fixed #300 Cocos2d-win32 application wizard for vs ok.	2011-03-10 12:00:29 +08:00
minggo	cb24e03466	Merge branch 'iss377' of https://github.com/natural-law/cocos2d-x into natural-law-iss377	2011-03-10 09:37:26 +08:00
natural-law	7c6147421b	[wophone]fixed #377,Replace the word "uphone" with "wophone".	2011-03-09 17:28:35 +08:00
minggo	12981fac89	fixed #375	2011-03-09 16:19:20 +08:00
minggo	75e2ecc16d	issue #387: move platform_support into cocos2dx/platform	2011-03-09 14:40:05 +08:00
minggo	63d283d3e8	delete ccxString.h	2011-03-09 12:00:04 +08:00
minggo	f1d13ca2e1	issue #375: android compiled ok	2011-03-08 13:49:58 +08:00
minggo	7a331e1e14	issue #375: wophone compiled ok	2011-03-07 18:20:48 +08:00
minggo	b5a99f90df	issue #375: rename file names and object names	2011-03-07 17:11:57 +08:00
minggo	aaf898cb72	merge master into dev	2011-03-07 09:52:45 +08:00
minggo	69edcb16af	fix a mergeing bug	2011-03-04 17:17:53 +08:00
minggo	661bae2797	merge natural-law-iss370	2011-03-04 16:32:54 +08:00
minggo	8e2f9c96b8	remove unneeded files	2011-03-04 16:22:53 +08:00
natural-law	aef83b2660	[uphone]Move Application from Application code to Cocos2dx/platform/ccxApplication.	2011-03-02 17:45:04 +08:00
yangws	395a0b3d47	AtlasTest rename to LabelTEst on win32.	2011-03-02 17:34:26 +08:00
minggo	4379a1c96f	Move ccxApplication to cocos2dx/platform on ios.	2011-03-02 17:05:22 +08:00
minggo	f58d2f8b32	[andriod] fixed #247: support multitouch on android	2011-03-02 10:40:02 +08:00
minggo	0a5ec4c12b	[android] move MultiTouchController.java to cocos2dx/lib/touch	2011-03-02 10:34:49 +08:00
minggo	f7b401163b	Merge branch 'multitouchController' of https://github.com/Macarse/cocos2d-x into Macarse-multitouchController	2011-03-02 09:38:23 +08:00
minggo	e00222104f	merge yangws-issue360 into dev	2011-03-02 09:31:47 +08:00
minggo	89b4d07ed8	[android] fixed #368: move Application code to cocos2dx/platform/ccxApplication	2011-03-01 19:53:39 +08:00
yangws	b54de8a3ef	fixed #360 Modify CCXAppWiz for win32， add initInstance function in class AppDelegate	2011-03-01 14:28:39 +08:00
minggo	b65d84551b	resolve confict when merging branch yangws-issue366	2011-03-01 14:08:18 +08:00
yangws	7bc7d32001	fixed #366 [win32] Move Application from Application code to Cocos2dx/platform/ccxApplication	2011-03-01 12:41:57 +08:00
minggo	1b6602f582	Merge branch 'WVGA_scale_android' of https://github.com/minggo/cocos2d-x into minggo-WVGA_scale_android	2011-02-28 10:00:55 +08:00
minggo	f504211e56	merge natural-law-iss332 to dev	2011-02-28 09:48:14 +08:00
minggo	498e0072e1	[android] fixed #358: autoscale HVGA resource to WVGA	2011-02-26 15:52:57 +08:00
minggo	1428480c7f	[android] fixed #338:refactor platform_support	2011-02-25 13:35:27 +08:00
natural-law	6c54eb0a86	Update the tests from 0.99.4 to 0.99.5.	2011-02-25 11:31:49 +08:00
yangws	63cedd1317	Merge code of Platform_support for IOS.	2011-02-23 18:22:05 +08:00
natural-law	949c1000a8	update tests to 0.99.5.	2011-02-23 16:47:25 +08:00
Macarse	b52eed0782	blah	2011-02-22 22:32:24 -03:00
yangws	4d47babf9e	add ; after NS_CC_BEGIN	2011-02-19 18:16:45 +08:00
natural-law	4362a5f381	[uphone]issue #316,Resolution auto adjustment.	2011-02-19 17:44:43 +08:00
natural-law	60e9ae873c	Merge branch 'dev-retina' of https://github.com/yangws/cocos2d-x into iss316 ... Conflicts: HelloWorld/AppDelegate.cpp tests/AppDelegate.cpp	2011-02-19 10:19:14 +08:00
yangws	85b9c9ae21	Retina display support and scale with keep w/h rate ok on win32.	2011-02-18 18:30:22 +08:00
natural-law	245155e66a	[uphone]issue #340,Refactor platform_support on uphone,and run tests successful on both simulator and device.	2011-02-18 10:44:49 +08:00
Macarse	c6f4eab602	typo	2011-02-17 23:44:14 -03:00
Macarse	43a437a978	fixed small error	2011-02-17 23:28:17 -03:00
Macarse	4267593bf9	Used an array approach	2011-02-17 23:23:36 -03:00
natural-law	0a2ceee2c5	Merge branch 'dev' of https://github.com/cocos2d/cocos2d-x into dev	2011-02-12 17:24:41 +08:00
minggo	043d771f1a	Merge branch 'dev' of https://github.com/natural-law/cocos2d-x into natural-law-dev	2011-02-12 17:23:50 +08:00
natural-law	20409e7a58	delete the code for debug in cocos2d-android.	2011-02-12 17:20:13 +08:00
natural-law	8fcb9d017c	delete the code for debug in cocos2d-android.	2011-02-12 17:18:25 +08:00
yangws	8458476597	Merge branch 'dev' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 ... Conflicts: .gitignore	2011-02-12 16:42:47 +08:00
Macarse	24c4a477e3	Fixed issue for tests	2011-02-11 00:48:46 -03:00
Macarse	e1dfb21dd4	Added logic for POINTER_UP and POINTER_DOWN	2011-02-06 19:02:03 -03:00
Macarse	8d5995d5a6	First approach	2011-02-06 17:05:56 -03:00
Macarse	ab44dafc6c	Use SENSOR_DELAY_GAME for the SensorManager	2011-02-06 09:11:24 -03:00
Macarse	66038230eb	Added logic to disable sensors from the c++ code	2011-02-05 20:17:24 -03:00
Macarse	284c330569	Added code from walzer's comment	2011-02-01 00:11:42 -03:00
Macarse	fce540989d	First approach	2011-01-30 20:05:30 -03:00
yangws	34a6ca5208	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 ... Conflicts: cocos2dx/platform/win32/CCXUIImage_win32.cpp cocos2dx/platform/win32/CCXUIImage_win32.h tests/test.win32/test.win32.vcproj	2011-01-28 14:33:47 +08:00
yangws	76ea63da7f	Change prefix CCX to ccx.	2011-01-27 17:07:36 +08:00
minggo	d68d33b029	Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master	2011-01-27 09:56:45 +08:00
minggo	31f9969674	fixed #333: fix compiling issue under linux	2011-01-27 09:49:06 +08:00
Macarse	89f012023e	Fix display issue with Samsung Galaxy Tab	2011-01-26 19:03:14 -03:00
minggo	046668c3f1	Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master	2011-01-26 10:02:26 +08:00
minggo	052e8634dc	[android]fix a bug of SimpleAudioEngine::playEffect()	2011-01-26 09:46:34 +08:00
minggo	9e2587c26c	Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master	2011-01-25 17:09:11 +08:00
minggo	acb6b67bd9	Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master	2011-01-25 17:08:04 +08:00
walzer	5d051a14fa	[iphone] fix the build error in SchedulerTest.cpp, use CCLOG instead of CCXLog	2011-01-25 16:56:46 +08:00
minggo	4fae086e8b	[android]: fps controller	2011-01-25 15:26:16 +08:00
natural-law	6a1b8d64aa	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-01-25 15:09:34 +08:00
natural-law	d56575dd5a	[uphone]change the parameter order of function setResource.And add default value of the parameter pszResPath.	2011-01-25 14:26:26 +08:00
walzer	04aab22145	Merge branch 'natural-law-master'	2011-01-25 11:43:57 +08:00
minggo	59edc619a8	[android] to prevent preload effect many times	2011-01-25 11:30:25 +08:00
minggo	38b7e054bd	[android]fix the error of preloadEffect()	2011-01-25 11:29:15 +08:00
natural-law	800033d98b	fixed #329,use std::string to implement function CCBMFontConfiguration::parseConfigFile.	2011-01-24 15:53:52 +08:00
yangws	09748e88a1	SchedulerTest can output log now.	2011-01-24 14:52:16 +08:00
yangws	1a17f3ea55	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 ... Conflicts: cocos2dx/platform/win32/CCXApplication_win32.cpp tests/test.win32/test.win32.vcproj	2011-01-22 17:52:06 +08:00
yangws	6ad3ec6bf0	HelloWorld and tests can run after move ccxApplication.	2011-01-22 17:30:00 +08:00
minggo	e23c1eb2f6	Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master	2011-01-22 16:45:26 +08:00
natural-law	5cf0ee5d90	[uphone]Modify the param of function get/set volume in SimpleAudioEngine from int to float.The Max/Min value changed to 1.0/0.0	2011-01-22 16:22:26 +08:00
minggo	4a4c0d3485	[android] fixed #321: Frame control of android. It is not so accuracy.	2011-01-22 15:10:18 +08:00
minggo	882b473291	[iphone]: font support	2011-01-21 18:15:12 +08:00
minggo	b3fe7f5b6c	fixed #307:merge TestAudioEngine into tests	2011-01-21 16:26:51 +08:00
minggo	01a3e37db8	[android] fix bug of build_native.sh	2011-01-21 15:45:55 +08:00
minggo	cffc61d426	issue #307: add music resource	2011-01-21 15:17:23 +08:00
minggo	e92970ec69	[android] fixed #311: implement cocosdenshin on android	2011-01-21 15:15:09 +08:00
minggo	f9d0db48e1	issue #307: merge TestAudioEngine into tests	2011-01-21 15:11:15 +08:00
yangws	333f0b5574	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 ... Conflicts: HelloWorld/AppDelegate.cpp cocos2dx/particle_nodes/CCParticleSystem.cpp cocos2dx/proj.win32/cocos2d-win32.vcproj tests/AppDelegate.cpp	2011-01-20 11:18:35 +08:00
minggo	14fa024e48	Merge https://github.com/cocos2d/cocos2d-x into merger	2011-01-20 09:22:29 +08:00
walzer	9041d03d3b	[uphone] issue #307, config test.vcproj uphone for TestAudioEngine merger.	2011-01-19 18:02:35 +08:00
minggo	d64ac9fdb8	issue #311: cocosdenshion for android	2011-01-19 16:00:19 +08:00
yangws	804dc4ef7c	Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 ... Conflicts: cocos2dx/platform/CCArchOptimalParticleSystem.h cocos2dx/platform/win32/CCXBitmapDC.cpp cocos2dx/proj.win32/cocos2d-win32.vcproj	2011-01-19 15:29:08 +08:00
yangws	79b711a758	move CCXBitmapDC from cocos2d/platform to platform_support.	2011-01-19 14:23:26 +08:00
natural-law	ec7c24ad8d	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge	2011-01-19 10:03:39 +08:00
natural-law	f992838f96	[uphone]fixed #293,Modify the absolute path method in CCFileUtils.	2011-01-18 18:21:06 +08:00
walzer	a58acc79f3	[iphone] fixed #301, add info.plist for HelloWorld & tests	2011-01-18 12:02:27 +08:00
natural-law	c682dd7084	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge	2011-01-18 10:16:35 +08:00
natural-law	acb4a6a369	[uphone]fixed #293,modify the absolute path method in CCFileUtils.	2011-01-18 10:14:44 +08:00
walzer	04c685b95a	issue #289, fix some warnings	2011-01-17 21:16:25 +08:00
walzer	b60e1e1ff8	Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master	2011-01-17 20:37:23 +08:00
yangws	d2a116b001	fixed bug: Post build error on win32 when compiled project which the project's path string has space.	2011-01-17 18:01:20 +08:00
walzer	ad5ee3c9f6	Merge remote branch 'remotes/origin/upto-0.99.5' Fix some conflicts manually.	2011-01-17 16:21:11 +08:00
yangws	67c0ad6332	add platform support project on win32. ... Move macros, CCXUIImage, ccxCommon, CCXCocos2dDefine, 3rd party libraries, glu, NSLock, ccxConfig from platform/win32 to platform_support.	2011-01-15 18:05:35 +08:00
natural-law	9ccbb62f6e	fixed #313,Modify the main menu of tests project from page-turning to scroll.	2011-01-12 18:00:11 +08:00
natural-law	237042f7dd	fixed #309,App will not crash any more when surface re-created.	2011-01-10 17:54:44 +08:00
minggo	78a7329054	Merge branch 'upto-0.99.5' of https://github.com/natural-law/cocos2d-x into natural-law-upto-0.99.5	2011-01-08 09:27:58 +08:00
natural-law	c02a9a4dd5	Setting apk file path at runtime in cocos2d-android.	2011-01-07 16:29:06 +08:00
minggo	321c8098f3	make tests runs ok on iphone	2011-01-07 11:49:17 +08:00
natural-law	ec7fbd0e69	Fix bugs. ... 1. Run tests and HelloWorld in cocos2d-android. 2. Modify the makefile of cocos2d-uphone.	2011-01-07 11:30:19 +08:00
natural-law	0d2d746aec	Fix bugs.Run tests in cocos2d-uphone successful.	2011-01-05 17:01:08 +08:00
natural-law	25e9721678	fix bugs.	2011-01-04 17:46:23 +08:00
Walzer	4a6989b6ff	[uphone] add keyMenuBack to CCKeypadDelegate	2010-12-31 18:15:30 +08:00
natural-law	3dfd530b38	Merge branch 'iss295' into upto-0.99.5	2010-12-31 09:48:48 +08:00
natural-law	34f45c8faa	Implement CCEventDispatcher.	2010-12-31 09:36:53 +08:00
yangws	706f97114b	issue #281 CCParticleSystemQuad upto-0.99.5	2010-12-28 11:55:34 +08:00
yangws	5e377f9368	issue #281 CCParticleSystemPoint.h upto-0.99.5	2010-12-28 11:09:40 +08:00
natural-law	01cd90f2cc	update layers_scenes_transition_nodes to 0.99.5.	2010-12-27 09:40:45 +08:00
natural-law	4a64f899fe	update label_nodes to 0.99.5.	2010-12-24 17:07:31 +08:00
minggo	e3b49d7504	merge from minggo and natual-raw	2010-12-23 17:40:23 +08:00
minggo	6d98bc7b5d	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge	2010-12-23 16:22:37 +08:00
minggo	30f4c94bfb	make a little change to upto-0.99.5	2010-12-23 10:35:09 +08:00
natural-law	eeb4e99804	rename the action classes.	2010-12-22 15:43:54 +08:00
natural-law	4a765d33a3	rename the CCXXXAction files to CCActionXXX.	2010-12-22 15:15:04 +08:00
Walzer	5c9aea9ee7	Merge branch 'minggo-master'	2010-12-20 15:03:32 +08:00
Walzer	13865e7331	Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master	2010-12-20 15:03:12 +08:00
minggo	3d85f8f8d3	correct the error for checking the existance of resources	2010-12-20 14:44:38 +08:00
minggo	dc980de055	copy resources correctly	2010-12-20 14:35:02 +08:00
minggo	32307cc3e0	copy resources from top directory	2010-12-20 14:21:33 +08:00
minggo	4c14ff2c2f	copy resources from top directory	2010-12-20 14:17:51 +08:00
Walzer	156e667849	merge tests/proj.uphone & framework.uphone, merge tests/proj.win32 & framework.win32	2010-12-20 12:47:56 +08:00
natural-law	9a4f0c0283	fixed #267 Fix the bug of test case "ParallaxParticle" in ParticleTest.	2010-12-18 15:20:45 +08:00
Walzer	5c858b182c	issue #243, fix warnings	2010-12-18 12:02:57 +08:00
Walzer	edc742d41b	Merge branch 'master' of https://github.com/leon-li/cocos2d-x into leon-li-master	2010-12-18 10:26:22 +08:00
Walzer	b12f20c834	[iphone-cpp] SDKROOT = "iphoneos" instead of "iphoneos4.1"	2010-12-18 10:15:07 +08:00
Leon	96f4f5c9fd	fix some compiling warning for iOS	2010-12-17 23:44:19 +08:00
Walzer	5a4c721f0c	modify build_natvie.sh to use unix line feed character	2010-12-17 15:43:36 +08:00
Walzer	063f595e9a	Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master	2010-12-16 12:03:25 +08:00
natural-law	95e697d316	fixed #262 Add namespace for the project CocosDenshion.	2010-12-15 18:28:18 +08:00
minggo	53753b65b5	merge bada platform	2010-12-15 18:05:02 +08:00
impact	7434748d4a	Capitalization changes for building on linux (case-sensitive filesystem)	2010-12-15 01:00:35 -05:00
natural-law	2576bbe5b4	Merge branch 'master' into iss258	2010-12-14 13:53:25 +08:00
unknown	acc30e35b1	Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master	2010-12-14 11:10:46 +08:00
unknown	57770086e6	Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master	2010-12-14 11:09:36 +08:00
natural-law	2c84b167e0	fixed #258 Move FileUtils.h from path "support/file_support" to path "include".	2010-12-14 10:45:23 +08:00
natural-law	341e7efb27	fixed #251 add a test case for CCKeypadDelegate	2010-12-14 10:23:20 +08:00
minggo	a33823706d	fixed #259	2010-12-14 09:42:39 +08:00
natural-law	8cb331994d	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge	2010-12-13 17:55:02 +08:00
unknown	7cc2498756	Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master	2010-12-13 16:53:16 +08:00
natural-law	2706e3a003	fixed #251 CCKeypadDelegate implement	2010-12-13 14:10:39 +08:00
minggo	4e0d856151	fixed #256	2010-12-13 11:36:35 +08:00
minggo	faa3063ad0	Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master	2010-12-11 17:41:33 +08:00
minggo	2f0f89abb1	fixed #255	2010-12-11 17:34:07 +08:00
minggo	817af55e1e	Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master	2010-12-11 13:26:26 +08:00
minggo	b7e78d82ab	fixed #254	2010-12-11 13:18:33 +08:00
Walzer	dec419be71	Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master	2010-12-10 10:34:41 +08:00
minggo	6b37bc97d4	fixed #220: run tests on android	2010-12-09 10:50:02 +08:00
unknown	4d22e3b263	Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master	2010-12-08 18:03:35 +08:00
minggo	a6855993f6	issue #220: android does not support glColor4ub, so use glColor4f instead	2010-12-06 11:15:16 +08:00
minggo	534a55eaa1	issue #220: All tests run on android emulator, but the effect of some tests are wrong	2010-12-06 09:51:21 +08:00
yangws	96115bc26e	fixed #233 now don't call preMainLoop when application enter background, test ok on uphone device. ... fixed a CCXAppWiz.uphone bug, create a empty file named xxxxx_str_str.h when build. Signed-off-by: yangws <yangws@cocos2d-x.org>	2010-12-03 15:27:55 +08:00
minggo	ad344d69fb	fixed #238, checked in xcodeproj file for HelloWorld & tests	2010-12-03 14:39:07 +08:00
yangws	687fb199fc	issue #233 stop main loop when application enter background. test ok on emulator	2010-12-02 18:44:13 +08:00
minggo	d88b26c4d2	commit AppDelegate.cpp after merging	2010-11-29 15:57:53 +08:00
minggo	7fa8d72076	commit before merging the code from https://walzer@github.com/cocos2d/cocos2d-x.git	2010-11-29 15:54:32 +08:00
minggo	9a2ff2407a	commit the change before merging master of cocos2d-x	2010-11-29 15:08:21 +08:00
natural-law	4d98faabc5	fixed #226 add support read resource file from zip file in cocos2d-uphone	2010-11-29 10:49:43 +08:00
Walzer	b4152fa700	fixed #222 merge different HelloWorld to one directory just like "tests", except HelloWorld.android	2010-11-27 18:25:31 +08:00
Walzer	8854ec5b10	Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master	2010-11-26 11:59:56 +08:00
minggo	aa826970eb	fixed #224	2010-11-26 11:38:10 +08:00
walzer	29191a385e	Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master	2010-11-24 10:38:01 +08:00
yangws	852c57d2c6	add CCLOG support on win32 and uphone	2010-11-23 18:20:46 +08:00
minggo	8be8a02e73	fixed #210: support accelemeter	2010-11-22 11:11:20 +08:00
yangws	9346275604	show fps	2010-11-19 03:14:19 +00:00
Walzer	3f8c167882	issue #211, add batch build for uphone	2010-11-19 02:59:27 +00:00
yangws	d96599e787		2010-11-19 02:48:08 +00:00
Walzer	0ad77b779a	issue #211 don't checkout	2010-11-18 15:55:00 +00:00
Walzer	26bfa32ca6	issue #211 don't check out	2010-11-18 14:56:54 +00:00
Walzer	5a44e5f1fe	issue #211 don't checkout	2010-11-18 13:51:33 +00:00
Ming	202ed580d6		2010-11-18 08:32:32 +00:00
Ming	99b7ae73e9		2010-11-18 08:24:19 +00:00
Ming	04aa648c1b		2010-11-18 08:23:49 +00:00
Ming	dc2f5f604f	fixed #208	2010-11-18 07:38:47 +00:00
Ming	31809a3774	issue #208	2010-11-18 06:50:28 +00:00
yangws	4a432f3125	change win32 porject name after test ok.	2010-11-17 03:13:37 +00:00
yangws	b181701039	change win32 porject name	2010-11-17 02:46:43 +00:00
yangws	0618af9711	change win32 project name	2010-11-17 02:16:21 +00:00
natural-law	10c6cd29f1	issue #189 ... add support of Accelerometer sensor	2010-11-16 09:09:12 +00:00
Walzer	fb25984f12	rename getShared methods to shared	2010-11-16 07:12:09 +00:00
yangws	2587114512	issue #186 add template/CCXAppWiz.vs to cocos2dx.	2010-11-16 03:25:33 +00:00
yangws	2e6f7c0623	issue #205 vs2008 run tests win32 OK.	2010-11-15 02:57:15 +00:00
Walzer	9a431a434e	fixed #198 reuse "tests" game logic between uphone & win32 platform! ohye~~	2010-11-13 06:35:37 +00:00
Walzer	aaf6a7f1ee	makefile for test_uphone arm	2010-11-13 01:47:25 +00:00
Walzer	ed7d1ca159	issue #198 now test_uphone & test_win32 directories are remove. "test" stands for them	2010-11-12 09:24:12 +00:00