2487 Commits

Author	SHA1	Message	Date
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	df58a09255	Update: ... 1. init CCSprite::m_pobBatchNode at the beginning of CCSprite::initWithTexture. 2. Add CCAssert in ccArrayRemoveObjectAtIndex. 3. Use new method to allocate CCDirector.	2012-04-05 18:53:53 +08:00
James Chen	931c42a621	Updated some files.	2012-04-04 21:58:04 +08:00
James Chen	2b17a7276c	issue #1056: Updated CCTextureAtlas.cpp	2012-03-29 14:33:50 +08:00
James Chen	d7aed75942	issue #1056: Removed CCNode::arrayMakeObjectsPerformSelector, instead, we defined two macros (arrayMakeObjectsPerformSelector and arrayMakeObjectsPerformSelectorWithObject) to fit for any classes that inherit from CCNode.	2012-03-29 14:30:13 +08:00
James Chen	a0520d8f27	Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20	2012-03-29 11:25:57 +08:00
James Chen	56d5c496e9	issue #1056: Refactored two macros -- ccArrayMakeObjectsPerformSelector , ccArrayMakeObjectsPerformSelectorWithObject.	2012-03-29 11:25:08 +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	a626271b06	issue #1056: Made setupVBO as CCTextureAtlas's member function.	2012-03-28 22:01:12 +08:00
James Chen	bb7485621e	issue #1056: Updated ParticleTest, CCParticleSystem, CCParticleSystemQuad.	2012-03-28 21:44:28 +08:00
James Chen	3d63f9c58e	issue #1056: Set CC_ENABLE_GL_STATE_CACHE = 1, Updated LavaFlow.plist.	2012-03-28 17:51:26 +08:00
James Chen	c73c84f79b	issue #1056: Fixed a bug in CCDirector::setProjection. ... We should invoking kmGLMultMatrix(&orthoMatrix) after invoking kmMat4OrthographicProjection.	2012-03-28 17:02:07 +08:00
James Chen	394bb24cf5	issue #1056: Reverted opengles emulator version to 2.09, because there are some issues in v2.10.	2012-03-27 14:11:28 +08:00
James Chen	3475108953	issue #1056: Updated Android.mk, fixed a bug in CCImage.h.	2012-03-27 13:48:14 +08:00
James Chen	cef41dfbc5	issue #1056: Updated opengles2.0 emulator libraries to newest version 2.10@863987. Deleted some files of opengles1.1.	2012-03-27 13:42:35 +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	7d04254855	issue #1056: Updated some files.	2012-03-26 22:37:09 +08:00
James Chen	0f5efaffd2	issue #1056: Check bugs of SpriteTest.	2012-03-26 18:44:28 +08:00
James Chen	85c13998ee	issue #1056: Added CCTransitionProgress class, Updated Texture2dTest, TileMapTest, TransitionsTest.	2012-03-26 16:46:23 +08:00
James Chen	9c9230a43f	#issue #1056: Updated SpriteTest.	2012-03-23 17:31:28 +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
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
James Chen	b1f293e089	issue #1056: Updated MenuTest. Added CCArray::arrayWithObject function.	2012-03-22 14:22:06 +08:00
James Chen	fc2fd4d353	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20	2012-03-22 09:46:23 +08:00
James Chen	59393c2fef	issue #1056: Update CCLabelBMFont.	2012-03-22 09:46:07 +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	35d93328b9	issue #1056: 1.Fixed a bug of double delete TouchDispatcher. ... 2. Modified the last parameter of glDrawElements. It will cause crash on some devices if the last parameter which means Indices's pointer is zero.	2012-03-21 21:53:03 +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	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	2ac2da9c97	issue #1056: 1. Removed ChipmunkTest, added ChipmunkAccelTouchTest. ... 2. Added Box2DTest and Box2DTestBed. Tested on win32.	2012-03-21 15:43:35 +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	00a81f5bd0	Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20	2012-03-21 10:43:54 +08:00
James Chen	02ae04c1d6	issue #1056: Modified the configuration of ios project.	2012-03-21 10:41:21 +08:00
James Chen	bb4d7c2f88	issue #1056: Updated some files for ios platform. Added some 'TODO'.	2012-03-21 10:36:20 +08:00
James Chen	321771a7ea	issue #1056: Added gles2.0 support for ios platform.	2012-03-21 10:05:23 +08:00
James Chen	7c0af610ff	issue #1056: Added CCArray::copyWithZone implementation. CCDictElement bound check.	2012-03-20 23:30:18 +08:00
James Chen	15e03f8b14	issue #1056: Remove old files(CCMutableArray, CCMutableDictionary) reference in vc2008 project. ... Update CCDICT_FOREACH implementation.	2012-03-20 21:08:52 +08:00
James Chen	b5fca2f5f3	issue #1056: Fixed a bug in CCTouchDispatcher which will cause crash when app exit. Fixed some memory leaks.	2012-03-20 21:04:29 +08:00
minggo	382e4e7eb8	issue #1056: modify code according new code after pull	2012-03-20 17:27:06 +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
James Chen	9203b60fb0	add CCDictionary based on UTHASH, improve the performance.	2012-03-19 14:53:44 +08:00
James Chen	f67ac20639	Merge pull request #775 from dumganhar/gles20-dev ... issue #1056: synchronise cocos2d-iphone-2.0-rc0a, update some files.	2012-03-16 02:59:21 -07: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	86a1acc0d8	Merge pull request #774 from dumganhar/gles20-dev ... issue #1056: synchronise cocos2d-iphone-2.0-rc0a	2012-03-15 22:45:20 -07:00
James Chen	275891dfb0	issue #1056: synchronise cocos2d-iphone-2.0-rc0a	2012-03-16 13:42:53 +08:00
James Chen	303818ef6d	issue #1056: Update CCGLProgram.	2012-03-15 10:54:07 +08:00
James Chen	9e89171557	issue #1056: Rename ccGLState to ccGLStateCache, add some ccShader_***_.h, update CCGLProgram class.	2012-03-15 10:42:22 +08:00
James Chen	673a1ca238	Merge pull request #771 from dumganhar/gles20-dev ... issue #1056: TestCases works ok except Box2dTest and ChipmunkTest.	2012-03-14 03:15:38 -07:00
James Chen	8aa3f7f9ae	issue #1056: TestCases works ok except Box2dTest and ChipmunkTest.	2012-03-14 18:11:25 +08:00
James Chen	b8d760064d	issue #1056: Add CCVertex.h CCVertex.cpp, implement CCMotionStreak.	2012-03-14 16:10:01 +08:00
James Chen	d0f93d38f4	Merge pull request #769 from dumganhar/gles20-dev ... issue #1056: synchronise cocos2d-iphone gles2.0 branch, HelloWorld on win32 works ok.	2012-03-14 00:00:57 -07:00
James Chen	aefdb852a2	issue #1056: synchronise cocos2d-iphone gles2.0 branch, HelloWorld on win32 works ok.	2012-03-14 14:55:17 +08:00
Paolo Giangrandi	4f2f403827	Fixed a broken call to SetTouchInfo in CCEGLView_linux.cpp	2012-03-12 14:22:48 +01:00
Paolo Giangrandi	7820be7841	Fixed a typo: CCAplication_linux.{cpp,h} renamed in CCApplication_linux.{cpp,h}	2012-03-12 14:22:39 +01:00
James Chen	bd59979495	add gles2.0 libraries for win32. ... add CCGLProgram, ccGLState, CCShaderCache. add third library---kazmath	2012-03-12 15:22:03 +08:00
minggo	cc7542a86b	Merge pull request #766 from assoulter/master ... Fix m_nEntryID typo	2012-03-11 20:06:24 -07:00
minggo	7fc0ffbf26	fixed #737: remove view id	2012-03-12 11:00:12 +08:00
Anton Rusanov	8e53d9db9f	fix m_nEntryID typo for CC_LUA_ENGINE_DEBUG	2012-03-12 00:59:03 +04: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	7dfe4224e1	Merge pull request #756 from dualface/fix-lua-engine-bugs ... fixed #1030: Improve Lua engine	2012-03-07 21:42:35 -08:00
minggo	e9c1e43e27	Merge pull request #755 from dumganhar/iss1022_string_with_file ... fixed #1022: Added a static method named CCString::stringWithContentsOfFile.	2012-03-07 21:39:59 -08:00
minggo	645d561276	fixed #737: remove view id	2012-03-08 12:40:27 +08:00
Liao YuLei	c6c7fb1be6	Improve Lua engine ... rename executeFunctionByRefId() to executeFunctionByHandler() add executeFunctionWithCCObject() add pushIntegerToLuaStack() add pushFloatToLuaStack() add pushBooleanToLuaStack() add pushCCObjectToLuaStack()	2012-03-07 20:27:26 +08:00
James Chen	c91fd243dc	Update cocos2dx/include/CCString.h	2012-03-07 16:15:26 +08:00
James Chen	2564f39eb8	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss1022_string_with_file	2012-03-07 16:13:16 +08:00
James Chen	00745ae172	fixed #1022: add the comment for CCString::stringWithContentsOfFile.	2012-03-07 16:12:46 +08:00
minggo	a0f0971782	fixed #1017: improve win32 timing accuracy	2012-03-06 14:12:57 +08:00
James Chen	74b4b14ee3	Merge pull request #730 from moadib/qnx_eventhandler ... Added CCEGLView::EventHandler class for qnx-platform Added window group id for qnx-version of CCEGLView	2012-03-05 18:07:20 -08:00
minggo	ed68855e19	fixed #1009: fix a typo error	2012-03-06 09:35:36 +08:00
James Chen	fd9dd6c7fe	add stringWithContentsOfFile static method in CCString class.	2012-03-05 11:13:45 +08:00
James Chen	cb1f94df47	revert CCFileUtils::getFileData method.	2012-03-05 09:55:50 +08:00
James Chen	347a8294ac	fixed #1007: Allocate one more byte of '\0' to terminate string in CCFileUtils::getFileData.	2012-03-03 12:24:02 +08:00
minggo	796ba89e9d	Merge pull request #742 from minggo/iss762_label_position ... compute correct text rect and display it on center	2012-03-01 22:24:04 -08:00
minggo	2360a9a04e	fixed #762: let zfont display on center	2012-03-02 14:22:01 +08:00
minggo	5485eb19d9	fixed #762: compute correct text rect and display it on center	2012-03-02 14:17:22 +08:00
minggo	79495fd743	Merge pull request #741 from minggo/master ... remove libiconv.a	2012-03-01 19:28:35 -08:00
minggo	c196f2dff2	issue #983: remove libiconv.a	2012-03-02 11:25:35 +08:00
minggo	528a769cf6	fixed #762: make label display on center on iOS	2012-03-02 11:15:44 +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	6c01009a18	fixed #986: Add init() member funciton of CCMenu class.	2012-02-29 10:07:18 +08:00
James Chen	05bf647ec3	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss984_bada_qnx_static_lib	2012-02-28 15:00:18 +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
minggo	bb2ca44c24	fixed #985: remove xcode3 template	2012-02-28 10:21:59 +08:00
James Chen	2bc48219f8	remove libjpeg, libpng, libz project, use them as sources in cocos2dx project.	2012-02-27 18:18:40 +08:00
minggo	be66bec269	Merge pull request #727 from minggo/iss946_retina ... fixed #946: HD image for both retina and normal	2012-02-27 00:10:17 -08:00
moadib	de9f8dc441	Added window group id for qnx-version of CCEGLView	2012-02-24 08:40:35 +04:00
minggo	fd9445f6df	add commet for CCArray	2012-02-23 10:06:36 +08:00
moadib	7fcdb3b114	Added CCEGLView::EventHandler class for qnx-platform	2012-02-22 12:27:13 +04:00
minggo	b0b6b85a79	fixed #946: HD image for both retina and normal	2012-02-16 10:47:16 +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	2ef7b5d413	refactor folders for qnx	2012-02-15 11:26:28 +08:00
James Chen	abbda72b2f	modify bada 2.0 project setting	2012-02-14 23:31:37 +08:00
James Chen	dac63dd2c2	rename include file name from uppercase to lowercase for linux platform	2012-02-14 22:41:33 +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	4f523bf986	remove .settings folder	2012-02-14 18:06:29 +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
James Chen	e3e016331c	issue #972: move extensions folder to cocos2dx	2012-02-14 16:08:12 +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	0adca5774c	move CCNotificationCenter to extensions folder	2012-02-14 11:45:59 +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
minggo	c98dd0cf2d	fixed #948: remove getIndexOfObject()	2012-02-14 10:49:53 +08:00
minggo	538adcec3e	merge code from duleface	2012-02-10 13:56:20 +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	5ce4968524	merge from cocos2d-x master	2012-02-10 10:46:58 +08:00
YuLei Liao	1d6d966717	fix CCScriptEngineManager::purgeSharedManager()	2012-02-09 20:07:55 +08:00
minggo	141dac47d3	Merge branch 'luafix-master' of https://github.com/dualface/cocos2d-x into lua_support_refactor	2012-02-09 17:58:39 +08:00
YuLei Liao	e74b842a58	update HelloLua	2012-02-09 17:48:15 +08:00
minggo	95906c34bf	Merge branch 'luafix-master' of https://github.com/dualface/cocos2d-x into lua_support_refactor	2012-02-09 16:14:54 +08:00
minggo	153d2b8192	issue #971: build cocos2dx as static lib and remove some unneeded codes	2012-02-09 15:49:14 +08:00
YuLei Liao	6ebdf9cb4b	* add CCScriptSupport	2012-02-09 14:07:11 +08:00
dumganhar	ca94a11190	fixed #951: removed definition of NSMutableSet.	2012-02-07 15:35:10 +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
YuLei Liao	7a96d13fb6	rename all FuncID to Handler	2012-02-07 11:43:29 +08:00
dumganhar	1e807d00c3	fixed #967: fixed PVR Textures can not be reloaded after GL context lost on android.	2012-02-07 11:18:39 +08:00
minggo	8770976884	Merge branch 'android_ndk_modules' of https://github.com/folecr/cocos2d-x into ndk_module	2012-02-07 10:48:07 +08:00
Wartortle	aa06de2fb3	Second half of commit for adding Accelerometer simulation to Win32.	2012-02-06 11:38:53 +00:00
Wartortle	ffc4457991	On Win32 platform, there's now support for simulating the Accelerometer ... using the up/down/left/right/comma/period keys.	2012-02-06 11:29:28 +00:00
minggo	babbd64f0d	Merge pull request #691 from winbinar/master ... fixed #626: Fix bug #626	2012-02-05 23:00:31 -08:00
YuLei Liao	4fe0c10e10	merge upstream/master	2012-02-06 10:54:51 +08:00
moadib	f5b8aa79c5	Fixed "out of bound" error in CCFileUtils::getWriteablePath() for BlackBerry	2012-02-05 16:49:47 +04:00
YuLei Liao	69a7e2a2e3	* change unsigned int CCObject::m_uLuaID -> int CCObject::m_nLuaID, because LUA_INTEGER is int.	2012-02-04 11:34:17 +08:00
dumganhar	6fbf2f1d09	move SelectorProtocol to CCObject	2012-02-03 15:05:29 +08:00
folecr	3eeb0c8687	fix library name - the makefiles expect the full name of the library including the lib prefix	2012-02-02 23:01:50 -08:00
folecr	cab83bb4a6	Fix header file location to match convention in include directives in the cocos source	2012-02-02 20:07:37 -08:00
folecr	516c56a793	Add EXPORT_C_INCLUDES and correct the paths to third party modules	2012-02-02 20:04:29 -08:00
dumganhar	f6d6d0dd49	fixed #965: Remove some dynamic_cast callings since selector_protocol.h was removed	2012-02-02 17:46:45 +08:00
minggo	2b91b1c7cf	fixed #933: free doc	2012-02-02 14:24:51 +08:00
minggo	591b7d0619	fixed #933: profile CCUserDefault	2012-02-02 14:18:13 +08:00
martinezgerman	c78bf39601	Member variable added to keep the current window active status	2012-01-31 22:55:44 -08:00
martinezgerman	acdd00f03b	Functionality to detect when the application goes to the background and return from it, notifying only ones per time to the application	2012-01-31 21:38:44 -08:00
martinezgerman	e8f9c5f675	merging the original update	2012-01-31 20:06:39 -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
Nicholas Kostelnik	edaf2cf269	fixed issue with CCEaseBackInOut being erratic on the second stage of the transititon	2012-01-31 09:57:58 +00:00
martinezgerman	38cd599bdc	Functionality to detect when the application goes to the background and return from it	2012-01-31 00:25: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
dumganhar	a909be3264	remove selector_protocol.h for vs2010 project	2012-01-30 18:27:03 +08:00
dumganhar	c6ec949950	remove some functions in CCObject	2012-01-30 16:07:01 +08:00
dumganhar	6eb65442d4	remove some logs	2012-01-30 15:46:56 +08:00
dumganhar	f44b38eaf8	fixed #958: move the implement of SelectorProtocol to CCObject	2012-01-30 15:31:59 +08:00
winbinar	231446a8a5	Update cocos2dx/textures/CCTextureCache.cpp	2012-01-30 07:10:49 +02:00
winbinar	910ded54c5	Update cocos2dx/textures/CCTextureCache.cpp	2012-01-30 07:10:19 +02:00
folecr	b0b5790e06	Simplify inclusion of cocos2d in Android NDK projects: Cocos2DX is the only module that importing projects need to add. Requires Android NDK r7. ... * Uses NDK modules as the basis of the build system for Android NDK * Add a cocos2dx module to generate a shared library named cocos2dx_shared. Library name is still libcocos2d.so * The dependencies of this module are also Android NDK modules * ... which are prebuilt static libraries from the png, jpeg and xml2 modules. * Dependency library names set to libjpeg, libpng, etc. even though we are building variants with names like jpeg_shared.	2012-01-29 09:52:38 -08:00
folecr	e6fddbc047	Move libraries & include files for third party dependencies so that it is possible to create Android NDK Modules from prebuilt libs.	2012-01-29 09:33:17 -08:00
gzito	fe79a2c5d2	Merge branch 'master' of git://github.com/cocos2d/cocos2d-x	2012-01-28 10:54:31 +01:00
dumganhar	49b57569c9	fixed #756: CCMenu can't be initialized by using CCMenu::node() method.	2012-01-28 14:38:44 +08:00
folecr	a9d7500ae7	Fix whitespace line ending in one single line.	2012-01-25 18:14:29 -08:00
gzito	f40d3d3db8	Changed use of animation interval in game loop	2012-01-24 23:27:03 +01:00
YuLei Liao	f8dafe6712	* add CCNode::getChildrenCount()	2012-01-21 01:29:41 +08:00
YuLei Liao	b79828a697	* merge lua fix	2012-01-21 00:47:51 +08:00
YuLei Liao	9660bcd165	* merge upstream/master to master	2012-01-20 19:08:21 +08:00
dumganhar	57eee38f4e	Merge branch 'master' into moveSel2CCObject	2012-01-19 15:46:31 +08:00
dumganhar	a23893507d	fixed 952: make CCLabelBMFont support other language, such as chinese, korean, japanese.	2012-01-18 18:43:41 +08:00
dumganhar	543d96a73f	issue 952: make CCLabelBMFont support other language, such as chinese, korean, japanese.	2012-01-18 18:02:39 +08:00
gzito	b400570265	Workaround for issue #635. Prevents "ERROR: 5 in device 25" to be reported in X86 Marmalade Mac OSX simulator	2012-01-17 10:57:31 +01:00
dumganhar	cea250a962	restore original CCCopying as the parent class of CCObject	2012-01-17 10:54:21 +08:00
dumganhar	aa4fae3980	restore original CCCopying as the parent class of CCObject	2012-01-17 10:00:22 +08:00
dumganhar	ea0fb47f98	Merge branch 'master' into moveSel2CCObject	2012-01-17 09:37:31 +08:00
gzito	c87881ff94	Added Marmalade support to TextInputTest and HelloLua samples	2012-01-15 15:57:10 +01:00
dumganhar	d3642be42d	Merge pull request #677 from dumganhar/modify_linux_port ... modify eclipse project setting for linux port	2012-01-12 04:00:02 -08:00
minggo	bd5ff14e45	Merge branch 'test' of https://github.com/minggo/cocos2d-x into test	2012-01-12 19:30:46 +08: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	0e03c8ca21	fixed #930: linux supports jpg format file	2012-01-12 17:46:53 +08:00
minggo	cfe02e39ef	Broken include guard in CCActionEase.h	2012-01-12 17:06:46 +08:00
minggo	75216ac9ca	make CCTouchDelegate::touchDelegateRetain() and touchDelegateRelease as pure virtual function	2012-01-11 16:54:14 +08:00
minggo	57801eb0a0	modify version	2012-01-11 15:17:16 +08:00
dumganhar	ffeed3827a	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into moveSel2CCObject ... Conflicts: cocos2dx/platform/CCPlatformMacros.h	2012-01-09 23:23:45 +08:00
dumganhar	d61f87ba92	modify construct and destruct function of some class, for example CCNode() --> CCNode.cpp(void)	2012-01-09 23:21:31 +08:00
minggo	0ee582e887	fixed #917: add header files to resolve compiling errors	2012-01-09 17:36:57 +08:00
minggo	b1aee8f9eb	Merge https://github.com/cocos2d/cocos2d-x into iss917_CCFileUtils	2012-01-09 17:12:46 +08:00
dumganhar	4cc1658d45	fixed #938:Don't use eglGetProcAddress to get extension function on bada1.0 device, otherwise it will cause crash.	2012-01-09 14:15:49 +08:00
dumganhar	259aaf42a6	Fixed: get extension function from eglGetProcAddress on bada platform	2012-01-09 14:15:18 +08:00
dumganhar	30a02030b0	make the property function to virtual	2012-01-09 11:07:45 +08:00
dumganhar	a773e4fb96	move SelectorProtocol to CCObject	2012-01-08 21:03:16 +08:00
dumganhar	2f1c313d12	Merge pull request #658 from gzito/master ... Added options to compile libFreetype and libXml2 also under Marmalade Mac (x86 version)	2012-01-04 22:09:22 -08:00
gzito	65ddb88000	Added options to compile freetype and libXml under Marmalade MAC (x86 simulator version)	2012-01-04 23:34:48 +01:00
minggo	4bffaaf9cb	fixed #936: check whether selector is valid	2012-01-04 10:58:20 +08:00
minggo	c6da8d2fbd	call correct java method	2012-01-04 10:14:46 +08:00
gzito	2acea5f7af	libxml2.mkf for both Windows and Mac Marmalade versions	2012-01-03 00:39:31 +01:00
gzito	083d0015a3	Merge branch 'master' of git://github.com/cocos2d/cocos2d-x	2012-01-02 22:32:29 +01:00
dumganhar	4010733c20	fixed #927: To use 'std::map::find' instead of 'std::map::[]', because '[]' will create a new element with default value.	2011-12-31 17:44:45 +08:00
minggo	f776ecc7e0	Merge pull request #650 from dumganhar/issue#934_add_isEqual ... Add 'isEqual' function for CCString, make CCObject::isEqual to virtual function	2011-12-30 18:18:39 -08:00
dumganhar	8c65786dce	fixed #934: Add 'isEqual' function for CCString, make CCObject::isEqual to virtual function	2011-12-31 10:10:41 +08:00
minggo	53fae04ba8	fixed #752: make add/remove touch delegate in menu callback function correctly	2011-12-30 15:43:36 +08:00
dumganhar	20b6257198	fixed #928:change 'vt->m_PixelFormat = CCTexture2D::defaultAlphaPixelFormat();' to 'vt->m_PixelFormat = tt->getPixelFormat();'	2011-12-29 16:00:36 +08:00
dumganhar	025258d21d	fixed #928: save pixelformat for each texture, restore the pixelformat after entering foreground	2011-12-29 15:05:38 +08:00
minggo	fcb2294e20	fixed #926: subclass should retain/release when dynamic_cast fail.	2011-12-28 14:47:54 +08:00
minggo	37915cfed6	remove unneeded function, and make protocol an abstract class	2011-12-28 14:46:49 +08:00
gzito	28562c3fb9	Merge branch 'master' of git://github.com/cocos2d/cocos2d-x	2011-12-27 16:14:19 +01:00
YuLei Liao	bbad5a4392	* merge upstream/master to master	2011-12-25 11:48:03 +08:00
dumganhar	a09bebb32b	fixed #903: 1.pass 'id' parameter to setTouchInfo function; ... 2.when double press happens, deal with it as single press.	2011-12-23 20:33:42 +08:00
minggo	edbbe25a98	issue #888: remove the setting for android building	2011-12-23 10:40:02 +08:00
minggo	12237cf288	fixed #911: add some comment	2011-12-22 16:29:25 +08:00
minggo	7422a424da	fixed #911: make CCTextureCache::addUIImage() work ok when key is null	2011-12-22 16:26:56 +08:00
minggo	a96285b617	fixed #923: init iamge type and refactor a little codes	2011-12-22 15:38:31 +08:00
minggo	a0fe048f11	fixed #923: cache texture with correct image type	2011-12-22 10:48:54 +08:00
minggo	21f05c2d6f	issue #903: fix a compiling error	2011-12-22 09:56:09 +08:00
minggo	bb4b1d02bb	Merge pull request #608 from GMTDev/patch-2 ... issue #903: Update CCTouch to include the ID/PID of the touch	2011-12-20 21:48:30 -08:00
GavT	36f8e43dd8	Update cocos2dx/include/CCTouch.h	2011-12-20 20:40:48 -08:00
gzito	a39be9506f	Defines documentation to avoid warning in Marmalade	2011-12-20 22:34:23 +01:00
gzito	d37417f7da	Re-added libXml2	2011-12-20 22:10:01 +01:00
gzito	298f12e7a3	Removed libxml2 (precompiled version)	2011-12-20 22:05:01 +01:00
minggo	01cf5793ad	fixed #922: rename CCTexture2D::setPVRImagesHavePremultipliedAlpha() and change it to a static method	2011-12-20 14:59:15 +08:00
minggo	28d0737bf3	fixed #917: implement CCFileUtils::getFileDataFromZip() on iOS	2011-12-20 14:18:53 +08:00
dumganhar	a8d5b6544a	Merge pull request #629 from gzito/master ... Optimized ttf to bitmap, cached last loaded ttf & fixed ttf alpha. Other minor fixes. Added authors info.	2011-12-19 18:46:07 -08:00
minggo	faa8b59b6d	fixed #920: export functions in CCAffineTransform	2011-12-20 10:39:10 +08:00
gzito	59bccb6bf8	Added last loaded font caching & minor fixes	2011-12-19 23:08:35 +01:00
gzito	e3c5d6886e	Added authors info	2011-12-19 22:57:04 +01:00
gzito	e389ae5469	Optimized CCImage and fixed alpha value	2011-12-19 22:56:44 +01:00
YuLei Liao	318a4c5ba8	merge upstream/master to master	2011-12-17 12:02:24 +08:00
dumganhar	2f63d6a158	Merge pull request #624 from dumganhar/issue#918 ... fixed #918: modify filter of airplay to marmalade.	2011-12-15 19:11:49 -08:00
dumganhar	af221f8710	fixed #918: modify filter of airplay to marmalade.	2011-12-16 11:08:37 +08:00
minggo	ffe8890498	Merge pull request #621 from minggo/iss892_RTTI ... issue #892: use RTTI instead of selectorRetain() and selectorRelease()	2011-12-15 18:52:46 -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	f3b7b519fc	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into pullrequest#619	2011-12-15 11:38:15 +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
minggo	15fca8b4b4	issue #892: use RTTI instead of selectorRetain() and selectorRelease()	2011-12-15 10:26:31 +08:00
minggo	8813d94257	Merge pull request #617 from minggo/issue906 ... remove unneeded code in CCImage_android.cpp	2011-12-14 18:08:24 -08:00
Didiet Noor	00e504356a	Fixing Warning on CLang 3.0 on XCode 4.2	2011-12-15 01:46:55 +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	7f7ef29b21	Fixes on QNX project accidentally including marmalade	2011-12-14 16:50:26 +08:00
dumganhar	625d299717	Merge branch 'master' of https://github.com/gzito/cocos2d-x into marmalade	2011-12-13 10:01:29 +08:00
gzito	d4ea6d4ef5	Rollback changes about CCDirector::sharedInstance as pointer ... Optimized a little bit CCImage::initWithString Fixed CCApplication::run in order to handle closing Marmalade simulator	2011-12-12 14:50:35 +01: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
minggo	ba462e99a6	fixed #906: remove unneeded code in CCImage_android.cpp	2011-12-12 17:02: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	f3b662a5a8	marmalade updates	2011-12-10 22:29:39 -08:00
styck	dc6476ebe0	marmalade updates	2011-12-10 21:54:07 -08:00
styck	9fc2061c6b	mamarlade updates	2011-12-10 21:20:15 -08:00
styck	bcf63d0e96	Merged from gitbub.gom/gzito, marmalade support, remove airplay	2011-12-10 20:59:48 -08:00
gzito	2be5240a5d	Fixed CCFileUtils::getWriteblePath on Marmalade	2011-12-10 16:34:54 +01: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
Giovanni Zito	af29be2d26	Shared instance is now a pointer instead of a static instance. Also the CCEGLView::release notifies application about quit	2011-12-09 22:04:35 +01:00
Giovanni Zito	362a82f41c	mainloop modified to handle correctly quit requests	2011-12-09 22:03:38 +01:00
Giovanni Zito	c17d7de0a1	For CC_PLATFORM_MARMALADE used pointers instead of static instances for singletons	2011-12-09 22:02:19 +01:00
Giovanni Zito	5584039f47	libFreeType and libJpeg for Marmalade	2011-12-09 21:58:32 +01:00
dumganhar	1c9ecabd89	modify all projects config	2011-12-09 17:03:11 +08:00
dumganhar	6d2a298035	Merge branch 'bbf' into blackberry	2011-12-09 15:58:16 +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	190fbb60a7	Merge branch 'Forf_2' into bbf	2011-12-09 10:39:27 +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	0a7a000c2d	Changed symbols from "airplay" to "marmalade", added files and folders for marmalade	2011-12-08 12:21:48 +01:00
Giovanni Zito	0c1b058629	Changed symbols from "airplay" to "marmalade", added files and folders for marmalade	2011-12-08 12:16:32 +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
Giovanni Zito	7b0cb1bc8b	Accelerometer stuff	2011-12-08 10:48:03 +01:00
Giovanni Zito	e077107575	Used CONSTANT definitions for touch	2011-12-08 09:30:18 +01:00
YuLei Liao	b3ecaedfeb	Merge branch 'refs/heads/luafix-0.10.0'	2011-12-08 15:47:28 +08:00
YuLei Liao	d49456cbd1	* merge upstream/master to master	2011-12-08 15:47:20 +08:00
YuLei Liao	7e170c7517	* add LUA_ENGINE_DEBUG & LUALOG macro	2011-12-08 15:44:13 +08:00
Giovanni Zito	8b4b802839	Merge remote-tracking branch 'upstream/master' ... Conflicts: cocos2dx/platform/CCSAXParser.h	2011-12-08 08:41:16 +01:00
GavT	3d86583818	Update cocos2dx/platform/android/jni/TouchesJni.cpp	2011-12-07 20:25:51 -08:00
dumganhar	fa07d16f73	switch to WVGA	2011-12-08 11:07:17 +08:00
Giovanni Zito	b60eac2505	integrating libXml2	2011-12-07 23:49:52 +01:00
dumganhar	de7754697f	fixed #904: use relative path for bada 2.0 projects	2011-12-07 18:26:38 +08:00
dumganhar	2c94bcc075	add some files for qnx	2011-12-07 16:22:40 +08:00
minggo	3bf11dba7e	issue #892: modify pkg for lua	2011-12-07 15:24:03 +08:00
minggo	cdc842051f	issue #892: use RTTI to simplify codes, work ok on win32	2011-12-07 14:28:22 +08:00
GavT	6ab60118af	Update cocos2dx/include/CCTouch.h	2011-12-06 20:31:40 -08:00
GavT	190891bab7	Pass on index/ID/PID of the touch from UITouch to CCTouch and the users touch handlers. Needed for multi touch apps that need to tell which touch/finger was let go. As discussed here by GavT: http://www.cocos2d-x.org/boards/6/topics/4043?r=5751#message-5751 ... Files Modified: Eagleview.mm, CCTouch.h	2011-12-06 20:06:38 -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
Giovanni Zito	97967ffcb3	Specific classes for Marmalade platform	2011-12-07 00:08:04 +01:00
dumganhar	6d7baa9684	add platform files for qnx	2011-12-06 17:19:36 +08:00
dumganhar	bfdb908d01	add Cocos2dx project ... add HelloWorld project and rename proj.blackberry fold to proj.qnx	2011-12-06 14:56:37 +08:00
Walzer	70d5a088f1	fixed #887, define GL_GLEXT_PROTOTYPES = 1 automatically when compile on ndk-r7	2011-12-04 20:18:17 +08:00
YuLei Liao	442e06e62e	* add CCNode:getPositionLua(), return CCPoint	2011-12-04 11:35:55 +08:00
YuLei Liao	cf12806558	merge luafix-0.9.2	2011-12-01 22:02:16 +08:00
YuLei Liao	f860edc744	Merge remote-tracking branch 'refs/remotes/upstream/master'	2011-12-01 22:00:21 +08:00
minggo	f0e80b32f4	fixed #854: cache texture on android	2011-12-01 17:04:56 +08:00
YuLei Liao	2d9e8f065b	* add CCNode:getPositionX(), CCNode:getPositionY(), CCNode:setPositionX(), CCNode:setPositionY()	2011-12-01 14:58:39 +08:00
YuLei Liao	f3e654056c	* fix merge error 2	2011-11-30 21:50:00 +08:00
YuLei Liao	25f1cf16fd	* fix merge error 1	2011-11-30 21:47:23 +08:00
YuLei Liao	45fe3b3090	* merge luafix-0.9.2	2011-11-30 21:42:18 +08:00
YuLei Liao	216ad9b9cb	* merge upstream/master to master	2011-11-30 21:38:20 +08:00
YuLei Liao	a680ba4a8a	* CCTouch:locationInView() & CCTouch:previousLocationInView() return const reference	2011-11-30 21:29:57 +08:00
YuLei Liao	31285fea17	* add Touch & MultiTouches lua support	2011-11-30 21:27:50 +08:00
minggo	a5f389894a	Merge pull request #593 from minggo/box2d ... change version and support android 4.0	2011-11-29 23:34:33 -08:00
minggo	4607ba8029	support for android 4.0	2011-11-30 15:30:11 +08:00
dumganhar	445982a252	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base	2011-11-30 09:35:15 +08:00
dumganhar	68297f0121	fix a bug when COCOS2D_DEBUG >=1, CCAssert haven't the second param.	2011-11-30 09:32:07 +08:00
dumganhar	3f97e7db44	fix a bug when COCOS2D_DEBUG >= 1 in CCScheduler.cpp	2011-11-30 09:26:45 +08:00
YuLei Liao	4bf68e79fd	* merge upstream/master to master	2011-11-29 19:56:20 +08:00
YuLei Liao	ebd381af26	* merge luafix-0.9.2 to master	2011-11-29 19:20:49 +08:00
YuLei Liao	9070248d17	* [fix] MenuItem::activate() not call script function with tag value	2011-11-29 17:40:18 +08:00
minggo	adfec68577	fixed #850: update Box2d for linux	2011-11-29 17:12:21 +08:00
YuLei Liao	90ae1aabc7	* add CCScene::registerScriptEventsHandler(), CCScene::unregisterScriptEventsHandler()	2011-11-29 17:10:58 +08:00
YuLei Liao	6117e15354	* [fix] CCFileUtils::getDoubleResolutionImage() not display HD file path.	2011-11-29 15:52:13 +08:00
YuLei Liao	0739c1f262	* rename LuaEngine to CCLuaEngine ... * add #if LUA_ENGINE * format source files	2011-11-29 15:42:12 +08:00
YuLei Liao	31b47c3fc6	* remove needless code	2011-11-29 12:38:28 +08:00
dumganhar	0fff92236f	add f project	2011-11-29 12:38:20 +08:00
YuLei Liao	f1351610d8	* merge CCLuaSupport to CCLuaEngine	2011-11-29 12:35:48 +08:00
minggo	266f0ee7ab	Merge pull request #586 from leon-li/master ... Fix some minor bugs.	2011-11-28 18:27:38 -08:00
Leon	f108952595	Merge remote branch 'upstream/master' ... Conflicts: cocos2dx/support/CCPointExtension.cpp	2011-11-29 10:15:15 +08:00
dumganhar	d108f4f456	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base	2011-11-28 23:13:02 +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
minggo	f0d22ae504	issue #879: replase assert with CCAssert	2011-11-28 17:28:43 +08:00
dumganhar	112ec42670	fixed #854: support bada pthread and semaphore	2011-11-28 16:07:17 +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
dumganhar	31ea76c16a	remove COCOS2D_DEBUG=1 in helloworld and cocos2dx project	2011-11-28 14:33:29 +08:00
dumganhar	20455bf164	fix a bug that when selecting "target-release" in building configurations, CCFileUtils::getFileData can't work correctly because CC_ASSERT is called uncorrectly.	2011-11-28 14:27:48 +08:00
minggo	8fd6a7298f	issue #854: fix warning	2011-11-28 10:12:31 +08:00
Leon	6f99f7efde	1. fix multi touch index. ... 2. swap. 3. create gl view.	2011-11-26 22:37:36 +08:00
Walzer	ab7db20809	Fix a typo, CCSprite::get/setHornorParnetTransform to get/setHonorParnetTransform	2011-11-26 17:20:12 +08:00
Walzer	8edbbd56a9	Fix a typo here. Two values are not swapped correctly, max_inclusive is still equal to itself.	2011-11-26 17:07:36 +08:00
minggo	842c64486e	issue #854: remove unneeded code	2011-11-25 16:16:37 +08:00
minggo	77b830b36b	issue #854: use semaphore instead of condition because the condition may lose message	2011-11-25 16:14:06 +08:00
dumganhar	331dac34de	Merge branch 'master' into master_base ... Conflicts: cocos2dx/include/CCDirector.h	2011-11-25 11:06:20 +08:00
dumganhar	d94effbcfa	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-11-25 10:56:44 +08:00
minggo	7e61ce7d67	issue #781: add audio functions on linux	2011-11-25 10:48:05 +08:00
minggo	837e5048d2	Merge https://github.com/cocos2d/cocos2d-x into iss781_cocosdenshion	2011-11-25 10:19:29 +08:00
minggo	c034f84b2d	fixed #760: implement functions in .cpp	2011-11-25 10:17:32 +08:00
minggo	101f076a44	fixed #760: implement functions in .cpp	2011-11-25 10:13:59 +08:00
minggo	f5bbad5833	issue #854: implement CCImage::initWithImageFileThreadSafe for iOS	2011-11-25 10:09:29 +08:00
dumganhar	79e204abad	add semaphore support on bada	2011-11-25 10:06:26 +08:00
dumganhar	c138d7e258	update CCAccelerometer on bada platform	2011-11-24 18:04:25 +08:00
dumganhar	e87b00db67	add pthread support for bada 1.0	2011-11-24 17:26:04 +08:00
dumganhar	aeb56495a6	add user truetype font support, fix a bug in CCTextureCache.cpp	2011-11-24 15:15:23 +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	4612e6e1d6	update pthread.cpp	2011-11-24 11:37:59 +08:00
dumganhar	42775d4ec5	update pthread implement	2011-11-24 10:58:09 +08:00
dumganhar	2bd49545fa	add bada1.0 pthread support	2011-11-24 00:07:50 +08:00
dumganhar	cfa42fa8a1	Merge branch 'newest' into master_base	2011-11-23 21:47:21 +08:00
dumganhar	035d7326db	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-11-23 21:43:40 +08:00
dumganhar	15e3a6b1cf	update CCFileUtils_bada.cpp and CCImage_bada.cpp	2011-11-23 18:40:36 +08:00
minggo	c3a034a19b	fixed #760: add functions to get/add m_pNotificationNode	2011-11-23 17:18:53 +08:00
minggo	6aedc258b4	fixed #838: tests and HelloLua support x86	2011-11-23 15:51:30 +08:00
YuLei Liao	a8240abbe2	* revert CCFileUtils_ios.mm to 0.9.2	2011-11-23 13:48:15 +08:00
YuLei Liao	4ff2bf96d1	* ccConfig: add LUA_ENGINE macro, turn on Lua support when LUA_ENGINE defined	2011-11-23 13:41:48 +08:00
YuLei Liao	01c8f5f47e	* CCFileUtils_ios dump error message to console	2011-11-23 13:36:32 +08:00
minggo	8b20639d75	issue #838: HelloWorld support x86	2011-11-23 11:02:18 +08:00
YuLei Liao	151b373239	* ccConfig: add LUA_ENGINE macro, turn on Lua support when LUA_ENGINE defined	2011-11-23 00:58:31 +08:00
minggo	bc60ed7856	issue #854: optimize CCTextureCache::addImageAsync()	2011-11-22 16:47:24 +08:00
YuLei Liao	43226d190f	* CCFileUtils_ios dump error message to console	2011-11-21 18:50:45 +08:00
YuLei Liao	a1f8433a47	* fix merge error 4	2011-11-21 18:50:19 +08:00
YuLei Liao	611e09fe2f	* fix merge error 3	2011-11-21 17:09:23 +08:00
YuLei Liao	27ce997e36	* fix merge error 2	2011-11-21 17:07:16 +08:00
YuLei Liao	012ce7a04f	* fix merge error 1	2011-11-21 17:00:56 +08:00
YuLei Liao	7a6253d9aa	* merge cocos2d-1.0.1-x-0.9.2-luafix to master	2011-11-21 16:38:00 +08:00
minggo	efa9275d7f	save the codes for testing	2011-11-21 12:04:21 +08:00
YuLei Liao	b34859108e	* remove needless files	2011-11-21 11:58:55 +08:00
minggo	51eb56075b	Merge https://github.com/cocos2d/cocos2d-x into iss854_pthread	2011-11-21 09:36:55 +08:00
minggo	4226fcf355	issue #854: add CCThread_ios.mm	2011-11-21 09:34:49 +08:00
YuLei Liao	4944d5ced8	* remove needless warning	2011-11-20 21:12:24 +08:00
YuLei Liao	57bf9453b7	* add CCLuaSupport.cpp/.h, CCSchedulerFuncEntry class ... * move CCTimer from CCScheduler.cpp/.h to CCTimer.cpp/.h	2011-11-20 16:38:27 +08:00
YuLei Liao	09d12be875	* format cocos2d-x source files	2011-11-18 21:23:54 +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	50a2e2d5e9	Merge pull request #574 from minggo/iss854_pthread ... remove unneeded files	2011-11-17 18:59:03 -08:00
minggo	5d8043ce7e	issue854: remove unneeded files	2011-11-18 10:54:36 +08:00
minggo	a7d6c90adb	Merge pull request #571 from jbyu/master ... fix memory-leak for lua engine	2011-11-17 18:53:14 -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
Phenix Yu	dccf577ad3	getLastValidIterator() may return a invalid iterator m_array.end(). ... don't know where this code came from.	2011-11-16 11:08:26 +08:00
minggo	cc79e533a3	issue #854: add pthread for win32 and implement CCTextureCache::addImageAsync()	2011-11-16 11:04:29 +08:00
Phenix Yu	786feb6a8d	Merge remote-tracking branch 'remotes/upstream/master' ... Conflicts: HelloLua/Classes/AppDelegate.cpp HelloLua/Resource/hello.lua HelloLua/ios/HelloLua.xcodeproj/project.pbxproj HelloLua/win32/HelloLua.win32.vcproj HelloLua/win32/HelloLua.win32.vcxproj.filters cocos2dx/include/ccMacros.h cocos2dx/platform/ios/AccelerometerDelegateWrapper.mm lua/cocos2dx_support/LuaCocos2d.cpp lua/cocos2dx_support/LuaEngineImpl.cpp template/xcode3/cocos2d-x_lua_app/___PROJECTNAME___.xcodeproj/project.pbxproj template/xcode4/cocos2dx_lua.xctemplate/Resources/hello.lua template/xcode4/cocos2dx_lua.xctemplate/TemplateInfo.plist tests/test.win32/test.win32.vcxproj.filters	2011-11-15 14:43:55 +08:00
Phenix Yu	441f8e6da9	Merge branch 'master' of https://github.com/jbyu/cocos2d-x ... Conflicts: cocos2dx/CCScheduler.cpp lua/cocos2dx_support/LuaEngine.cpp lua/cocos2dx_support/LuaEngine.h	2011-11-15 14:00:52 +08:00
minggo	5273819e83	offer a thread safe function to read contents of xml file, and the engine use it internal	2011-11-15 10:41:18 +08:00
dumganhar	0fa48e2cfb	Update cocos2dx/platform/CCPlatformMacros.h	2011-11-14 11:35:04 +08:00
dumganhar	7cb27a76ae	modify accelerometer and Platform Functions	2011-11-13 22:45:41 +08:00
dumganhar	d346fa8650	close debug draw	2011-11-13 01:22:05 +08:00
dumganhar	d8de253542	add messagebox support	2011-11-13 01:13:25 +08:00
dumganhar	5704fdc146	Merge branch 'testMP_static_lib' into newest	2011-11-13 01:05:22 +08:00
dumganhar	25ab866557	when CCTextureAtlas::resizeCapacity, should ... glDeleteBuffers(2, m_pBuffersVBO); // initial binding glGenBuffers(2, &m_pBuffersVBO[0]); otherwise, CCSpriteBatchNode will have a bug the can't draw more than one sprite on bada 2.0 device.	2011-11-13 00:57:05 +08:00
dumganhar	ea3b57ea2c	modify multi touch support	2011-11-13 00:54:44 +08:00
dumganhar	8fd2917888	fixed a bug that Accelerometer value error if use HVGA resource in WVGA device	2011-11-13 00:54:05 +08:00
dumganhar	2abe0c0d32	CCAssert will show system messagebox, this easy for debuging code.	2011-11-10 16:49:05 +08:00
dumganhar	4e924986a2	add static lib project	2011-11-10 16:47:17 +08:00
dumganhar	ca3b91855a	debug issue #852	2011-11-10 16:44:58 +08:00
Walzer	dcb4f14a5b	According to this thread, http://www.cocos2d-x.org/boards/6/topics/5075?r=5177, we must prevent yOffset to become a negative value. I use the laziest approach.	2011-11-09 22:11:36 +08:00
dumganhar	33db1c7951	use unix text format	2011-11-08 18:11:43 +08:00
dumganhar	a81b078286	fixed a bug in calloc(0) return NULL.	2011-11-08 15:59:51 +08:00
dumganhar	920b41271d	add TextInput support	2011-11-08 15:59:04 +08:00
dumganhar	0d6ea61b76	fixed some bug:1.setDeviceOrientation, chipmunkDemo glOrthof	2011-11-07 18:18:10 +08:00
dumganhar	7d2a26ec10	comment some applog	2011-11-07 00:28:09 +08:00
dumganhar	16fba505b6	add multitouch support	2011-11-05 11:36:27 +08:00
dumganhar	2998726364	revert language	2011-11-02 01:23:07 +08:00
dumganhar	240aa4c077	add russian language support	2011-11-01 23:32:26 +08:00
dumganhar	cf3cecc108	revert to normal version	2011-11-01 23:02:26 +08:00
dumganhar	cff6437b76	revert to normal ccLanguageType	2011-11-01 17:12:39 +08:00
Leon	785b79d263	fix compile errors under ubuntu 11.10	2011-10-31 23:50:08 -07:00
dumganhar	f43530c010	Merge branch 'test' of https://github.com/dumganhar/cocos2d-x into bada ... Conflicts: CocosDenshion/proj.bada/sdk1.0/.cproject CocosDenshion/proj.bada/sdk2.0/.cproject cocos2dx/platform/bada/CCApplication_bada.cpp	2011-10-31 09:34:40 +08:00
dumganhar	853126036d	add ogg source for cocosDenshion project	2011-10-29 15:38:15 +08:00
dumganhar	fd90641c49	merge testf branch	2011-10-29 14:47:13 +08:00
Leon	b7f0385a2b	bundle 64 bit linux static libs	2011-10-28 12:19:26 +08:00
Leon	1b42b1d801	Merge remote branch 'upstream/master'	2011-10-28 11:37:02 +08:00
minggo	2c14402107	fixed #776: merge pull request and remove unneeded codes	2011-10-28 09:46:19 +08:00
dumganhar	d061e8323d	modify project configure	2011-10-27 19:22:14 +08:00
dumganhar	5db8a24389	fixed one issue in cocosdenshion	2011-10-26 18:38:27 +08:00
dumganhar	dd73456576	Merge branch 'bada' into f	2011-10-25 17:40:20 +08:00
dumganhar	146d3e1536	modify project config	2011-10-24 14:22:09 +08:00
dumganhar	3aef823bd5	rename sdk1.2 to sdk1.0	2011-10-24 11:00:11 +08:00
laschweinski	e53649ccaa	add a member function to get key string of a texture.	2011-10-22 19:39:31 +08:00
laschweinski	5589335d3a	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into linux_port1	2011-10-22 19:27:35 +08:00
laschweinski	04633242ba	fix a bug in audio player	2011-10-22 19:10:50 +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
Leon	5c4a3c3fda	Merge remote branch 'upstream/master'	2011-10-20 18:34:10 +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
dumganhar	6451d8b6bf	use ceil to compute viewport	2011-10-20 13:44:21 +08:00
Leon	70a4942ea6	fix some warning	2011-10-19 15:24:19 +08:00
Leon	77b3a32e16	fix compile error on 64 bit Linux	2011-10-19 15:12:38 +08: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
dumganhar	6af6257fa9	Merge branch 'testf1016' of github.com:dumganhar/cocos2d-x into FishGameBada ... Conflicts: CocosDenshion/bada/CCAudioOut.cpp CocosDenshion/bada/CCAudioOut.h	2011-10-17 13:45:16 +08:00
dumganhar	064014aeae	make some special configure	2011-10-16 22:44:29 +08:00
dumganhar	ee53c29e5c	switch to 2.0 WVGA	2011-10-16 13:23:48 +08:00
dumganhar	1ffd3a4350	add language support	2011-10-14 15:54:18 +08:00
dumganhar	8dfa18efb9	commit some file for private use	2011-10-14 15:38:58 +08:00
Walzer	47c9020b85	fixed #738: caculate label height if not set	2011-10-14 14:33:08 +08:00
dumganhar	3f89f3088b	remove mouse test log	2011-10-14 09:21:03 +08:00
dumganhar	fd3f496b76	use system orientation	2011-10-13 11:55:48 +08:00
minggo	2b2405e2dc	fixed #750: add comment	2011-10-13 10:56:02 +08:00
minggo	aaa16b4a4f	fixed #750: change the key to full path, because retrieve it use full path	2011-10-13 10:54:22 +08:00
moadib	5feee662e7	More simple and correct way to detect language for win32 application, also added detection of all languages contained in ccLanguageType enumeration . ... Added support for detect russian language.	2011-10-12 09:32:59 +04:00
moadib	0283a4b254	Added dll-export macro to CCSaxParser declaration	2011-10-11 22:44:18 +04:00
dumganhar	64388023f6	Merge branch 'master' into bada	2011-10-10 13:47:16 +08:00
dumganhar	f162a5fcaa	add m_pAccelDelegate != NULL to avoid crash	2011-10-10 10:24:52 +08:00
dumganhar	eb9cb31ca4	use shared lib for cocos2dx project	2011-10-09 18:15:31 +08:00
minggo	9695b6df86	fixed #745: export CCTime to dll	2011-10-09 10:19:12 +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
minggo	ba2f2fbc8b	Merge https://github.com/reflog/cocos2d-x into reflog	2011-10-08 11:28:16 +08:00
Eli Yukelzon	d23b044782	fill for polygon drawing	2011-10-05 10:50:00 +02:00
dumganhar	beaa489406	add scale support	2011-09-30 17:19:16 +08:00
dumganhar	1830b4e2e9	add default file path = /Res	2011-09-30 10:02:37 +08:00
dumganhar	1b5365282a	add accelerometer support	2011-09-29 18:12:08 +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	d6049846bb	Merge branch 'master' into bada	2011-09-29 16:18:47 +08:00
minggo	33c7caf555	Merge pull request #535 from minggo/master ... fixed a assert error	2011-09-29 01:13:49 -07:00
minggo	a56034f177	fixed a assert error	2011-09-29 16:07:18 +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
minggo	333e08330b	make create-linux-android-project.sh works ok	2011-09-29 00:49:49 -07: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	4ad422defd	make tests run ok on linux android	2011-09-27 20:36:21 -07:00
dumganhar	56eb3060ee	uiimage to uiImage	2011-09-28 09:49:57 +08:00
dumganhar	800940dd82	fixed some bug in bada port	2011-09-28 09:49:18 +08:00
dumganhar	1a8c6b06c7	add bada 2.0 project ... move 1.2 project to sdk1.2 folder	2011-09-27 17:15:50 +08:00
dumganhar	a54ab3c293	add bada 2.0 project ... move 1.2 project to sdk1.2 folder	2011-09-27 17:09:14 +08:00
dumganhar	cd18394b09	add bada 2.0 project ... move 1.2 project to sdk1.2 folder	2011-09-27 17:06:11 +08:00
minggo	d4283b1f11	Merge branch 'linux_port'	2011-09-27 17:01:51 +08:00
dumganhar	294c796e55	add bada 2.0 project ... move 1.2 project to sdk1.2 folder	2011-09-27 17:00:13 +08:00
minggo	4f7e349c0a	set HelloWorld dependence and make it run ok on android emulator	2011-09-26 22:38:59 -07:00
dumganhar	6cf5592499	modify Gbk_Unicode.c	2011-09-26 17:50:31 +08:00
dumganhar	c78a4cb485	modify cocos2dx project setting for bada	2011-09-26 17:50:05 +08:00
dumganhar	13b091fb15	modify CCImage, make text being showed correctly	2011-09-26 15:40:56 +08:00
laschweinski	0f7a15b1b3	recommit ... modify eclipse project config delete libs and use the folder eclipse generated instead.	2011-09-23 09:56:30 +08:00
moadib	267cce29a9	Added testing ability for case when application enters background and returns in foreground on windows platform. ... When application minimized applicationDidEnterBackground() called, when restored applicationWillEnterForeground(). Also break; forgotten in WM_KEYDOWN.	2011-09-22 13:11:51 +04:00
moadib	0ad5ec3557	fixed typo for win32 keypad testing ability	2011-09-22 10:27:10 +04:00
moadib	5537ba7e9e	Added keypad testing ability for windows platform. Shift+F1 emulated Back key pressing, and Shift+F2 emulated Menu key pressing	2011-09-21 16:21:11 +04:00
zhangxiaoming	1cac9520cc	make HelloWorld & tests build needed libraries, not use prebuilt libraries of cocos2d and cocosdenshion	2011-09-21 02:27:42 -07:00
dumganhar	eeb0956fb8	add linux makefiles	2011-09-20 14:38:12 +08:00
minggo	762e342b4d	fixed #727: invoke DeleteLocalRef() to resolve memory leak	2011-09-20 14:25:16 +08:00
dumganhar	c93be8b828	modify <cstdio> to <stdio.h> ... delete old project files	2011-09-20 12:39:44 +08:00
dumganhar	eb32cf9fe2	modify some files of bada project	2011-09-20 02:19:26 +08:00
dumganhar	81243eecdf	modify libpng version to 1.4.5 ... modify libjpeg txt mode to windows \r\n style	2011-09-20 02:17:44 +08:00
dumganhar	8ad2125139	add source code of libjpeg ,libpng ,zlib for bada	2011-09-20 02:16:20 +08:00
dumganhar	ca2027fbad	modify bada project	2011-09-19 23:35:46 +08:00
dumganhar	edb2cbbad6	modify bada project files	2011-09-19 18:17:19 +08:00
dumganhar	0e7fc78e4e	commit some files of bada project	2011-09-19 18:05:40 +08:00
dumganhar	c94adc58b9	changed bada projects directory, add bada macro	2011-09-19 17:53:45 +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	d016f05f92	use relative path instead of the workspace_loc	2011-09-15 18:24:41 +08:00
minggo	61f2ab3cf2	fixed #718: fixed a typo error	2011-09-15 13:49:04 +08:00
minggo	dcc5726665	Merge pull request #504 from minggo/iss715 ... fixed #715: make sure selected image is valid	2011-09-12 23:34:27 -07:00
minggo	bdb7cfdd71	fixed #715: make sure selected image is valid	2011-09-13 14:29:15 +08:00
minggo	d763cc3884	Merge pull request #503 from minggo/master ... fixed #709: write doxygen comment in CCSet.h	2011-09-12 23:23:21 -07:00
minggo	e2315d92b5	fixed #709: write doxygen comment in CCSet.h	2011-09-13 09:31:54 +08:00
Walzer	8082b91c0e	fix CCPointMake marco in CCPointExtension.h. The bug is reported in forum http://www.cocos2d-x.org/boards/6/topics/3730	2011-09-10 08:48:15 +08:00
laschweinski	8f5c327937	add all eclipse project files to the corresponding directory	2011-09-07 12:44:03 +08:00
laschweinski	310e79a491	delete the project configurations in base folder	2011-09-07 12:41:39 +08:00
minggo	ae056a07b1	Merge pull request #502 from minggo/iss686 ... fixed #686: set z tag of appended tile	2011-09-05 23:52:00 -07:00
minggo	e2bb1d49e5	fixed #686: set z tag of appended tile	2011-09-06 14:01:08 +08:00
minggo	8ccc3321a3	Merge pull request #500 from flyingpacer/renderendcrash ... Renderendcrash	2011-09-05 20:52:50 -07:00
RongHong	53227073a7	fixed #696 to modify some end() usilization	2011-09-06 11:43:09 +08:00
RongHong	fea3da3156	fixed #696 Some android machines may crash at CCRenderTexture::end(bool bIsTOCasheTexture)	2011-09-06 11:33:48 +08:00
minggo	e69d16e7d6	change CC_DIRECTOR_FPS_INTERVAL to 0.5, it is more reliable	2011-09-06 10:52:37 +08:00
RongHong	624e27497a	fixed #696 Some android machines may crash at CCRenderTexture::end(bool bIsTOCasheTexture)	2011-09-06 09:51:35 +08:00
laschweinski	91f8ed7eb4	CCParticleSystemPoint now derive from CCParticleSystemQuade in linux	2011-09-05 11:57:10 +08:00
laschweinski	717698bf65	fix some compiling mistake	2011-09-05 10:12:14 +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
minggo	018036eb28	Merge pull request #498 from minggo/iss703 ... fixed #703: refactor Accelerometer	2011-08-31 18:30:22 -07:00
minggo	f61fde764b	fixed #703: refactor Accelerometer	2011-08-31 17:14:29 +08:00
Walzer	1402350870	fixed #676, add more languages into CCApplication::getCurrentLanguage(). Android & iPhone port is done, other platforms no yet.	2011-08-31 14:20:33 +08:00
liswei	dd90e8ce86	issue #702 add invalid point judgement	2011-08-30 16:40:57 +08:00
liswei	c8619240c4	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into issue702	2011-08-30 16:39:13 +08:00
liswei	ab2a6cb2bb	fixed #702 tests crashs at the start on wophone device	2011-08-30 15:59:06 +08:00
Walzer	554e3fda52	fixed #701, CCZHeader.version should be an unsigned short, instead of unsigned char. Keep the same to cocos2d-iphone	2011-08-30 15:26:17 +08:00
Walzer	9f1e26f8a0	fixed #700, a stupid typo in CC_SWAP32 marco	2011-08-30 15:20:41 +08:00
minggo	0cfbf4344a	fix a compiling error on wophone	2011-08-30 10:54:32 +08:00
minggo	414791a684	issue #675: initialize acceleration_	2011-08-30 10:34:29 +08:00
minggo	92f741aa73	issue #675: remove unneeded header file	2011-08-30 09:49:55 +08:00
minggo	c7fd375539	issue #675: make wophone support only one accelerometer delegate	2011-08-30 09:45:11 +08:00
minggo	b38105a70b	issue 675: dispatch accelerometer data to one delegate	2011-08-29 18:18:39 +08:00
minggo	a411f4877c	fixed #698:Not invoke init() in the construction of CCSprite	2011-08-29 11:00:31 +08:00
laschweinski	a362d3131c	update debug and release makefiles again	2011-08-28 16:58:10 +08:00
laschweinski	c977f3e07c	commit debug and release makefile	2011-08-28 16:44:20 +08:00
laschweinski	e64bfd6c68	commit subdir.mk ... delete all obsolete *.d and *.o files	2011-08-28 15:43:50 +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	e0fa5fdd78	new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/config/ftconfig.h ... new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/config/ftheader.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/config/ftmodule.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/config/ftoption.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/config/ftstdlib.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/freetype.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftadvanc.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftbbox.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftbdf.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftbitmap.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftbzip2.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftcache.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftchapters.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftcid.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/fterrdef.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/fterrors.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftgasp.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftglyph.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftgxval.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftgzip.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftimage.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftincrem.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftlcdfil.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftlist.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftlzw.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftmac.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftmm.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftmodapi.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftmoderr.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftotval.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftoutln.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftpfr.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftrender.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftsizes.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftsnames.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftstroke.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftsynth.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftsystem.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/fttrigon.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/fttypes.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftwinfnt.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftxf86.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/autohint.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftcalc.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftdebug.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftdriver.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftgloadr.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftmemory.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftobjs.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftpic.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftrfork.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftserv.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftstream.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/fttrace.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftvalid.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/internal.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/psaux.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/pshints.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svbdf.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svcid.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svgldict.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svgxval.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svkern.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svmm.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svotval.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svpfr.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svpostnm.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svpscmap.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svpsinfo.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svsfnt.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svttcmap.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svtteng.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svttglyf.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svwinfnt.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svxf86nm.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/sfnt.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/t1types.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/tttypes.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/t1tables.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ttnameid.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/tttables.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/tttags.h new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ttunpat.h new file: cocos2dx/platform/third_party/linux/libfreetype2/ft2build.h new file: cocos2dx/platform/third_party/linux/libjpeg/cderror.h new file: cocos2dx/platform/third_party/linux/libjpeg/cdjpeg.h new file: cocos2dx/platform/third_party/linux/libjpeg/jconfig.h new file: cocos2dx/platform/third_party/linux/libjpeg/jdct.h new file: cocos2dx/platform/third_party/linux/libjpeg/jerror.h new file: cocos2dx/platform/third_party/linux/libjpeg/jinclude.h new file: cocos2dx/platform/third_party/linux/libjpeg/jmemsys.h new file: cocos2dx/platform/third_party/linux/libjpeg/jmorecfg.h new file: cocos2dx/platform/third_party/linux/libjpeg/jpegint.h new file: cocos2dx/platform/third_party/linux/libjpeg/jpeglib.h new file: cocos2dx/platform/third_party/linux/libjpeg/jversion.h new file: cocos2dx/platform/third_party/linux/libjpeg/transupp.h new file: cocos2dx/platform/third_party/linux/libpng/PngFile.h new file: cocos2dx/platform/third_party/linux/libpng/cexcept.h new file: cocos2dx/platform/third_party/linux/libpng/config.h new file: cocos2dx/platform/third_party/linux/libpng/png.h new file: cocos2dx/platform/third_party/linux/libpng/pngconf.h new file: cocos2dx/platform/third_party/linux/libpng/pngpriv.h new file: cocos2dx/platform/third_party/linux/libpng/readpng.h new file: cocos2dx/platform/third_party/linux/libpng/readpng2.h new file: cocos2dx/platform/third_party/linux/libpng/resource.h new file: cocos2dx/platform/third_party/linux/libpng/writepng.h new file: cocos2dx/platform/third_party/linux/libraries/libfreetype.a new file: cocos2dx/platform/third_party/linux/libraries/libjpeg.a new file: cocos2dx/platform/third_party/linux/libraries/libpng.a new file: cocos2dx/platform/third_party/linux/libraries/libpng15.a new file: cocos2dx/platform/third_party/linux/libraries/libxml2.a new file: cocos2dx/platform/third_party/linux/libxml2/libxml/DOCBparser.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/HTMLparser.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/HTMLtree.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/Makefile new file: cocos2dx/platform/third_party/linux/libxml2/libxml/Makefile.am new file: cocos2dx/platform/third_party/linux/libxml2/libxml/Makefile.in new file: cocos2dx/platform/third_party/linux/libxml2/libxml/SAX.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/SAX2.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/c14n.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/catalog.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/chvalid.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/debugXML.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/dict.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/encoding.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/entities.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/globals.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/hash.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/list.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/nanoftp.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/nanohttp.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/parser.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/parserInternals.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/pattern.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/relaxng.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/schemasInternals.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/schematron.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/threads.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/tree.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/uri.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/valid.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xinclude.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xlink.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlIO.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlautomata.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlerror.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlexports.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlmemory.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlmodule.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlreader.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlregexp.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlsave.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlschemas.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlschemastypes.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlstring.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlunicode.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlversion.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlversion.h.in new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlwriter.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xpath.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xpathInternals.h new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xpointer.h HelloWorld/Classes/ HelloWorld/android/assets HelloWorld/postCompiled.sh installLinuxLib.sh	2011-08-25 19:08:55 +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
minggo	e26eaae5e1	[android] fixed #688: support reading file other than apk	2011-08-25 11:24:31 +08:00
minggo	55dd2545d7	Merge pull request #488 from minggo/iss672 ... fixed #672: implement copywithzone for CCShow & CCHide	2011-08-24 01:51:30 -07:00
minggo	ff34ada115	assign correct value to CCSkewY::m_fStartSkewY	2011-08-24 15:02:40 +08:00
minggo	952a01f43e	fixed #672: implement copywithzone for CCShow & CCHide	2011-08-24 14:21:23 +08:00
minggo	75339b7630	Merge pull request #486 from minggo/master ... invoke this->drawNumberOfQuads(n, 0) in CCTextureAtlas::drawNumberOfQuads(unsigned int n)	2011-08-23 02:10:22 -07:00
minggo	a7e8c36eee	invoke this->drawNumberOfQuads(n, 0) in CCTextureAtlas::drawNumberOfQuads(unsigned int n)	2011-08-23 17:04:38 +08:00
minggo	66b453edc9	[iOS] fixed #693: CCLabelTTF support line break with \n	2011-08-23 16:19:31 +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	d5457526d4	fixed #689: the width & height of CCRect should big or equal to 0	2011-08-23 10:46:00 +08:00
minggo	19244406d6	fixed #689: assert the width and height of rect is big than 0	2011-08-22 14:55:51 +08:00
minggo	cd4a08aa6a	Merge pull request #479 from minggo/iss678 ... fixed #679: add constructor for CCArray	2011-08-21 20:14:06 -07:00
laschweinski	8f4d47900b	new file: cocos2dx/.cproject ... new file: cocos2dx/.project	2011-08-21 19:03:46 +08:00
moadib	807ae36d6a	CCMutableArray optimization	2011-08-20 01:30:33 +04:00
minggo	1f9f1f59d4	fixed #679: add constructor for CCArray	2011-08-19 16:15:06 +08:00
laschweinski	60e794fcc8	add files include test and cocosDenshion	2011-08-19 14:43:19 +08: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	5087f6ddb2	[android] fixed #683: remove unneeded includes	2011-08-18 16:19:36 +08:00