1461 Commits

Author	SHA1	Message	Date
James Chen	21134cc48f	Merge branch 'new_develop_merge_clean' of https://github.com/carlomorgantinizynga/cocos2d-x into carlomorgantinizynga-new_develop_merge_clean	2013-08-15 17:02:51 +08:00
folecr	b4edb14d33	Use ndk-gdb-py and name the explicit launch activity to be able to use gdb's Text User Interface when debugging.	2013-08-13 15:50:58 -07:00
folecr	4d34cfc28f	Add --nowait option (Android has broken something again in NDK/SDK/emulator/etc.) and the debugger will not work correctly anymore	2013-08-13 11:29:53 -07:00
folecr	84054a237c	Android platform version used matches all other sample projects	2013-08-13 11:28:56 -07:00
carlo morgantini	47be4ff58a	Merge remote-tracking branch 'originGithub/develop' into new_develop_merge_clean ... Conflicts: cocos2dx/label_nodes/CCFontAtlas.cpp cocos2dx/label_nodes/CCFontAtlas.h cocos2dx/label_nodes/CCFontAtlasCache.cpp cocos2dx/label_nodes/CCFontAtlasFactory.cpp cocos2dx/label_nodes/CCFontAtlasFactory.h cocos2dx/label_nodes/CCFontDefinition.cpp cocos2dx/label_nodes/CCFontFreeType.cpp cocos2dx/label_nodes/CCLabel.cpp cocos2dx/label_nodes/CCLabel.h cocos2dx/label_nodes/CCStringBMFont.h cocos2dx/label_nodes/CCStringTTF.cpp samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp	2013-08-13 11:28:54 -07:00
carlo morgantini	15ec303278	more clean ups on tests for label	2013-08-13 10:12:02 -07:00
folecr	b61ce3c79d	ndkgdb.sh for TestCpp	2013-08-13 08:47:48 -07:00
folecr	17c7b7cbcf	APP_OPTIM is debug	2013-08-13 08:47:48 -07:00
folecr	652920eaac	set android:debuggable property to true	2013-08-13 08:47:48 -07:00
folecr	75f7af00a6	TestCpp builds both ARM and x86 versions	2013-08-13 08:47:48 -07:00
folecr	cd0f1beaf4	fix evaluation of properties array read from local.properties	2013-08-13 08:47:48 -07:00
folecr	ef7c3b2b09	Remove unused option in build script	2013-08-13 08:47:48 -07:00
carlo morgantini	35b5e30190	alignment added to new label creation	2013-08-12 15:41:29 -07:00
carlo morgantini	d15d84c05f	samples cleaned up	2013-08-12 15:09:28 -07:00
carlo morgantini	097a5c488a	New Label tests plus bug fixing	2013-08-12 13:29:54 -07:00
Lee, Jae-Hong	66593ae4bf	[Tizen] Update project files ... - include stdint.h - set etc, s3tc header path - exclude CCImageCommonWebp.cpp, include etc, s3tc directories. - update project files.	2013-08-10 23:11:31 +09:00
godyZ	fa7b486880	update s3tc #5, code standardization	2013-08-09 12:54:05 +08:00
godyZ	46e9eed028	nothing with s3tc	2013-08-08 14:11:22 +08:00
godyZ	cd8430f81a	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop ... Conflicts: cocos2dx/Android.mk cocos2dx/platform/CCImage.h cocos2dx/platform/CCImageCommon_cpp.h cocos2dx/textures/CCTexture2D.h scripting/javascript/bindings/generated	2013-08-08 10:19:09 +08:00
folecr	cbd7796438	Update nojava.txt with readme.	2013-08-07 12:29:58 -07:00
James Chen	87736683c0	Merge pull request #3387 from pyrasis/tizen_2.2 ... [Tizen] Enable LocalStorage	2013-08-07 03:08:38 -07:00
Lee, Jae-Hong	5a8ec8ca5e	[Tizen] Enable LocalStorage ... - add sqlite3 headers and libraries. - use sqlite3 library.	2013-08-07 19:01:41 +09:00
minggo	910215fa89	Merge pull request #3377 from boyu0/iss2345_refactor_ccimage ... issue #2345 refactor CCImage and CCTexture2D	2013-08-06 23:29:38 -07:00
godyZ	27baf5b961	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2013-08-07 09:32:42 +08:00
godyZ	02419ccb00	update s3tc #3 ,android test	2013-08-06 15:33:38 +08:00
James Chen	a5067f63dd	Merge pull request #3372 from pyrasis/tizen_2.2 ... [Tizen] Fix Debug Settings	2013-08-05 22:51:06 -07:00
Lee, Jae-Hong	1acfca45b2	[Tizen] CC_ENABLE_CHIPMUNK_INTEGRATION=1	2013-08-06 14:42:53 +09:00
boyu0	dc6503f7d4	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2345_refactor_ccimage	2013-08-06 13:37:38 +08:00
godyZ	195536097f	update s3tc #2	2013-08-06 11:52:48 +08:00
boyu0	94f9921d5e	issue #2345: edit linux command to link the libpng12-dev.lib instead of use ourselves. Move ccTexParams into CCTexture2D	2013-08-06 11:34:48 +08:00
godyZ	fd7b00681f	update s3tc#1	2013-08-06 11:19:45 +08:00
Lee, Jae-Hong	3db495ab0e	[Tizen] Fix Debug Settings. ... - fix debugging failure problem	2013-08-06 01:26:56 +09:00
folecr	bf6b57fe19	Changes to match reverting of namespace simplegame for this sample	2013-08-05 02:05:48 -07:00
folecr	fe01166e92	Revert "namespace simplegame for game code" ... This reverts commit f35ebf6c494b68e6b3938a8ad1781d0d0684bb45.	2013-08-05 02:05:47 -07:00
folecr	23061fb312	AssetsManagerTest	2013-08-05 02:05:47 -07:00
folecr	ff079791e5	TestCpp	2013-08-05 02:05:47 -07:00
folecr	d3476bec17	HelloCpp	2013-08-05 02:05:46 -07:00
folecr	81318d72ed	Update target sdk version to 13 so that the game can handle all configuration changes	2013-08-05 02:05:46 -07:00
Rohan Kuruvilla	388edc144b	Adding additional android:configChanges parameters to AndroidManifest	2013-08-05 02:05:46 -07:00
folecr	325892eb82	Remove dependency on cocos extensions	2013-08-05 02:05:43 -07:00
folecr	9da4b9798f	Use android.appNativeActivity directly	2013-08-05 02:05:40 -07:00
folecr	1deb291026	Helper script to run the app	2013-08-05 02:05:40 -07:00
folecr	d271d02004	namespace simplegame for game code	2013-08-05 02:05:39 -07:00
folecr	ebd68c8feb	Force enable debug ... * APP_OPTIM in Application.mk * android:debuggable="true" in AndroidManifest.xml * NDK_DEBUG=1 in build_native.sh	2013-08-05 02:05:39 -07:00
folecr	b87c29d50b	simplegame : logging of entry points into app	2013-08-05 02:05:39 -07:00
folecr	21165cd285	simplegame : provide cocos_android_app_init() to initialize the Application.	2013-08-05 02:05:39 -07:00
folecr	a5f9b19c30	simplegame : add option to build script to build in debug mode	2013-08-05 02:05:38 -07:00
folecr	2e81871497	simplegame : Fix build script to process input elements as an array	2013-08-05 02:05:38 -07:00
folecr	c91d004fdc	simplegame : NDK GDB debugging script	2013-08-05 02:05:38 -07:00
folecr	e5377e2ddc	simplegame : Use Cocos2dxActivity (which is also a NativeActivity.)	2013-08-05 02:05:38 -07:00
folecr	fc3cd0c68c	simplegame : Use cocos2dxandroid static library	2013-08-05 02:05:37 -07:00
folecr	ccfdbe42bc	simplegame : Use nativeactivity	2013-08-05 02:05:37 -07:00
folecr	816b77e7c0	simplegame : enable building native library for x86	2013-08-05 02:05:37 -07:00
folecr	26c5e1e180	simplegame : no java, Create empty src/ directory with a nojava.txt file	2013-08-05 02:05:37 -07:00
Éloi Rivard	9dcb6fb80e	Multi-resolution emscripten html template. ... Default emscripten html template update. Minor emscripten warnings.	2013-08-05 09:24:47 +02:00
James Chen	5ee6e7d79a	Merge branch 'develop' into carlomorgantinizynga-new_develop_merge ... Conflicts: cocos2dx/Android.mk	2013-08-05 10:09:15 +08:00
minggo	456b5af872	closed #2434:fixed path	2013-08-03 23:12:10 +08:00
minggo	9cba2c42c1	closed #2434: simply Android.mk	2013-08-02 17:33:27 +08:00
carlo morgantini	4904e0f31f	Clean up (as requested by code review)	2013-08-01 17:08:57 -07:00
carlo morgantini	2fb2916bae	some more cleanup	2013-08-01 14:36:34 -07:00
boyu0	93aa3c7ada	issue #2345: refract CCImage and CCTexture2D.	2013-08-01 15:53:52 +08:00
Huabing.Xu	9a9d0b9def	closed #2423: add ActionTargetedReverse test case	2013-08-01 10:28:18 +08:00
carlo morgantini	b2579987e5	Merge remote-tracking branch 'cocos2d/develop' into new_develop_merge ... Conflicts: cocos2d_libs.xcodeproj/project.pbxproj cocos2dx/include/ccTypes.h samples/samples.xcodeproj/project.pbxproj	2013-07-31 13:58:25 -07:00
minggo	0530109a9f	Merge pull request #3178 from boyu0/2345 ... Refactor CCImage and CCTexture2D	2013-07-31 01:21:18 -07:00
minggo	d887008bb8	Merge pull request #3336 from minggo/simplify-sample-code ... Simplify sample code	2013-07-31 00:41:20 -07:00
minggo	e412fe5a31	use Point::+ to simplify HelloWorld sample	2013-07-31 14:38:50 +08:00
minggo	0241470ff9	Merge pull request #3330 from dabingnn/Iss2447-ClippingNodeTestCrash-bug ... closed #2447: Fix clippingNodeTest RawStencilBufferTest6 crash bug	2013-07-30 18:42:46 -07:00
carlo morgantini	ff56ad5435	fix bugs with new Label stuff and add new sample for unicode	2013-07-30 16:41:26 -07:00
carlo morgantini	9de1ef3f97	New label TTF. New text alignment sample.	2013-07-30 10:27:22 -07:00
Huabing.Xu	6a1938056c	closed #2447: Fix clippingNodeTest RawStencilBufferTest6 crash bug	2013-07-30 16:27:13 +08:00
Éloi Rivard	14e200e61a	Added debugging information in emscripten DEBUG mode	2013-07-30 10:11:30 +02:00
boyu0	afde1e57b2	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345 and fix the per premultipied tag	2013-07-30 11:10:05 +08:00
carlo morgantini	023b46154f	Fix problems with missing glyphs in .ttf file	2013-07-29 13:43:23 -07:00
boyu0	894584e5a0	Add texture2D convert test and fix the convert bugs	2013-07-29 17:34:33 +08:00
minggo	0b0c223d33	Merge pull request #3318 from dabingnn/Iss2437-RenderTextureStencilTest-Bug ... Iss2437 render texture stencil test bug	2013-07-29 01:25:14 -07:00
James Chen	5aab0cab7b	[Android] Fixing build errors for ndk-r9.	2013-07-29 14:54:00 +08:00
Huabing.Xu	0dcf9e88c3	close #2437: replace stencil mechanism with a new approach by removing glColorMask call	2013-07-29 14:13:36 +08:00
Huabing.Xu	4ebfc1c6e4	issue #2437: Fix Bug RenderTextureTestDepthStencil not clipped by stencil	2013-07-29 14:11:21 +08:00
minggo	9780b75da8	Merge pull request #3273 from thp/develop-qt5 ... Port Cocos2D-X to Qt 5 (develop branch)	2013-07-28 16:51:55 -07:00
minggo	92f9ed743a	use correct type to initialize an array	2013-07-28 23:23:35 +08:00
samuele3hu	cc95fcaa69	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DrawNode	2013-07-28 14:35:38 +08:00
samuele3hu	3aeefb51b3	Modify deprecated CCPhysicsDebugNode typedef and some test bug	2013-07-28 14:33:02 +08:00
minggo	e97b2504ea	fix a logical error	2013-07-28 10:22:12 +08:00
James Chen	e66e429bb2	issue #2430: Moving enum type to class for CCBReader.	2013-07-27 21:44:49 +08:00
James Chen	324607c32c	More warning fixes.	2013-07-27 15:15:54 +08:00
carlo morgantini	6e4aafdacf	fix a problem with the new Label and colors	2013-07-26 16:30:36 -07:00
carlo morgantini	23575f0a68	New Label stuff merged and Label::Alignment replaced with TextVAlignment and TextHAlignment	2013-07-26 16:04:21 -07:00
carlo morgantini	8416e7cf6d	Merge remote-tracking branch 'cocos2d/develop' into developNewLabelMergeDevelop ... Conflicts: cocos2d_libs.xcodeproj/project.pbxproj scripting/javascript/bindings/generated tools/bindings-generator	2013-07-26 15:54:50 -07:00
Ricardo Quesada	0da367e05e	fixes warnigns when using HttpRequest ... fixes warnigns when using HttpRequest	2013-07-26 14:34:17 -07:00
carlo morgantini	be47a6da52	Merge remote-tracking branch 'ricorigin/label_merge' into developNewLabelForRiq ... Conflicts: cocos2dx/label_nodes/CCFontAtlasFactory.cpp samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp	2013-07-26 11:58:18 -07:00
carlo morgantini	76ebeb0676	some more clean up for CCLabel	2013-07-26 10:29:29 -07:00
James Chen	58a3560bca	More enum class: ScrollView::Direction, TableView::VerticalFillOrder	2013-07-26 22:55:41 +08:00
James Chen	dc7fcce0fe	Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into minggo-iss2430-modify_enum ... Conflicts: scripting/javascript/bindings/generated scripting/lua/cocos2dx_support/LuaCocos2d.cpp	2013-07-26 21:22:16 +08:00
James Chen	e16a5f469b	issue #2430: Refactoring enum 'ResolutionPolicy'.	2013-07-26 18:18:58 +08:00
minggo	3cb40b36e4	issue #2430:fix some errors	2013-07-26 18:07:40 +08:00
minggo	a7c1904eb8	issue #2430:move EditBox enum into class	2013-07-26 17:45:01 +08:00
James Chen	ad1d8b667d	enum class for LanguageType, Application::Platform	2013-07-26 17:29:06 +08:00
James Chen	54ab99bf74	enum class for ProgressTimer::type	2013-07-26 17:28:18 +08:00
Thomas Perl	2f35353020	Qt 5 port: Fixes to build against "develop" branch ... The Qt 5 port was based on the "master" branch. This patch updates all Qt 5 changes to build correctly with the "develop" branch. Tested with GCC 4.6 and Qt 5.1.0 on Linux.	2013-07-26 08:55:46 +00:00
minggo	0b3ed85914	issue #2430:fix some compiling error	2013-07-26 16:43:40 +08:00
minggo	0870581623	fix warnings	2013-07-26 15:22:45 +08:00
minggo	f55d73194e	issue 2430:use enum class for Control enum values	2013-07-26 14:37:26 +08:00
James Chen	d345ac7f3f	[Android] Usage changes: ccGLInvalidateStateCache --> GL::invalidateStateCache();	2013-07-26 14:00:10 +08:00
James Chen	b57d48b0d2	ParticleSystem::MODE_RADIUS --> ParticleSystem::Mode::RADIUS	2013-07-26 13:47:30 +08:00
minggo	0b8de88ddc	issue 2430:use enum class	2013-07-26 12:08:18 +08:00
Ricardo Quesada	8bf24f0475	ccGLXXX -> GL::xxx ... Adds GL namespace. Deprecates the `ccGLFunctionName` functions. New functions are `GL::functionName` Also, converts the class `DrawPrimitives` into a namespace	2013-07-25 18:42:53 -07:00
carlo morgantini	7d141a3f57	the new label system now uses only CCStringTTF (CCStringBMFont is still here, but not used anymore)	2013-07-25 17:58:13 -07:00
Ricardo Quesada	07c6c904cc	Removes more Hungarian notation and more ... Adds Touch::DispatchMode. Removes Layer::TouchDispatchMode	2013-07-25 16:27:24 -07:00
Ricardo Quesada	058935aa8d	Removes Hungarian notation ... Removes Hungarian notation from the code.	2013-07-25 15:53:24 -07:00
Ricardo Quesada	d683e10808	More constant fixes ... Transition::ORIENTATION_XXX -> Transition::Orientation::XXX Image::FORMAT_XXX -> Image::Format::XXX Image::_function() -> Image::function() // private methods should not start with '_' DrawPrimitives::drawColor() -> DrawPrimitives::setDrawColor() And fixes Premultiplied Alpha in PVR v3 images And tests are updated with the new functions	2013-07-25 14:49:43 -07:00
Ricardo Quesada	16d0b43181	Constant fixes ... Director::PROJECTION_2D, 3D,... -> Director::Projection::_2D, _3D, ... Label::TEXT_ALIGNMENT_... -> Label::HAlignment::... Label::TEXT_VERTICAL_ALIGNMENT_... -> Label::VAlignment::... Texture2D::PIXEL_FORMAT_... -> Texture2D::PixelFormat::... BlendFunc::BLEND_FUNC_DISABLE -> BlendFunc::DISABLE Also adds more constant for BlendFunc	2013-07-25 13:36:19 -07:00
James Chen	a1c3631962	issue #2404: DrawPrimitives deprecated.	2013-07-25 22:38:55 +08:00
minggo	4d7ac6c800	issue #2430:fix conflict	2013-07-25 21:37:12 +08:00
minggo	8b748e2992	issue #2430:use const member variable instead of macro	2013-07-25 21:04:32 +08:00
minggo	051caf5e54	issue #2430:move TransitionScene enum into class	2013-07-25 20:50:39 +08:00
minggo	df48f52aa3	issue #2430:use Image::Format instead of tImageFormat	2013-07-25 20:38:15 +08:00
minggo	18a19d5168	issue #2430:move Layer enum into class	2013-07-25 20:12:55 +08:00
minggo	beb192ecaa	issue #2430:move Menu enum into class	2013-07-25 20:04:24 +08:00
minggo	77afae124b	issue #2430:move Texture2D enum into class	2013-07-25 19:52:44 +08:00
minggo	2293630335	issue #2430:move enum in ccTypes.h class	2013-07-25 18:46:43 +08:00
minggo	acdd1cfe9d	issue #2430:move GLProgram enum into class	2013-07-25 17:48:22 +08:00
James Chen	25beed0051	[Android] Fixing path error and reducing dependence for extension.	2013-07-25 16:53:35 +08:00
James Chen	aaf5bcef52	issue #2404: Invocation of some deprecated methods fixes.	2013-07-25 15:25:11 +08:00
minggo	3d6f3bf8b2	issue #2430:move ProgressTimer enum into class	2013-07-25 15:11:36 +08:00
minggo	658bffbb69	issue #2430:use upper letter for enum item in ccGLStateCache.h	2013-07-25 15:04:13 +08:00
minggo	8dab462f6f	issue #2430:move Director enum into class	2013-07-25 14:39:32 +08:00
minggo	edcea3eb8d	issue #2430:move more Particle enum into class	2013-07-25 14:27:46 +08:00
minggo	4519a09ce4	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2430-modify_enum	2013-07-25 13:54:55 +08:00
minggo	4bfe6c2439	issue #2430:move Particle enum into class	2013-07-25 13:54:32 +08:00
James Chen	306587167d	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2404-ext-deprecated ... Conflicts: AUTHORS	2013-07-25 11:28:48 +08:00
minggo	a13a46e54f	Merge pull request #3243 from azmeuk/emscripten-package ... Use of a single emscripten HTML template file	2013-07-24 18:36:28 -07:00
Ricardo Quesada	a7760d117d	Adds more tests	2013-07-24 17:21:51 -07:00
Ricardo Quesada	e0523b3438	Merge branch 'developNewLabelForRiq' into label_merge ... Conflicts: cocos2dx/textures/CCTexture2D.h samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp scripting/javascript/bindings/generated tools/bindings-generator	2013-07-24 15:15:08 -07:00
Ricardo Quesada	943b805bc8	Fixes some warnings ... ... and updates the version to pre-alpha0	2013-07-24 14:02:36 -07:00
Thomas Perl	6f4f8c0e38	Qt 5: System-wide installation of targets	2013-07-24 20:23:08 +02:00
Thomas Perl	366dbeda31	Qt 5: Build test application (Cpp/TestCpp)	2013-07-24 20:23:07 +02:00
Thomas Perl	15e3a7825c	Re-enable use of CocosDenshion in SimpleGame	2013-07-24 20:19:49 +02:00
Thomas Perl	e1baba5407	Build SimpleGame example	2013-07-24 20:19:20 +02:00
Thomas Perl	b64c0a0e87	Platform abstraction implementation with Qt 5 ... Based partially on the Linux platform abstraction, therefore this right now works only with Qt 5 on Linux.	2013-07-24 20:18:43 +02:00
carlo morgantini	97363c9382	some more cleanup and refactory for the new Label stuff	2013-07-24 10:22:46 -07:00
Éloi Rivard	682a1238fa	Use of a single emscripten HTML template file.	2013-07-24 17:59:21 +02:00
James Chen	e0f9ac82da	issue #2404: Updating ExtensionsTest/CocosBuilderTest.	2013-07-24 18:17:20 +08:00
Ricardo Quesada	1f37d4d00a	More best practices fixes and other bug fixes ... - Adds `CC_REQUIRES_NULL_TERMINATION` to methods that require a NULL at the end - Removes more Hungarian notations in samples - s/sprite/scene: fix from previous commit - `CCLog` -> `log` - `getLayerNamed` -> `getLayer` - `getPropertyNamed` -> `getProperty` - and other small fixes	2013-07-23 15:20:22 -07:00
Ricardo Quesada	2013f841ad	Merge branch 'develop' into more_best_practices_fixes	2013-07-23 13:36:22 -07:00
James Chen	12bb640307	issue #2378: ParticleTest: _emitter->getOpacityModifyRGB --> _emitter->isOpacityModifyRGB	2013-07-23 20:47:19 +08:00
minggo	f6cfe3007f	issue #2412:fix merging conflict	2013-07-23 10:41:11 +08:00
Ricardo Quesada	c158cd5be6	More best practices fixes ... - Removes Hungarian notation from the CPP test (there are still some Hungarian to remove) - Label and MotionStreak: Uses the CL() entry for the tests (lambda functions)	2013-07-22 17:25:44 -07:00
carlo morgantini	98bb0c26f3	working on the new label stuff	2013-07-22 14:43:45 -07:00
carlo morgantini	98c52cd98d	new FontCache	2013-07-22 13:08:37 -07:00
carlo morgantini	5668607e0e	merging with Ricardo stuff and fixin the new Label	2013-07-22 11:40:39 -07:00
James Chen	1db847ad7c	issue #2344: ScriptEngineManager::sharedManager --> ScriptEngineManager::getInstance, ScriptEngineManager::purgeSharedManager --> ScriptEngineManager::destroyInstance	2013-07-22 17:24:54 +08:00
James Chen	b58d18e20a	More unsinged int -> int in some places where it could be difficult to find underflow bugs. And some warnings fix.	2013-07-22 14:28:19 +08:00
James Chen	e81c0f944d	Merge branch 'ricardoquesada-property_synthesize_fixes' of https://github.com/dumganhar/cocos2d-x into ricardoquesada-property_synthesize_fixes	2013-07-22 11:47:08 +08:00
James Chen	604c30f102	Merge branch 'openal-deletebuffers' of https://github.com/rafaelx/cocos2d-x into rafaelx-openal-deletebuffers ... Conflicts: CocosDenshion/include/SimpleAudioEngine.h samples/Cpp/TestCpp/Classes/CocosDenshionTest/CocosDenshionTest.cpp	2013-07-22 10:06:14 +08:00
Ricardo Quesada	89d210bdb3	CCAssert -> CCASSERT ... and other best pracitces like: capacity and "index" are ints and not unsigned int (google's recomendation). It is easier to detect underflow bugs like this plus other minor improvements	2013-07-19 22:01:27 -07:00
Ricardo Quesada	2219bde542	bmfont sample working ... ...still TTF working OK	2013-07-19 16:49:51 -07:00
Ricardo Quesada	88928fff99	Merge branch 'developNewLabelMerge' into merge_new_label ... Conflicts: cocos2d_libs.xcodeproj/project.pbxproj cocos2dx/textures/CCTexture2D.h samples/Javascript/Shared	2013-07-19 16:04:23 -07:00
carlo morgantini	c977e6c3fa	Merge remote-tracking branch 'ricorigin/developNewLabel_create' into developNewLabelMerge ... Conflicts: cocos2dx/label_nodes/CCFontDefinition.cpp cocos2dx/label_nodes/CCFontDefinition.h cocos2dx/label_nodes/CCStringTTF.cpp cocos2dx/label_nodes/CCStringTTF.h samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp	2013-07-19 12:24:25 -07:00
carlo morgantini	5068622c04	working on the new atlas stuff	2013-07-19 10:33:26 -07:00
James Chen	4043ca7e23	Merge pull request #3197 from dumganhar/ricardoquesada-more_more_best_practices_fixes ... Merge PR https://github.com/cocos2d/cocos2d-x/pull/3192	2013-07-19 08:15:39 -07:00
yinkaile	0470ce936b	1.Fix release CCTexture2DMutable.cpp crash ... 2.Change frame tween method	2013-07-19 19:02:26 +08:00
Lee, Jae-Hong	980a053e50	[Tizen] Fix compile error. ... - Tizen SDK doesn't support override keyword yet. - add class keyword before friend keyword.	2013-07-19 15:16:05 +09:00
minggo	687c088b51	issue #2412:remove blackberry and marmalade port because they don't support c++11	2013-07-19 13:55:03 +08:00
minggo	7704ab9161	issue #2412:remove platform.cpp/.h	2013-07-19 13:42:45 +08:00
Ricardo Quesada	ba6ab126c6	More best practices fixes ... - class order fixes - static methods (creators) at the beginning - then constructors / destructors - then init - more `const` fixes - adds some const getters - some getters have 2 versions: `const` and no-const version - renamed CocosDenshion::sharedEngine -> getInstance()	2013-07-18 16:30:19 -07:00
rafael.x	c4ef2c9250	Added to various functions a check whether an OpenAL source exists on which OpenAL functions can be called. ... Playback of background music starts now with the previously set volume, independent of the OpenAL source state. Added a delete on the SimpleSoundEngine object within CocosDenshionTest::onExit() so that alutExit() gets called to release allocated resources by OpenAL.	2013-07-19 01:00:24 +02:00
carlo morgantini	9c53da22fa	some more cleanup	2013-07-18 14:11:12 -07:00
carlo morgantini	5480810a9c	clean up and now using FreeType for rendering fonts	2013-07-18 13:13:41 -07:00
James Chen	a425dd3dc0	Merge branch 'more_best_practices_fixes' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-more_best_practices_fixes ... Conflicts: cocos2dx/actions/CCActionTiledGrid.h	2013-07-18 15:46:14 +08:00
James Chen	bf45fa86fe	Merge pull request #3176 from dumganhar/iss2413-overload-virtual ... closed 2413: Warning fixes for overload virtual functions.	2013-07-18 00:33:53 -07:00
James Chen	8176f2f178	issue #2404: Fixing wrong replacement of shape.m_Vertex2F. shape.m_Vertex2F --> shape.m_vertex2	2013-07-18 14:48:18 +08:00
carlo morgantini	80247d409b	rendering using free type. This commit is a work in progress and should NOT be used	2013-07-17 17:31:28 -07:00
Ricardo Quesada	6e25301b43	more best practices fixes ... - Adds more `const` in getters - Overriden methods have the `override` keyword - Reorganizes the structure of the class: # creators first, then constructor, destructors, init # then overridden methods # variables at the end - removes Hungarian notation from parts of the code	2013-07-17 16:56:19 -07:00
James Chen	d6f713a31b	Merge branch 'sanityzing_code' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-sanityzing_code ... Conflicts: samples/Cpp/TestCpp/Classes/Box2DTest/Box2dTest.h	2013-07-17 17:06:47 +08:00
James Chen	f4edc7a922	closed #2413: Warning fixes for overload virtual functions.	2013-07-17 16:25:13 +08:00
James Chen	c31e8a8afc	issue #2407: Updating SpriteTest.cpp, Don't hide virtual override function.	2013-07-17 14:33:15 +08:00
James Chen	b6fda7bf7c	issue #2407: Removing unused codes in Box2dTest.h	2013-07-17 14:32:38 +08:00
James Chen	56419b9e90	issue #2410: [Android] Adding listener for CCDrawNode when application resume from background. ... Reset the order of reloading shaders and textures in main.cpp.	2013-07-17 12:53:30 +08:00
Ricardo Quesada	5d499d351d	Some more changes to make the code more c++ friendly: ... - nodeToParentTransform -> getNodeToParentTransform() (the same for its friends) - Deprecates the old methods - adds 'consts' to those methods - boundingBox() -> getBoundingBox() - the new one is const - Deprecates the old method. - Adds overrides keywords in CCNodeRGBA and CCArmature - AffineMatrix are mutables	2013-07-16 18:16:04 -07:00
James Chen	510b29a2ff	Merge branch 'android-textures-fix' of https://github.com/jotel/cocos2d-x into shared-codes ... Conflicts: cocos2dx/textures/CCTextureCache.cpp	2013-07-16 16:33:02 +08:00
James Chen	13e939b55e	Merge pull request #3157 from ricardoquesada/override_love ... closed 2407: Adds more readability to the class internals.	2013-07-15 22:05:33 -07:00
Ricardo Quesada	f9268c8054	small API changes ... ::create() and const chars	2013-07-15 14:35:25 -07:00
Ricardo Quesada	9958e0d7f9	Adds more readability to the class internals. ... Changes: - creator (static) methods, and singleton methods (static) are always at the top of the class - Constructors, destructros, and init methods comes next - Then the instance methods for the class - Then the overriden methods - and finally the ivars Also, overriden methos have the "override" context keyword	2013-07-15 12:43:22 -07:00
pktangyue	6bb2d64f19	add S9CascadeOpacityAndColor test	2013-07-15 20:13:30 +08:00
minggo	93e75bad9f	Merge pull request #3154 from minggo/add-deprecated-header ... Add deprecated header	2013-07-15 03:20:32 -07:00
James Chen	759831c1d8	issue #2397: Application::sharedApplication --> Application::getInstance.	2013-07-15 16:24:42 +08:00
minggo	eada29ee40	issue #2404:created CCDprecated.h and move all global functions and variables into it	2013-07-15 16:14:26 +08:00
yinkaile	680b7f1cb0	Remove vld.h	2013-07-13 22:59:21 +08:00
James Chen	4b2165e648	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into socketio	2013-07-13 19:24:41 +08:00
James Chen	b5ca0b4ed5	Fixing warnings in SocketIOTest.cpp.	2013-07-13 19:21:31 +08:00
yinkaile	619a8810fe	Change Physics detector	2013-07-13 19:14:30 +08:00
carlo morgantini	e4af13f1f6	use freetype	2013-07-12 12:39:47 -07:00
minggo	6abe6fce78	closed #2393: fix conflicts	2013-07-12 18:04:32 +08:00
minggo	58fe3c7563	closed #2393: fixed conflicts	2013-07-12 15:07:44 +08:00
minggo	5d9fea1416	issue #2393:mark PointZero RectZero and SizeZero as deprecated	2013-07-12 14:47:36 +08:00
minggo	15096b0716	issue #2393:mark CCPointMake CCSizeMake CCRectMake as deprecated	2013-07-12 14:30:26 +08:00
James Chen	f8cd252c5c	issue #2397: sharedNotificationCenter --> getInstance	2013-07-12 14:17:42 +08:00
James Chen	6038d69183	issue #2397: sharedSpriteFrameCache --> getInstance, purgeSharedSpriteFrameCache --> destroyInstance.	2013-07-12 14:12:58 +08:00
minggo	bb758df0d0	issue #2393:mark ccp as deprecated	2013-07-12 14:11:55 +08:00
James Chen	1f8e852020	issue #2397: Shader::sharedShaderCache() --> Shader::getInstance().	2013-07-12 13:40:01 +08:00
James Chen	2c1b26acf8	issue #2397: EGLView::sharedOpenGLView() --> EGLView::getInstance()	2013-07-12 13:11:21 +08:00
James Chen	a678d12615	issue #2397: FileUtils::sharedFileUtils --> FileUtils::getInstance() for all platforms	2013-07-12 12:03:39 +08:00
James Chen	88a28b041e	issue #2397: Director::sharedDirector --> Director::getInstance() for all files.	2013-07-12 11:50:36 +08:00
Ricardo Quesada	cf262c28e2	getInstance() / destroyInstance() are used... ... ... instead of sharedXXX / purgeXXX. They are more C++ friendly, and also easier to remember. common files + Mac files + iOS files + tests/samples files were updated. The old methods are deprecated now.	2013-07-11 15:24:23 -07:00
Chris Hannon	126ebb888c	Implements a socket.io client extension, adds a test case and updates the android makefiles. ... Contains the following tasks: -initial socket.io extension commit -sioclientimpl subclasses websocket:delegate to respond to websocket events -implement static connect methods and basic client creation -move SocketIO class files into correct extension folder (network) -create SocketIO test in TestCpp -update project references -add missing static modifier to connect method -implement basic test methods -update extensions tests with SocketIO test entry -implement basic handshake and opensocket methods for SocketIO -add Delegate class to handle callbacks, implement virtual Delegate methods in test -implement socket and client registries for lookup when connecting to hosts and endpoints -connect delegate onOpen method by separating impl creation from connection -update test to demonstrate onOpen callback -create send and emit methods, move SIOClient into header file, add send and emit methods to test -implement basic socket.io message parsing -improve logging for events and messages -add logic to pull event name from payload -schedule heartbeat to keep connection alive, scheduled for 90% of the heartbeat interval from the server for safety -add onConnect handler to to catch socket.io onconnect vs websocket onopen -add disconnect and disconnectFromEndpoint methods to properly disconnect and destroy objects -modify SIOClientImpl to track _uri for easier lookup in registries -connect handler for onMessage to message event from socket.io, modify onError handler to take a string instead of WebSocket error code -create SIOEvent callback type, implement event registry in clients, add test for event registration and callback -update SIOEvent to use std::function and c++11, utilize cocos2d CC_CALLBACK method to bind selectors, this ensures that the *this reference is properly passed -check for connect before sending or emitting in the client, cleanup some codes -change connect logic to reuse existing socket connections instead of opening a new one -implements get and set Tag methods for clients for easy reference -improve endpoint handling, add endpoint tests to test layer -additional error handling within socket disconnect error and failure to open connection -fixes extracting endpoint from socket.io messages (in cases of the connect message, where there is 1 less colon for the connect message to the default namespace). Also fixes connecting to the default namespace "/" in the connectToEndpoint method -add disconnect and onClose handlers to client so that onClose is called in the delegate -add disconnect test methods to test layers -change c-style casts to static_casts when using a CCDICT_FOREACH -remove some unneeded namespace completion -add usage documentation -add handling for disconnect from server, cleanup some codes -update comments and documentation in the socketiotest -update includes so the NDK doesn't complain when compiling with c++11 -add socketio.cpp and test.cpp to the android makefiles -update test URL to my public server, test script can also be found in my repo at https://github.com/hannon235/socket.io-testserver.git Signed-off-by: Chris Hannon <himynameschris@gmail.com>	2013-07-11 17:41:42 -04:00
carlo morgantini	002ae77698	new dynamic TTF label stuff	2013-07-11 14:41:03 -07:00
James Chen	3c64bc8972	issue #2396: Updating Scale9SpriteTest.cpp.	2013-07-11 17:08:09 +08:00
minggo	c37af8fa77	issue #2393:mark functions in CCPointExtensions deprecated	2013-07-11 16:38:58 +08:00
pktangyue	5e8de73061	add S9FrameNameSpriteSheetRotatedSetCapInsetLater test	2013-07-11 16:09:07 +08:00
James Chen	227afc37b9	Merge branch 'iss2395-s9sprite-test' of https://github.com/dumganhar/cocos2d-x into iss2395-s9sprite-test	2013-07-11 15:10:27 +08:00
James Chen	1527c1b4c3	issue #2395: Updating TestCpp/Android.mk	2013-07-11 15:09:13 +08:00
James Chen	ab4e9749b6	issue #2395: [Win32] Updating TestCpp project configuration	2013-07-11 14:17:43 +08:00
James Chen	9946bc4f00	issue #2395: Adding Scale9SpriteTest for other platforms.	2013-07-11 14:13:01 +08:00
James Chen	ad95ba4894	closed #2395: Adding Scale9SpriteTest for TestCpp	2013-07-11 14:07:14 +08:00
James Chen	2e9d727466	issue #2395: Removing unused codes in ActionTest.h.	2013-07-11 14:00:26 +08:00
Lee, Jae-Hong	9322e5594b	Support Tizen 2.2 SDK. ... - Update project files. - based on develop branch. - HelloCpp, SimpleGame, HelloLua, TestLua available to build.	2013-07-10 13:04:08 +09:00
yinkaile	54e5fca2aa	Bone can add a particle display as a CCNode	2013-07-10 10:00:51 +08:00
Jaroslaw Lewandowski	626ba2686f	Solving 'black screen' on android	2013-07-09 21:21:43 +01:00
Éloi Rivard	e6354bbf0a	Various linux eclipse projects compilation fixes	2013-07-09 15:23:19 +02:00
Éloi Rivard	d853934f1b	Added -std=c++0x flag in C++ eclipse projects	2013-07-09 15:23:19 +02:00
James Chen	9b9fe67d25	issue #2387: Using static_cast instead of C style cast in iteration of CCArray.	2013-07-09 14:29:51 +08:00
minggo	6d7b9ca236	Merge pull request #3108 from minggo/pitch_7platforms ... Pitch 7platforms	2013-07-08 20:24:15 -07:00
minggo	e5a80eed91	fixed conflict	2013-07-09 10:39:16 +08:00
James Chen	85ef6b3b98	closed #2384: Using static_cast instead of C cast in ExtensionsTest.cpp.	2013-07-09 10:18:15 +08:00
James Chen	3c394bba87	Merge branch 'iss3102-extensionstest-menuscroll' of https://github.com/hannon235/cocos2d-x into hannon235-iss3102-extensionstest-menuscroll	2013-07-09 10:16:31 +08:00
James Chen	976d4ad11e	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into remove-copywithzone ... Conflicts: cocos2dx/actions/CCActionInterval.cpp cocos2dx/cocoa/CCDictionary.cpp samples/Cpp/TestCpp/Classes/NodeTest/NodeTest.cpp	2013-07-09 09:48:41 +08:00
Ricardo Quesada	c7bf2ead10	More static_cast<>	2013-07-08 14:42:08 -07:00
Ricardo Quesada	9fe9341646	From C++ best practices ... Uses static_cast<> instead of C casting.	2013-07-08 14:38:14 -07:00
Chris Hannon	bba9722faa	iss3102: make extension test submenu in TestCpp scrollable to access all entries	2013-07-08 16:20:24 -04:00
dumganhar	9b126e79d7	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into remove-copywithzone ... Conflicts: scripting/lua/cocos2dx_support/LuaCocos2d.cpp	2013-07-08 23:09:48 +08:00
dumganhar	8f900d02b8	issue #2300: Removing all 'copyWithZone' pattern.	2013-07-08 23:05:47 +08:00
minggo	87125e4b2a	issue #2129:use capital words for static const member variables	2013-07-08 18:11:32 +08:00
James Chen	e28cf8d258	issue #2129: Windows doesn't support 'initializer list', using constructor instead.	2013-07-07 21:08:14 +08:00
minggo	dfde41b932	issue #2129:fix conflicts	2013-07-05 17:32:50 +08:00
minggo	04465622b7	issue #2129:remove prefix of types in ccTypes.h	2013-07-05 16:49:22 +08:00
minggo	12bc534475	Merge pull request #3079 from dabingnn/Issue-2367-ClippingNodes-Bug ... issue #2367: Fix Bug "ClippingNodes work different in Android and IOS"	2013-07-04 22:42:03 -07:00
Huabing.Xu	7a61ead598	issue #2367: Fix Bug "ClippingNodes work different in Android and IOS"	2013-07-05 11:59:46 +08:00
James Chen	dca0874ee3	issue #2371: Removed unused projects.	2013-07-04 17:24:34 +08:00
Ricardo Quesada	1d011510af	setTexParams() is passed as a const reference ... All structs (PODs), should be passed as const reference. eg: Size, Point, ccTexParams, etc... should be passed as const reference.	2013-07-03 17:59:22 -07:00
Darragh Coy	e247b5d960	Add ccDrawSolidCircle ... Similar to ccDrawCircle() primitives drawing function except the circle is filled.	2013-07-02 13:39:16 -07:00
minggo	55202b978a	Merge pull request #3048 from dabingnn/iss2328-refractor-etc ... Iss2328 refractor etc	2013-07-02 01:37:55 -07:00
Huabing.Xu	dded008909	issue #2328 refractor etc support:remove comments	2013-07-02 15:46:17 +08:00
Huabing.Xu	041bef148a	Merge branch 'origin/develop' ... Conflicts: cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj cocos2dx/proj.win32/cocos2d.vcxproj.filters	2013-07-02 13:47:02 +08:00
Ricardo Quesada	c38e932fe8	Adds SimpleGame and HelloCpp to the mac samples project	2013-07-01 17:31:03 -07:00
Ricardo Quesada	9e13cb91a5	Adds xcworspace data	2013-07-01 16:33:17 -07:00
Ricardo Quesada	f83383b86c	removes unused projects	2013-07-01 14:43:47 -07:00
Ricardo Quesada	87fc7d4d62	cocos2d mac project redesigned	2013-07-01 14:41:39 -07:00
Huabing.Xu	ae47e94db9	change test case, all platform not can read pkm file	2013-07-01 18:15:59 +08:00
Sergey Shambir	0a2207f531	Fixed coding style, rearranged CocosDenshionTest UI, changed ... rewindBackgroundMusic to work with paused music.	2013-06-29 13:46:19 +04:00
Sergey Shambir	1c52517770	CocosDenshion: added effects customization for 7 platforms. ... 1. Pitch/pan/gain support on iOS, Mac, Linux+FMOD, Android+SoundPool; 2. Unified OpenAL code with pitch/pan/gain on Linux, Tizen, Blackberry, Native Client; 3. Bug fixed: rewindBackgroundMusic() no longer stops music on unified OpenAL engine. 4. Optional mp3 support for Linux+OpenAL (OPENAL_MP3 make option); 5. Pan/gain (not pitch) support for Android+OpenES. 6. Reorganized CocosDenshion tests in TestCpp. Known issues: 1. No support for windows, emscrippten, marmalade. 2. No pitch effect on Android+OpenES. It requires backend redesign: http://code.google.com/p/android/issues/detail?id=24592	2013-06-29 13:44:16 +04:00
James Chen	9bac943040	issue #2325: [MAC] Removing libxml2.dylib, adding libcurl.dylib and updating dependence for TestCpp.	2013-06-29 12:25:44 +08:00
James Chen	e2b9863bf7	issue #2325: [Linux] KEYBOARD_SUPPORT --> CC_KEYBOARD_SUPPORT.	2013-06-29 11:44:14 +08:00
Ricardo Quesada	b846a3060e	cocos2d-x in Mac: ... Works as expected. All the projects defines CC_KEYBOARD_SUPPORT. Either all of them should define them, or none, otherwise the vtable will be broken	2013-06-28 19:02:10 -07:00
Ricardo Quesada	ccd9cb486c	JS Tests compiles and links in Mac ... ...but it doesn't work yet due to a bug with the touch events :-(	2013-06-27 00:58:46 -07:00
Ricardo Quesada	398c6593f0	JS Tests: Almost working on Mac	2013-06-26 23:45:08 -07:00
James Chen	10f4446596	Merge pull request #2998 from sbc100/emscripten_linux ... closed #2333: 1) Share top level Makefile between emscripten, linux and nacl. 2) Remove the dependacy of the emscripten build on /Library/Fonts (a darwin-only folder). On non-darwin platforms we use the ariel.tff that is part of TestCpp.	2013-06-25 22:43:16 -07:00
Sam Clegg	f9ae701a4b	Fix emscripten build on linux ... Remove the dependacy of the emscripten build on /Library/Fonts (a darwin-only folder). On non-darwin platforms we use the ariel.tff that is part of TestCpp.	2013-06-25 11:47:52 -07:00
James Chen	4196f2036e	Merge pull request #2993 from dumganhar/iss2325-ios-workspace-dependence-fix ... issue #2325: Fixing an issue that Xcode doesn't rebuild app when source file updated in dependent static library.	2013-06-25 08:41:28 -07:00
James Chen	3e052d5525	issue #2325: Fixing an issue that Xcode doesn't rebuild app when source file updated in dependent static library.	2013-06-25 23:21:06 +08:00
minggo	86646bb820	issue #2329:fixed a compiling error of AssetsManager on Android	2013-06-25 17:09:10 +08:00
minggo	d13597bcc3	Merge branch 'ccx_filesystem' of https://github.com/folecr/cocos2d-x into ccx_filesystem	2013-06-25 16:55:39 +08:00
James Chen	425db1af6b	Merge pull request #2982 from ricardoquesada/ios_project_fixes ... [iOS] TestCpp for iOS uses libcocos2dx, libCocosDenshion, etc...	2013-06-24 22:02:53 -07:00
Ricardo Quesada	436c7e9391	removes Xcode's autogenerated library paths	2013-06-24 21:30:04 -07:00
Ricardo Quesada	e1d65e149b	some fixes ... removes deprecated functions from AsssetManager AssetManager: updated project HelloCpp: does not depent on box2d, chipmunk, etc.	2013-06-24 18:20:07 -07:00
Ricardo Quesada	ef6f67902f	Adds mac workspace ... for the moment it includes TestCpp. But Chipmunk, Box2d, cocos2dx, extensions and CocosDenshion are libraries Like in the iOS project	2013-06-24 18:04:05 -07:00
Ricardo Quesada	4204e8243c	TestCpp for iOS uses libcocos2dx, libCocosDenshion, etc... ... ...as dependencies, and other minor fixes	2013-06-24 16:59:00 -07:00
folecr	6708983de2	Update target to android-10 for NDK code	2013-06-24 15:14:14 -07:00
folecr	7d4ce91b6b	Up the minSdkVersion to 9	2013-06-24 15:14:14 -07:00
James Chen	8dc8fec180	issue #2325: Updating project configuration, tested on iPad 3.	2013-06-24 18:32:06 +08:00
James Chen	b870488aad	issue #2325: [iOS] Using Workspace to manage all projects. TBD, also apply to Mac port.	2013-06-24 15:31:18 +08:00
James Chen	80cb06d3f7	Merge branch 'minggo-iss2305-replace-pthread' of https://github.com/dumganhar/cocos2d-x into minggo-iss2305-replace-pthread	2013-06-24 10:01:57 +08:00
James Chen	53a372669a	closed #2322: Updating all win32 project configurations, improvement by using Multi-processor Compilation.	2013-06-23 17:25:34 +08:00
Ricardo Quesada	404193eb9f	Uses C++11 iterator in samples ... or it just uses touches->anyObject() instead of creating an iterator and removes more unneeded casts	2013-06-21 20:02:43 -07:00
Ricardo Quesada	6c0c48a3a9	Removes CallFuncO and CallFuncND ... ...which can be simualted with CallFunc and CallFuncN. Adds std::function() support to CallFuncN. Adds more samples	2013-06-21 14:58:52 -07:00
Ricardo Quesada	5e106f3c85	Uses C++11 code for the actions tests ... Removes all casting. Uses auto for actions uses for(:) (C++11) iterator	2013-06-21 12:25:36 -07:00
James Chen	88a0dbec5e	Merge branch 'iss2305-replace-pthread' of https://github.com/minggo/cocos2d-x into minggo-iss2305-replace-pthread	2013-06-21 21:29:25 +08:00
minggo	0a768da240	issue #2305: use 4.7 toolchain to fix compiling errors	2013-06-21 17:17:23 +08:00
James Chen	12549f72f9	Adding resource for ComponentTest.	2013-06-21 14:16:03 +08:00
James Chen	dcaa55e622	Warning fixes for TestCpp. Using lambda, CC_CALLBACK_1 and clone pattern.	2013-06-21 14:15:20 +08:00
James Chen	0879a12516	issue #2129: Re-adds 'CC' prefix to objective-c classes for all projects.	2013-06-21 11:14:03 +08:00
James Chen	2a715ec3cf	Merge pull request #2956 from ricardoquesada/cc_namespace_obj ... issue #2129: Re-adds 'CC' prefix to objective-c classes.	2013-06-20 19:10:01 -07:00
Ricardo Quesada	578bce4bc8	Re-adds 'CC' prefix to objective-c classes. ... And also makes it compile on Mac, which was broken	2013-06-20 17:46:22 -07:00
Sam Clegg	04d7d5a061	[NaCl] Add support for building using glibc toolchain. ... BUG= R=binji@chromium.org Review URL: https://codereview.chromium.org/14694016	2013-06-20 12:56:14 -07:00
Sam Clegg	d3110c0a45	[NaCl] Recreate webstore zip archive each build.	2013-06-20 12:56:13 -07:00
Sam Clegg	47878c1855	[NaCl] Remove legacy nacl_mounts usage. ... Also add nacl SDK version check to ensure the SDK contains a recent version of nacl_io.	2013-06-20 12:56:12 -07:00
Sam Clegg	40766006bd	[NaCl] Fix NaCl build which had been disabled. ... Since switching to C++11 the NaCL build was disabled. This re-enables the ARM configuration which uses a more recent version of gcc. This means that that NaCl code paths will at least be test until we can find a way to re-enable the X86 build.	2013-06-20 12:56:12 -07:00
Sam Clegg	ab1243e8dd	[NaCl] Disable http tests under NaCl	2013-06-20 10:56:26 -07:00
Lee, Jae-Hong	2f8b24d05c	Fix compile error.	2013-06-20 19:20:27 +09:00
James Chen	1fb9f44d15	issue #2129: Removing CC prefix for samples module.	2013-06-20 14:17:10 +08:00
James Chen	31cbc0cbf8	issue #2129: [TestCpp] A typo fix.	2013-06-20 14:08:22 +08:00
James Chen	74048d7eec	issue #2129: [TestCpp] Renaming some class name to avoid conflicts after removing CC prefix.	2013-06-20 14:04:44 +08:00
James Chen	e3ed28a8fb	issue #2129: no need to write namespace since we are using *using namespace cocos2d::extension::armature;*.	2013-06-20 14:02:14 +08:00
James Chen	b55a0dee2b	issue #2129: using cocos2d::extension::armature namespace for Armature extension.	2013-06-20 13:48:43 +08:00
James Chen	7ce6ef04f8	issue #2129: [TestCpp] LayerGradient --> LayerGradientTest, TexturePVR --> TexturePVRTest.	2013-06-20 13:43:40 +08:00
samuele3hu	b818001007	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into opengl_develop	2013-06-19 16:43:15 +08:00
samuele3hu	b48cf5997d	issue #2277: Add OpenGL lua test samples	2013-06-19 16:40:02 +08:00
James Chen	1eadcd8b38	fixed #2301: Merge branch 'emscriptenate' of https://github.com/j4m3z0r/cocos2d-x into j4m3z0r-emscriptenate ... Conflicts: cocos2dx/proj.emscripten/cocos2dx.mk	2013-06-19 13:03:51 +08:00
Ricardo Quesada	a90f6c9b41	config resources are part of TestCpp for iOS	2013-06-18 16:52:52 -07:00
Ricardo Quesada	3d2862f8f7	Converts copy->autorelease() to clone() ... ... in the samples	2013-06-18 16:12:28 -07:00
James Gregory	88648aafc4	Update to testcpp makefile to include all assets, rather than cherrypicking.	2013-06-18 16:12:05 -07:00
Ricardo Quesada	159ef1ec68	clone() doesn't use copy constructor ... ... and other bug fixes	2013-06-18 15:06:53 -07:00
Ricardo Quesada	d35cc3b0fa	Merge branch 'develop' into clone_reverse_fixes ... Conflicts: cocos2dx/actions/CCAction.cpp cocos2dx/actions/CCActionEase.cpp cocos2dx/actions/CCActionGrid.cpp cocos2dx/actions/CCActionInstant.cpp cocos2dx/actions/CCActionInterval.cpp scripting/javascript/bindings/generated	2013-06-18 09:59:34 -07:00
James Chen	3cd82c8bf3	Merge pull request #2917 from pyrasis/tizen_2.1 ... [Tizen] Enable Hardware Acceleration.	2013-06-18 04:32:18 -07:00
Lee, Jae-Hong	4b828cfff2	Enable Hardware Acceleration.	2013-06-18 19:17:49 +09:00
James Gregory	ad90fe88a8	Merge remote-tracking branch 'origin/master' into emscriptenate	2013-06-17 20:30:36 -07:00
James Gregory	84cf597738	Simple logging controls in testcpp index.html	2013-06-17 20:29:57 -07:00
James Chen	2c0cc603d1	Merge branch 'master' into develop ... Conflicts: extensions/cocos-ext.h	2013-06-18 10:46:25 +08:00
minggo	b9c85d87ae	Merge pull request #2896 from dumganhar/iss2129-format-codes ... issue #2129: New naming of member varibles, renaming m_iVar to _var.	2013-06-17 03:27:01 -07:00
James Chen	ccb67cbcb4	Template fix for iOS Template.	2013-06-17 15:54:12 +08:00
James Chen	8b298fab0e	issue #2284: fixing windows build.	2013-06-16 11:19:47 +08:00
Ricardo Quesada	71ea3c7a3c	Fixed headers. Compiles but it doesn't link yet. ... Many methods not implemented yet.	2013-06-15 18:54:34 -07:00
James Chen	c0d44cb2e4	fixed #2129: Rename m_iVar to _var, remove CC prefixes.	2013-06-15 14:03:30 +08:00
James Chen	82cd7bb01f	Merge branch 'iss2284-merge-master' of https://github.com/minggo/cocos2d-x into minggo-iss2284-merge-master	2013-06-14 15:41:01 +08:00
minggo	a221f06592	issue #2284: fix bugs after merging master	2013-06-14 14:34:50 +08:00
Ricardo Quesada	8a6d33a212	Adds CC prefix to CALLBACK() ... Now it is called: CC_CALLBACK()	2013-06-13 20:36:43 -07:00
minggo	cd5bcb87af	issue #2284: merge master and fixed some conflicts	2013-06-13 17:54:05 +08:00
James Chen	0de1a4ebd8	Merge pull request #2877 from pyrasis/tizen_2.1 ... Support Tizen device	2013-06-12 22:56:23 -07:00
minggo	5996e99b74	Merge pull request #2875 from ricardoquesada/CALLBACK_macro_for_callbacks ... Adds CALLBACK_0, CALLBACK_1 and CALLBACK_2	2013-06-12 22:51:21 -07:00
Lee, Jae-Hong	1bd3f10601	Support Tizen device.	2013-06-12 10:20:18 +09:00
Ricardo Quesada	83b43ab93e	Adds CALLBACK_0, CALLBACK_1 and CALLBACK_2 ... Handy macros for callbacks. Instead of: std::bind(func_ptr, instnace, std::placeholder::_1) you use: CALLBACK_1(func_ptr, instance) And also removes more warnings from the tests	2013-06-11 16:30:05 -07:00
Ricardo Quesada	af49023741	Fixes for iOS7 and Xcode5	2013-06-11 12:11:05 -07:00
Rene Klacan	f31a258c01	Merge pull request from cocos2d/develop	2013-06-11 01:06:12 +02:00
James Chen	4948de6462	[VS2012] Warning fixes.	2013-06-10 11:44:16 +08:00
James Chen	a14df8d28d	issue #2271: Fixing some memory leaks.	2013-06-10 11:43:43 +08:00
James Chen	b0669b4f7d	[Tizen] Updating project configurations.	2013-06-09 18:56:22 +08:00
James Chen	3632693cd9	Reverting TestCpp/AppDelegate.cpp to use config file. But modify it to a suitable value.	2013-06-09 16:09:56 +08:00
James Chen	0a8ae1e79f	[BB] Updating project configuration after adding CocoStudio runtime.	2013-06-09 15:29:51 +08:00
James Chen	132fd591c1	[TestCpp] Commenting the line of loading configuration file in TestCpp.	2013-06-09 15:29:51 +08:00
James Chen	fd37cdf8df	SimpleGame doesn't depend on extension now.	2013-06-09 14:02:49 +08:00
James Chen	44c6043a3f	Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x into 2youyouo2-master	2013-06-09 10:40:44 +08:00
yinkaile	af819c6db5	Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x	2013-06-08 22:09:34 +08:00
yinkaile	d29931dc4f	1.add hd resource ... 2.remove zobie resource 3.support frame event	2013-06-08 22:08:22 +08:00
chengstory	86f4b96f05	Merge branch 'master111' ... Conflicts: samples/Cpp/TestCpp/proj.ios/TestCpp.xcodeproj/project.pbxproj samples/Cpp/TestCpp/proj.mac/TestCpp.xcodeproj/project.pbxproj	2013-06-08 20:01:25 +08:00
chengstory	c2e85c1ae4	1. adds support for iOS and Mac. ... 2. Modify position of some examples.	2013-06-08 17:11:11 +08:00
James Chen	bb8a0d2859	Updating iOS Project after adding Armature support.	2013-06-08 16:08:05 +08:00
James Chen	93ecfbbf7e	Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x into nacl-fix	2013-06-08 15:42:41 +08:00
yinkaile	8ff088da53	Standardize code	2013-06-08 12:14:43 +08:00
yinkaile	cba46082ce	Standardize code	2013-06-08 11:48:45 +08:00
carlo morgantini	494ec43fe8	new CCLabelTTF (static) create with fontDefinition method, and new CPP test using it	2013-06-08 10:59:07 +08:00
James Chen	ba5972ef79	[C++ 11] Bug fix for the usage of lambda in testBasic.cpp while using GCC compiler.	2013-06-08 10:25:53 +08:00
Ricardo Quesada	022dfc0acc	CPP Tests migrated to the new C++11 API ... Many tests were converted to the C++11 API and some tests were also simplified by using the "CL" macro instead of the "CF" macro.	2013-06-07 17:21:11 -07:00
carlo morgantini	b7ffb5b810	new CCLabelTTF (static) create with fontDefinition method, and new CPP test using it	2013-06-07 16:33:01 -07:00
yinkaile	7c924c714f	Standardize code	2013-06-07 22:56:54 +08:00
Lee, Jae-Hong	b9f5691706	[Tizen] Add libwebsockets.h, .a and support C++11	2013-06-07 20:14:43 +09:00
James Chen	7c650d7f28	[BB] Updating project configuration.	2013-06-07 18:45:58 +08:00
James Chen	3fc675a6df	[BB] Updating project configuration. especially for multi-platform-cpp/lua template.	2013-06-07 18:38:00 +08:00
James Chen	fc2c068a66	[BB] Updating project configuration.	2013-06-07 18:17:07 +08:00
James Chen	9298492384	Updating project configuration for Blackberry port.	2013-06-07 16:52:49 +08:00
yinkaile	2418afc96d	conform declare and initialize order	2013-06-07 16:13:08 +08:00
James Chen	942c797749	Removing unused codes.	2013-06-07 15:39:18 +08:00
James Chen	522a091d72	Adding BaseTest in TestCpp for Android, emscripten, linux, nacl and marmalade.	2013-06-07 14:37:06 +08:00
James Chen	8cfe969137	Fixing compilation errors for win32.	2013-06-07 14:31:15 +08:00
yinkaile	65974f2243	standardize code	2013-06-07 10:52:32 +08:00
Ricardo Quesada	80117afc82	Adds Base class to tests ... Base class displays the Menu( <- O -> ) Improved in some tests the way to create entries. Instead of defining the tests twice: the "create" method, and the entry in the array, it is only needed in the array (ActionsTest, SpriteTest and Texture2DTest)	2013-06-06 17:12:28 -07:00
Ricardo Quesada	428711482e	Adds missing config files for CCConfiguration ... ...and add functionality on the Director to override the default values from the config file. Supported values: - cocos2d.x.fps - cocos2d.x.display_fps - cocos2d.x.gl.projection - cocos2d.x.texture.pixel_format_for_png - cocos2d.x.texture.pvrv2_has_alpha_premultiplied If the "config.plist" file is not present, or some keys are not present, the default values are going to be used IMPORTANT: The folder "samples/Cpp/TestCpp/Resources/configs" needs to be added in the Android, Linux, Win32 projects. Already added in OS X and iOS Xcode projects.	2013-06-06 12:23:44 -07:00
yinkaile	10ed7ebdf4	merge newest version	2013-06-06 16:22:58 +08:00
James Chen	5832934e41	Reverting target to android-8.	2013-06-06 16:20:22 +08:00
James Chen	deceba3fd2	Merge branch 'menuitem_toggle_fixes' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-menuitem_toggle_fixes	2013-06-06 15:52:33 +08:00
Rene Klacan	8b16178f9f	Merge pull request from cocos2d/develop	2013-06-06 09:42:18 +02:00
James Chen	ed4b9b2bb3	Marmalade projects fix.	2013-06-06 14:26:35 +08:00
James Chen	f22d320797	Removing CODE_SIGN_IDETITY section in prom.pbxproj.	2013-06-06 14:24:58 +08:00
yinkaile	3cfba7bc9a	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x ... Conflicts: extensions/Android.mk extensions/proj.win32/libExtensions.vcxproj.filters samples/Cpp/TestCpp/Android.mk samples/Cpp/TestCpp/Classes/ExtensionsTest/ExtensionsTest.cpp	2013-06-06 12:35:18 +08:00
yinkaile	245b0395b1	1.upload CCArmature	2013-06-06 12:02:54 +08:00
Ricardo Quesada	479062fdb7	on dealloc, log "this" with %p, not %x. ... Also adds %p where it was missing. And make a few fixes on the iOS project	2013-06-05 18:21:05 -07:00
Ricardo Quesada	3441ca5563	MenuItemToggle is fixed ... Supports callbacks now. Updated MenuTest to supports the new API. Updated CHANGELOG and version Updatged Xcode project for Mac	2013-06-05 17:51:40 -07:00
James Chen	1bb73e50df	Fixing a warning in Bug-458.cpp	2013-06-05 18:18:59 +08:00
James Chen	dc8cfeb648	Merge branch 'menuitem_function_callback' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-menuitem_function_callback	2013-06-05 16:40:25 +08:00
minggo	a9788a7f9d	Merge pull request #2767 from chengstory/master_Components#2 ... 1. change “bool isEnabled()” to "bool isEnabled() const".	2013-06-05 00:52:32 -07:00
chengstory	ca3dc682ea	1. change “bool isEnabled()” to "bool isEnabled() const". ... 2. dolete license.	2013-06-05 15:05:49 +08:00
James Chen	993070b27e	Minor fix in CCConfiguration.	2013-06-05 09:47:29 +08:00
Ricardo Quesada	d27da88c06	Adds setObject to CCConfiguration ... also adds the test Conflicts: scripting/javascript/bindings/generated	2013-06-05 09:46:56 +08:00
James Chen	26219d4a14	Minor fix in CCConfiguration.	2013-06-05 09:41:03 +08:00
James Chen	2a16a6b17f	Merge branch 'configuration_set_value' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-configuration_set_value	2013-06-05 09:36:53 +08:00
Ricardo Quesada	4b37ec252a	Adds C++11 std::function<> support to MenuItem ... Updates some of the tests	2013-06-04 18:29:26 -07:00
Ricardo Quesada	337f966d0f	It was using an clang extension for tuples<> ... Instead of converting it to pairs<>, which is compatible with gcc, I converted it to C structs.	2013-06-04 10:03:32 -07:00
Ricardo Quesada	f22092c7fc	Merge branch 'develop' into testmenu_sorted	2013-06-04 09:53:49 -07:00
chengstory	a5f8e2c27e	no message	2013-06-04 17:54:05 +08:00
chengstory	cfb424a6c9	1. add Component struct.	2013-06-04 17:38:43 +08:00
René Klačan	f66e12f414	Merge pull request #4 from cocos2d/develop ... pull request from main repo	2013-06-04 02:05:36 -07:00
James Chen	1610854902	fixed #2252: Updating iOS and mac project configuration.	2013-06-04 15:09:19 +08:00
James Chen	988269f9fa	fixed #2252: Updating iOS and mac project configuration.	2013-06-04 15:03:10 +08:00
flaming0	39ce9b4813	Update spine runtime	2013-06-04 14:46:46 +08:00
Ricardo Quesada	dccc4a3814	adds mising tests + cosmetic changes	2013-06-03 22:47:28 -07:00
James Chen	5d89a0cd0c	Merge branch 'develop' into update-spine-runtime-develop ... Conflicts: extensions/proj.win32/libExtensions.vcxproj.filters	2013-06-04 13:46:05 +08:00
Ricardo Quesada	cc771da2c2	Merge branch 'develop' into testmenu_sorted	2013-06-03 22:35:55 -07:00
Ricardo Quesada	cd52912f66	Main menu from test is sorted alphabetically ... Code was refactored. Now it is super easy to add a new test. No need to add it in 3 different places	2013-06-03 22:33:52 -07:00
Ricardo Quesada	69e8628626	Adds setObject to CCConfiguration ... also adds the test	2013-06-03 13:49:06 -07:00
Ricardo Quesada	39928d6a80	Adds std::function support in CCCallFunc ... And fixes some minor issues on the iOS and OS X projects	2013-06-03 12:13:24 -07:00
René Klačan	9e4c5bbca3	Merge pull request #3 from cocos2d/develop ... pull request from main repo	2013-06-03 04:07:43 -07:00
minggo	4f484cbcbf	enable c++11 for android projects	2013-06-03 11:02:41 +08:00
minggo	236286829b	enable c++11	2013-06-03 11:02:35 +08:00
minggo	2cdb48bc22	enable c++11 for iOS projects	2013-06-03 10:57:06 +08:00
James Chen	2fdeab46b1	fixed #1647: [WebSocket] Fixing compilation errors on win32.	2013-06-03 10:12:55 +08:00
James Chen	0ca86db0ff	fixed #1647: Renaming enumerations to Cocos2d-x style. ERROR and ERROR_TIMEOUT is defined as macros on Windows, fuck it.	2013-06-03 10:12:55 +08:00
James Chen	d0680258c6	fixed #1647: [WebSocket] Fixing compilation errors on win32.	2013-06-03 10:03:38 +08:00
James Chen	f2f0f031c7	fixed #1647: Renaming enumerations to Cocos2d-x style. ERROR and ERROR_TIMEOUT is defined as macros on Windows, fuck it.	2013-06-03 09:55:43 +08:00
flaming0	b87a89eaa4	Update spine runtime	2013-06-02 19:59:13 +04:00
James Chen	4b8f76c903	WS_ERROR -> ERROR, WS_STATE -> STATE.	2013-06-02 18:56:49 +08:00
James Chen	cedb427a6e	fixed #1647: Adding WebSocket support for Cpp and JSB. ... Conflicts: extensions/proj.win32/libExtensions.vcxproj extensions/proj.win32/libExtensions.vcxproj.filters	2013-06-02 18:55:57 +08:00
Rene Klacan	7c9a765e64	TestCpp sample respects keyboard support directive	2013-06-02 04:28:46 +02:00
James Chen	8e15cdf5fd	WS_ERROR -> ERROR, WS_STATE -> STATE.	2013-06-01 19:51:10 +08:00
Rene Klacan	a6f229a376	assert for fwrite return value	2013-06-01 02:06:11 +02:00
Rene	61ec83b742	Merge pull request #1 from cocos2d/develop ... Develop	2013-05-31 16:27:23 -07:00
James Chen	05a88c89dc	fixed #1647: Adding WebSocket support for Cpp and JSB.	2013-05-31 23:13:03 +08:00
Rene Klacan	07d6fefd8a	fixed typo that return value was ignored	2013-05-31 14:31:26 +02:00
Rene Klacan	50ad3e1c80	KeyboardDispatcher + tests for it on linux	2013-05-31 14:29:32 +02:00
minggo	57600783c4	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2013-05-31 10:29:39 +08:00
Ricardo Quesada	3383fc5f04	CCConfiguration supports default values in the query ... Adds tests for the new API as well	2013-05-31 10:25:34 +08:00
Ricardo Quesada	f6665d492b	CCConfiguration supports default values in the query ... Adds tests for the new API as well	2013-05-30 16:10:31 -07:00
minggo	1ff88de561	Merge pull request #2666 from jotel/ccdata-in-userdefault ... Ability to save/retrieve CCData into/from CCUserDefault	2013-05-29 19:40:23 -07:00
minggo	53365b9e46	Merge pull request #2669 from frranck/master ... adding norwegian language	2013-05-29 02:10:37 -07:00
Ricardo Quesada	a219f9c520	CCConfiguration has format ... CCconfiguration has a file format. It has a data and metadata	2013-05-29 17:09:04 +08:00
franck	81a0fed3e2	adding norwegian language...	2013-05-29 10:31:46 +02:00
Ricardo Quesada	ebb392ca8e	CCConfiguration has format ... CCconfiguration has a file format. It has a data and metadata	2013-05-28 18:15:16 -07:00
Jaroslaw Lewandowski	3f7c506638	Ability to save/retrieve CCData into/from CCUserDefault	2013-05-29 01:06:41 +01:00
minggo	6f624351b3	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ETC1-support	2013-05-28 11:36:05 +08:00
minggo	beef61fc90	issue #2161: android supports ETC format now	2013-05-27 14:42:22 +08:00
Lee, Jae-Hong	47fac0ed98	Implement CCEditBox for Tizen. (develop branch)	2013-05-26 20:40:13 +09:00
samuele3hu	338c7c8d67	issue #2103 add more test lua	2013-05-24 11:42:27 +08:00
James Chen	731b3c2324	fixed #2215: Updating project configuration for other platforms after adding ConfigurationTest.	2013-05-23 10:09:35 +08:00
Ricardo Quesada	207fc4be9c	Adds ConfigurationTest to the suite	2013-05-22 17:56:05 -07:00
James Chen	c1d85aaab2	Merge pull request #2611 from pyrasis/tizen_2.1 ... Update projects to Tizen 2.1 SDK.	2013-05-22 02:07:06 -07:00
Lee, Jae-Hong	220ac4982a	Update projects to Tizen 2.1 SDK.	2013-05-22 16:55:18 +09:00
James Chen	5c506e2edc	Merge pull request #2607 from pyrasis/background_foreground_tizen ... Implementing foreground and background status for Tizen port.	2013-05-21 21:43:51 -07:00
minggo	d1a8f54113	Merge pull request #2609 from j4m3z0r/emscriptenate ... Add Audio Support for Emscripten	2013-05-21 18:32:12 -07:00
Lee, Jae-Hong	d83ed86739	Implementing foreground and background status and modify CocosDenshion comment.	2013-05-21 22:48:51 +09:00
Lee, Jae-Hong	6f34c7cb46	Support Tizen 2.1 SDK.	2013-05-21 21:22:31 +09:00
minggo	cc2b00e9fe	Merge pull request #2573 from j4m3z0r/emscriptenate ... Use browser font rendering instead of FreeType	2013-05-20 22:50:28 -07:00
James Gregory	da7113a04f	Implement audio for Emscripten using SDL. Still needs methods to release samples when we're done with them.	2013-05-20 20:09:56 -07:00
James Chen	acef98a350	Merge pull request #2572 from pyrasis/tizen ... fixed #2185: Cocos2d-x Tizen support.	2013-05-20 20:08:28 -07:00
Lee, Jae-Hong	e1a947637f	Use libcocos2d.a HelloCpp, TestCpp, and SimpleGame.	2013-05-21 10:43:24 +09:00
James Gregory	a1ff189854	Query the GL canvas for its width and height and use that rather than hardcoding it. Default the frame size to the whole canvas, and update the samples to use iPad resolution (1024x768).	2013-05-17 12:39:18 -07:00
minggo	59a6635c7b	issue #1859:fix compiling error of AssetsManager.cpp	2013-05-17 09:47:31 +08:00
Lee, Jae-Hong	20dffcd179	Adding SampleGame project. for Tizen.	2013-05-16 21:20:49 +09:00
Lee, Jae-Hong	1c170aedd3	Adding README.mdown for TestCpp	2013-05-16 20:52:19 +09:00
Lee, Jae-Hong	65373f828c	Adding README.mdown for HelloCpp	2013-05-16 20:52:00 +09:00
Lee, Jae-Hong	bef09d51f9	Adding placeholder.txt for samples/Cpp/HelloCpp/proj.tizen/res directory.	2013-05-16 20:49:13 +09:00
Lee, Jae-Hong	6b990209a2	Set the static libarary pathes.	2013-05-16 20:25:12 +09:00
Lee, Jae-Hong	6289a20fcb	Adding design size for Tizen.	2013-05-16 20:23:21 +09:00
Lee, Jae-Hong	fc28943b3f	set screen orientation landscape. TestCpp project.	2013-05-16 20:17:41 +09:00
Lee, Jae-Hong	2a332a5862	Replace \ to / in include and library pathes.	2013-05-16 20:16:27 +09:00
Lee, Jae-Hong	c426370f63	Replace tab to spaces.	2013-05-16 20:14:40 +09:00
Lee, Jae-Hong	bd71c8775d	Modify library link order.	2013-05-16 20:14:16 +09:00
Lee, Jae-Hong	09a0eec90a	Enable chipmunk.	2013-05-16 20:14:03 +09:00
Lee, Jae-Hong	34599daf9d	Enable Box2D.	2013-05-16 20:13:36 +09:00
Lee, Jae-Hong	9bbfdf2adb	Adding placeholder.txt files.	2013-05-16 20:12:31 +09:00
Lee, Jae-Hong	ca69bf39c8	Modify the output filename.	2013-05-16 20:11:33 +09:00
Lee, Jae-Hong	e445af65ad	Adding license.	2013-05-16 20:11:14 +09:00
Lee, Jae-Hong	9db7b7f3a3	Adding TestCpp project for Tizen.	2013-05-16 20:10:53 +09:00
Lee, Jae-Hong	e459129fac	Move to rootstraps directory.	2013-05-16 20:06:25 +09:00
Lee, Jae-Hong	7e1be64f28	Allocate memory for AppDelegate.	2013-05-16 19:59:59 +09:00
Lee, Jae-Hong	ab8ede5ff8	Adding Osp Application, Osp Form Layer and implementing CCEGLView.	2013-05-16 19:55:26 +09:00
Lee, Jae-Hong	112ff3c820	Adding manifest.xml.	2013-05-16 19:55:00 +09:00
Lee, Jae-Hong	e286759965	Adding placeholder.txt	2013-05-16 19:54:38 +09:00
Lee, Jae-Hong	690e383950	Adding HelloCpp sample for Tizen.	2013-05-16 19:52:59 +09:00
minggo	1a947ce1cd	Merge pull request #2567 from minggo/AssetsManager-asynchronization ... Make AssetsManager download resources in a new thread	2013-05-15 20:24:05 -07:00
carlo morgantini	36b88039a1	CCLabelTTF C++ test fixed	2013-05-15 16:37:08 -07:00
carlo morgantini	cab90dd276	CCTextDefinition is passed now by pointers	2013-05-15 16:35:24 -07:00
carlo morgantini	2430d79642	changed the label test (shadows + stroke) for using ccTextDefinition when creating CCLabelTTF	2013-05-15 16:29:33 -07:00
carlo morgantini	c727fa33c0	CCLabelTTF have now a tint, plus bug fixing and code clean up	2013-05-15 16:29:33 -07:00
carlo morgantini	221884f6d4	better CCTexture2D API for init texture with shadow and stroke	2013-05-15 16:29:32 -07:00
carlo morgantini	dd9b4a8932	new shadow and stroke for CCLabelTTF	2013-05-15 16:12:43 -07:00
minggo	d8a0b0c130	issue #1859:download resources in a new thread	2013-05-15 17:09:28 +08:00
James Chen	dea45e8e79	fixed #2150: Adding tests for this issue and fix compilation error of CCScale9Sprite.	2013-05-13 17:57:30 +08:00
James Chen	8ebde4df7f	Merge branch 'data-visitor' of https://github.com/dumganhar/cocos2d-x into iss2142-datavisitor	2013-05-10 15:54:47 +08:00
James Chen	db464530fb	fixed #2142: updating win32.	2013-05-10 15:46:24 +08:00
James Chen	42427634f2	fixed #2142: Adding datavisitor support for other platforms except win32.	2013-05-10 15:37:40 +08:00
James Chen	cbafaf67a6	fixed #2142: Adding CCDataVisitor and Implementing CCPrettyPrinter, iOS port is ok.	2013-05-10 15:07:05 +08:00
minggo	ee8ec25f6a	Merge pull request #2541 from j4m3z0r/emscriptenate ... Compile for Emscripten in asm.js mode	2013-05-08 18:53:35 -07:00
Ed Bartley	2e8abad402	Merge pull request #1 from minggo/TexturePacker-SpriteSheetProtection ... Add TexturePackerEncryptionTest for other platforms	2013-05-08 07:25:09 -07:00
Ed Bartley	3216995d4a	Merge branch 'master' into TexturePacker-SpriteSheetProtection	2013-05-08 10:22:14 -04:00
minggo	5e660e9c71	add TexturePackerEncryptionTest into vs2010 project	2013-05-08 11:32:59 +08:00
James Chen	3c39cb336c	Don't use "recursive" property to search header file in "cocos2d-x/external" folder for TestCpp project.	2013-05-08 11:23:05 +08:00
minggo	806c728a2d	add TexturePackerEncryptionTest into android, mac, linux, native client, marmalade project	2013-05-08 10:53:24 +08:00
minggo	8e78f8a7eb	Merge branch 'TexturePacker-SpriteSheetProtection' of https://github.com/FlowerpotGames/cocos2d-x into TexturePacker-SpriteSheetProtection	2013-05-08 10:32:26 +08:00
James Gregory	25bded7faf	Now validates as asm.js: Disable HttpClient, pthread_cond_signal and eglReleaseThread in Emscripten.	2013-05-07 17:25:39 -07:00
Ed Bartley	3ff7e5871c	Added function ccSetPvrEncryptionKey(…) to set the encryption key in a single function call. ... Updated the TextureAtlasEncryptionTest to show how to use the ccSetPvrEncryptionKey(…) function. Updated the notes and header docs for improved clarity.	2013-05-07 10:14:38 -04:00
James Chen	912905054e	fixed #2123: Refactoring network extension, fixing unlikely memory leaks, adding PUT/DELETE methods. ... Merge branch 'curl_raii' of https://github.com/sergey-shambir/cocos2d-x into sergey-shambir-curl_raii Conflicts: extensions/network/HttpClient.cpp samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp	2013-05-07 15:37:25 +08:00
James Chen	140927494a	Updating http test url, removing www prefix.	2013-05-07 15:13:55 +08:00
minggo	d58f21dc76	Merge pull request #2521 from minggo/emscriptenate ... fix conflict of #2050	2013-05-06 23:51:38 -07:00
James Chen	a9aafdafac	Merge pull request #2490 from coolengineer/pull-request-httpclient ... fixed #2119: Introduce HttpResponse callback selector type to resolve #2365, fixed version ;-)	2013-05-06 23:44:20 -07:00
James Chen	2418e72a0e	Fix compilation errors for linux port.	2013-05-07 14:36:01 +08:00
minggo	1166a02e13	resolve conflict for #2505	2013-05-07 14:31:00 +08:00
minggo	ea5d7bc5ad	Merge pull request #2361 from tiantian20007/dictStuff ... Implement CCDictionary::writeToFile();	2013-05-06 23:17:11 -07:00
James Gregory	5be2da896a	Add resources to TestCpp makefile	2013-05-06 21:29:43 -07:00
James Gregory	568562fac9	Update build process for HelloCpp to build .js and .data files separately, pulling both in from index.html	2013-05-06 21:29:43 -07:00
James Gregory	cd166c789f	Add missing files to testcpp makefile	2013-05-06 21:17:22 -07:00
James Gregory	4581fa7309	Instruct Emscripten to emit .html file for HelloCpp sample.	2013-05-06 21:06:07 -07:00
James Gregory	6bbd6ddf6c	Add missing fonts to TestCpp makefile, fixing layertest.	2013-05-06 21:00:39 -07:00
James Gregory	83612c98f9	Add missing assets from TestCpp's Makefile	2013-05-06 21:00:39 -07:00
James Gregory	7cb51f4eb4	Add missing assets from "Extentions" to TestCpp.	2013-05-06 21:00:39 -07:00
James Gregory	5bd1ea9d41	Delete tmp directory after generating data file.	2013-05-06 20:59:50 -07:00
James Gregory	6994d451fe	Correct the resolution in main.cpp for TestCpp for Emscripten	2013-05-06 20:59:49 -07:00
James Gregory	ac2986139a	Copy resources in HelloCpp makefile	2013-05-06 20:59:47 -07:00
James Gregory	749c92a572	Basis of Makefile for SimpleGame sample.	2013-05-06 20:59:47 -07:00
James Gregory	297f0fb0ac	Add resources to TestCpp makefile	2013-05-06 20:59:47 -07:00
James Gregory	130ab4b584	Disable libcurl tests for Emscripten.	2013-05-06 20:59:47 -07:00
James Gregory	51d42d7392	Add index.html for SimpleGame and TestCpp. Set resolution on all canvases to 800x500 to match code.	2013-05-06 20:59:47 -07:00
James Gregory	aa2739a109	Update build process for HelloCpp to build .js and .data files separately, pulling both in from index.html	2013-05-06 20:58:45 -07:00
James Gregory	9d6db6953e	Instruct Emscripten to emit .html file for HelloCpp sample.	2013-05-06 20:58:45 -07:00
James Gregory	5a23190672	Add main.cpp files for app samples	2013-05-06 20:58:43 -07:00
James Gregory	c45e5797cf	Add Makefiles for Emscripten + Emscripten external	2013-05-06 20:58:02 -07:00
minggo	923234a095	Merge pull request #2399 from gelldur/linking_errors_linux_lub_curl ... Fixing linking errors for TestCPP with libcurl	2013-05-06 20:52:58 -07:00
minggo	80dfd4d493	Merge pull request #2407 from sergey-shambir/attribute_format ... Added __attribute__(__format__()) for CCLog and CCString	2013-05-06 20:06:52 -07:00
Ed Bartley	040e6fc5b9	Promote global functions and variables for PVR decryption to ZipUtils class. ... Rename PVR decryption functions and variables to better fit in the Cocos2DX framework. Improve log error notes. Update TextureAtlasEncryptionTest to match revised function call in ZipUtils. Update ccSetPvrEncryptionKeyPart documentation to clarify that encryption is never 100% secure.	2013-05-06 10:04:45 -04:00
minggo	73dba9ef2c	Merge pull request #2514 from savdalion/extend-tests ... Added example for russian language in TestCpp / LabelTest / BMFontUnicode	2013-05-05 23:52:30 -07:00
James Chen	f12d118cb9	Merge branch 'travis' of https://github.com/sbc100/cocos2d-x into sbc100-travis	2013-05-06 10:24:28 +08:00
savdalion	bade1f086d	Added example for russian language in TestCpp / LabelTest / BMFontUnicode.	2013-05-04 15:28:24 +03:00
Darragh Coy	212feb8d8c	Add CCDirector::popToSceneStackLevel(int level) ... This replicates a change made to cocos2d-iphone in the following commit: 59c5272bff The cocos2d-iphone change was originally discussed in the following pull request: http://github.com/cocos2d/cocos2d-x/pull/2210	2013-04-30 23:33:22 +01:00
Sam Clegg	924d271410	Fix warnings.	2013-04-29 16:46:48 -07:00
Hojin Choi	8b9644150d	Changes samples' function prototypes to apply newly introduced callback type.	2013-04-28 23:42:31 +09:00
minggo	55e4de40f6	make AssetsManagerTest and TestLua run on iOS device	2013-04-28 11:19:03 +08:00
tiantian	2ba5035e5a	Make sure XMLDocument is deleted; Code clean up; Add test;	2013-04-28 00:36:37 +08:00
minggo	cd0cf6eee9	Merge https://github.com/cocos2d/cocos2d-x	2013-04-27 18:30:41 +08:00
minggo	afb91e752d	include cocos2d.h to make android template work	2013-04-27 17:16:27 +08:00
James Chen	7f70a4c6e8	Merge pull request #2474 from dumganhar/bb-fixes ... Some fixes for Blackberry port.	2013-04-26 23:48:12 -07:00
James Chen	edc8444ca4	Updating blackberry project configurations.	2013-04-27 14:07:54 +08:00
minggo	fa0370bba5	disable depth test for clipping test	2013-04-27 11:33:23 +08:00
minggo	d40fdd24b7	fixed #2075:add SpiteTest into Android.mk	2013-04-26 14:02:13 +08:00
Ed Bartley	f89d39953e	Add PVR.CCZ encryption support to ZipUtils based upon http://www.codeandweb.com/texturepacker/contentprotection ... Add sample to TestCPP.	2013-04-25 13:40:49 -04:00
minggo	93ed85903f	Merge pull request #2437 from dumganhar/iss2075-spine-support ... fixed #2075: Adding spine editor support.	2013-04-24 01:12:23 -07:00
James Chen	abacdc9921	tabify for makefile.	2013-04-24 15:15:25 +08:00
James Chen	8e5610fc58	issue #2075: Updating Makefile of TestCpp for native client port.	2013-04-24 15:00:53 +08:00
James Chen	6c1890f8ab	issue #2075: Updating TestCpp project setting for marmalade and linux.	2013-04-24 14:58:11 +08:00
minggo	c6dfee706c	fix memory leak in FontTest	2013-04-24 14:49:52 +08:00
James Chen	7b138c6be9	issue #2075: Adding spinetest in TestCpp for win32.	2013-04-24 14:48:39 +08:00
James Chen	0c3cb27113	issue #2075: Updating TestCpp for mac.	2013-04-24 14:34:41 +08:00
James Chen	2d1172814d	issue #2075: Adding spine editor support. Adding a new test 'SpineTest' in TestCpp, adding the parse code in "extensions/spine". It works only on iOS now.	2013-04-24 13:57:34 +08:00
minggo	d4efbcfcef	don't include unneeded header file	2013-04-23 10:10:14 +08:00
Sergey Shambir	8507f7a386	network: Added PUT and DELETE request types	2013-04-21 20:54:52 +04:00
Sergey Shambir	e5b2f300f9	Added CC_FORMAT_PRINTF(x,y) macro to warn on CCLog() format errors ... Uses printf format. Enabled for GCC and clang.	2013-04-19 11:54:08 +04:00
minggo	f9aa710c36	fix a compiling error	2013-04-19 10:34:40 +08:00
Dawid Drozd	a153fa1f94	Fixing linking errors for TestCPP with libcurl	2013-04-18 12:14:18 +02:00
minggo	78d3c7f048	fixed #1613:not reload resources on Android platform after return from background	2013-04-17 15:34:57 +08:00
Sam Clegg	ffb7360e46	Enable easy swithing between Box2D and chipmunk in linux and nacl ... The ENABLE_BOX2D/ENABLE_CHIPMUNK defines were previously hardcoded in the Makefiles. Now you get chipmunk by default on both platforms and can enble Box2D by setting USE_BOX2D in your environment. Also remove erroneous -D__CC_PLATFORM_FILEUTILS_CPP__ and -D__CC_PLATFORM_IMAGE_CPP__ from linux Makefiles. These should never be defined globally like this.	2013-04-15 07:35:50 -07:00
James Chen	0c8e3e9129	Merge pull request #2349 from rogerzanoni/master ... fixed #2052: [Linux] [-Werror=array-bounds] error appears when compiling Box2dTestBed.	2013-04-14 19:45:35 -07:00
James Chen	a5d78830db	fixed #1860: onNodeLoaded will be called twice if ccb was added as a CCBFile.	2013-04-15 10:39:44 +08:00
Roger Zanoni	05873ad7a0	Check array boundaries to avoid the "array-bounds" error on linux ... Compiling on linux causes the error "array subscript is above array bounds [-Werror=array-bounds]". This commit adds boundary checking using the constant defining the maximum number of items in the "nuke" array. Signed-off-by: Roger Zanoni <roger.zanoni@openbossa.org>	2013-04-10 10:53:52 -04:00
James Chen	6e9fcf8c05	fixed #2048: Adding test case for variable cell sizes in CCTableView.	2013-04-10 16:38:00 +08:00
James Chen	32406efec2	Merge branch 'newlines_in_cclog' of https://github.com/sbc100/cocos2d-x into sbc100-newlines_in_cclog ... Conflicts: cocos2dx/proj.linux/cocos2dx.mk	2013-04-10 14:17:23 +08:00
James Chen	935b7af11c	Merge branch 'openal' of https://github.com/azmeuk/cocos2d-x into azmeuk-openal ... Conflicts: AUTHORS	2013-04-08 17:53:14 +08:00
James Chen	c3a177e5e6	Merge pull request #2268 from Weeds/ccscheduler-fix ... fixed #2003: Fixed potential crash in CCScheduler::removeHashElement.	2013-04-08 02:00:22 -07:00
minggo	2436d87cb3	Merge pull request #2256 from waiter/master ... Add CCRemoveSelf Action	2013-04-06 19:09:17 -07:00
Sergej Tatarincev	202edc1597	CCEditBox test for separate font name/size setters	2013-04-03 17:20:01 +03:00
waiter	c9e36438a8	Add ActionRemoveSelf in TestCpp/ActionTest ... Add ActionRemoveSelf in TestCpp/ActionTest	2013-04-01 10:18:26 +08:00
Andre Rudlaff	bcab80a0f1	Added TestCase for crash in CCScheduler ... The code seems to look wrong (and it sure is) however in real-world applications it might not be that eays to tell who has ownership of the object, especially if weak references are involved.	2013-03-29 14:48:35 +01:00
Éloi Rivard	2664c5e4b9	Makefile	2013-03-29 09:41:15 +01:00
Éloi Rivard	b9ec3ead65	* Fixed CocosDenshionTestBug	2013-03-29 09:32:50 +01:00
James Chen	c9cdb81020	Removing unused codes.	2013-03-25 14:30:25 +08:00
James Chen	f7b2ca2125	Fixing compilation errors when enable CC_ENABLE_PROFILERS.	2013-03-25 11:47:27 +08:00
billy1380	fc806d0496	added sample game xcode project for mac	2013-03-23 17:21:26 +00:00
billy1380	cdfe693583	- changed cocos2d mac project to support universal build and x86 ... - fixed issues associated with that	2013-03-23 16:04:51 +00:00
fape	e9343c2d8a	- update README files ... - format javascript sample README files like cpp samples	2013-03-21 16:04:53 +01:00
minggo	949700ca1a	issue #1848:use CCConfiguration::supportsPVRTC() to determine if the device support powertc format	2013-03-21 15:50:41 +08:00
James Chen	e2e9bc8ce0	Fixing memoryleaks.	2013-03-21 09:00:55 +08:00
James Chen	8c70955547	[VS2012] Adding dependence for AssetsMangerTest.	2013-03-21 08:11:02 +08:00
James Chen	33fc16261b	Updating blackberry project settings.	2013-03-20 18:34:28 +08:00
minggo	ee37529884	remove unsupported parameter in android	2013-03-20 16:04:42 +08:00
James Chen	7e1efa7c89	fix of wrong group of TimelineCallbackTest in TestCpp.vcxproj.filters.	2013-03-20 14:14:01 +08:00
James Chen	aa5f7ffb6a	Updating project setting of testcpp for Marmalade.	2013-03-19 17:46:49 +08:00
James Chen	3ed479d7f4	Updating project configuration of TestCpp for win32.	2013-03-19 17:06:12 +08:00
James Chen	ef98d95e75	Updating project configuration of TestCpp for Android, Linux, Mac and nacl.	2013-03-19 16:59:39 +08:00
James Chen	6110d5df74	Merge pull request #2201 from dumganhar/rohankuruvilla-ccbreader ... fixed #1838: Fix bugs of CCBReader and adding test for the new feature(Timeline callback & playing effect) of CocosBuilder.	2013-03-19 01:35:26 -07:00
James Chen	8b466f12a2	fixed #1838: Adding test for the new feature(Timeline callback & playing effect) of CocosBuilder.	2013-03-19 16:33:23 +08:00
minggo	0a8b4f923f	delete parameter(-o igncr) when running build_native.sh in eclipse project	2013-03-19 13:48:32 +08:00
minggo	15733e0089	Merge pull request #2187 from minggo/merge-fape-android-eclipse ... merge pull request and fix some conflicts	2013-03-18 01:16:10 -07:00
minggo	58618172e6	merge pull request and fix some conflicts	2013-03-18 16:15:48 +08:00
minggo	529a9bf394	make AssetsManager work on iOS	2013-03-18 15:57:30 +08:00
minggo	19cf6665c4	Merge pull request #2176 from folecr/easierandroidbuild ... Improvements to android build setup and samples' build scripts	2013-03-17 18:58:11 -07:00
Sam Clegg	04c1a863a0	Remove tailing newlines from CCLog messaages. ... Some CCLog message contained trailing newlines which made the logs hard to read on many platforms. The solution here is to stip trailing newlines on those platforms, and also to remove the newlines from the existing log messages.	2013-03-16 09:01:21 -07:00
folecr	6dba49f25b	Android build_native.sh now reads local.properties for environment variables	2013-03-15 16:44:16 -07:00
Ricardo Quesada	59ca1e198a	README.md eclipse improvements ... Includes screenshots, fixes instructions, looks better	2013-03-15 15:20:39 -07:00
minggo	a987c87844	Merge pull request #2151 from sbc100/fix_warning ... Fix warning in linux build.	2013-03-12 19:30:51 -07:00
Sam Clegg	863286b0b9	Fix warning in linux build. ... Also, define _DEBUG rather then DEBUG in linux and nacl makefiles by default, and limit the command line definions that are used when building Box2D.	2013-03-12 16:59:22 -07:00
fape	75c68f178a	Rename cocos2dx.hpp to jsb_cocos2dx_auto.hpp in AppDelegate.cpp	2013-03-12 22:18:45 +01:00
James Chen	ae1c64573e	Merge pull request #2046 from rohankuruvilla/eclipse ... fixed #1827: Eclipse Project import - Documentation Added and Tested.	2013-03-12 01:36:17 -07:00
James Chen	3f709c3edb	Merge pull request #2134 from AsadR/remove-all-notifications-for-target ... fixed #1822: Added CCNotificationCenter::removeAllObservers(CCObject *target).	2013-03-10 22:41:59 -07:00
Asad ur Rehman	c1a8059998	Added CCNotificationCenter::removeAllObservers ... This is a helper method that removes all observers with a particular target. It can be used in destuctors to ensure no observers trigger callbacks on objects that no longer exist.	2013-03-10 19:34:01 +05:00
Sam Clegg	9eb9524659	Add 'make run' target for linux projects. ... Also, a few other linux build system improvements: - Add linux build of SimpleGame - Update multi-platform templates to use new common build system. - Remove redundant main.h files.	2013-03-08 10:01:03 -08:00
Rohan Kuruvilla	7149f0598d	Adding missing eclipse project files	2013-03-07 12:13:50 -08:00
Rohan Kuruvilla	360519dad5	Removing /bin/bash for executing build command, and keep only bash	2013-03-07 12:09:17 -08:00
minggo	dd8681b18b	Merge pull request #2113 from minggo/refactor-ccuserdefault ... Refactor ccuserdefault	2013-03-06 23:05:50 -08:00
Sam Clegg	7ad171d8ee	Use same top level Makefile for nacl and linux builds. ... Also, re-use some of the concepts from the linux build system (such as quite by default) in the nacl build. Fix remaining warnings in NaCl builds.	2013-03-06 13:02:55 -08:00
Sam Clegg	8677dad3c6	Improved build system from linux. ... This change makes several fundamental improvements to the linux build system: - Remove duplication: a lot of the common make logic is now in a central shared makefile: cocos2dx/proj.linux/cocos2dx.mk - Quiet by default: unless you specify V=1 on the commandline the output is now very clean and quiet. - Dependencies: gcc's automatic dependancy generation is now used (-MMD). This means that if you change a header file then all the object that depend on it now get rebuilt. - Don't store objects in the source tree: previously object files were stored alongside the sources, which meant that debug and release object clobbered each other which leads to confusion and lots of unnecessary rebuilding.Q - Library dependencies: each binary now depends on the libraries it links aginst. This means that if the cocos2dx library changes then all examples will get re-linked. - Top level Makefile: there is now a top level Makefile that can be shared/used by any platform the uses make as the build system (for example NaCl). Everything can be built by simply running 'make' at the top level. e.g: make DEBUG=1 make DEBUG=1 clean	2013-03-06 13:02:55 -08:00
minggo	648e9a7bf1	issue #1529:use NSUserDefaults on iOS and SharedPreferences on Android to implement CCUserDefault	2013-03-06 16:36:44 +08:00
minggo	3ce5a99c8d	Merge pull request #2092 from sbc100/fix_all_warnings ... Fix all compiler warnings produced by gcc.	2013-03-05 17:59:35 -08:00
Sam Clegg	4d0aa01c4b	Fix all gcc warnings in NaCl build.	2013-03-05 17:01:40 -08:00
Sam Clegg	38878b084b	Fix all compiler warnings produced by gcc. ... This allows the linux and NaCl builds (and perhaps others) to be compiles with -Wall and -Werror, and it makes the build output much less noisy.	2013-03-05 17:01:00 -08:00
Rohan Kuruvilla	7d90fc2254	Adding README files to each sample project	2013-03-04 11:50:39 -08:00
Rohan Kuruvilla	4d14afa686	Modifying C++ project files to remove dependency on scripting	2013-03-04 11:50:39 -08:00
Rohan Kuruvilla	1ba2b5d169	Adding eclipse project files for TestCpp and HelloCpp	2013-03-04 11:50:39 -08:00
minggo	a330309628	issue #1686:add background color layer in CCTexture2DTest	2013-03-04 11:53:06 +08:00
Sam Clegg	33c422d1d5	Add new port: Native Client	2013-03-02 12:15:24 -08:00
minggo	163ab2c0be	issue #1686:add () in defining a macro in RenderTextureTest.cpp	2013-03-01 18:37:37 +08:00
minggo	8c80210007	issue #1686:not invoke CCLayer::init() in LayerTest to enable receiving touch messages	2013-03-01 17:11:02 +08:00
minggo	fb7642a332	issue #1686:change font size and fix a small bug in ActionTest	2013-03-01 11:25:40 +08:00
minggo	27b62952a4	issue #1686:draw polygon in CCFollowAction test case	2013-03-01 11:12:23 +08:00
minggo	70a70d38fc	Merge pull request #9 from dumganhar/iss1686-synchronize ... issue #1686: Synchronizing LayerTest, LabelTest.	2013-02-28 00:48:32 -08:00
James Chen	3b3adc3eea	issue #1686: Synchronizing LayerTest.	2013-02-28 16:45:59 +08:00
minggo	b952634d8e	issue #1686:synchronized NodeTest	2013-02-28 16:41:39 +08:00
minggo	dbd5a4069e	issue #1686:synchronized ParticleTest	2013-02-28 16:40:32 +08:00
minggo	738b96e478	Merge branch 'iss1686-synchronize' of https://github.com/minggo/cocos2d-x into iss1686-synchronize	2013-02-28 16:37:00 +08:00
minggo	c75e440e22	issue #1686:synchronized RenderTexture	2013-02-28 16:35:42 +08:00
James Chen	9d4c128391	tab ~> 4 spaces	2013-02-28 16:06:07 +08:00
James Chen	16422d7194	issue #1686: Updated LayerTest.	2013-02-28 16:03:55 +08:00
James Chen	69a746fc8b	issue #1686: Synchronizing LabelTest	2013-02-28 15:57:15 +08:00
James Chen	dbe1e2e427	Merge branch 'iss1686-synchronize' of https://github.com/minggo/cocos2d-x into iss1686-synchronize	2013-02-28 15:37:15 +08:00
James Chen	88fe33e927	Sync ActionsTest.	2013-02-28 15:32:27 +08:00
minggo	545882cb81	issue #1686:synchronized ShaderTest	2013-02-28 15:01:41 +08:00
minggo	f5e334d9e3	issue #1686:synchronized Texture2DTest	2013-02-28 14:54:09 +08:00
James Chen	5abec07fb5	Updated ActionsTest.	2013-02-28 14:42:45 +08:00
James Chen	e4b6495aac	Updated ActionEaseTest.	2013-02-28 14:42:32 +08:00
James Chen	d572a53a1d	Merge pull request #2050 from dumganhar/tableview-touch-fix ... fixed #1751: Clicking outside of CCTableViewCell will also get response when container size is smaller than view size.	2013-02-26 06:56:08 -08:00
James Chen	87935ac436	tableview touch area fix.	2013-02-26 19:59:14 +08:00
minggo	5a1e16f105	Merge pull request #2048 from minggo/iss1489-AssetsManager ... add namespace to AssetsManager	2013-02-26 00:45:06 -08:00
minggo	e0991fbd67	fixed #1489:add namespace to AssetsManager	2013-02-26 16:43:46 +08:00
minggo	a07f2b1e03	Merge pull request #2047 from minggo/iss1489-AssetsManager ... assets manager works ok	2013-02-26 00:32:01 -08:00
minggo	d35af7b6fe	fixed #1489:sample works ok	2013-02-26 16:29:52 +08:00
James Chen	efdb9180e4	fixed #1750: [iOS] CCEditBox's position is incorrect when it's added to a non-fullscreen CCNode.	2013-02-26 11:16:26 +08:00
James Chen	0ece3056ee	fixed #1749: Fixed compilation errors for win32.	2013-02-25 22:50:15 +08:00
James Chen	5fafaa8b67	Merge branch 'master' of https://github.com/neokim/cocos2d-x ... Conflicts: scripting/javascript/bindings/generated	2013-02-25 22:18:57 +08:00
James Chen	2eab8f75d4	Merge branch 'iss1489-AssetsManager' of https://github.com/dumganhar/cocos2d-x into minggo-iss1489-AssetsManager	2013-02-25 18:09:05 +08:00
James Chen	17d9837b45	Adds AssetsManager support for win32.	2013-02-25 18:03:38 +08:00
minggo	442e8ea0cc	issue #1489:android works ok	2013-02-25 16:58:10 +08:00
Neo Kim	93195ebe17	Modified a preprocessor line which distinguishes device platform in CCEditBox test code.	2013-02-25 15:44:38 +09:00
minggo	c8baa94753	issue #1489: update ios libcurl and add android project	2013-02-25 14:33:04 +08:00
minggo	2d225437e5	Update samples/Cpp/AssetsManagerTest/README.md	2013-02-22 17:26:21 +08:00
minggo	32fbced31f	issue #1489:modify sample code and add readme	2013-02-22 16:02:53 +08:00
minggo	ed1cbb94c2	Merge https://github.com/cocos2d/cocos2d-x into iss1489-AssetsManager	2013-02-22 11:04:40 +08:00
minggo	91f5972b42	issue 1489:add AssetsManager	2013-02-22 11:04:09 +08:00
James Chen	b50515c5bc	Merge pull request #1873 from ThePickleMan/master ... fixed #1742: Added 'rotationIsDir' property to ParticleSystem.	2013-02-21 19:02:39 -08:00
Neo Kim	a7c87f3b38	Add 'setFont' and 'setAnchorPoint' to CCEditBox	2013-02-20 22:41:08 +09:00
James Chen	a9fede525a	issue #1733: Marmalade ok.	2013-02-19 18:26:00 +08:00
James Chen	60ab4c4886	issue #1733: Updated linux makefile.	2013-02-19 18:06:30 +08:00
James Chen	fc1848eb02	issue #1733: Updated linux makefile.	2013-02-19 17:39:27 +08:00
James Chen	a94aa15031	issue #1733: Adding extension project for linux.	2013-02-19 17:28:49 +08:00
James Chen	339a60a649	Adding execute permissions for list.sh.	2013-02-19 14:21:56 +08:00
mutoo	4bc06c7fcb	changed fileformat of list.sh to unix ... list.sh doesn't work in linux/mac due to its fileformat	2013-02-19 12:20:02 +08:00
James Chen	2626005d20	issue #1712: Updating project setting for blackberry.	2013-02-17 16:26:08 +08:00
minggo	ba8f26fed9	Merge pull request #1969 from minggo/iss1702-writablePath ... modify writable path for iOS and Android	2013-02-06 22:16:46 -08:00
fape	96b92e2bd7	Group tests under test "folder"	2013-02-06 14:52:18 +01:00
minggo	0c5bcb3f7b	issue #1702:fix a typo error	2013-02-06 18:04:40 +08:00
James Chen	fb9ac31d08	fixed bugs in CCUserDefault.cpp after using tinyXML2, fixed warnings in SpriteTest.cpp.	2013-02-06 17:20:54 +08:00
James Chen	cc690c5a86	issue #1770: Adding webp support for mac port.	2013-02-06 13:06:48 +08:00
James Chen	1e5431bcc5	issue #1770: Adding webp support for blackberry and marmalade.	2013-02-06 10:52:13 +08:00
James Chen	64248386a2	issue #1770: Updating iOS project configuration and adding WEBP test demo.	2013-02-05 11:37:13 +08:00
James Chen	a22986bc82	Using new api of CCFileUtils for SimpleGame.	2013-02-03 15:38:44 +08:00
James Chen	c362f7e439	issue #1687: Adding new test - Checking whether file exists.	2013-02-01 22:18:43 +08:00
James Chen	157e229f8c	fixed #1634: Added the very first implementation of CCEditBox for Win32.	2013-01-31 14:04:49 +08:00
James Chen	3bdfb82e9c	Merge branch 'gles20' of https://github.com/jpridavok/cocos2d-x into win32-editbox ... Conflicts: samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters	2013-01-30 22:31:19 +08:00
James Chen	001d3382a9	[TestCpp/EffectsAdvancedTest] Adding getPosition method for Len3DTarget.	2013-01-29 12:59:43 +08:00
James Chen	2694cb150b	CCFileUtils::s|gSearchPath -> CCFileUtils::s\gSearchPaths.	2013-01-29 09:56:38 +08:00
James Chen	2e421304ca	Merge pull request #1911 from dumganhar/iss1683-ccfileutils ... issue #1683: Updating CCFileUtils for Blackberry and Marmalade.	2013-01-28 05:43:41 -08:00
minggo	05363ee8dd	Merge pull request #1908 from minggo/master ... fix some warnings	2013-01-28 04:36:01 -08:00
minggo	249b935be8	fix some warnins	2013-01-28 20:34:52 +08:00
James Chen	59f2ae13f8	issue #1683: Updating CCFileUtils for Blackberry and Marmalade.	2013-01-28 20:12:48 +08:00
James Chen	031380d4e9	issue #1683: Updating CCFileUtils.cpp for Win32.	2013-01-28 19:49:34 +08:00
James Chen	733a334ec2	issue #1683: Fixed compilation errors for linux.	2013-01-28 18:32:34 +08:00
James Chen	632f99b611	issue #1683: Updating CCFileUtils for MAC.	2013-01-28 17:54:49 +08:00
James Chen	e736ed487f	issue #1683: Adding default search path if developer didn't pass it.	2013-01-28 17:44:53 +08:00
James Chen	16ef70c069	issue #1683: Updating FileUtilsTest.cpp.	2013-01-28 17:43:53 +08:00
James Chen	f69ef6182c	issue #1683: Adding FileUtilsTest.	2013-01-28 15:17:20 +08:00
James Chen	c19b9885fe	Adding COCOS2D_DEBUG=1 for sample projects.	2013-01-28 10:22:32 +08:00
James Chen	d532670640	Removing some CCLOG.	2013-01-27 20:16:46 +08:00
James Chen	eec0ba3c19	Getting full path in before playing sound.	2013-01-27 19:20:49 +08:00
James Chen	2b9f79efc0	Merge pull request #1882 from dumganhar/memoryleak-action ... Fixed memory leaks in CCActionCatmullRom class.	2013-01-22 22:41:44 -08:00
James Chen	b5efd699bf	Fixed a memory leak in ActionsTest.	2013-01-23 14:40:11 +08:00
James Chen	de8a237d73	Merge pull request #1881 from dumganhar/linux-fix ... fixed #1676: Refactoring Makefile and eclipse project configuration for LINUX port.	2013-01-22 03:22:41 -08:00
James Chen	3f57b01f94	Fix for 32bit.	2013-01-22 18:30:16 +08:00
James	1d7650767b	Updated Makefile and project configurations for linux port.	2013-01-22 16:45:35 +08:00
James Chen	219657ee1a	Merge pull request #1872 from moadib/android_manifest_gles20 ... fixed #1673: Added <uses-feature android:glEsVersion="0x00020000"/> to AndroidManifest.	2013-01-21 23:52:32 -08:00
James	680fbe3517	Fixed compilation errors for linux port.	2013-01-22 15:21:37 +08:00
James Chen	0187bb6504	Merge pull request #1876 from dumganhar/iss1639-custom-property ... fixed #1639: Added custom property support for CCBReader.	2013-01-21 23:03:53 -08:00
PickleMan	c4d5bf8c85	Added test for rotation is dir in particle system	2013-01-21 12:35:59 -05:00
James Chen	c0d568da9b	fixed #1639: Added custom property support for CCBReader.	2013-01-21 18:37:17 +08:00
moadib	e39829269d	Added <uses-feature android:glEsVersion="0x00020000" /> to AndroidManifest.xml	2013-01-21 13:03:55 +04:00
James Chen	4a68e4ab89	fixed #1670: Fixed memory leak in CCBReader.	2013-01-21 14:40:29 +08:00
minggo	a7dca5c05a	fixed #1547:set selected menu item to null when it is removed from a menu	2013-01-17 15:04:48 +08:00
johnangel	a1155f52e6	Merge remote branch 'upstream/gles20' into gles20	2013-01-11 21:48:47 +01:00
Jozef Prídavok	9889b4f9fd	Added the very first implementation of CCEditBox for Win32.	2013-01-10 23:59:21 +01:00
johnangel	16269d952d	Detect VS2012 Update 1	2013-01-10 11:55:30 +01:00
Jozef Prídavok	229ad55dfa	Fixed and refactored Mac Implementation.	2013-01-09 15:34:53 +01:00
johnangel	674bb8e728	Setting PlatformToolSet to v110_xp instead of default v110 in Visual Studio 2012 for Windows XP support, leaving default v100 in Visual Studio 2010.	2013-01-07 11:51:05 +01:00
James Chen	8fa2eb080b	issue #1640: Updated Box2dTest and ChipmunkTest.	2013-01-06 10:22:07 +08:00
James Chen	0c28510513	issue #1640: Updated ChipmunkTest.cpp.	2013-01-06 10:13:59 +08:00
James Chen	9ef74bef80	fixed #1636: Deleted CC_ENABLE_CHIPMUNK_INTEGRATION and CC_ENABLE_BOX2D_INTEGRATION in ccConfig.h since they are moved to extension, it doesn't depend on engine any more. ... Added platform macro for CCEditBoxImpl* files.	2013-01-05 11:10:24 +08:00
James Chen	7bcbcfa187	fixed #1636: Refactored CCEditBox for iOS, moved the implementation of EditBoxImplIOS.h/.cpp to CCEditBoxImplIOS.h/.cpp.	2013-01-05 10:56:57 +08:00
James Chen	3263d06830	Merge pull request #1814 from fape/marmalade_simplegame ... fixed #1631: Making SimpleGame force landscape for Marmalade.	2013-01-03 19:07:41 -08:00
James Chen	f6b57a9b92	Removing grskia dependancy and adding in freetype support to the builds.	2013-01-04 10:16:18 +08:00
fape	e34f190f36	add SimpleGame Marmalade config files	2013-01-03 15:20:58 +01:00
fape	f3f67f62e1	.gitignores moved	2013-01-03 15:16:11 +01:00
Dale Ducharme	611db78b39	Removing grskia dependancy and adding in freetype support to the builds.	2013-01-02 18:53:31 -05:00
James Chen	d2ad820a48	fixed #1627: Adding view name for sample applications.	2012-12-29 14:50:00 +08:00
James Chen	9bd302e35b	fixed #1627: VS version check in project file.	2012-12-29 13:54:46 +08:00
James Chen	b120874a87	fix compilation errors.	2012-12-29 11:23:31 +08:00
James Chen	f2f3aa55bf	Merge branch 'gles20' of https://github.com/johnangel/cocos2d-x into iss-vs2012 ... Conflicts: samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj samples/Javascript/TestJavascript/proj.win32/TestJavascript.vcxproj samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj scripting/javascript/bindings/generated scripting/lua/proj.win32/liblua.vcxproj	2012-12-29 09:48:22 +08:00
James Chen	c68884a121	issue #1625: Updated EffectsTest.cpp and EffectsTest.lua.	2012-12-27 11:48:46 +08:00
James Chen	0e7934a8ce	Revert TestCpp/proj.win32/main.cpp.	2012-12-27 11:40:32 +08:00
James Chen	7d9f06b48c	fixed #1625: Updated TestCpp. 'ccg' --> 'CCSizeMake' . And exchanged the parameter order for 3D action tests.	2012-12-27 10:55:25 +08:00
James Chen	eb417274fb	fixed #1621: fix compilation error of eclipe project.	2012-12-24 11:15:56 +08:00
ivzave	fcce930188	repair linux eclipse build & add 64-bit project configurations	2012-12-22 07:14:59 +04:00
minggo	89fb58e791	issue #1603:change pathes of android codes	2012-12-21 17:28:14 +08:00
minggo	f71f13fc53	issue #1536:add permissions and modify module path error	2012-12-21 14:40:34 +08:00
James Chen	a36446cba2	Merge branch 'iss1603-adjust-directory' of https://github.com/minggo/cocos2d-x into iss1603-adjust-directory	2012-12-20 18:39:52 +08:00
James Chen	f47c5e1714	Added app.icf, development.icf.	2012-12-20 18:29:25 +08:00
minggo	65e01b9ade	issue #1603:build ok on mac	2012-12-20 18:02:24 +08:00
James Chen	f65717cd86	issue #1603: updated linux project configuration.	2012-12-20 17:49:34 +08:00
James Chen	08aa5066a5	issue #1603: updated blackberry, linux, marmalade project configurations.	2012-12-20 17:47:30 +08:00
minggo	977046cc32	issue #1603:make some samples build ok on iOS	2012-12-20 17:20:10 +08:00
James Chen	dcfd38756d	Updated android build files.	2012-12-20 14:04:49 +08:00
James Chen	4660e72eda	issue #1603: Moved the position of some projects.	2012-12-20 12:58:21 +08:00