2784 Commits

Author	SHA1	Message	Date
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
minggo	b4ab3f6b75	[android] fixed #683: remove unneeded includes	2011-08-18 16:18:26 +08:00
minggo	1640e48d5a	[android] fixed #683: let getCurrentLanguageJNI() & getPackageNameJNI() return valid pointer	2011-08-18 16:09:49 +08:00
Phenix Yu	ed42bc388c	fixed lua memory leak	2011-08-18 12:26:33 +08:00
moadib	a8d87a9976	Non-trivial arguments passed by reference now. ... Removed unnecessary cocos2d:: prefix inside namespace.	2011-08-17 17:26:26 +04:00
Walzer	4244fdb62b	fixed #643, swap accelerometer input x/y according to the orientation (on ios devices)	2011-08-17 20:11:33 +08:00
minggo	e39d551294	fixed #680: fix the bug that CCTouchDispatcher::rearrangeHandlers() crashed	2011-08-17 15:00:32 +08:00
laschweinski	5d20ebe24b	modified: HelloWorld/AppDelegate.cpp ... modified: HelloWorld/HelloWorldScene.cpp modified: cocos2dx/cocoa/CCNS.cpp modified: cocos2dx/include/CCActionInstant.h modified: cocos2dx/misc_nodes/CCRenderTexture.cpp modified: cocos2dx/particle_nodes/CCParticleSystemQuad.cpp modified: cocos2dx/platform/CCAccelerometer_platform.h modified: cocos2dx/platform/CCApplication_platform.h modified: cocos2dx/platform/CCArchOptimalParticleSystem.h modified: cocos2dx/platform/CCCommon.cpp modified: cocos2dx/platform/CCEGLView_platform.h modified: cocos2dx/platform/CCGL.cpp modified: cocos2dx/platform/CCGL.h modified: cocos2dx/platform/CCImage.cpp modified: cocos2dx/platform/CCPlatformConfig.h modified: cocos2dx/platform/CCPlatformMacros.h modified: cocos2dx/platform/CCSAXParser.h modified: cocos2dx/platform/CCStdC.h modified: cocos2dx/support/CCUserDefault.cpp modified: cocos2dx/support/data_support/ccCArray.h modified: tests/AppDelegate.cpp deleted: tests/Res/music.mid modified: tests/tests/controller.cpp modified: tests/tests/tests.h HelloWorld/Linux/ cocos2dx/.settings/ cocos2dx/platform/Linux/ tests/test.linux/	2011-08-17 11:36:54 +08:00
Walzer	3afe6ebfb2	fixed #638, add support for pvr ccz format. I've tested it on both ios & android, also with instrument memleak detection. But haven't tested on win32 & marmalde, in thoery it will work.	2011-08-16 11:56:17 +08:00
Walzer	0881668cc2	fixed #661. Thanks to GMTDev's previous resolvtion. And I fix the compilation error in the his patch: add float m_fContentScaleFactor declaration into CCTMXLayer.h, fix tile->setPositionIn to tile->setPosition. I just run TiledMapTest in retina mode, it works well	2011-08-15 12:10:11 +08:00
Phenix Yu	2eafb827cf	avoid memory leaking from lua script module	2011-08-14 17:26:51 +08:00
GavT	f47df23363	Fixed problems with iPhone Retina mode TMX Tiled map support. Uses "ContentScaleFactor" to divide down some Rect coordinates and changed some "setPositionInPixels" to "setPosition" too. See bug #661 http://www.cocos2d-x.org/issues/661 ... Also added "float m_fContentScaleFactor" in the class CCTMXLayer.h	2011-08-11 20:47:54 -07:00
Walzer	4aa33b0942	Merge pull request #463 from minggo/master ... fixed #668	2011-08-10 19:32:44 -07:00
Walzer	6d3941ebc1	Merge pull request #464 from leon-li/master ... fix some warnings under xcode 4.0 llvm clang	2011-08-10 19:32:16 -07:00
Leon	771e2349c5	fix some warnings under xcode 4.0 llvm compiler	2011-08-10 22:39:02 +08:00
minggo	9a884ffda6	[iOS] fixed #668: CCLabelBMFont looks ok in retina mode	2011-08-10 15:07:34 +08:00
Walzer	6eba0b658f	fixed #651, add CCFileUtils to doxygen api document	2011-08-08 23:05:47 +08:00
minggo	2b5635898a	fixed #665: add test of RenderTextureSave	2011-08-08 14:06:03 +08:00
minggo	7a0e8b4a0a	Merge pull request #457 from minggo/iss642 ... fixed #642: CCRenderTexture::saveBuffer() works ok on iOS	2011-08-07 20:08:16 -07:00
minggo	41ea2e98a1	fixed #642: CCRenderTexture::saveBuffer() works ok on iOS	2011-08-08 11:01:47 +08:00
liswei	70e19d7245	fixed #347 fixed 'AddFontResource' path error!	2011-08-08 10:32:21 +08:00
Walzer	976d886263	Merge pull request #455 from giom/master ... Lua AddSearchPath issue #647	2011-08-05 18:43:44 -07:00
minggo	2d5a04b9ca	Merge pull request #454 from flyingpacer/608 ... fixed #608 rendertexture disappears after going to background	2011-08-04 23:55:26 -07:00
minggo	dd43f16c8e	fixed #622: add comment of CCUserDefault	2011-08-05 11:02:42 +08:00
RongHong	5f08bb24fe	Merge branch 'master' into 608	2011-08-05 10:59:40 +08:00
minggo	016c463659	Merge pull request #449 from flyingpacer/savecrash ... fixed #657 Latest git version was broken	2011-08-04 02:39:33 -07:00
minggo	76da5f2e84	fixed #656: remove unneeded methods & android can let user set resource path	2011-08-04 17:19:58 +08:00
RongHong	4745b85af9	fixed #657 Latest git version was broken	2011-08-04 16:37:43 +08:00
liswei	bbc4bbeb6c	issue #347 lost [] in 'delete array'	2011-08-04 13:47:21 +08:00
liswei	897dd54b12	fixed #347 add ttf support in win32	2011-08-04 11:23:59 +08:00
minggo	78ffea3049	Merge pull request #443 from natural-law/master ... fixed #513	2011-08-02 23:35:35 -07:00
minggo	6892787afa	fixed #653: add CCScheduler::unscheduleScriptFunc()	2011-08-03 14:15:35 +08:00
natural-law	3a80e51d25	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-08-03 11:39:03 +08:00
natural-law	94f2d8a5e2	fixed #513, CCProgressTimer support sprite generated from CCSpriteFrame.	2011-08-03 11:38:38 +08:00
minggo	78642a39ac	[android] fixed #652: refactor JniHelper::jstringtochar()	2011-08-03 10:44:39 +08:00
minggo	b9374663cd	Merge pull request #440 from flyingpacer/savecrash ... fixed #649 the user could save any domain of the render texture	2011-08-02 03:16:20 -07:00
minggo	90f403d8a2	Merge pull request #441 from liswei/issue347 ... issue #347 add ttf support in wophone	2011-08-02 03:16:06 -07:00
liswei	188b168d30	issue #347 add ttf support in wophone	2011-08-02 18:02:27 +08:00
RongHong	4a8e3f468e	fixed #649 the user could save any domain of the render texture	2011-08-02 17:22:57 +08:00
minggo	09dc164fff	issue #645: update to v1.0.1	2011-08-02 15:45:27 +08:00
RongHong	3a3a52c59a	fixed #649 the user could save any domain of the render texture	2011-08-02 14:25:58 +08:00
minggo	730ff63c9f	rename scene to node	2011-08-02 14:09:23 +08:00
minggo	c4d1dedba8	Merge https://github.com/reflog/cocos2d-x into reflog	2011-08-02 14:03:34 +08:00
minggo	9fe868b881	Merge pull request #438 from natural-law/master ... Use the setter to set the value of m_tAnchorPoint.	2011-08-01 21:39:43 -07:00
natural-law	9a86582cd2	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-08-02 11:06:47 +08:00
natural-law	d6221cfa36	Use the setter to set the value of m_tAnchorPoint.	2011-08-02 11:02:02 +08:00
RongHong	d575d40ab3	fixed #648 savebuffer may crash on some machines like Motorola Defy	2011-08-02 10:27:52 +08:00
RongHong	335d2d30b4	fixed #648 savebuffer may crash on some machines like Motorola Defy	2011-08-02 10:05:15 +08:00
Guillaume Maury	f86da27a38	Merge branch '0.9.0'	2011-08-02 03:49:36 +08:00
Guillaume Maury	b789927ca3	added possibility to add a path to the lua search path (package.path/LUA_PATH)	2011-08-02 03:47:39 +08:00
minggo	63839de12a	Merge https://github.com/cocos2d/cocos2d-x into iss347	2011-08-01 18:23:14 +08:00
minggo	895d4992e4	issue #347: FontTest runs ok on iOS	2011-08-01 18:22:47 +08:00
natural-law	5b0f25466a	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-08-01 10:45:40 +08:00
natural-law	bf44d13bc9	fixed #644, m_bUseBatchNode of all sprite drawn by CCSpriteBatchNode should be false after CCSpriteBatchNode::removeAllChildrenWithCleanup() invoked.	2011-08-01 10:44:18 +08:00
minggo	52df611822	Merge pull request #434 from flyingpacer/641 ... fixed #641 the user could save buffer to any path	2011-07-31 18:20:28 -07:00
Eli Yukelzon	41bdb281dc	corrected bug and leak in getBool	2011-07-31 15:31:39 +03:00
Eli Yukelzon	af61a7c650	added support for optional default values in CCUserDefault getters	2011-07-31 15:08:25 +03:00
Eli Yukelzon	9c5fa51e6b	usuful macros for defining scene() and node() methods with params	2011-07-30 11:55:38 +03:00
Eli Yukelzon	b2dce6ab80	Merge remote-tracking branch 'upstream/master'	2011-07-30 09:32:44 +03:00
minggo	a3b4043755	issue #347: add tests for FontTest & it works ok on android	2011-07-29 15:57:27 +08:00
RongHong	a54fda812b	fixed #641 the user could save buffer to any path	2011-07-29 11:36:04 +08:00
minggo	cfb3765035	issue #347: iOS support font defined by ttf file	2011-07-29 10:15:10 +08:00
natural-law	d37a694529	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x ... Conflicts: cocos2dx/platform/CCImage.cpp	2011-07-29 09:51:43 +08:00
natural-law	5ad318fa71	Resolve the cocos2d compile error on wophone.	2011-07-29 09:50:06 +08:00
minggo	87f0b6c63f	Merge pull request #431 from flyingpacer/640 ... fixed #640 the image read from render texture is upseted	2011-07-28 18:42:14 -07:00
Eli Yukelzon	41ec0ba945	modification to support radio menu	2011-07-28 22:18:45 +03:00
reflog	ae945f4880	changes to support CCScrollLayer	2011-07-28 17:09:06 +03:00
minggo	50038b7cc2	Merge https://github.com/cocos2d/cocos2d-x into iss347	2011-07-28 18:06:20 +08:00
RongHong	c7aa948817	fixed #640 the image read from render texture is upseted	2011-07-28 18:02:25 +08:00
RongHong	c1fdf9afb5	issue #608 rendertexture disappears after going to background	2011-07-28 17:32:09 +08:00
minggo	648117ebb5	issue #347: android can use ttf file	2011-07-28 17:20:37 +08:00
natural-law	a7404dc2bf	fixed #639, Initialize the m_tPosition of CCParticleSystem with the setter.	2011-07-28 16:16:51 +08:00
natural-law	d4db9eb566	fixed #636, Modify the implementation of method CCTextureCache::textureForKey().	2011-07-28 15:08:07 +08:00
Leon	a8e4d5ea89	rename CCMenu::menu() -> CCMenu::node()	2011-07-28 14:24:24 +08:00
Leon	4c06cb853b	Merge remote branch 'upstream/master'	2011-07-28 12:27:07 +08:00
RongHong	0f94423b9b	fixed #630 To realize the buffer-saving function in CCRenderTexture	2011-07-28 10:52:09 +08:00
Leon	4510101e96	add CCMenu::init() and CCMenu::menu() to create empty menus	2011-07-28 10:45:32 +08:00
RongHong	aec1ddc4b4	Merge branch 'master' into 630	2011-07-28 10:10:47 +08:00
RongHong	eda6228374	fixed #630 To realize the buffer-saving function in CCRenderTexture	2011-07-28 10:09:56 +08:00
RongHong	a253909030	fixed #630 To realize the buffer-saving function in CCRenderTexture	2011-07-27 16:55:04 +08:00
RongHong	8afa3a9be1	fixed #619 CCFadeTo may crashed on android	2011-07-27 16:21:00 +08:00
minggo	33e85bdc53	Merge pull request #421 from leon-li/master ... add CCMenuItem::setTarget	2011-07-26 18:48:24 -07:00
Leon	c5f7036f7b	add CCMenuItem::setTarget	2011-07-26 18:41:58 +08:00
liswei	1e8e036da7	issue #633 add playeffect loop in wophone	2011-07-26 17:04:39 +08:00
minggo	b308effdc5	[android] fixed #631: Send \n to engine when user input nothing	2011-07-26 11:41:28 +08:00
Walzer	20bba80c73	Merge remote branch 'origin/master'	2011-07-25 15:02:41 +08:00
Walzer	059e5ebc0b	add "virtual" keyword to the destructor of CCMutableArray, to prevent someone delete it as a CCObject and cause memory leak	2011-07-25 15:00:00 +08:00
minggo	ab4ef0f180	Merge https://github.com/cocos2d/cocos2d-x into iss623	2011-07-25 14:13:20 +08:00
minggo	b105b6005e	[android] fixed #623: refactor Cocos2dJni.cpp	2011-07-25 14:12:30 +08:00
Leon	9ce402655d	Merge remote branch 'upstream/master'	2011-07-24 12:24:16 +08:00
Leon	864878d15a	fix warning on android	2011-07-24 12:16:40 +08:00
Walzer	b43d233c08	issue #629, pass eImgFmt param to initWithImageData. But still haven't add test case for this.	2011-07-24 09:04:08 +08:00
Walzer	45e8915963	fixed #628, CCMutableArray::arrayWithObjects & arrayWithArray should set the return object to autorelease. And add CCAnimation::m_pobFrames->retain() after it get value from arrayWithArray. (it's property with retain in -iphone version but we miss the retain)	2011-07-24 08:30:49 +08:00
minggo	62ea6a2d46	issue #623: create JniHelper and use it somewhere	2011-07-22 18:14:29 +08:00
minggo	0dac01b3d8	Merge pull request #409 from natural-law/master ... fixed #621	2011-07-20 00:43:02 -07:00
minggo	36a1f574b3	Merge pull request #408 from minggo/iss620 ... [win32] fixed #620: change the output of lua to a lib	2011-07-20 00:40:53 -07:00
natural-law	32e7ee6e2f	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-07-20 15:35:52 +08:00
natural-law	6a8b563feb	fixed #621, Add Texture2dTest in tests project.	2011-07-20 15:35:20 +08:00
minggo	3e080476f3	[win32] fixed #620: change the output of lua to a lib	2011-07-20 15:21:51 +08:00
minggo	6996ccee95	Merge pull request #407 from leon-li/master ... fix: passing std::string object to CCLOG	2011-07-19 20:42:29 -07:00
Leon	6426e96f82	Merge remote branch 'upstream/master'	2011-07-20 11:42:00 +08:00
Leon	5f1f63dabf	fix: passing std::string object to CCLOG	2011-07-20 08:52:29 +08:00
minggo	0c495628ea	Merge pull request #405 from minggo/iss618 ... invoke java code(System.exit()) to finish programe	2011-07-19 02:20:36 -07:00
Leon	d2d02e0c52	fix compile error with android-ndk-r6	2011-07-19 16:54:42 +08:00
Walzer	d2b44a203f	issue #536, build success on win32	2011-07-19 16:03:42 +08:00
minggo	640d811809	[android] fixed #618: invoke java code(System.exit()) to finish programe	2011-07-19 16:01:22 +08:00
Walzer	768bfa9a9b	issue #536, add CCTexturePVR, update from 0.99.5 to 1.0.0, remove _POWERVR_SUPPORT marco, use CC_SUPPORT_PVRTC instead, the plan is to support PVR format on all platforms. Compile successfully on ios & android, but haven't compile on other paltforms. Test case haven't written yet.	2011-07-19 15:22:13 +08:00
Walzer	bc44855091	issue #536, integrate the CCTexturePVR to project, update from 0.99.5 to 1.0.0, compile successfully on ios & android. Haven't test on other platforms yet.	2011-07-19 15:14:59 +08:00
minggo	7a12bb9cdc	fixed #613: Call executeCallFuncN instead of executeCallFunc in CCMenuItem::activate()	2011-07-18 10:31:41 +08:00
minggo	a3e9679578	fixed #611: add some functions for lua	2011-07-18 10:18:36 +08:00
minggo	29efe9bd39	Merge pull request #402 from minggo/iss615 ... fixed #615: CCLog may crash when invoke lua function	2011-07-17 18:40:23 -07:00
minggo	9bbab7897a	fixed #615: CCLog may crash when invoke lua function	2011-07-14 17:52:56 +08:00
minggo	0817d59edf	Merge pull request #401 from minggo/master ... [android] fixed #609: retain & release obj in CCSet	2011-07-14 02:27:56 -07:00
minggo	4694926edb	[android] fixed #609: retain & release obj in CCSet	2011-07-14 15:32:11 +08:00
minggo	dd42936bb3	[android] fixed #610: remove the support of ndk-r4	2011-07-14 10:37:40 +08:00
minggo	fe3aadf800	update to 1.0.0 07-12	2011-07-13 10:20:24 +08:00
minggo	faa1c8ee16	Merge pull request #393 from minggo/master ... [win32] modify for vs2010	2011-07-12 03:09:44 -07:00
minggo	760ec3201e	[win32] modify for vs2010	2011-07-12 18:05:44 +08:00
Walzer	48420dca0c	fixed #605, add CC_DLL to pure C methods in CCNS.h	2011-07-12 17:10:10 +08:00
RongHong	935051a363	set gl perspctive project	2011-07-12 16:04:13 +08:00
natural-law	8b5282a0cf	fixed #603, The test case TMXGIDObjectsTest in TileMapTest not crash any more.	2011-07-12 14:21:29 +08:00
natural-law	51b751aade	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-07-12 11:26:28 +08:00
minggo	d48c3fdfb1	upgrade to 1.0.0-final 07-11	2011-07-12 11:20:41 +08:00
natural-law	d3960a13df	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-07-12 10:36:30 +08:00
natural-law	3d24fc5be4	fixed #606, Resolve the wrong effect of the test case PageTransitionForward in TransitionsTest.	2011-07-12 10:36:07 +08:00
minggo	eb675073ee	remove inline to comiple ok on android	2011-07-11 16:36:19 +08:00
RongHong	ae3dd1f497	Merge branch 'master' of http://github.com/cocos2d/cocos2d-x	2011-07-11 15:33:53 +08:00
RongHong	c8f5f703a5	to commit LuaCocos2d.cpp	2011-07-11 15:33:27 +08:00
minggo	76d15b8767	Merge pull request #379 from minggo/master ... implements CCSequence::actionWithArray() & CCSpawn::actionWithArray()	2011-07-11 00:30:54 -07:00
minggo	60bf07b859	implements CCSequence::actionWithArray() & CCSpawn::actionWithArray()	2011-07-11 15:25:02 +08:00
natural-law	fcbe0443be	Resolve a bug in ZipUtils.cpp. And modify the Makefile of tests on wophone.	2011-07-11 15:16:29 +08:00
minggo	a64783d4d2	fix the usage of sort()	2011-07-11 10:12:29 +08:00
natural-law	1bdce00740	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x ... Conflicts: cocos2dx/include/ccConfig.h	2011-07-08 17:08:57 +08:00
minggo	a1531cd478	Merge pull request #369 from flyingpacer/master ... fix #592	2011-07-08 01:59:36 -07:00
minggo	6c37f42414	Merge pull request #368 from minggo/master ... fixed #586	2011-07-08 01:46:54 -07:00
natural-law	cba538d5d0	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-07-08 15:58:14 +08:00
RongHong	de7150214c	Merge branch 'master' of http://github.com/cocos2d/cocos2d-x	2011-07-08 15:40:27 +08:00
RongHong	7b74372cac	fix #592	2011-07-08 15:38:32 +08:00
minggo	39a3b715cd	fixed #589	2011-07-08 15:28:13 +08:00
natural-law	810cf3f8c3	fixed #591	2011-07-08 15:02:46 +08:00
minggo	f0ea58651b	fixed #586	2011-07-08 15:01:51 +08:00
Walzer	5c8b04bc25	fixed #585	2011-07-08 14:48:25 +08:00
natural-law	134a3a0fcf	fixed #590	2011-07-08 14:32:09 +08:00
natural-law	db6a5fce23	fixed #588.	2011-07-08 14:16:10 +08:00
natural-law	5db1719302	fixed #587	2011-07-08 14:15:51 +08:00
Max Aksenov	90564fac49	[airplay] fix : incorrect calculation of the bit depth	2011-07-07 08:40:29 -07:00
minggo	b0416adaf2	Merge pull request #364 from minggo/master ... upgrade to rc3	2011-07-07 01:06:27 -07:00
minggo	96289b20c4	upgrade to rc3	2011-07-07 16:03:03 +08:00
minggo	ae466898b0	Merge pull request #363 from minggo/master ... change the return value of CCSkewBy::reverse() & CCScaleBy::reverse() to CCActionInterval*	2011-07-07 00:49:31 -07:00
minggo	b08788d810	change the return value of CCSkewBy::reverse() & CCScaleBy::reverse() to CCActionInterval*	2011-07-07 15:41:42 +08:00
Walzer	94ac50bad0	fixed #582, use libpng instead of CIwImage in CCImage_airplay.cpp. Thanks to Max Akensov's contribution.	2011-07-07 14:45:59 +08:00
minggo	8e370eeb10	fix some compiling warnings	2011-07-07 11:27:45 +08:00
natural-law	2bc8427b3c	Resolve the bug of some particle test cases can't be shown.	2011-07-07 11:02:47 +08:00
Walzer	348a05a329	fix a typo, CCObject::m_uRefrence -> CCObject::m_uReference	2011-07-07 08:23:31 +08:00
Walzer	72dfb3f919	fixed #576, replace std::string to _KeyT in CCMutableDictionary class template	2011-07-07 08:19:29 +08:00
minggo	3dc1967f6c	fixed #579: change zorder to int	2011-07-06 20:48:56 +08:00
minggo	e56547b9f5	fixed #580: use int or it will loop for ever	2011-07-06 19:54:25 +08:00
minggo	6cb945a8ca	fix bug of particle_node when upgrade to rc3	2011-07-06 18:16:19 +08:00
minggo	f894e00f27	fix a bug of CCProgressTimer when upgrade to rc3	2011-07-06 16:29:56 +08:00
minggo	980ce79ead	[android] fixed #577: init member variable to default value	2011-07-06 15:22:25 +08:00
minggo	59ed71df03	Merge pull request #353 from minggo/master ... upgrade to 1.0.0-rc3	2011-07-06 00:02:45 -07:00
minggo	ff50997eb0	issue #574	2011-07-06 14:56:05 +08:00
Walzer	ac700583cc	fixed #573, init m_tColor & m_tBlendFunc in CCLayerColor constructor	2011-07-05 15:39:50 +08:00
minggo	7603665165	fix merging confict of CCDirector.cpp	2011-07-05 14:54:41 +08:00
minggo	7adb140439	fixed #568	2011-07-05 14:51:17 +08:00
minggo	2b963060ab	Merge pull request #352 from natural-law/master ... fixed #563	2011-07-04 22:56:40 -07:00
Walzer	12aa33e0ee	fix an unsafe call in CCDirector::isOpenGLAttached(). Thanks to Ben Smith http://www.cocos2d-x.org/boards/6/topics/2092	2011-07-05 12:13:07 +08:00
natural-law	6c95a3190f	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-07-05 12:05:43 +08:00
natural-law	7107c6612b	fixed #563, Upgrade folder support to rc3.	2011-07-05 12:05:19 +08:00
minggo	ad3bad964f	fixed #567	2011-07-05 11:36:46 +08:00
minggo	0d80326392	fixed #564: upgrade textures to 1.0.0-rc3	2011-07-05 10:47:25 +08:00
minggo	0e6bf40e7c	fixed #561: upgrade particle_nodes to 1.0.0-rc3	2011-07-04 19:20:16 +08:00
minggo	6b97a381e9	fixed #560: upgrade misc_nodes to 1.0.0-rc3	2011-07-04 16:01:57 +08:00
minggo	8478288e88	fixed #iss559	2011-07-04 14:47:32 +08:00
minggo	210840a22a	fixed #555: upgrade effects to 1.0.0-rc3	2011-07-04 14:21:03 +08:00
minggo	70ce4f877f	fixed #565: upgrade tileMap_parallax_nodes to 1.0.0-rc3	2011-07-04 14:11:43 +08:00
minggo	6482f5662b	fixed #557: upgrade label_nodes to 1.0.1-rc3	2011-07-04 10:59:35 +08:00
natural-law	0378a6a36d	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x ... Conflicts: cocos2dx/include/CCNode.h	2011-07-01 16:24:23 +08:00
natural-law	7d7f3a9241	fixed #562, Upgrade folder sprite_nodes to rc3.	2011-07-01 16:11:31 +08:00
minggo	16f79cb0be	fixed #554: upgrade base_nodes to 1.0.0-rc3	2011-07-01 15:48:05 +08:00
minggo	de705986f8	Merge pull request #341 from minggo/iss553 ... fixed #533: upgrade actions to 1.0.0-r3	2011-07-01 00:18:32 -07:00
minggo	7bdf2cb84e	fixed #533: upgrade actions to 1.0.0-r3	2011-07-01 15:08:23 +08:00
natural-law	4d5dab4a40	fixed #558, Upgrade folder layers_scenes_transitions_nodes to rc3.	2011-07-01 11:26:26 +08:00
natural-law	dab077d2a1	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-07-01 10:27:39 +08:00
natural-law	d892872d2f	fixed #552, Treat the parameter of method CCTextureCache::removeTextureForKey() as relative path.	2011-07-01 09:32:15 +08:00
minggo	989c8027d0	Merge pull request #338 from natural-law/master ... fixed #522	2011-06-30 18:24:09 -07:00
natural-law	b684cbdc6c	fixed #522, CCSpriteFrameCache::addSpriteFramesWithFile(const char *pszPlist) will not crash any more if the parameter don't have '/'.	2011-06-30 17:50:28 +08:00
minggo	2a39fe0aa4	Merge pull request #335 from minggo/iss547 ... [Android] fixed #547: line wrap OK on Android	2011-06-29 19:46:25 -07:00
minggo	6c47f53b13	[Android] fixed #547: line wrap OK on Android	2011-06-29 15:45:30 +08:00
minggo	bb90fbfb1e	[iOS] fixed #546: CCLabelTTF:initWithString() will crash when the height is 0	2011-06-28 15:24:58 +08:00
yangws	9d4c4b5cb6	delete some unused codes.	2011-06-28 14:37:06 +08:00
yangws	0dec97a303	fixed #544 The bug reaised by CCGrid render texture in another FBO.	2011-06-28 14:32:59 +08:00
yangws	3b6265aa58	Compile ok on vs2010	2011-06-27 17:02:58 +08:00
yangws	59f37ddb5d	fixed #526 Wrap glScissor in CCEGLVIew::setScissorInPoints.	2011-06-27 10:55:45 +08:00
Walzer	00568c229a	[android] back to shared library link	2011-06-25 11:21:16 +08:00
minggo	e8fda66ccc	Merge https://github.com/cocos2d/cocos2d-x	2011-06-24 13:55:52 +08:00
minggo	8440d6a267	[android] fixed #364: show string correct & line break ok	2011-06-24 13:55:00 +08:00
liswei	0c5f28fc11	fixed #539 call unzOpen, then may not call unzClose(WVGA)	2011-06-24 09:29:55 +08:00
liswei	4793713daa	fixed #539 call unzOpen, then may not call unzClose(WVGA)	2011-06-23 18:24:32 +08:00
Walzer	156dfa8859	Merge remote branch 'origin/master'	2011-06-23 16:31:52 +08:00
Walzer	9e74b1f50d	fixed #534, use #if (CC_TARGET_PLATFORM != CC_PLATFORM_IOS) - #endif to wrap the useless codes on ios.	2011-06-23 16:31:04 +08:00
Walzer	481010a417	Merge pull request #316 from minggo/iss364 ... [Android] line break ok on Android	2011-06-23 01:04:22 -07:00
Walzer	39d62d69a7	add script_support into cocos2dx/proj.wophone/Makefile.ARM, but untest.	2011-06-23 16:02:16 +08:00
Walzer	fea9f3b943	add script_support to cocos2d-wophone.vcproj	2011-06-23 15:59:28 +08:00
minggo	53eafa77ff	Merge https://github.com/cocos2d/cocos2d-x into iss364	2011-06-23 14:45:25 +08:00
minggo	10cdd7f798	[android] fixed #364: line break ok on Android	2011-06-23 14:44:20 +08:00
minggo	d4bd6e63d2	synchrolize java code to HelloLua	2011-06-23 12:47:02 +08:00
Walzer	d4e9e5a9d9	Merge pull request #314 from yangws/master ... PVRFrame lib update to version 2.8 r1 (2.08.28.0634)	2011-06-22 20:10:09 -07:00
Walzer	a98a3b9ca7	[airplay] add script_support	2011-06-23 09:31:18 +08:00
yangws	2c22cf0621	fixed #537 update to version 2.8 r1 (2.08.28.0634)	2011-06-22 17:55:03 +08:00
Walzer	45933b177f	Merge pull request #313 from minggo/iss535 ... [Android] Use Android widget Bitmap to drawing string	2011-06-22 02:17:07 -07:00
Walzer	67ac46647f	issue #531, Merge liswei/issue531 manually.	2011-06-22 17:13:01 +08:00
minggo	1122a7c7d0	[android] use Android widget Bitmap other than skia to drawstring	2011-06-22 16:58:50 +08:00
minggo	fd86f1ef8c	Merge pull request #309 from minggo/master ... fix a compile bug	2011-06-21 02:39:45 -07:00
minggo	53a5ec412e	fixed #528: fix a compile bug	2011-06-21 17:36:38 +08:00
minggo	6cb6359168	Merge pull request #308 from minggo/master ... fixed #528	2011-06-21 02:06:11 -07:00
Walzer	f3375f0dbb	issue #528, improve CCScriptEngineManager. AppDelegate should hold the whole lifecycle of LuaEngine object.	2011-06-21 17:02:08 +08:00
minggo	00cc1d277d	fixed #528: safe call of CCScriptEngineManager::sharedScriptEngineManager()->getScriptEngine()->xxx()	2011-06-21 16:59:17 +08:00
Walzer	ddbdf67f97	Merge http://github.com/minggo/cocos2d-x into lua	2011-06-21 16:03:34 +08:00
minggo	968779912a	fixed #528: add copyright & modify pop menu position	2011-06-21 15:50:47 +08:00
Walzer	175e9394bc	Merge https://github.com/minggo/cocos2d-x into lua	2011-06-21 15:22:00 +08:00
Walzer	f80948d2eb	Merge pull request #303 from natural-law/master ... fixed #323	2011-06-20 23:03:08 -07:00
minggo	d72d8a52f4	Merge https://github.com/cocos2d/cocos2d-x	2011-06-21 13:53:04 +08:00
minggo	8066312098	fixed #528: refactor lua ok	2011-06-21 13:51:36 +08:00
Marat Yakupov	14c43f4246	changed postfix increment of iterators to prefix increment	2011-06-21 09:30:03 +04:00
natural-law	49a4481473	fixed #323, Remove the #include <map> in CCApplication_win32.cpp.	2011-06-21 12:01:59 +08:00
natural-law	ba4c3b8928	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-06-21 11:58:52 +08:00
natural-law	960ef65f53	fixed #323, Modify the implement of getCurrentLanguage method on win32.	2011-06-21 11:58:10 +08:00
minggo	80e618f6ed	issue #528: fix some bug & complete hello.lua	2011-06-21 11:47:57 +08:00
Walzer	3559258d94	Merge pull request #305 from moadib/cclabelbmfont_ref_instead_copy ... Removed unnecessary copy of ccBMFontDef structure in CCLabelBMFont::createFontChars()	2011-06-20 20:38:05 -07:00
Walzer	4d161e7948	fix #529, add static node() method to CCLayerColor, CCLayerGradient, CCMultiplexLayer	2011-06-21 10:53:20 +08:00
minggo	2f97a43439	issue #528: refactor lua ok on Android	2011-06-21 10:18:43 +08:00
minggo	022e2b9998	issue #528: refactor ok on win32	2011-06-20 17:31:38 +08:00
Marat Yakupov	0b3586126b	Removed unnecessary copy of ccBMFontDef structure in CCLabelBMFont::createFontChars()	2011-06-20 10:40:27 +04:00
natural-law	fae0498b3c	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-06-17 10:49:25 +08:00
natural-law	cfee246959	fixed #323, Add an interface to get the current language.	2011-06-17 10:49:02 +08:00
Marat Yakupov	7be492d1b5	Parameters should be passed by const reference instead copy	2011-06-16 09:27:51 +04:00
yangws	19eaefab72	CCImage_win32 hasn't release font resource in Destructor.	2011-06-16 10:55:57 +08:00
minggo	33008fc8de	Merge pull request #300 from minggo/lua ... Lua support	2011-06-15 02:24:17 -07:00
minggo	738f0b3426	Merge https://github.com/cocos2d/cocos2d-x into lua	2011-06-15 15:32:09 +08:00
liswei	3e54282e04	fixed #502 modify CCConfiguration to singleton mode	2011-06-15 11:48:00 +08:00
liswei	c6cd929dac	fixed #516 ccactionmanager.cpp L289: 'if (UINT_MAX == i)' modify to 'if (UINT_MAX != i)'	2011-06-15 09:56:33 +08:00
liswei	585792f3da	Merge branch 'work1'	2011-06-14 16:29:41 +08:00
liswei	7c669cfcb4	fixed #523 [all] CCParticleSystemQuad::particleWithFile can't work correctly	2011-06-14 16:27:47 +08:00
natural-law	5d70774b4f	fixed #524, Parse the special format of plist files on ios & airplay.	2011-06-14 16:15:20 +08:00
minggo	49f1518893	fix a bug when compile in android	2011-06-14 15:43:45 +08:00
natural-law	214e86a5b6	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x ... Conflicts: cocos2dx/platform/CCFileUtils.cpp	2011-06-14 15:05:52 +08:00
natural-law	489fb7824b	fixed #524, Parse the special format of plist files.	2011-06-14 14:53:00 +08:00
minggo	a7a22e528b	remove the usage of NDController	2011-06-14 14:46:39 +08:00
minggo	9c49e27bf1	add extensions & tools directory	2011-06-14 14:31:25 +08:00
minggo	0f19c30921	remove redifine functions	2011-06-14 11:32:01 +08:00
minggo	4d8b2c284c	support lua	2011-06-14 11:08:39 +08:00
minggo	8003de7468	update to latest code and merge	2011-06-14 11:01:38 +08:00
liswei	91326028ec	fixed #516 Undefined Behaviour in ccCArray.h (signed / unsigned conversion)	2011-06-13 16:58:55 +08:00
liswei	1591c7edc8	fixed #512 fix warnings in /Wall flag	2011-06-10 17:51:37 +08:00
Walzer	f600846d4b	Merge http://github.com/flyingpacer/cocos2d-x, resolve conflicts in cocos2dx/CCScheduler.cpp	2011-06-08 11:08:29 +08:00
RongHong	67eb87abfe	To fix the crash when the gles version is too low	2011-06-08 10:02:07 +08:00
RongHong	a13e8ae859	1.修正gles版本过低时会崩溃的问题 ... 2.修正unscheduleAllSelectors（）中遍历哈希表导致崩溃的问题	2011-06-03 15:22:50 +08:00
Walzer	97afafd856	Merge remote branch 'origin/master'	2011-06-02 22:26:53 +08:00
Walzer	3cba64679c	add std::string CCString::toStdString() method	2011-06-02 22:26:38 +08:00
minggo	4f20deff30	fixed #518: fix a bug that use tHashSelectorEntry in wrong way	2011-06-02 10:07:17 +08:00
minggo	83e1e0ebd1	tests run ok when it don't enable lua	2011-06-01 20:29:05 +08:00
minggo	a8b6b850de	use precompile macro to cantrol if enable lua support	2011-06-01 17:51:08 +08:00
minggo	dedbd638d3	lua runs ok on Android	2011-06-01 14:35:28 +08:00
minggo	fe8fcb0b00	invode lua registerred tick	2011-05-31 14:49:47 +08:00
minggo	697368cf20	support lua	2011-05-31 14:04:14 +08:00
yangws	de977bc6c2	use 0 replace NULL	2011-05-30 16:49:08 +08:00
yangws	7e2d1d5c48	fixed #490 Text input on android use a different way, TextInputTest OK now.	2011-05-30 16:36:12 +08:00
Walzer	c790fba340	avoid a bug in clang, see this post http://www.cocos2d-x.org/boards/7/topics/1638 Thanks to Cem Aslan's contribution!	2011-05-27 16:26:59 +08:00
Walzer	03b1bb6c52	fix a typo in CCTextFieldTTF. add comment for in helloworld/AppDelegate.cpp	2011-05-26 10:08:05 +08:00
yangws	ec23d7ed55	fixed #508 Dynamic switch retina display support.	2011-05-23 16:21:31 +08:00
yangws	4c0008cd73	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 489	2011-05-20 10:02:16 +08:00
unknown	97142d4a59	Use GetCurrentDirectory instead GetModuleName in CCFileUitls_win32.cpp and compile OK on vs2010	2011-05-19 21:11:29 +08:00
unknown	b940676cab	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 489	2011-05-19 20:55:39 +08:00
yangws	02774dd963	fixed #499 Move CCRGBAProtocol implement from CCMenuItemImage to CCMenuItemSprite.	2011-05-19 17:00:13 +08:00
minggo	ff1017d86f	Merge pull request #276 from minggo/iss496 ... [android] fixed #496 fixed #497	2011-05-18 23:18:37 -07:00
minggo	073260e0a9	[android] fixed #496 fixed #497: tests and HelloWorld work ok on Android3.0	2011-05-19 11:26:57 +08:00
Walzer	2dd11490ad	Merge pull request #274 from yangws/master ... Fixed some bugs on wophone and modify CClog output utf-8 string on win32 and wophone emulator.	2011-05-18 18:51:38 -07:00
minggo	822016e375	[android] fixed #495: fix a memory leak	2011-05-18 13:56:35 +08:00
yangws	8e07ab7dc9	Modify CCLog out utf-8 string on win32 and wophone emulator.	2011-05-18 11:25:54 +08:00
yangws	5173738f37	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-05-18 11:08:44 +08:00
yangws	7a6a891242	fixed bugs: the image stoped when switch app fore/background several times. The background music not stoped when app enter background some time.	2011-05-18 11:08:18 +08:00
natural-law	95a46bd5f8	[ios] fixed #493, The return value of CCFileUtils::getWriteablePath() should be end with '/'.	2011-05-17 10:44:56 +08:00
natural-law	0466166935	[win32] fixed #492, Consider the path separated by '\' in function CCFileUtils::fullPathFromRelativeFile().	2011-05-16 17:13:15 +08:00
yangws	aba77f4cae	issue #489 modified for vs2008.	2011-05-13 14:13:30 +08:00
Walzer	c7fb183dcb	[airplay] After exclude CurlTest & CCUserDefault, UserDefaultTest, HelloWorld & Tests can be compiled successfully now.	2011-05-12 21:58:11 +08:00
Walzer	1340bbf842	[android] fix a compilation error in CCFileUtils_android.cpp, getWritablePath() method	2011-05-12 21:12:15 +08:00
Walzer	f17a8f6226	Merge pull request #271 from minggo/iss488 ... [Android] CCUserDefault works ok on android2.2	2011-05-12 05:40:15 -07:00
minggo	91bc9a3f7a	[android] fixed #488: fix memory leak	2011-05-12 18:55:32 +08:00
minggo	d8f3b0c25b	[android] CCUserDefault works ok on android2.2	2011-05-12 18:32:13 +08:00
yangws	c73c1a9ab6	compile ok in vs2010	2011-05-12 16:15:10 +08:00
Walzer	78d49e9806	[win32] dllexport 2 pure C functions from CCLabelBMFont.h	2011-05-12 08:40:19 +08:00
Walzer	249724f8d8	[ios] issue #371, fix the error when invoke CCImage::initWithString with null string ""	2011-05-12 08:24:29 +08:00
Walzer	d0ff1f274e	Merge pull request #264 from yangws/master ... fixed a bug: TextInputTextWithAction can't stop CCTextFieldTTF's action when click enter button.	2011-05-11 03:28:16 -07:00
yangws	b8a9db98dc	fixed a bug: TextInputTextWithAction can't stop CCTextFieldTTF's action when click enter button.	2011-05-11 18:22:55 +08:00
yangws	8fa1b97149	fixed a bug by bin: when reopen the keyboard can't delete the text which inputed before.	2011-05-10 18:08:07 +08:00
yangws	21c8628e68	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input2 ... Conflicts: cocos2dx/platform/wophone/CCApplication_wophone.h tests/tests/tests.h	2011-05-10 16:09:26 +08:00
yangws	167f4c206b	issue #478 KeyBoard can run on wophone. but too slow.	2011-05-10 15:48:26 +08:00
yangws	fc01bada97	input from sencond twindow named input view. ... ps: TWindow doesn't support switch. ps2: TWindow as memory window doesn't support rotate.	2011-05-09 16:59:26 +08:00
natural-law	02f30a86b3	[wophone] Modify the wophone Makefile.ARM for the CCUserDefault.	2011-05-09 11:09:54 +08:00
natural-law	dd309fe862	[wophone] fixed #487, Implement the function CCFiltUtils::getWriteablePath() on wophone.	2011-05-09 10:03:43 +08:00
minggo	e27452dd8a	Merge pull request #253 from minggo/iss455 ... Implement CCUserDefault	2011-05-08 18:37:33 -07:00
Walzer	7fa669bad1	Merge pull request #255 from minggo/iss484 ... fixed #484: solve a potential memory leak	2011-05-08 02:21:31 -07:00
minggo	113f1ab2ef	fixed #484: solve a potential issue	2011-05-06 18:09:31 +08:00
Walzer	3d17a650bf	Merge pull request #254 from natural-law/master ... [wophone] Use Sys_SchedYield to control the FPS, instead of Sys_Sleep.	2011-05-06 03:04:45 -07:00
natural-law	42b3ad676e	[wophone] Use Sys_SchedYield to control the FPS, instead of Sys_Sleep.	2011-05-06 18:00:43 +08:00
minggo	e14040730b	fixed #455: release CCUserDefault at end & fix a bug when the user delete CCUserDefault carelessly	2011-05-06 17:46:19 +08:00
yangws	3f8293dffb	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input ... Conflicts: HelloWorld/wophone/HelloWorld.wophone.vcproj tests/test.wophone/copy_res.bat	2011-05-06 17:45:39 +08:00
minggo	6c69107f33	fixed #455: CCUserDefault works ok on iOS	2011-05-06 17:01:41 +08:00
yangws	ced029257f	temp commit	2011-05-06 16:38:09 +08:00
minggo	7e40957e04	Merge https://github.com/cocos2d/cocos2d-x into iss455	2011-05-06 16:29:44 +08:00
minggo	80f739942d	issue #455 : compile CCUserDefault on iOS	2011-05-06 16:29:35 +08:00
minggo	33648a9e9b	issue #455: add compile CCUserDefault to WoPhone, but not test, because the path will change later	2011-05-06 16:14:07 +08:00
Walzer	857141eef3	[ios] issue #371, compatible with ios 4.1 4.2 4.3. switching different input methods will not cause crash	2011-05-06 15:43:36 +08:00
minggo	2c0bd49513	issue #455: CCUserDefault ok on win32 & Android	2011-05-06 15:31:51 +08:00
natural-law	846b529e49	[wophone] fixed #482, Modify the resource data path for the new WoPhone-SDK.	2011-05-06 10:13:12 +08:00
yangws	0fe61642f6	issue #478 text input ok.	2011-05-05 18:17:50 +08:00
Walzer	dcdad9a81a	Merge pull request #250 from yangws/481 ... fixed #481 DisableKeyLock and DisableBackLightAutoTurnOff when BackLightTurnOn.	2011-05-05 00:53:10 -07:00
Walzer	c7e25d305a	Merge pull request #248 from yangws/input ... Split TextInputTest to Default test and Action test. Compile ok on vs2010	2011-05-05 00:50:48 -07:00
yangws	6eb24cafee	fixed #481 remove KeyLock control code.	2011-05-05 14:00:36 +08:00
yangws	7c5a6d779c	fixed #481 DisableKeyLock and DisableBackLightAutoTurnOff when BackLightTurnOn.	2011-05-05 11:51:13 +08:00
yangws	a5da2bd226	Split TextInputTest to Default test and Action test. Compile ok on vs2010.	2011-05-04 14:13:15 +08:00
minggo	0db248e1f1	Merge pull request #245 from yangws/input. ... TextInputTest on on ios.	2011-05-02 18:48:48 -07:00
yangws	2b94d7d9ce	TextInputTest on on ios.	2011-04-29 18:09:54 +08:00
yangws	170933b4c5	CCTextFieldTTF test code ok on win32.	2011-04-29 16:46:29 +08:00
minggo	b00c54dc64	Merged pull request #243 from minggo/iss477. ... [android] fixed #477: set default ndk version to ndk-r5	2011-04-28 19:29:15 -07:00
Walzer	bdd0b44b99	fixed a warning in CCProfiling.cpp	2011-04-29 10:08:35 +08:00
minggo	bb4fc1c446	[android] fixed #477: set default ndk version to ndk-r5	2011-04-29 09:59:05 +08:00
yangws	2bb4775051	add CCTextFieldDelegate.	2011-04-28 18:01:29 +08:00
Walzer	b61c019b2c	[android] fixed #475, CCImage::initWithString return true even if the bitmap hasn't been initialized. Thanks to Isaac Ashdown's fix on the forum.	2011-04-28 15:14:59 +08:00
minggo	8b14b1bab8	Merged pull request #242 from yangws/input. ... [ios] tests add RootViewController for rotate with ui object.	2011-04-27 23:46:47 -07:00
yangws	d73699aabb	[ios] tests add RootViewController for rotate with ui object.	2011-04-28 14:19:12 +08:00
minggo	86b856c7f1	Merged pull request #241 from yangws/input. ... make tests can compile on wophone and airplay.	2011-04-27 20:50:08 -07:00
minggo	963c271120	Merged pull request #240 from natural-law/master. ... issue #428	2011-04-27 19:38:09 -07:00
yangws	323c065934	make test can compile on wophone and airplay.	2011-04-28 10:31:51 +08:00
natural-law	15ef0b9105	issue #428, fix the bug created by issue 428. Have some loop in wrong arrays.	2011-04-28 10:16:58 +08:00
Walzer	2cceeb5c39	Merge remote branch 'origin/master'	2011-04-27 22:46:38 +08:00
Walzer	fa43292250	ccTouchDeletateAllBit -> ccTouchDelegateAllBit. I met this typo 3 days ago, then miss it. Thanks to Isaac Ashdown.	2011-04-27 22:45:54 +08:00
yangws	f8dc140840	change CCLabelTTF accept string from gb2312 to utf8.	2011-04-27 18:19:47 +08:00
yangws	e895d9d073	TextInputTest compile ok on android and merge last master code. ... Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input Conflicts: HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxRenderer.java HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj cocos2dx/platform/android/Cocos2dJni.cpp tests/test.android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java tests/test.android/src/org/cocos2dx/lib/Cocos2dxRenderer.java tests/test.ios/test.xcodeproj/project.pbxproj tests/test.win32/test.win32.vcproj	2011-04-26 18:04:07 +08:00
yangws	9b08f4add6	keyboard notification message on ios and TextFieldTTF test code OK.	2011-04-26 16:33:20 +08:00
Walzer	b3f76a81a4	[win32] issue #471, CCFileUtils::fullPathFromRelativeFile mustn't calculate realtive path twice	2011-04-26 14:53:57 +08:00
minggo	ef94d19030	Merge branch 'iss468' of https://github.com/natural-law/cocos2d-x	2011-04-25 16:08:27 +08:00
minggo	1c248b9955	Merge branch 'iss462' of https://github.com/minggo/cocos2d-x	2011-04-25 16:07:16 +08:00
minggo	99733c602d	[android] fixed #462: call applicationDidEnterBackground and applicationWillEnterBackground on android	2011-04-25 15:13:24 +08:00
natural-law	71e4ec6aca	issue #468, Fix the compile error when the target platform is not win32.	2011-04-25 15:05:16 +08:00
Walzer	6a11f73999	Merge branch 'iss468' of https://github.com/natural-law/cocos2d-x	2011-04-25 14:44:21 +08:00
natural-law	7231120b16	fixed #468, Implement CCProfiler & CCProfilingTimer. And use them in PerformanceNodeChildrenTest.	2011-04-25 14:30:30 +08:00
Walzer	38ee881876	Merge branch 'master' of https://github.com/natural-law/cocos2d-x	2011-04-25 09:52:13 +08:00
natural-law	7337119501	issue #466, Modify the interface to fit the refactor of CCFileUtils.	2011-04-25 09:40:10 +08:00
moadib	85afa22195	[android] fixed typo in CCEGLView method name	2011-04-24 18:52:21 +04:00
Walzer	386005ef79	issue #466, Bin forget to modify CCFileUtils_ios.mm to fit the refactor, which cause compilation error.	2011-04-24 15:44:00 +08:00
Walzer	f7b294fe24	fixed #467 CCLayer:m_eTouchDelegateType = ccTouchDeletateAllBit all the time, which makes an error logic if adding standard touch delegate when CCTouchDispatcher::m_tLock = ture	2011-04-24 15:38:03 +08:00
yangws	252f3efe1a	CCIMEDispatcher works on android.	2011-04-22 16:33:41 +08:00
natural-law	e2ce006db2	fixed #466. [wophone] Refactor the CCFileUtils for the new packing approach.	2011-04-22 10:57:46 +08:00
natural-law	acb4bb5a16	Merge branch 'master' into iss428 ... Conflicts: template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj	2011-04-21 14:58:58 +08:00
natural-law	5d2ac1fc0c	fixed #428, Use CCArray instead of CCMutableArray as the parameter type of CCNode::m_pChildren.	2011-04-21 14:46:15 +08:00
minggo	8458058f26	Merge branch 'iss393' of https://github.com/minggo/cocos2d-x into minggo-iss393	2011-04-20 17:19:03 +08:00
minggo	fd45cbea77	[android] fixed #393: use new version of libxml2, it supports xpath and xslt	2011-04-20 17:08:50 +08:00
minggo	7b51fa8e9b	[android] fixed #393: use new version of libxml2, it supports xpath and xslt	2011-04-20 16:11:18 +08:00
minggo	e5441a4fc2	fixed #450: can set default pixel format other than RGBA8888	2011-04-20 15:34:33 +08:00
yangws	85027c40ca	CCIMEDispatcher works on ios.	2011-04-19 18:11:57 +08:00
minggo	4ffe24fc8e	Merge branch 'iss374' of https://github.com/natural-law/cocos2d-x into natural-law-iss374	2011-04-19 13:45:56 +08:00
minggo	f1363af496	Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master	2011-04-19 11:49:50 +08:00
minggo	26da27aaca	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-04-19 11:48:33 +08:00
minggo	0db048de73	Merge branch 'issue_456' of https://github.com/minggo/cocos2d-x into minggo-issue_456	2011-04-19 11:36:00 +08:00
Walzer	735b6ce97b	CCMutableArray::count() may crash if m_array is empty. Detect empty() before iteration	2011-04-19 11:23:02 +08:00
minggo	c38af3c28d	fixed #456: integrate libcurl into cocos2dx	2011-04-19 10:57:44 +08:00
yangws	d11bd85d00	CCTextFieldTTF works on win32.	2011-04-19 09:32:33 +08:00
minggo	a4e9f1c18d	libcurl works ok on ios	2011-04-18 14:12:41 +08:00
natural-law	adbf349116	fixed #449. Modify the wophone Makefile.ARM for remove mac support.	2011-04-18 11:35:57 +08:00
walzer	0738f751d1	Merge branch 'point_math' of https://github.com/moadib/cocos2d-x	2011-04-16 15:22:44 +08:00
walzer	eb4b31e4da	update config file from doxygen 1.7.2 to 1.7.4. add simple brief for CCMessageBox	2011-04-16 15:21:50 +08:00
moadib	03093a98b5	In pointmath-related functions parameters should be passed by reference	2011-04-16 10:55:02 +04:00
minggo	37e7fad0d3	issue #456: add curl test & libcurl.so works ok on android	2011-04-15 17:15:05 +08:00
walzer	73f2c5297c	#define ccp CCPointMake(...) to cocos2d::CCPointMake(...). Thanks Marat Yakupov's fix. http://www.cocos2d-x.org/boards/6/topics/1200	2011-04-14 16:15:12 +08:00
minggo	932b475170	fixed #448: make CCCallFuncO invoke correct parameter	2011-04-13 11:53:25 +08:00
minggo	7f6e0052a1	Merge branch 'iss341' of https://github.com/natural-law/cocos2d-x into natural-law-iss341	2011-04-12 15:43:48 +08:00
natural-law	da7c608ab8	fixed #341. Modify the location of allocate memory for m_pTMXLayers.	2011-04-12 15:31:54 +08:00
minggo	3d6fd051ab	issue #449: refactor CCTransition	2011-04-11 16:09:14 +08:00
natural-law	ba933f9456	fixed #341, modify the implementation of function CCTMXTiledMap::layerNamed().	2011-04-11 15:59:59 +08:00
minggo	37bb33d9e5	fixed #452: refactor CCDirector CCNode CCGrid	2011-04-11 15:10:09 +08:00
natural-law	d4dbedca4d	fixed #451,remove the code of support mac platform. ... 1. Remove the EventDispatcher. 2. Refactor CCLayer, CCMenu and CCParticleSystemPoint. 3. Modify the project file of win32, wophone and android.	2011-04-11 11:24:10 +08:00
yangws	d3ef9e7da7	Merge branch '0.8.2_vc10' of https://github.com/yangws/cocos2d-x into master.cocos2d	2011-04-07 14:30:28 +08:00
yangws	455ec071b3	VC2010 compile ok.	2011-04-07 14:20:04 +08:00
yangws	b1ab937ec3	fix MouseEvent bug	2011-04-07 11:05:44 +08:00
natural-law	1af4aa1138	[android] fixed #374,Modify the approach of cache the textures when EGL rendering context lost.	2011-04-06 16:29:58 +08:00
natural-law	f3b1385279	fixed #446,read the .fnt file by it's full path.	2011-04-06 10:20:01 +08:00
Max Aksenov	b33aeac164	[airplay] renamed "CCEGLView::setFrameWitdAndHeight" to "CCEGLView::setFrameWidthAndHeight". ... reformatted CCEGLView::setMotionTouch for unification with other functions of "setTouche".	2011-04-04 01:58:07 -07:00
Max Aksenov	6927dae38f	[airplay] renamed "CCEGLView::setFrameWitdAndHeight" to "CCEGLView::setFrameWidthAndHeight". ... reformatted CCEGLView::setMotionTouch for unification with other functions of "setTouche".	2011-04-04 01:56:15 -07:00
walzer	cb65469103	[airplay] move .mkf to proj.airplay folder, improve SimpleAudioEngine implementation, integrate chipmunk	2011-04-04 00:40:39 +08:00
walzer	de81120b6a	Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master	2011-04-03 09:51:01 +08:00
walzer	28fbfb04dc	Merge branch 'iss349' of https://github.com/natural-law/cocos2d-x into natural-law-iss349	2011-04-03 09:30:26 +08:00
minggo	0aa8eb2892	fixed #350: transitionfade flickers on both android and iphone	2011-04-02 16:16:19 +08:00
natural-law	72f11cb421	[ios]fixed #349,Modify the method of parse *.plist files in order to deal with *.plist files in binary format.	2011-04-02 11:32:15 +08:00
minggo	39b60291ed	Merge branch 'issue_441' of https://github.com/minggo/cocos2d-x into minggo-issue_441	2011-04-01 17:34:17 +08:00
minggo	8fbfc2773a	Merge branch 'issue_440' of https://github.com/minggo/cocos2d-x into minggo-issue_440	2011-04-01 17:19:30 +08:00
minggo	7d52161804	fixed #441: Initialize pointer in contruction & detect pointer value in destruction	2011-04-01 16:06:53 +08:00
Marat Yakupov	ac84278dae	[android] #443 implemented CCKeypadDelegate on android	2011-04-01 11:27:06 +04:00
minggo	2c539a1df5	[android] fixed #440: CCMessage works ok on android	2011-04-01 11:35:26 +08:00
yangws	0efeaa6696	fixed #420 deal with ccsprite init failed case in CCSprite.cpp.	2011-03-31 14:56:49 +08:00
yangws	63801db3f6	fixed #440 Commit missing file last commit.	2011-03-31 11:23:58 +08:00
yangws	20539d4b89	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 439	2011-03-31 10:51:00 +08:00
yangws	f8a5a4ecf3	CCMessageBox works on ios.	2011-03-31 10:36:53 +08:00
walzer	87bd4a2938	fixed #438, rename CCMotionStreak::update to CCMotionStreak::updateMotion to avoid this crash	2011-03-30 15:00:13 +08:00
walzer	70eb85e6df	Merge branch 'yangws-439'	2011-03-30 11:47:10 +08:00
yangws	7e81c56231	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 439 ... Conflicts: cocos2dx/platform/ios/CCFileUtils_ios.mm	2011-03-30 11:05:23 +08:00
walzer	35d94eb3a5	Merge branch 'iss411' of https://github.com/natural-law/cocos2d-x into natural-law-iss411	2011-03-30 10:44:34 +08:00
yangws	ba68a5b966	fixed #439 test OK.	2011-03-29 17:32:52 +08:00
natural-law	87ea85a986	fixed #411,support .plist format generated by zwoptex in the last version.	2011-03-29 16:59:50 +08:00
yangws	48d57b88e2	issue #439 ios and airplay midified.	2011-03-29 15:59:37 +08:00
yangws	1887417472	issue #439 ios and airplay midified.	2011-03-29 15:56:55 +08:00
walzer	5811fb7c76	Merge branch 'issue_422' of https://github.com/minggo/cocos2d-x into minggo-issue_422	2011-03-29 15:50:28 +08:00
yangws	6c5cf577b7	issue #439 wophone and android modified.	2011-03-29 15:05:53 +08:00
minggo	c686047f83	[android] fixed #422: multitouch for android	2011-03-29 14:20:05 +08:00
natural-law	334786c633	fixed #391,Add implement of CCNS on airplay.	2011-03-29 13:59:10 +08:00
natural-law	edc33952be	fixed #391,Add support on ios and airplay.	2011-03-29 12:50:25 +08:00
natural-law	5f7357bf09	fixed #391,CCSpriteFrameCache support *.plist files with format value is not 0.	2011-03-29 11:56:14 +08:00
yangws	041953151a	issue #439 CCFileData and imageWithImageFile modified on win32.	2011-03-29 11:41:44 +08:00
natural-law	1991a65b0b	Merge branch 'master' into iss391 ... Conflicts: HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj cocos2dx/proj.win32/cocos2d-win32.vcproj cocos2dx/proj.wophone/Makefile.ARM cocos2dx/proj.wophone/cocos2d-wophone.vcproj template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj tests/test.ios/test.xcodeproj/project.pbxproj	2011-03-29 10:20:57 +08:00
walzer	6cc09aa4dc	Merge branch '396' of https://github.com/yangws/cocos2d-x into yangws-396	2011-03-28 21:08:56 +08:00
yangws	6b66affbab	fixed #396 wophone modified.	2011-03-28 17:20:39 +08:00
yangws	a9f85a2daa	issue #396 airplay modified.	2011-03-28 17:10:05 +08:00
natural-law	e38d3a2277	Merge branch 'master' into iss434 ... Conflicts: cocos2dx/platform/airplay/CCFileUtils_airplay.h template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj	2011-03-28 17:06:32 +08:00
natural-law	ed2566e201	issue #434,Refactor class CCFileUtils on platform airplay.	2011-03-28 16:27:26 +08:00
yangws	a5040e0ccb	issue 396 ios modified.	2011-03-28 13:41:14 +08:00
yangws	814b66b089	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 396	2011-03-28 11:11:50 +08:00
yangws	dceff2d179	issue #396 android modified.	2011-03-28 11:09:49 +08:00
yangws	4b86cec4be	issue #396 win32 modifyed.	2011-03-28 10:44:14 +08:00
walzer	2f573a784e	fixed #435, CocosDenshion crashes at foreground/background switching	2011-03-27 22:17:18 +08:00
natural-law	cee82fe9fa	issue #434,refactor class CCFileUtils on android and ios.	2011-03-26 17:24:37 +08:00
walzer	f568ad8487	issue #379, fix a bug caused by airplay port integration, which makes android port unable to load resources by zlib.	2011-03-26 14:09:42 +08:00
natural-law	28a940ab57	issue #434,refactor class CCFileUtils on win32 and wophone.	2011-03-26 13:52:33 +08:00
walzer	3029b66fbc	Merge branch '417' of https://github.com/yangws/cocos2d-x into yangws-417	2011-03-26 13:35:53 +08:00
yangws	2015e468ca	fixed #417 When mouse pressed， capture it in EGLView.	2011-03-26 11:34:18 +08:00
yangws	cd6352adec	add new files to vc2010 project.	2011-03-25 17:41:54 +08:00
walzer	326bc998da	typo fixed, sorry :(	2011-03-25 16:13:18 +08:00
walzer	95d672a858	add copyright & author name for airplay port	2011-03-25 15:30:10 +08:00
walzer	e4ae24a20c	Merge branch 'yangws-430'	2011-03-25 14:25:52 +08:00
walzer	9c1d462275	Merge branch '430' of https://github.com/yangws/cocos2d-x into yangws-430	2011-03-25 14:23:05 +08:00
walzer	9b8bc8373b	fixed #431, manually merge the WenSheng's work	2011-03-25 14:20:53 +08:00
walzer	fa5e71916b	issue #431, manually merge WenSheng's work	2011-03-25 14:16:58 +08:00
yangws	be966dbddb	fixed #430 Solved bug by replacing glColor4ub with glColor4f.	2011-03-25 13:50:57 +08:00
walzer	7e7e8e2b4c	Merge branch 'issue427'	2011-03-25 13:45:49 +08:00
walzer	ff91c91ea9	issue #427 android HelloWorld ok	2011-03-25 12:01:56 +08:00
walzer	d58a1ac9bc	issue #427 projct configs for win32-vs2008, wophone emu & device are ok	2011-03-25 11:23:21 +08:00
walzer	0450048a41	[all] typo fixed, CCSprite::isTextureRectTotated -> CCSprite::isTextureRectRotated	2011-03-25 09:48:43 +08:00
walzer	799fb0994f	issue #427, airplay port ok	2011-03-24 18:17:35 +08:00
walzer	db4fb7cc9c	issue #427, refactor ios port ok.	2011-03-24 17:51:29 +08:00
walzer	b9c56f1728	issue #427, try to add CCSAXParser.h	2011-03-24 16:16:49 +08:00
natural-law	55143e3b9e	issue #391,implement functions:CCRectFromString, CCPointFromString and CCSizeFromString.	2011-03-24 10:38:08 +08:00
walzer	ed492bbd1e	[airplay] first commit of airplay port. Thanks for Аксёнов Максим's contribution!	2011-03-23 22:16:20 +08:00
unknown	7fa4e43ee5	fixed #424 CCamera.cpp rename to CCCamera.cpp, re-add the file to vc2010 project.	2011-03-23 10:01:37 +08:00
walzer	2b7a324c47	fix compilation error when COCOS2D_DEBUG = 2	2011-03-21 10:50:24 +08:00
walzer	81fa070125	fixed #418, add copyright of original authors, merge Bin's commit	2011-03-19 14:45:51 +08:00
walzer	adfad22b2e	Merge branch 'issue_418' of https://github.com/minggo/cocos2d-x into minggo-issue_418	2011-03-19 14:20:30 +08:00
minggo	22b55eaf78	issue #418: add copyright of original author to each file	2011-03-19 10:59:01 +08:00
walzer	abd2725ed4	issue #148, add copyright	2011-03-19 10:34:26 +08:00
walzer	08a5f8029e	issue #418 add copyright of original authors to particle module	2011-03-19 10:07:16 +08:00
walzer	ffeb116542	Merge branch 'issue_400' of https://github.com/minggo/cocos2d-x into minggo-issue_400	2011-03-18 16:32:20 +08:00
walzer	d8c28d3754	Merge branch 'issue_409' of https://github.com/minggo/cocos2d-x into minggo-issue_409	2011-03-18 15:59:01 +08:00
walzer	b56014c70f	issue #376, ios version compilation error when when COCOS2D_DEBUG = 1, fix CCLOG(@"...") to CCLOG("")	2011-03-18 15:17:15 +08:00
minggo	6524d037db	issue #400: change vs2010 vcproj to include CCCamera.cpp	2011-03-18 15:06:26 +08:00
minggo	1ce64f1ecf	issue #400: rename CCamera.cpp to CCCamera.cpp	2011-03-18 14:54:24 +08:00
minggo	7d39629c8c	issue #400: rename CCamera.cpp to CCCamera.cpp	2011-03-18 14:54:03 +08:00
minggo	47173778cc	fixed #409: rename NSArray UIAlignment	2011-03-18 14:31:29 +08:00
walzer	724ac1d0a9	Merge branch 'issue_403' of https://github.com/minggo/cocos2d-x into minggo-issue_403	2011-03-18 10:08:43 +08:00
minggo	7c52a521fa	fixed #403: change UIEvent to CCEvent	2011-03-18 09:39:34 +08:00
walzer	b4d757ce9e	fixed #408 @5m , fix memory leak in CCImage::_initWithPngData	2011-03-17 14:26:36 +08:00
walzer	fe6487b33a	Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master	2011-03-17 11:58:38 +08:00
yangws	dd7934a19e	Merge branch 'master' of https://github.com/yangws/cocos2d-x	2011-03-17 11:11:56 +08:00
yangws	fc2818cf21	fixed #404 enableRitinaDisplay return false on iphone3	2011-03-17 11:10:50 +08:00
walzer	0f760e89fa	#include "ccGL.h" -> #include "CCGL.h" in CCamera.cpp, for case-sensitive systems	2011-03-17 09:48:28 +08:00
walzer	59b65373e7	[bug fix] CCConfiguration::checkForGLExtension(const string&) sometimes crashes. Define it!	2011-03-16 20:53:08 +08:00
walzer	19d8dc6978	Merge branch 'dev' of https://github.com/yangws/cocos2d-x into yangws-dev	2011-03-15 15:44:53 +08:00
yangws	61e2f56439	Add Retina display resource for tests. ... Modify CCDrawingPrimitives.cpp for retina display support.	2011-03-15 15:12:50 +08:00
natural-law	06ad40f101	[android]fixed #356,modify the parameter type form ccxScopedPtr<std::string> to std::string *.	2011-03-15 11:59:45 +08:00
minggo	89db0334a3	revert the modification of CCNode_mobile.cpp and CCSprite.cpp	2011-03-15 10:27:16 +08:00
minggo	4b61e713e5	Merge branch 'dev' of https://github.com/yangws/cocos2d-x into yangws-dev	2011-03-15 10:20:56 +08:00
natural-law	0c75af0f97	[android]fixed #356,CCLabelTTF::initWithString not crashed anymore.	2011-03-14 18:29:15 +08:00
yangws	1e67709e34	fixed #392 CC_SPRITE_DEBUG_DRAW OK.	2011-03-12 15:20:26 +08:00
natural-law	dd675f8cf1	[wophone]Resolve the memory leak of CCAccelerometer.	2011-03-11 17:41:19 +08:00
natural-law	6d028007c2	Fix the bug of CCAnimationCache and CCSpriteFrame.Run SpriteTest successful.	2011-03-11 17:00:10 +08:00
minggo	69dcaddb51	Merge branch 'dev' of https://github.com/yangws/cocos2d-x into yangws-dev	2011-03-11 12:01:58 +08:00
yangws	f0661a2679	fix 4 bugs: ... 1 call CCTextureCache::purgeSharedTextureCache() to release cached texture when enableRetinaDisplay is called. 2 enableRetinaDisplay performence correctly. 3 Modify libcocos2d project pre-link event performence corretly when the source in the path which contain white blacks. 4 Modify HiResTest, that can switch resouce dynamicly now.	2011-03-11 11:04:22 +08:00
unknown	0d51d129b5	fixed #253 TileMapTest crash in windows7.	2011-03-10 23:16:38 +08:00
unknown	8e429c422d	Build-win32.bat OK on win7	2011-03-10 21:11:14 +08:00
unknown	795f1b985f	Add VC2010 project files on win32	2011-03-10 19:50:17 +08:00
minggo	a45125dafe	Merge branch 'issue385' of https://github.com/yangws/cocos2d-x into yangws-issue385	2011-03-10 17:20:32 +08:00
minggo	9a67fa6df1	Merge branch 'dev' of https://github.com/yangws/cocos2d-x into yangws-dev	2011-03-10 17:16:15 +08:00
yangws	8335e30aef	fixed #385 Impliment CCLog on ios.	2011-03-10 17:08:38 +08:00
natural-law	93aebbc469	[wophone]fixed #386,Resolve the compile conflict on wophone sdk.Modify the makefiles for wophone.	2011-03-10 14:24:13 +08:00
yangws	3fc701f1d2	fixed #300 Cocos2d-win32 application wizard for vs ok.	2011-03-10 12:00:29 +08:00
minggo	cb24e03466	Merge branch 'iss377' of https://github.com/natural-law/cocos2d-x into natural-law-iss377	2011-03-10 09:37:26 +08:00
natural-law	7c6147421b	[wophone]fixed #377,Replace the word "uphone" with "wophone".	2011-03-09 17:28:35 +08:00
minggo	12981fac89	fixed #375	2011-03-09 16:19:20 +08:00
minggo	19470fda34	Merge branch 'iss383' of https://github.com/natural-law/cocos2d-x into natural-law-iss383	2011-03-09 14:55:45 +08:00
minggo	15368e6169	Merge branch 'issue373' of https://github.com/yangws/cocos2d-x into yangws-issue373	2011-03-09 14:53:51 +08:00
minggo	75e2ecc16d	issue #387: move platform_support into cocos2dx/platform	2011-03-09 14:40:05 +08:00
minggo	63d283d3e8	delete ccxString.h	2011-03-09 12:00:04 +08:00
minggo	7aaf4be85f	move platform_support into cocos2dx/platform	2011-03-09 11:38:36 +08:00
natural-law	4c0ace849a	[wophone]fixed #383 ... 1. Modify the approach of handle left soft-key clicked. 2. Fix some compile error.	2011-03-09 11:26:13 +08:00
yangws	151a0096fa	fixed #373 Hide PVRFrame window on win32. ... Modify the PVR registry "hide_gui" false in CCApplication_win32.cpp.	2011-03-09 10:39:08 +08:00
minggo	1aafd4fc56	issue #375: fix some compile error	2011-03-09 10:21:29 +08:00
minggo	f1d13ca2e1	issue #375: android compiled ok	2011-03-08 13:49:58 +08:00
minggo	837b8c04bf	issue #375: rename some macros	2011-03-08 09:29:41 +08:00
minggo	7a331e1e14	issue #375: wophone compiled ok	2011-03-07 18:20:48 +08:00
minggo	b5a99f90df	issue #375: rename file names and object names	2011-03-07 17:11:57 +08:00
minggo	632cf39a8a	fix a bug when merging master into dev	2011-03-07 10:34:42 +08:00
minggo	d3f93b658d	rename libs to libraries and modify cocos2dx/Android.mk	2011-03-07 10:00:33 +08:00
minggo	aaf898cb72	merge master into dev	2011-03-07 09:52:45 +08:00
minggo	661bae2797	merge natural-law-iss370	2011-03-04 16:32:54 +08:00
natural-law	aef83b2660	[uphone]Move Application from Application code to Cocos2dx/platform/ccxApplication.	2011-03-02 17:45:04 +08:00
minggo	4379a1c96f	Move ccxApplication to cocos2dx/platform on ios.	2011-03-02 17:05:22 +08:00
minggo	f7b401163b	Merge branch 'multitouchController' of https://github.com/Macarse/cocos2d-x into Macarse-multitouchController	2011-03-02 09:38:23 +08:00
minggo	89b4d07ed8	[android] fixed #368: move Application code to cocos2dx/platform/ccxApplication	2011-03-01 19:53:39 +08:00
minggo	fc75306402	[android] fix a bug when run in HVGA	2011-03-01 18:34:06 +08:00
minggo	b65d84551b	resolve confict when merging branch yangws-issue366	2011-03-01 14:08:18 +08:00
yangws	7bc7d32001	fixed #366 [win32] Move Application from Application code to Cocos2dx/platform/ccxApplication	2011-03-01 12:41:57 +08:00
minggo	1b6602f582	Merge branch 'WVGA_scale_android' of https://github.com/minggo/cocos2d-x into minggo-WVGA_scale_android	2011-02-28 10:00:55 +08:00
minggo	f504211e56	merge natural-law-iss332 to dev	2011-02-28 09:48:14 +08:00
minggo	498e0072e1	[android] fixed #358: autoscale HVGA resource to WVGA	2011-02-26 15:52:57 +08:00
minggo	0453eb0266	[android] issue #338:refactor platform_support	2011-02-24 19:42:45 +08:00
yangws	03e946a34f	Delete unused files.	2011-02-23 18:24:29 +08:00
yangws	63cedd1317	Merge code of Platform_support for IOS.	2011-02-23 18:22:05 +08:00
natural-law	949c1000a8	update tests to 0.99.5.	2011-02-23 16:47:25 +08:00
minggo	36cb90aaa0	Merge branch 'jpgsupport' of https://github.com/minggo/cocos2d-x into minggo-jpgsupport	2011-02-23 14:13:48 +08:00
minggo	3dde0ebcf5	[android] fixed #353: support jpg on android	2011-02-23 13:43:45 +08:00
natural-law	4362a5f381	[uphone]issue #316,Resolution auto adjustment.	2011-02-19 17:44:43 +08:00
natural-law	60e9ae873c	Merge branch 'dev-retina' of https://github.com/yangws/cocos2d-x into iss316 ... Conflicts: HelloWorld/AppDelegate.cpp tests/AppDelegate.cpp	2011-02-19 10:19:14 +08:00
yangws	85b9c9ae21	Retina display support and scale with keep w/h rate ok on win32.	2011-02-18 18:30:22 +08:00
Macarse	4267593bf9	Used an array approach	2011-02-17 23:23:36 -03:00
natural-law	8035fc366c	[uphone]Support read image file from zip file.	2011-02-17 16:16:50 +08:00
natural-law	e4063fd190	[uphone]issue #340.Refactor platform_support on uphone,and run HelloWorld successful on both simulator and device.	2011-02-17 14:31:52 +08:00
natural-law	0f52839efb	[uphone]support wrap when the dimensions is specified in CCLabelTTF.	2011-02-16 11:03:32 +08:00
walzer	693a8f049b	[iphone] test alignment in labels, ref to the post http://www.cocos2d-x.org/boards/6/topics/588?r=589#message-589 Thanks to Slaz	2011-02-14 11:51:56 +08:00
walzer	626a3f8b74	[uphone] fixed #348, text drawing blur if color=white and fontSize<24	2011-02-12 22:42:42 +08:00
yangws	8458476597	Merge branch 'dev' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 ... Conflicts: .gitignore	2011-02-12 16:42:47 +08:00
minggo	81848f19e6	Merge branch 'bug345' of https://github.com/minggo/cocos2d-x into minggo-bug345	2011-02-12 11:29:27 +08:00
walzer	7e039fbaa1	[win32] add CCX_DLL to CCLayerGradient & CCTimer	2011-02-11 17:30:11 +08:00
minggo	eef0bd4578	[iphone] fixed bug #345: remove init invoking	2011-02-11 16:06:09 +08:00
yangws	36d68eeb41	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5	2011-02-11 09:34:12 +08:00
Macarse	8d5995d5a6	First approach	2011-02-06 17:05:56 -03:00
Macarse	66038230eb	Added logic to disable sensors from the c++ code	2011-02-05 20:17:24 -03:00
Macarse	284c330569	Added code from walzer's comment	2011-02-01 00:11:42 -03:00
Macarse	fce540989d	First approach	2011-01-30 20:05:30 -03:00
natural-law	d0b27c4222	fix bug,MenuTest crash.	2011-01-28 16:05:21 +08:00
yangws	34a6ca5208	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 ... Conflicts: cocos2dx/platform/win32/CCXUIImage_win32.cpp cocos2dx/platform/win32/CCXUIImage_win32.h tests/test.win32/test.win32.vcproj	2011-01-28 14:33:47 +08:00
yangws	76ea63da7f	Change prefix CCX to ccx.	2011-01-27 17:07:36 +08:00
walzer	3260eddd75	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-01-26 17:11:39 +08:00
walzer	ead71525e2	[uphone] don't block when zip resources loading failed	2011-01-26 17:08:19 +08:00
minggo	a0ecaed1ef	[android] define s_bPopupNotify	2011-01-26 16:45:27 +08:00
minggo	54dc660f6b	[android] change the declaration of s_bPopupNotify from public to private	2011-01-26 16:44:58 +08:00
minggo	39165142b8	[iphone] change the declaration of s_bPopupNotify from public to private and define it	2011-01-26 16:44:12 +08:00
minggo	31d287a77d	[uphone]change the declaration of s_bPopupNotify from public to private	2011-01-26 16:42:48 +08:00
minggo	072ed1651e	[win32] change the declaration of s_bPopupNotify from public to private	2011-01-26 16:41:59 +08:00
walzer	a732665b85	Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master	2011-01-26 15:48:02 +08:00
natural-law	3746af1d63	fixed #328.Modify the function and parameter name.	2011-01-26 15:43:12 +08:00
natural-law	7015e85918	fixed #328.By default,pop up a err dialog when loading textures failed.	2011-01-26 11:50:13 +08:00
walzer	950a284b94	[iphone] fixed #289, clear a warning.	2011-01-26 11:31:01 +08:00
minggo	9e2587c26c	Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master	2011-01-25 17:09:11 +08:00
natural-law	6a1b8d64aa	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2011-01-25 15:09:34 +08:00
natural-law	d56575dd5a	[uphone]change the parameter order of function setResource.And add default value of the parameter pszResPath.	2011-01-25 14:26:26 +08:00
walzer	04aab22145	Merge branch 'natural-law-master'	2011-01-25 11:43:57 +08:00
walzer	462ac4823f	bug fix, CCDirect_mobile.cpp crash m_bPurgeDirecotorInNextLoop, according to this post http://www.cocos2d-x.org/boards/6/topics/422	2011-01-25 11:33:03 +08:00
natural-law	800033d98b	fixed #329,use std::string to implement function CCBMFontConfiguration::parseConfigFile.	2011-01-24 15:53:52 +08:00
minggo	9eff0da20a	fix warning when building on android	2011-01-24 10:51:30 +08:00
yangws	1a17f3ea55	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 ... Conflicts: cocos2dx/platform/win32/CCXApplication_win32.cpp tests/test.win32/test.win32.vcproj	2011-01-22 17:52:06 +08:00
minggo	e23c1eb2f6	Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master	2011-01-22 16:45:26 +08:00
yangws	bc9bfdc30c	Move win32/CCXApplication to platform_support	2011-01-22 16:24:54 +08:00
minggo	4a4c0d3485	[android] fixed #321: Frame control of android. It is not so accuracy.	2011-01-22 15:10:18 +08:00
minggo	9d8f0f4b17	Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master	2011-01-21 18:18:13 +08:00
minggo	882b473291	[iphone]: font support	2011-01-21 18:15:12 +08:00
natural-law	48d1791341	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge	2011-01-21 17:33:43 +08:00
minggo	cb7a0e553a	[iphone]: frame control	2011-01-21 17:33:15 +08:00
natural-law	6bde512cbe	[android]issue #268,support more fonts on cocos2d-android.	2011-01-21 17:32:11 +08:00
walzer	8c47a5b254	fix bug in CGRect::CGRectIntersectsRect(..) method, CGGeometry.cpp, according to this solution http://www.cocos2d-x.org/boards/6/topics/387	2011-01-21 08:54:45 +08:00
natural-law	31fc6c0039	[uphone]fixed #308,Modify the code,remove the function CCXApplication::setIsInBackground().	2011-01-20 13:55:45 +08:00
natural-law	f7107fb015	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge ... Conflicts: cocos2dx/platform/uphone/CCXApplication_uphone.h	2011-01-20 13:47:01 +08:00
natural-law	3d225465c0	[uphone]fixed #308,BGM is paused when press power key to make uphone sleep.	2011-01-20 13:41:58 +08:00
walzer	dc11bdf16a	Merge remote branch 'origin/master'	2011-01-20 11:41:41 +08:00
yangws	333f0b5574	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 ... Conflicts: HelloWorld/AppDelegate.cpp cocos2dx/particle_nodes/CCParticleSystem.cpp cocos2dx/proj.win32/cocos2d-win32.vcproj tests/AppDelegate.cpp	2011-01-20 11:18:35 +08:00
yangws	ee50078b3e	implement FPS limitation on UPhone.	2011-01-20 10:49:30 +08:00
walzer	a9f90256b8	fix the wrong direction of particle system	2011-01-20 10:21:41 +08:00
walzer	b7e109f6e6	fixed iphone/android/uphone compilation errors brought by the prevous commit of #322	2011-01-19 22:29:57 +08:00
walzer	9347fadc71	[win32] fixed #322, FPS control on win32	2011-01-19 18:23:42 +08:00
walzer	e404a6aeb9	Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master	2011-01-19 18:11:21 +08:00
yangws	d627608ff4	win32 platform fps limitation support.	2011-01-19 17:59:20 +08:00
walzer	816deced9e	Merge branch 'upto-0.99.5' of https://github.com/natural-law/cocos2d-x into natural-law-upto-0.99.5	2011-01-19 16:41:47 +08:00
walzer	a0c50d3edb	[iphone] support UTF8 Chinese chars	2011-01-19 16:26:55 +08:00
yangws	804dc4ef7c	Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 ... Conflicts: cocos2dx/platform/CCArchOptimalParticleSystem.h cocos2dx/platform/win32/CCXBitmapDC.cpp cocos2dx/proj.win32/cocos2d-win32.vcproj	2011-01-19 15:29:08 +08:00
yangws	79b711a758	move CCXBitmapDC from cocos2d/platform to platform_support.	2011-01-19 14:23:26 +08:00
natural-law	f992838f96	[uphone]fixed #293,Modify the absolute path method in CCFileUtils.	2011-01-18 18:21:06 +08:00
natural-law	c682dd7084	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge	2011-01-18 10:16:35 +08:00
natural-law	acb4a6a369	[uphone]fixed #293,modify the absolute path method in CCFileUtils.	2011-01-18 10:14:44 +08:00
walzer	e399a77369	fixed #306, invoke CCDirector::end() method in next msgloop, otherwise the flow will crashes when end() is called in an ActionInterval.	2011-01-17 22:01:15 +08:00
walzer	04c685b95a	issue #289, fix some warnings	2011-01-17 21:16:25 +08:00
walzer	b60e1e1ff8	Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master	2011-01-17 20:37:23 +08:00
yangws	d2a116b001	fixed bug: Post build error on win32 when compiled project which the project's path string has space.	2011-01-17 18:01:20 +08:00
walzer	ad5ee3c9f6	Merge remote branch 'remotes/origin/upto-0.99.5' Fix some conflicts manually.	2011-01-17 16:21:11 +08:00
yangws	67c0ad6332	add platform support project on win32. ... Move macros, CCXUIImage, ccxCommon, CCXCocos2dDefine, 3rd party libraries, glu, NSLock, ccxConfig from platform/win32 to platform_support.	2011-01-15 18:05:35 +08:00
natural-law	acff950860	[uphone]fixed #315,remove the way which use resource in ResourceMap.	2011-01-14 17:42:37 +08:00
minggo	6043008a11	Merge branch 'track' of https://github.com/leon-li/cocos2d-x into leon-li-track	2011-01-13 13:52:20 +08:00
natural-law	5fe891408c	[win32]fixed #314,when function CCDirector::setDeviceOrientation() be called calculate the Projection and window size again.	2011-01-13 10:14:32 +08:00
Walzer	c9d52d2a48	[uphone] add CCNS_uphone.cpp into Makefile.ARM	2011-01-12 17:35:53 +08:00
natural-law	d1c6c466d3	fixed #312,fix the bug of CCXBitmapDC in cocos2d-win32.	2011-01-12 15:48:36 +08:00
natural-law	5155980ef9	fixed #309,optimize code.	2011-01-11 13:57:13 +08:00
natural-law	00a9615e0f	Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into merge	2011-01-10 18:08:57 +08:00
natural-law	237042f7dd	fixed #309,App will not crash any more when surface re-created.	2011-01-10 17:54:44 +08:00
minggo	d405d3a1ba	fixed #310:	2011-01-10 16:03:53 +08:00
minggo	7e30615d02	issue #304 Remove codes for controlling frame rate.	2011-01-10 15:13:30 +08:00
Walzer	653cb2d76d	[uphone] fixed #308, BGM can be paused after power key pressed to make uphone sleep.	2011-01-10 11:03:58 +08:00
minggo	78a7329054	Merge branch 'upto-0.99.5' of https://github.com/natural-law/cocos2d-x into natural-law-upto-0.99.5	2011-01-08 09:27:58 +08:00
natural-law	c02a9a4dd5	Setting apk file path at runtime in cocos2d-android.	2011-01-07 16:29:06 +08:00
natural-law	ec7fbd0e69	Fix bugs. ... 1. Run tests and HelloWorld in cocos2d-android. 2. Modify the makefile of cocos2d-uphone.	2011-01-07 11:30:19 +08:00
minggo	1f08213563	HelloWorld runs ok on iphone	2011-01-07 11:27:42 +08:00
minggo	a391c8ef99	fixed some errors for iphone platform	2011-01-07 10:25:32 +08:00
minggo	99dd33f94a	Merge branch 'upto-0.99.5' of https://github.com/minggo/cocos2d-x into upto-0.99.5	2011-01-07 09:33:09 +08:00
minggo	9a959c299f	fixed some errors of iphone platform	2011-01-07 09:35:27 +08:00
minggo	0a7b16f9c0	Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5	2011-01-06 14:15:45 +08:00
natural-law	e0570d43ad	Fix bugs.Run HelloWorld and tests in cocos2d-win32 successful.	2011-01-06 14:04:03 +08:00
minggo	e312bb4d18	Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into merger	2011-01-06 10:24:29 +08:00
natural-law	0d2d746aec	Fix bugs.Run tests in cocos2d-uphone successful.	2011-01-05 17:01:08 +08:00
natural-law	1b37dd27ad	Fix bugs.Run HelloWorld successful.	2011-01-05 11:24:52 +08:00
natural-law	25e9721678	fix bugs.	2011-01-04 17:46:23 +08:00
Walzer	4a6989b6ff	[uphone] add keyMenuBack to CCKeypadDelegate	2010-12-31 18:15:30 +08:00
natural-law	711f3a2906	modify YES to true,and No to false.	2010-12-31 17:56:46 +08:00
minggo	f3e8665387	remove the usage of YES and NO	2010-12-31 16:37:00 +08:00
Walzer	56f8bf3c40	[uphone] use a shared TWindow to draw bitmaps and texts, this optimization promotes the performance on uphone about 5%~6%	2010-12-31 16:07:52 +08:00
minggo	d0a16a246e	fixed comipling error and link error of upto-0.99.5	2010-12-31 14:56:24 +08:00
natural-law	3dfd530b38	Merge branch 'iss295' into upto-0.99.5	2010-12-31 09:48:48 +08:00
natural-law	34f45c8faa	Implement CCEventDispatcher.	2010-12-31 09:36:53 +08:00
minggo	942d0233cf	fixed #290	2010-12-30 17:30:11 +08:00
Walzer	eac572b2c9	[uphone] remove CfgGetScreenStatus call from EVENT_WinPaint, this api is out-of-process & inefficient	2010-12-30 15:42:11 +08:00
minggo	0a4ff84f87	fix an error of cocos2d-uphone.vcproj	2010-12-30 15:30:30 +08:00
minggo	8af9edbcf8	Merge branch 'upto-0.99.5' of https://github.com/minggo/cocos2d-x into minggo-upto-0.99.5	2010-12-30 14:44:34 +08:00
minggo	88de01d915	update some files in platfomr/iphone to 0.99.5	2010-12-30 14:22:25 +08:00
minggo	b0e5c06d37	Merge branch 'upto-0.99.5' of https://github.com/minggo/cocos2d-x into minggo-upto-0.99.5	2010-12-30 10:36:17 +08:00
minggo	da00d82117	fix some error in CCGrid and CCDirector.h	2010-12-30 10:28:13 +08:00
minggo	7b804d985b	merge yangws-upto-0.99.5 into upto-0.99.5	2010-12-30 10:25:35 +08:00
minggo	94c7f968e1	Merge branch 'minggo-upto-0.99.5' into upto-0.99.5	2010-12-29 18:18:14 +08:00
minggo	dc55c164ba	fixed #292	2010-12-29 18:01:37 +08:00
Li Lirong	e58ba468ee	fix some warnings under android	2010-12-29 10:30:42 +08:00
natural-law	35d611155b	add functions: ... void CCSpriteBatchNode::addQuadFromSprite(CCSprite *sprite, unsigned int index); CCSpriteBatchNode * CCSpriteBatchNode::addSpriteWithoutQuad(CCSprite*child, unsigned int z, int aTag);	2010-12-28 17:42:23 +08:00
natural-law	05bf58b488	Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into merge	2010-12-28 17:24:56 +08:00
natural-law	a48b4b762b	update tileMap_parallax_nodes to 0.99.5.	2010-12-28 15:17:59 +08:00
minggo	355570ea8f	issue #292	2010-12-28 15:05:55 +08:00
yangws	0edf124e4f	issue #281 CCParticleExamples upto-0.99.5	2010-12-28 14:04:28 +08:00
yangws	706f97114b	issue #281 CCParticleSystemQuad upto-0.99.5	2010-12-28 11:55:34 +08:00
yangws	5e377f9368	issue #281 CCParticleSystemPoint.h upto-0.99.5	2010-12-28 11:09:40 +08:00
minggo	b2b8591b26	fixed #279	2010-12-28 10:23:14 +08:00
yangws	afd9675854	CCParticleSystem upto-0.99.5	2010-12-27 17:39:15 +08:00
minggo	33ad2881b7	merge mingo-upto-0.99.5 to upto-0.99.5	2010-12-27 11:06:44 +08:00
minggo	28a3857f95	Merge branch 'natural-law-upto-0.99.5' into upto-0.99.5	2010-12-27 10:59:03 +08:00
minggo	4e35a660dc	Merge branch 'upto-0.99.5' of https://github.com/yangws/cocos2d-x into yangws-upto-0.99.5	2010-12-27 10:55:59 +08:00
minggo	4cd3e59e2b	fixed #278	2010-12-27 10:26:56 +08:00
natural-law	46e78ab7a1	update layers_scenes_transition_nodes to 0.99.5.	2010-12-25 18:07:34 +08:00
yangws	c142070c2c	misc_node upto-0.99.5. ... Signed-off-by: yangws <yangws@cocos2d-x.org>	2010-12-25 15:09:42 +08:00
natural-law	6ee16ce878	update menu_nodes to 0.99.5	2010-12-25 11:15:19 +08:00
minggo	07b774bc6f	Merge branch 'natural-law-upto-0.99.5' into upto-0.99.5	2010-12-25 09:24:15 +08:00
natural-law	969e65b959	Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into merge	2010-12-24 17:33:18 +08:00
natural-law	4a64f899fe	update label_nodes to 0.99.5.	2010-12-24 17:07:31 +08:00
minggo	e7231f232c	fixed #276	2010-12-24 15:53:51 +08:00
minggo	c6b7fd82a9	Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into merger	2010-12-24 15:25:28 +08:00
minggo	d6fb209861	merged from minggo-upto-0.995 to upto-0.99.5	2010-12-24 15:21:57 +08:00
minggo	f92b0d514e	fixed #273	2010-12-24 15:04:26 +08:00
natural-law	0f0a8ed956	rename the files related to label_nodes.	2010-12-24 14:00:49 +08:00
natural-law	e11ccb50fe	fixed #283 Add member data m_positionInPixels for some classes.	2010-12-24 11:40:44 +08:00
minggo	e3b49d7504	merge from minggo and natual-raw	2010-12-23 17:40:23 +08:00
natural-law	3c6d1d8317	update actions to 0.99.5	2010-12-23 16:47:29 +08:00
minggo	6d98bc7b5d	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge	2010-12-23 16:22:37 +08:00
minggo	7e4d8b9d1c	set up base environment	2010-12-23 16:16:11 +08:00
minggo	3692d01c5a	fixed #288	2010-12-23 14:18:08 +08:00
minggo	994a3b05ea	fixed #273	2010-12-23 11:19:56 +08:00
natural-law	eeb4e99804	rename the action classes.	2010-12-22 15:43:54 +08:00
natural-law	4a765d33a3	rename the CCXXXAction files to CCActionXXX.	2010-12-22 15:15:04 +08:00
Walzer	f65a6eb90b	[iphone-cpp] load image from buffer, support some PD formats	2010-12-20 18:46:58 +08:00
walzer	02bbc49111	Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master	2010-12-18 16:47:27 +08:00
Walzer	639d75e6eb	Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master	2010-12-18 16:36:08 +08:00
minggo	9aa7e1bc84	fixed #245	2010-12-18 16:12:59 +08:00
minggo	87b926c74f	match the declaration of cocos2dVersion	2010-12-18 16:08:57 +08:00
yangws	6d71a5b0f2	if defined COCOS2D_DEBUG, show messagebox when UIImage can't find resource file on disk.	2010-12-18 15:00:26 +08:00
natural-law	792781f5d6	fixed #266 fix a bug of message box in cocos2d-uphone pop-up at the wrong time.	2010-12-18 14:44:24 +08:00
Walzer	5c858b182c	issue #243, fix warnings	2010-12-18 12:02:57 +08:00
Walzer	edc742d41b	Merge branch 'master' of https://github.com/leon-li/cocos2d-x into leon-li-master	2010-12-18 10:26:22 +08:00
Walzer	5f563102e9	fixed #265	2010-12-18 08:17:53 +08:00
Walzer	6de3f0f404	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2010-12-18 08:10:14 +08:00
Leon	96f4f5c9fd	fix some compiling warning for iOS	2010-12-17 23:44:19 +08:00
Walzer	641bea0abc	fixed #265 compile error when enable CC_XXX_DEBUG_DRAW switchs in ccConfig.h	2010-12-17 23:18:03 +08:00
Walzer	988d7289b8	Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master	2010-12-17 20:40:16 +08:00
Walzer	63bfa195db	Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master	2010-12-17 20:36:24 +08:00
yangws	53bc90f634	fix UImage Constructor error	2010-12-17 18:16:31 +08:00
yangws	caf518f97d	fixed: helloworld win32 release configure build error, CCTMXTiledMap.cpp Access NULL pointer error.	2010-12-17 17:20:39 +08:00
minggo	012812a8f5	Because platform/android/ccx_Common_android.cpp is rename to platform/android/ccxCommon_android.cpp, so the Android.mk should change too.	2010-12-17 11:48:46 +08:00
minggo	e287466c2f	fixed #246	2010-12-17 11:39:25 +08:00
Walzer	c8989c7941	fix a memory leak when invoking png_destroy_read_struct, for uphone & andorid platform	2010-12-17 10:14:56 +08:00
Walzer	b55ef3cd69	Merge branch 'master' of https://github.com/mattjesson/cocos2d-x into mattjesson-master	2010-12-17 10:03:57 +08:00
Walzer	0b8d5c96f7	fixed #263, compilation error while enableing CC_SPRITE_DEBUG_DRAW	2010-12-16 22:37:15 +08:00
unknown	31951603a4	Fixed a memory leak in the Win32 version of the PNG reading code. ... The png_info struct wasn't being properly free'd (leaving behind row data). (looks like it might also apply to the 'uphone' version but I have no way of testing)	2010-12-16 12:23:27 +00:00
Walzer	063f595e9a	Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master	2010-12-16 12:03:25 +08:00
natural-law	95e697d316	fixed #262 Add namespace for the project CocosDenshion.	2010-12-15 18:28:18 +08:00
minggo	53753b65b5	merge bada platform	2010-12-15 18:05:02 +08:00
impact	7434748d4a	Capitalization changes for building on linux (case-sensitive filesystem)	2010-12-15 01:00:35 -05:00
natural-law	b8b5c2e8cd	fixed #258 Modify the files which include FileUtils.h.	2010-12-14 14:05:35 +08:00
natural-law	2576bbe5b4	Merge branch 'master' into iss258	2010-12-14 13:53:25 +08:00
Walzer	02e95f6b06	issue #243 fix a memory leak point of iphone-cpp version. but the leaks isn't completely clear yet.	2010-12-14 11:21:44 +08:00
unknown	acc30e35b1	Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master	2010-12-14 11:10:46 +08:00
unknown	57770086e6	Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master	2010-12-14 11:09:36 +08:00
natural-law	2c84b167e0	fixed #258 Move FileUtils.h from path "support/file_support" to path "include".	2010-12-14 10:45:23 +08:00
minggo	a33823706d	fixed #259	2010-12-14 09:42:39 +08:00
natural-law	8cb331994d	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge	2010-12-13 17:55:02 +08:00
natural-law	2706e3a003	fixed #251 CCKeypadDelegate implement	2010-12-13 14:10:39 +08:00
minggo	1f34709c03	Merge branch 'master' of https://github.com/minggo/cocos2d-x	2010-12-11 13:40:16 +08:00
minggo	562930f816	fixed #252	2010-12-11 13:33:53 +08:00
Walzer	9737e908ab	Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master	2010-12-11 09:49:59 +08:00
Walzer	dec419be71	Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master	2010-12-10 10:34:41 +08:00
Walzer	5babcbca6b	fixed #248, crashed in CCSprite::setDisplayFrame	2010-12-10 10:31:14 +08:00
natural-law	6c1eb5d5c0	fixed #227 integrate multi-touch support on uphone	2010-12-09 18:28:16 +08:00
minggo	f3126de646	Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master	2010-12-09 13:59:02 +08:00
yangws	1151cea7dd	fixed 233 keep the backlight on when the cocos2d-game at foreground. ... Signed-off-by: yangws <yangws@cocos2d-x.org>	2010-12-09 11:41:32 +08:00
minggo	6b37bc97d4	fixed #220: run tests on android	2010-12-09 10:50:02 +08:00
unknown	9c06a69ed9	Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master	2010-12-08 18:05:17 +08:00
unknown	4d22e3b263	Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master	2010-12-08 18:03:35 +08:00
minggo	534a55eaa1	issue #220: All tests run on android emulator, but the effect of some tests are wrong	2010-12-06 09:51:21 +08:00
yangws	5b51bd049b	issue #233 prevent KeyLock when playgame on uphone.	2010-12-04 18:16:09 +08:00
Walzer	c02230b4ae	fixed #240, CCSequence(..., CCHide::action(), ...) will not break down now.	2010-12-04 15:03:07 +08:00
natural-law	8891b894d6	fixed #239 Clear memory leak in cocos2d-uphone	2010-12-03 16:42:31 +08:00
yangws	96115bc26e	fixed #233 now don't call preMainLoop when application enter background, test ok on uphone device. ... fixed a CCXAppWiz.uphone bug, create a empty file named xxxxx_str_str.h when build. Signed-off-by: yangws <yangws@cocos2d-x.org>	2010-12-03 15:27:55 +08:00
yangws	4df7cbcc40	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2010-12-03 11:24:39 +08:00
natural-law	3a0ae951b7	fixed #236 Fix the bug of cross-compile in cocos2d-uphone	2010-12-03 11:08:30 +08:00
yangws	687fb199fc	issue #233 stop main loop when application enter background. test ok on emulator	2010-12-02 18:44:13 +08:00
minggo	7fa8d72076	commit before merging the code from https://walzer@github.com/cocos2d/cocos2d-x.git	2010-11-29 15:54:32 +08:00
minggo	9a2ff2407a	commit the change before merging master of cocos2d-x	2010-11-29 15:08:21 +08:00
natural-law	b1d3e66e68	1. Check the return value of FileData::getFileData() ... 2. Fix a bug of CCBitmapFontConfiguration::parseConfigFile() 3. Move the function CCFileUtils::getFileDataFromZip() to class of FileUtils.	2010-11-29 14:21:33 +08:00
natural-law	94c9addace	fixed #226 add support read resource file from zip file in cocos2d-uphone	2010-11-29 10:55:32 +08:00
natural-law	4d98faabc5	fixed #226 add support read resource file from zip file in cocos2d-uphone	2010-11-29 10:49:43 +08:00
Walzer	8854ec5b10	Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master	2010-11-26 11:59:56 +08:00
minggo	b695c42655	Merge branch 'master' of https://github.com/minggo/cocos2d-x	2010-11-26 11:39:26 +08:00
minggo	aa826970eb	fixed #224	2010-11-26 11:38:10 +08:00
walzer	29191a385e	Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master	2010-11-24 10:38:01 +08:00
yangws	852c57d2c6	add CCLOG support on win32 and uphone	2010-11-23 18:20:46 +08:00
minggo	59a986438f	Remove unneeded predefined macro _ADNROID, because ndk build chain has already defined a macro named ANDROID	2010-11-23 18:02:42 +08:00
natural-law	3eba79ec07	fixed #217	2010-11-23 15:15:07 +08:00
minggo	98c5546658	fixed #216: Accelerometer is correct	2010-11-23 14:40:10 +08:00
yangws	de97900b6c	CCLOG support for cocos2d-win32	2010-11-23 11:23:29 +08:00
minggo	22f7521cd3	fixed #215	2010-11-22 18:09:38 +08:00
yangws	efd69c7023	re-add source files to cocos2d-win32.proj.	2010-11-22 15:40:43 +08:00
minggo	96ea648820	fixed #213: fixed the bug.	2010-11-22 11:36:40 +08:00
minggo	8be8a02e73	fixed #210: support accelemeter	2010-11-22 11:11:20 +08:00
Walzer	224e9cfb6c	fixed #210: support accelemeter	2010-11-22 10:48:19 +08:00
Ming	e379786e4d		2010-11-19 06:57:58 +00:00
yangws	d96599e787		2010-11-19 02:48:08 +00:00
natural-law	fc745a6a70	debug	2010-11-19 01:21:47 +00:00
Walzer	78a2792dcb	issue #211 cocos2d-x.abc -> cocos2d-abc	2010-11-18 15:58:58 +00:00
Walzer	0ad77b779a	issue #211 don't checkout	2010-11-18 15:55:00 +00:00
Walzer	820c2f0714	issue #211 cocos2d-x back to cocos2dx	2010-11-18 15:01:42 +00:00
Walzer	b4328354af	issue #211 cocos2dx -> cocos2d-x	2010-11-18 14:07:17 +00:00
Walzer	79ed40ef38	issue #211 don't check out	2010-11-18 13:47:14 +00:00
Walzer	a96bb3ef0c	rename projects	2010-11-18 12:36:14 +00:00
Walzer	6afe5752f2	rename directories	2010-11-18 12:32:01 +00:00
natural-law	2b23e0f6d5	debug	2010-11-18 10:27:05 +00:00
Ming	dc2f5f604f	fixed #208	2010-11-18 07:38:47 +00:00
Ming	31809a3774	issue #208	2010-11-18 06:50:28 +00:00
Walzer	0a2567c646	SEL_MunuHandler -> SEL_MenuHandler & SimpleAudioEngine::sharedEngine	2010-11-17 08:31:48 +00:00
Walzer	0c687c3aac	jump a messagebox when load image failed in uphone.	2010-11-17 07:24:50 +00:00
natural-law	575922ab7c	debug	2010-11-17 06:32:44 +00:00
yangws	b181701039	change win32 porject name	2010-11-17 02:46:43 +00:00
yangws	0618af9711	change win32 project name	2010-11-17 02:16:21 +00:00
natural-law	84ece545bd	issue #189 ... add support of Accelerometer sensor	2010-11-16 07:13:20 +00:00
Walzer	fb25984f12	rename getShared methods to shared	2010-11-16 07:12:09 +00:00
Ming	26363b5f9a	fixed #207	2010-11-16 06:33:00 +00:00
Ming	0aab635d85	fixed #206	2010-11-16 04:02:45 +00:00
yangws	2e6f7c0623	issue #205 vs2008 run tests win32 OK.	2010-11-15 02:57:15 +00:00
yangws	278fc00906	issue #205 update third_party's libraries to the latest release version.	2010-11-13 10:19:08 +00:00
natural-law	d2006ec7a9	debug	2010-11-13 09:55:41 +00:00
natural-law	a0930a2991	debug	2010-11-13 09:01:35 +00:00
Ming	416a319344	fixed #203	2010-11-13 03:34:49 +00:00
Ming	0e78c9071a	issue #202	2010-11-12 10:21:52 +00:00
Ming	3a5ce078cf	issue #202	2010-11-12 09:44:13 +00:00
Ming	64ac386384	issue #202	2010-11-12 09:29:14 +00:00
Ming	6062cf1558	issue #202	2010-11-12 09:26:01 +00:00
Ming	026713cf76	issue #202	2010-11-12 09:18:54 +00:00
Ming	0a4e9885f3	issue #202	2010-11-12 09:16:15 +00:00
Walzer	916b620259	fixed #201 when load image fails, it will jump a MessageBox now, and return a transparent sprite	2010-11-12 07:55:28 +00:00
Walzer	d842a47e10	fix win32 version to sync with uphone-0.9.0-stable	2010-11-11 07:26:16 +00:00
Walzer	94806c9194	merge with tag/0.99.4-uphone-0.9.0	2010-11-11 03:18:58 +00:00
natural-law	000bdeeb42	issue #189 ... add support of Accelerometer sensor	2010-11-10 08:29:52 +00:00
natural-law	c165ad36a7	debug	2010-11-05 09:29:24 +00:00
Ming	0ea2035ec6		2010-11-04 09:33:31 +00:00
Ming	ca066d0bac	fixed #191	2010-11-04 09:32:22 +00:00
yangws	c792daec63	update PowerVR OGLES lib to version 2.0.27.0484	2010-11-04 03:59:29 +00:00
yangws	d630996bd0	fixed #187 The reason is call preMailLoop too many times in short time in message loop, use sleep(0) to resolve this problem.	2010-11-04 03:51:57 +00:00
Walzer	f80ea71066	fix #188, for win32 version, make glDeleteTextrues before eglDestroyContext	2010-11-03 08:00:39 +00:00
Walzer	200080aea0	fix #188 , make eglDestroyContext after glDeleteTexture	2010-11-03 06:47:23 +00:00
Ming	b06f84d332		2010-11-03 06:13:40 +00:00
Ming	b0e0d63217		2010-11-03 06:04:48 +00:00
Ming	b60fbd82a5	added for android	2010-11-03 03:01:17 +00:00
Ming	6853385c8d	resolve compile error for android	2010-11-03 02:59:07 +00:00
Walzer	4695fa05df	egl function errors will show a messagebox now	2010-10-29 08:36:34 +00:00
natural-law	6d98ae5b2c	support Chinese in cocos2dx-uphone	2010-10-27 03:56:51 +00:00
Walzer	2935faebfc	change default Makefile.ARM to build static libraries.	2010-10-26 09:51:37 +00:00
natural-law	419544ff45	debug	2010-10-22 07:51:32 +00:00
natural-law	1d8b5d02a3	debug	2010-10-22 07:10:18 +00:00
natural-law	1b81908ae4	add comment	2010-10-21 09:56:13 +00:00
natural-law	78a93db918	issue #182	2010-10-21 02:29:09 +00:00
natural-law	1f8442cc05	issue #182	2010-10-21 02:24:46 +00:00
natural-law	0dbda6c32d	issue #185 ... Let cocos2d-uphone support WVGA	2010-10-19 09:08:25 +00:00
yangws	72e31303a7	Don't need disable statusbar on uphone yet	2010-10-16 09:28:16 +00:00
Ming	992ad7e75d	fix the method of computing frame rate	2010-10-16 07:29:53 +00:00
yangws	2ba7ba409b	fixed #184 support deviceOrientation on win32 now.	2010-10-15 08:06:05 +00:00
Ming	0298500abe	add setContentScaleFactor()	2010-10-15 07:47:48 +00:00
yangws	fb0987ae6c	fixed #183 add zlib1.dll for win32	2010-10-14 07:05:44 +00:00
yangws	24ae7b36b7		2010-10-13 08:44:16 +00:00
natural-law	c8e2874c9f	debug	2010-10-13 08:21:59 +00:00
yangws	c1225b9396	fixed #183 run test ok.	2010-10-13 06:46:06 +00:00
yangws	83ac66091d		2010-10-13 06:18:39 +00:00
yangws	3317280984		2010-10-13 06:15:11 +00:00
yangws	ebb4ae2aa7	issue #183 add iconv libjpeg libpng libxml2 zlib to win32/third_party	2010-10-13 06:12:23 +00:00
yangws	23808af094	win32 window close button enable.	2010-10-13 05:16:17 +00:00
yangws	f9b550a7b0	add user files	2010-10-13 05:11:55 +00:00
yangws	c4e53c54e4	fixed #176 test_win32 OK.	2010-10-13 05:09:39 +00:00
yangws	040f68160a	issue #176 add test code in test_win32, which same with test_uphone .	2010-10-12 09:15:44 +00:00
Walzer	2a43160d39	fix a warning	2010-10-12 04:07:49 +00:00
natural-law	31c069777d	issue #182	2010-10-12 03:52:11 +00:00
Walzer	3224f8b9c5	issue 172 : fix the bug. In CCTextureCache::addImage and CCTextureCache::addUIImage, we will lock the texture cache array before we use it. So we must make sure that we unlock the texture cache array when we return in the function.	2010-10-12 03:23:47 +00:00
Ming	7a9b417248		2010-10-11 10:05:34 +00:00
yangws	c1e4bf366f		2010-10-11 08:48:44 +00:00
natural-law	09e9638b03	issue #182	2010-10-11 07:35:36 +00:00
natural-law	05bea6a707	issue #182	2010-10-11 07:28:58 +00:00
yangws	5184e4383e	change UIImage(TBitmap * ) to UIImage(CCXBitmapDC *) on uPhone platform.	2010-10-11 02:58:27 +00:00
yangws	82e6fabf96	Helloworld-win32 release OK.	2010-10-10 15:30:38 +00:00
yangws	e7502ad66f	Add PowerVR Lib to platform/win32/third_party.	2010-10-10 13:03:11 +00:00
yangws	8900e0644c	helloworld-win32 vertical screen ok.	2010-10-09 09:41:42 +00:00
Ming	9febafadec		2010-10-09 08:23:58 +00:00
Walzer	77564d0017	add LAYER_NODE_FUNC & SCENE_NODE_FUNC	2010-10-09 06:23:47 +00:00
Ming	a05f9d0dc5		2010-10-09 01:57:24 +00:00
Walzer	f94d1760e5	bug fix: release error in forceRemoveDelegate method	2010-10-08 13:17:03 +00:00
yangws	cf0a2c5665	add cocos2dx-win32 framework, can't work yet.	2010-10-08 09:53:04 +00:00
Ming	19b6f1a235		2010-10-08 01:57:07 +00:00
Walzer	371baf3efc	add NSSet::anyObject method	2010-10-01 15:05:05 +00:00
Walzer	ed4e288f27	modify the logic of "node" method	2010-10-01 15:04:12 +00:00
Walzer	1b385bfe20	fix warnings in NSSet & CCXUIImage_uphone. NSSet will alloc std::set in heap, instead of in stack, to avoid compile warning	2010-10-01 06:34:47 +00:00
Walzer	a6b03ce9ea	add type cast in "ccp" marco, to avoid warnings	2010-10-01 06:21:37 +00:00
Walzer	b86a666269	fix some warnings during compile phase	2010-09-30 23:51:06 +00:00
Ming	0247182dc3	fixed #173	2010-09-30 07:54:15 +00:00
Walzer	72aee0eace	issue #175, add retain for CCCallFunc::m_pSelectorTarget	2010-09-30 03:57:31 +00:00
Ming	683596a023	issue #170	2010-09-29 09:39:45 +00:00
Walzer	8633fa5d9e	issue #171	2010-09-29 08:33:52 +00:00
Walzer	f1c48be489	issue #171, implement CGRectIntersectsRect	2010-09-29 08:06:03 +00:00
Walzer	b8f59f623d	issue #171, implement CGRectIntersectsRect	2010-09-29 07:24:51 +00:00
Walzer	d93aae9133	issue #171, add annotate for protected member variable	2010-09-29 04:03:21 +00:00
yangws	c8439ca79e	change CGPoint CGSize CGRect function's parameter pass by value to pass by reference, ... impliment CGRectIntersectsRect function	2010-09-29 03:49:38 +00:00
Walzer	dad659641b	issue #171, add @brief in class annotate	2010-09-29 01:44:57 +00:00
Ming	742baf4fdb	issue #170	2010-09-28 10:27:33 +00:00
Ming	a257cad0a4	issue #170	2010-09-28 10:00:38 +00:00
natural-law	c57957d910	issue #170 ... add comment of class CCFileUtils	2010-09-28 08:57:39 +00:00
natural-law	b7dd58e4e1	issue #170 ... add comment of class CCFileUtils	2010-09-28 08:48:26 +00:00
Ming	68d3edc0d3	issue #170	2010-09-28 08:18:05 +00:00
Walzer	01eb8da314	issue #171, modify object-c code in annotate.	2010-09-28 04:14:12 +00:00
Walzer	a279e5dc9b	issue 169, we should retain the new variable first, and then release the old one. assignment at last.	2010-09-27 10:19:10 +00:00
Walzer	3f233e2651	issue #161，support *.jpg，add texture to texture cache	2010-09-27 09:26:35 +00:00
Walzer	dff457e4eb	issue 167， premutiply alpha when read png file	2010-09-27 08:05:49 +00:00
Ming	ced3d86507	issue #166	2010-09-26 06:55:28 +00:00
Ming	167aed310c		2010-09-26 06:26:19 +00:00
Ming	85e2bfdea0	fixed #163	2010-09-26 06:11:10 +00:00
Ming	29dba052bf	fixed #163	2010-09-26 04:01:19 +00:00
Walzer	5b82f4d468	issue #161，support *.jpg	2010-09-26 02:09:05 +00:00
natural-law	c4c81dba7e	issue #165 ... Update the tests code to 0.99.4 release version	2010-09-25 03:54:33 +00:00
Walzer	8de5442c0e	issue #161，update CCTMXLayer, CCTMXTiledMap, CCTextureCache	2010-09-25 02:28:27 +00:00
Ming	12d6df9717	issue #154	2010-09-24 10:10:32 +00:00
Walzer	5415e04d7c	issue #161，add CCSpriteBatchNode	2010-09-24 04:05:25 +00:00
Walzer	156d1ff69b	issue #161，add CCSpriteBatchNode	2010-09-24 04:04:13 +00:00
Ming	0d0b68a200	fixed #151	2010-09-24 02:54:06 +00:00
Ming	a50b1b97bb	issue #151: because now the r, g, b is correct, so we should not ... change it	2010-09-21 08:15:23 +00:00
yangws	30417e37f9		2010-09-21 07:06:01 +00:00
Ming	7852912fdd	issue #151	2010-09-18 09:49:02 +00:00
Ming	addfb8df94	issue #151	2010-09-18 09:22:21 +00:00
Ming	556b8ed455	issue #151: change the function name	2010-09-18 07:44:56 +00:00
Ming	93135d1366	issue #151	2010-09-18 07:22:07 +00:00
Ming	b87fb419fb	issue #151	2010-09-18 06:14:51 +00:00
natural-law	5af16c3282	issue #144 ... Clear memory leaks of the test_uphone project	2010-09-17 06:51:34 +00:00
yangws	069d3507e8	unified CCXEGL code base on uPhoneEmuGlesPatch.zip	2010-09-17 04:02:23 +00:00
natural-law	d2b60c4402	issue #144 ... Clear memory leaks of the test_uphone project	2010-09-17 03:41:02 +00:00
Ming	0c842b7874	issue #142: add depth test of opengl	2010-09-17 01:20:46 +00:00
natural-law	6bd7d28e06	issue #144 ... Clear memory leaks of the test_uphone project	2010-09-16 09:19:18 +00:00
Ming	300e1abbbb	issue #142	2010-09-16 07:53:58 +00:00
natural-law	4db7ac0e9b	issue #144 ... Clear memory leaks of the test_uphone project	2010-09-16 03:18:09 +00:00
Ming	14982bd715	issue #141	2010-09-15 06:52:11 +00:00
Ming	a92f74d318	fixed #141: the transition vertex is error, so use CCDirector's instead	2010-09-15 03:47:55 +00:00
Ming	be2baff67f	fixed #146: convert the pointer to NSObject* before HASH_FIND_INT, because we save it as NSObject*, and the saving operation will adjust the value of pointer.	2010-09-15 01:31:01 +00:00
Walzer	c83678f9b2	hide system state bar when cocos2d running	2010-09-14 08:47:29 +00:00
yangws	221f07610c	hide system state bar when cocos2d running	2010-09-14 08:34:14 +00:00
Ming	622170528c	issue #141	2010-09-14 07:23:38 +00:00
natural-law	16b360fd7d	fixed #148 ... Explant Box2D and add Box2dTest	2010-09-14 06:47:12 +00:00
natural-law	cd4bb0bfc8	issue #144 ... Clear memory leaks of the test_uphone project	2010-09-14 02:26:19 +00:00
natural-law	331f777713	issue #144 ... Clear memory leaks of the test_uphone project	2010-09-13 08:01:27 +00:00
natural-law	0c2849eea3	issue #139 ... Debug	2010-09-13 07:00:08 +00:00
natural-law	ae1439812a	issue #139 ... Debug	2010-09-13 06:12:50 +00:00
natural-law	40b6d8500a	issue #139 ... Debug	2010-09-13 03:09:15 +00:00
natural-law	ea125c8500	issue #143 ... Clear memory leaks	2010-09-11 10:15:34 +00:00
natural-law	8c1c49bff0	issue #143 ... Clear memory leaks	2010-09-11 08:35:06 +00:00
natural-law	44ce8d9c5a	issue #143 ... Clear memory leaks	2010-09-11 08:18:18 +00:00
natural-law	2c682380ed	issue #143 ... Clear memory leaks	2010-09-11 07:48:37 +00:00
natural-law	b25f35d2c0	issue #143 ... Clear memory leaks	2010-09-11 07:40:01 +00:00
natural-law	143d8a3271	debug	2010-09-11 06:51:13 +00:00
Ming	8ee9347d72	issue #138	2010-09-10 07:52:10 +00:00
Ming	1c0d6b1d31	issue #138	2010-09-10 07:47:10 +00:00
Walzer	b2d950743b	issue 136, use NSDictionary in CCSpriteFrameCache	2010-09-10 06:08:25 +00:00
Ming	1de4c1eb6e	issue #138	2010-09-10 01:21:49 +00:00
Ming	9cab8be0ff	issue #138	2010-09-09 09:24:55 +00:00
natural-law	2f438483e5	fixed #137 ... add SchedulerTest code	2010-09-09 08:15:21 +00:00
natural-law	2997a74699	issue #135 ... Add SpriteTest code	2010-09-09 02:17:38 +00:00
Walzer	cba41dc44b	issue #129, add obj->release when obj is inserted into NSDictionary	2010-09-08 06:52:56 +00:00
Ming	6d8cad341d	issue #131	2010-09-08 06:11:24 +00:00
Ming	2abd0cbff7	issue #131	2010-09-08 02:04:06 +00:00
Walzer	a1f3f89517	fixed #134, save plist file name	2010-09-08 01:52:30 +00:00
Ming	712da80ffb		2010-09-08 01:33:43 +00:00
Ming	03cdfe1e27		2010-09-08 01:32:04 +00:00
Walzer	64d0d7a7e1	fixed #134, fullPathFromRelativeFile, modify CCTextureCache::addImage	2010-09-08 01:28:28 +00:00
Walzer	4b86b49b08	fixed #134, fullPathFromRelativeFile, modify CCTextureCache::addImage	2010-09-07 10:04:57 +00:00
natural-law	bd796c7452	issue #130 ... Add function to set the resource path	2010-09-07 08:30:31 +00:00
natural-law	8eb885382e	issue #130 ... Add function to set the resource path	2010-09-07 08:05:18 +00:00
Walzer	3313d696f2	issue #18, debug	2010-09-07 07:39:15 +00:00
Walzer	641adefe1c	fixed #133, override copyWithZone in class CCCallFuncN	2010-09-07 07:13:25 +00:00
natural-law	f94441141f	fixed #132 ... add AtlasTest code	2010-09-07 03:47:54 +00:00
Walzer	43672e1770	issue #114, CCTMXTiledMap debug	2010-09-07 03:26:28 +00:00
Ming	4023e2830b	issue #131	2010-09-07 02:22:07 +00:00
Walzer	1c1971255e	fixed #129, use NSString to make dictionary	2010-09-06 12:26:19 +00:00
yangws	4a52e5aaf9	impliment CCXEGLView for uPhone device.	2010-09-06 10:35:24 +00:00
Ming	7b33c38e51	issue #61:	2010-09-06 10:10:41 +00:00
Ming	d15fe1b211	issue #61:	2010-09-06 10:02:17 +00:00
Ming	105c1d4ab6	issue #61:	2010-09-06 10:01:50 +00:00
Walzer	37458680a7	fixed #127, add NSString	2010-09-06 06:54:14 +00:00
Walzer	fce216a111	issue #126, initialize the pointer	2010-09-06 06:15:06 +00:00
Ming	7131389535	issue #61:	2010-09-06 05:52:57 +00:00
Walzer	4de7ff7a98	issue #114, CCTMXTiledMap debug	2010-09-06 03:59:28 +00:00
Ming	031054abc6	issue #61:	2010-09-06 03:58:14 +00:00
Ming	b842c135c3	issue #61:	2010-09-06 03:55:56 +00:00
Ming	6e9ca000e5	issue #61:	2010-09-06 03:53:41 +00:00
Ming	ee75a8c033	issue #61:	2010-09-06 03:50:24 +00:00
Ming	69762e4b4c	issue #61:	2010-09-06 03:48:04 +00:00
Ming	b035165e25		2010-09-06 03:45:02 +00:00
Ming	aaa6b127e9	issue #61:	2010-09-06 03:31:23 +00:00
Ming	174befbbfe		2010-09-06 03:10:00 +00:00
Ming	515acaa4cf	issue #61:	2010-09-06 03:06:57 +00:00
Ming	e975c403ba	issue #61:	2010-09-06 02:57:21 +00:00
Walzer	907fb3f692	issue #126, add retain when member variable is changed	2010-09-06 02:27:38 +00:00
Ming	b587476b97	issue #61:	2010-09-06 02:21:05 +00:00
Ming	b12fac2958	issue #61:	2010-09-06 02:04:28 +00:00
Walzer	fee1ce8f09	fixed #124, chipmunk done!	2010-09-04 10:18:14 +00:00
Walzer	4226dcede9	issue #61, add retain for member variable	2010-09-04 10:06:26 +00:00
Ming	41d9386ad3	issue #61:	2010-09-04 09:13:34 +00:00
Ming	cee96f55a7	issue #61:	2010-09-04 07:24:26 +00:00
Ming	41b014f6ab	issue #61:	2010-09-04 07:16:52 +00:00
Ming	ae3f178c7b	issue #61:	2010-09-04 07:10:41 +00:00
Walzer	88888f7f63	issue #114, CCTMXTiledMap debug	2010-09-04 06:51:16 +00:00
Ming	21e0bfe46b	issue #61:	2010-09-04 06:47:40 +00:00
Ming	0ee9e5fd0b	issue #61:	2010-09-04 06:13:48 +00:00
Walzer	35fe435800	issue #121, return bool in function init****	2010-09-04 05:39:37 +00:00
Walzer	5fd1bf85b6	issue #121, return bool in function init****	2010-09-04 04:02:52 +00:00
Ming	004df276ee	issue #122	2010-09-04 04:00:39 +00:00
Ming	f4681c4b53	issue #122	2010-09-04 03:55:42 +00:00
Ming	0dda718b87	issue #122	2010-09-04 03:48:11 +00:00
Ming	d52678bca9	issue #61	2010-09-04 03:36:40 +00:00
Ming	ea6ecb2e93	issue #122	2010-09-04 03:35:06 +00:00
Ming	4088681630	issue #122	2010-09-04 03:34:37 +00:00
Ming	0468bbf3f3	issue #122	2010-09-04 03:30:39 +00:00
Ming	bcea1e97a4	issue #122	2010-09-04 03:26:26 +00:00
Ming	8b1e5f71c0	issue #122	2010-09-04 03:20:10 +00:00
Ming	543c3f5a96	issue #61: free the memory in void to memory leak	2010-09-03 10:00:48 +00:00
Ming	d9e1134840	issue #61: should retain in void to memory leak	2010-09-03 10:00:09 +00:00
Ming	642f2a297b	issue #61: use delete[] instead of delete to avoid memory leak	2010-09-03 09:23:45 +00:00
Ming	acfe962059	issue #116	2010-09-03 07:01:55 +00:00
Ming	34e4254957	issue #116: remove the using of itoa, use "/" as path separator	2010-09-03 06:40:48 +00:00
Walzer	178b48ddfc	issue #114, CCTMXTiledMap debug	2010-09-03 05:47:34 +00:00
Ming	c549d497a6	issue #116: remove the using of sprintf_s, because it is VC specific	2010-09-03 03:50:04 +00:00
Ming	37ea7dd914	issue #116: remove the using of sprintf_s, because it is VC specific	2010-09-03 03:49:10 +00:00
Ming	03afc91007	issue #116: remove the using of sprintf_s, because it is VC specific	2010-09-03 03:47:35 +00:00
Ming	ed3909c9e4	issue #116: remove the using of sprintf_s, because it is VC specific	2010-09-03 03:15:46 +00:00
Ming	9258d171aa	issue #119	2010-09-03 03:09:47 +00:00
Walzer	e7ae3ff710	issue #114, CCTMXTiledMap debug	2010-09-03 02:37:34 +00:00
Ming	9a12e848f5	fixed #118	2010-09-03 01:32:13 +00:00
Walzer	082b90ea06	issue #114, CCTMXTiledMap debug	2010-09-02 10:16:02 +00:00
Ming	863fc8584a	issue #116	2010-09-02 08:58:04 +00:00
Ming	857595d644	issue #116	2010-09-02 08:46:25 +00:00
Ming	7a1c55dd5a	fixed #117	2010-09-02 08:45:51 +00:00
Walzer	fea395cc79	issue #116, remove include "support/data_support/CCArray.h" in CCTMXLayer.h	2010-09-02 07:48:47 +00:00
Walzer	43a4664534	issue #114, CCTMXTiledMap debug	2010-09-02 07:31:37 +00:00
Ming	59afd38192	issue #116: remove __super	2010-09-02 06:54:42 +00:00
Ming	73d6ecb232	issue #116	2010-09-02 02:44:40 +00:00
Ming	6a4af3bcfd	issue #116	2010-09-02 02:33:39 +00:00
natural-law	b18e246eb9	fixed #115 ... add TileMapTest code	2010-09-01 09:30:51 +00:00
Walzer	ca6a97c4ac	issue #114, CCTMXTiledMap debug	2010-09-01 09:26:16 +00:00
Walzer	8cb49d0a8f	issue #114, CCTMXTiledMap debug	2010-09-01 08:23:30 +00:00
Ming	8da7979dc6	remove the include of CGPointExtension.h in .vcproj file	2010-09-01 07:46:08 +00:00
Ming	ed023fc129	fixed #112	2010-09-01 07:36:25 +00:00
Walzer	ca8672ff62	fixed #113	2010-09-01 07:26:47 +00:00
natural-law	4b529493fc	fixed #110 ... add ParallaxTest code	2010-09-01 06:57:55 +00:00
Ming	c6789ef16d	fixed issue#111	2010-09-01 06:57:12 +00:00
Walzer	7bcb58ef78		2010-09-01 05:56:36 +00:00
Walzer	820676ea28	issue #18, complete the implementation left.	2010-09-01 04:02:36 +00:00
Ming	05259df015	issue #61: the destruction of NSObject should be virtual	2010-09-01 04:01:48 +00:00
Walzer	ff3d907846	issue 67, modify constructor	2010-08-31 10:11:31 +00:00
Walzer	3d91d1e58d	update to uphone-sdk-2010.08.26, which adds opengl headers	2010-08-31 08:53:25 +00:00
Walzer	a0ec92f6c4	fixed #71, complete CCTMXTiledMap	2010-08-31 08:48:42 +00:00
Walzer	92f2528ede	fixed #69, complete CCTMXLayer	2010-08-31 07:11:13 +00:00
Ming	c293bd456f	issue #85: remove the use of static_cast()	2010-08-31 03:23:54 +00:00
Ming	39c6ebf503	issue #85:remove the using of dynamic_cast()	2010-08-31 03:20:37 +00:00
Ming	b9587a7062		2010-08-30 07:45:39 +00:00
Walzer	4ac8acdf44	fixed #68, complete CCTileMapAtlas	2010-08-30 07:23:07 +00:00
Ming	40158638ff	issue #85:remove the using of dynamic_cast()	2010-08-30 07:06:08 +00:00
natural-law	6e7fede2bb	fixed #103 ... add ActionManager Test code	2010-08-30 07:04:46 +00:00
Ming	b70950dd57	issue #85:remove the using of dynamic_cast()	2010-08-30 05:53:20 +00:00
Ming	af1afdb8fb	issue #85: remove unneeded comments	2010-08-30 05:48:27 +00:00
Ming	821602a853	fixed #105	2010-08-30 05:42:17 +00:00
Walzer	1eeebfb6fb	fixed #70, CCTMXObjectGroup	2010-08-30 03:45:46 +00:00
Ming	0cdfba141a	issue #85: make CCRepeatForever to inherit from CCIntervalAction	2010-08-28 10:00:38 +00:00
Ming	1e7e3f6854	fixed #102: CCRANDOM_0_1() has an error, it always return 0	2010-08-28 09:42:12 +00:00
Walzer	aec3660ec4	issue #18, debug	2010-08-28 08:28:30 +00:00
Walzer	cac04e3bfc	issue #18, debug	2010-08-28 08:23:03 +00:00
natural-law	3f1d4f4fcb	issue #101 ... add MenuTest code	2010-08-28 07:47:51 +00:00
Walzer	4a91a25226	issue #18, debug	2010-08-28 07:43:13 +00:00
Walzer	35b33ba82b	issue #18, debug	2010-08-28 07:24:33 +00:00
natural-law	b1c7636632	fixed #100 ... Modify the variable type of CCAction::m_pTarget form NSObject to CCNode	2010-08-28 04:02:10 +00:00
Ming	32c2e83b3f	issue #98	2010-08-28 02:56:18 +00:00
Walzer	aad6392555	issue #72,debug link error	2010-08-27 10:14:17 +00:00
Walzer	408a34603b	fixed #72, complete CCTMXLayerInfo	2010-08-27 10:07:37 +00:00
Walzer	2367ceed67	issue #82: debug CCParticleSystem::initWithDictionary ,break and return false if there is something wrong	2010-08-27 07:17:15 +00:00
Ming	60adec78e8	issue #85: avoid virtual inheriting from NSObject, and remove the using of dynamic_cast()	2010-08-27 06:13:32 +00:00
natural-law	738ed042fa	fixed #97 ... add Touches Test code	2010-08-27 03:53:35 +00:00
Walzer	2aca691689	issue #96, add CCTMXXMLParser files	2010-08-26 09:53:35 +00:00
Walzer	daa63cebda	issue #82: implement initWithDictionary	2010-08-26 09:22:23 +00:00
natural-law	7fd86b7734	fixed #95 ... add CocosNode Test code	2010-08-26 07:09:02 +00:00
Walzer	2658199ead	issue #82: debug	2010-08-26 06:06:41 +00:00
Ming	0f3717cc45	fixed #94	2010-08-26 05:47:47 +00:00
Ming	c81b45fe44	fixed #94	2010-08-26 04:04:22 +00:00
natural-law	82f316a247	issue #78 ... modify Particle Test code	2010-08-26 03:39:26 +00:00
Walzer	0e053e2703	issue #91, debug CCParallaxNode	2010-08-26 03:34:22 +00:00
Walzer	2ad752d206	fixed #91, implement CCParallaxNode	2010-08-26 03:30:52 +00:00
natural-law	b47d47b3b5	fixed #93 ... add DrawPrimitives Test code	2010-08-26 02:53:49 +00:00
Walzer	4f1e1996be	issue #91, add CCParallaxNode files	2010-08-26 02:44:00 +00:00
Walzer	e7fc567b94	issue #82: debug ,	2010-08-26 01:42:20 +00:00
Ming	fab3c76c10	fixed #89	2010-08-25 10:31:55 +00:00
Ming	b8416fdfec	fixed #86	2010-08-25 09:25:01 +00:00
Ming	8e3ab00f18	fixed #86	2010-08-25 09:23:32 +00:00
Ming	7291056154	fixed #86	2010-08-25 09:21:38 +00:00
Walzer	3c4eb5e8e0	issue #18, debug xml parser	2010-08-25 08:50:31 +00:00
Ming	1cfee20d06	fixed #84:	2010-08-25 08:08:10 +00:00
Ming	32fbef7d34	issue 82: remove the including of "platform/platform.h"	2010-08-25 06:37:40 +00:00
Ming	bfadb1371a	fixed #83:	2010-08-25 06:14:31 +00:00
natural-law	4a42f2d334	issue #78 ... add code to show FPS and particle count	2010-08-25 05:45:28 +00:00
Ming	8c818ac0ff	issue #81: remove including header of "platform/platform.h"	2010-08-25 03:46:57 +00:00
Ming	c36b833784	issue #81: remove including header of "platform/platform.h"	2010-08-25 03:44:26 +00:00
Ming	82a39c917f	issue #81: remove including header of "platform/platform.h"	2010-08-25 03:40:02 +00:00
Ming	ebab68a580	issue #81: remove including header of "platform/platform.h"	2010-08-25 03:38:08 +00:00
Walzer	b34b5b379e	issue #82: debug , undefine CCDictionary	2010-08-25 03:36:57 +00:00
Walzer	96a1e4f5ec		2010-08-25 03:18:59 +00:00
Ming	1cec3f5b60	issue #81: remove including header of "platform/platform.h"	2010-08-25 03:17:03 +00:00
Ming	25f49cac40	issue #81: remove including header of "platform/platform.h"	2010-08-25 03:14:34 +00:00
Ming	ecd8b2e9e4	fixed #80	2010-08-25 02:35:19 +00:00
Ming	710e29b086	issue #80	2010-08-25 02:19:20 +00:00
Ming	bd6c97dd2a	issue #80: remove CCDirector.h to direction of include	2010-08-25 01:40:31 +00:00
Walzer	cbccd4b1f8	issue #62, debug	2010-08-24 09:12:16 +00:00
Walzer	e838e5c8b9	issue #62, debug	2010-08-24 06:40:30 +00:00
Walzer	8da4457904	issue #62, debug	2010-08-24 06:32:01 +00:00
Walzer	2051869da5	issue #62, debug	2010-08-24 06:30:03 +00:00
Ming	1cb377bca8	fixed #79	2010-08-24 01:56:09 +00:00
Walzer	8c88676d27	issue #18, debug	2010-08-24 01:49:38 +00:00
Walzer	df7092b83b	issue #62, debug	2010-08-23 09:53:43 +00:00
Ming	4b34b3a015	fixed #79	2010-08-23 09:29:52 +00:00
Ming	c085826f9a	fixed #77	2010-08-23 08:32:37 +00:00
Walzer	8f24fa052b	issue #62, debug	2010-08-23 07:56:14 +00:00
Walzer	b43a3a2aac	issue #62, debug	2010-08-23 07:53:10 +00:00
Walzer	de81590145	issue #62, debug	2010-08-23 07:15:05 +00:00
Walzer	0fd94875fb	fixed #62, complete particle system	2010-08-23 06:57:37 +00:00
Ming	0c98caf83f	fixed #75: include uphone/ZipUtil.h	2010-08-23 06:09:10 +00:00
Ming	61028a5dab	fixed #75	2010-08-23 05:51:23 +00:00
natural-law	5f008f935a	issue #74 ... add ClickAndMove Test code	2010-08-23 03:53:37 +00:00
natural-law	90c8b7898f	issue #73 ... add effects test code	2010-08-23 02:17:29 +00:00
Ming	ceba1ff961	issue #65: add some missed codes	2010-08-21 05:53:24 +00:00
Ming	64e729905a	issue #64: fixed a bug of CCSpawn	2010-08-21 03:03:18 +00:00
natural-law	6193087b0c	issue #65 ... add ProgressActions Test	2010-08-21 02:26:26 +00:00
natural-law	40e7abcc5f	issue #64 ... add Transitions Test	2010-08-20 09:51:45 +00:00
Ming	cad3d3c230	fixed #52	2010-08-20 09:38:48 +00:00
Ming	19b75463ed	issue #64: retain the object when it was added to the scheduler	2010-08-20 07:56:24 +00:00
natural-law	2a37efc84a	issue #64 ... add Transitions Test	2010-08-20 06:35:37 +00:00
Ming	0894732547	fixed #53	2010-08-20 02:41:36 +00:00
Ming	e09f21b4d8	fixed #51	2010-08-20 02:07:58 +00:00
Ming	17e866f5ac	issue #61	2010-08-20 01:31:35 +00:00
Walzer	1d7f567963	issue #18, debug	2010-08-19 08:45:18 +00:00
Walzer	ccca95746e	issue #18, debug	2010-08-19 07:29:38 +00:00
Walzer	1dc617174a	issue #18, debug	2010-08-19 06:25:52 +00:00
Walzer	29d9a489b8	issue #18, debug	2010-08-19 06:11:35 +00:00
Walzer	9703e75e57	issue #18, debug	2010-08-19 06:09:40 +00:00
Walzer	b2585b1d4b	issue #18, debug	2010-08-19 05:46:34 +00:00
Walzer	a08b17b4aa	fixed #59, complete CCMotionStreak	2010-08-19 05:37:39 +00:00
Walzer	584f558075	fixed #59, complete CCMotionStreak	2010-08-19 02:14:54 +00:00
Walzer	59324a4a65	fixed #58, complete CCRibbon, CCRibbonSegment	2010-08-18 09:56:59 +00:00
Ming	3bca871999	issue #51	2010-08-18 08:56:27 +00:00
Walzer	2aa067875b	issue #18, debug	2010-08-18 08:49:49 +00:00
Walzer	b2bbe00479	issue #18, debug uiimage::save, uiimage::initWithBuffer	2010-08-18 08:48:39 +00:00
Ming	5076ff065c	issue #55	2010-08-18 08:37:54 +00:00
Ming	1a4a070dfe		2010-08-18 07:26:21 +00:00
yangws	876c0dabb8	add CCXEGLView::getFrame() function.	2010-08-18 07:24:19 +00:00