2502 Commits

Author	SHA1	Message	Date
folecr	7510a55c6a	Update TestJavaScript	2013-08-05 02:05:47 -07:00
folecr	5531272979	Update a bunch of JS projects for android	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
minggo	a8f10c480d	Merge pull request #3332 from azmeuk/clang ... Clang support for Linux	2013-07-30 18:26:12 -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
minggo	1d2b1c79c2	closed #2438:remove mac 32-bit support	2013-07-30 18:02:35 +08: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
Lee, Jae-Hong	4beeda2294	[Tizen] Fix compile error.	2013-07-30 15:43:05 +09: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	4c32303b2e	Merge pull request #3317 from dumganhar/member-var-init ... Fixing warnings of the order of member variables and fixing errors for tizen projects. Updating JS-test.	2013-07-29 00:29:08 -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
James Chen	b1a0393191	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into member-var-init	2013-07-29 14:11:13 +08:00
James Chen	1c298cf5a1	Updating JS-Test, fixing CrystalCraze crash on android and windows.	2013-07-29 14:10:42 +08:00
samuele3hu	cff6fd13b1	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TestDevelop	2013-07-29 11:47:42 +08:00
samuele3hu	a6d2ab40f0	Modify ActionTest sample of lua to add draw functions	2013-07-29 11:44:56 +08:00
boyu0	304d636deb	Closed #2345 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345	2013-07-29 11:40:18 +08:00
James Chen	f5d9bf9465	Updating JS-Test.	2013-07-29 10:17:31 +08:00
minggo	bc4845b856	fixed a link error of HelloLua Mac 32 bit	2013-07-29 09:30:42 +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	6176076bce	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2430-ccb-constants	2013-07-27 22:36:14 +08:00
boyu0	cecfc13bc4	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345	2013-07-27 22:06:30 +08:00
James Chen	e66e429bb2	issue #2430: Moving enum type to class for CCBReader.	2013-07-27 21:44:49 +08:00
samuele3hu	af9f6fbe3a	issue #2404:Add more deprecated function and modify some test sample	2013-07-27 17:20:22 +08:00
James Chen	324607c32c	More warning fixes.	2013-07-27 15:15:54 +08:00
James Chen	9a56cd80bf	Updating JS-Tests. Fixed a bug of PerformanceSpriteTest that mgr is undefined when it runs on the JSB.	2013-07-27 14:02:23 +08:00
James Chen	32b823f301	Merge pull request #3291 from dumganhar/develop ... Updating JS-Test to the latest version.	2013-07-26 21:17:01 -07:00
James Chen	83afffe5b1	Updating JS-Test to the latest version.	2013-07-27 11:37:07 +08:00
samuele3hu	f12db807a0	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DrawNode	2013-07-27 11:04:36 +08:00
samuele3hu	faa0b46f57	issue #2426:Add Drawprimitives and DrawNode lua binding and modify releated test sample	2013-07-27 10:42:22 +08:00
James Chen	ea9988fde6	[Mac] Adding resources for SimpleGame.	2013-07-27 10:28:40 +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
samuele3hu	a6e514f3d5	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DrawNode	2013-07-27 00:36:20 +08:00
samuele3hu	016593bd0e	issue #2426:Add Drawprimitives.lua and Drawprimitives lua test sample	2013-07-27 00:28:06 +08:00
James Chen	b313ec43fc	Merge pull request #3239 from samuele3hu/TestSample ... issue #2429:LuaWebSocket supports sending binary string passed by lua	2013-07-26 08:00:52 -07:00
James Chen	58a3560bca	More enum class: ScrollView::Direction, TableView::VerticalFillOrder	2013-07-26 22:55:41 +08:00
samuele3hu	bc83304e23	issue #2429:Replace LuaWebSocket sendTextMsg function and sendBinaryMsg function with sendString function	2013-07-26 22:50:45 +08:00
samuele3hu	70fcf47a3e	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TestSample	2013-07-26 21:39:34 +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	3bc45e665c	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into constants-refactor ... Conflicts: scripting/lua/cocos2dx_support/LuaCocos2d.cpp	2013-07-26 19:56:04 +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
samuele3hu	273bdc8fbd	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprectedOperator	2013-07-26 14:35:40 +08:00
James Chen	d345ac7f3f	[Android] Usage changes: ccGLInvalidateStateCache --> GL::invalidateStateCache();	2013-07-26 14:00:10 +08:00
samuele3hu	2288280b2d	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprectedOperator	2013-07-26 13:57:11 +08:00
James Chen	b57d48b0d2	ParticleSystem::MODE_RADIUS --> ParticleSystem::Mode::RADIUS	2013-07-26 13:47:30 +08:00
samuele3hu	f49277d367	issue #2404:replace deprecated functions in testlua and hellolua sample	2013-07-26 13:43:28 +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
samuele3hu	6854bd6b19	issue #2404:replace LuaEngine::defaultEngine() with LuaEngine::getInstance()	2013-07-25 20:40:44 +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
samuele3hu	11d7c9c653	issue #2404:Add more functions to Deprecated.lua and modify some .pkg files	2013-07-25 19:58:59 +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	653c1f7f8f	Merge branch 'releasing' of https://github.com/minggo/cocos2d-x into minggo-releasing	2013-07-25 16:00:45 +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
minggo	439ed140cd	assign 1 to predefined macro CC_ENABLE_CHIPMUNK_INTEGRATION	2013-07-24 18:35:26 +08:00
James Chen	e0f9ac82da	issue #2404: Updating ExtensionsTest/CocosBuilderTest.	2013-07-24 18:17:20 +08:00
samuele3hu	8e0a3b16a1	issue #2429:LuaWebSocket supports sending binary string passed by lua	2013-07-24 15:42:32 +08:00
samuele3hu	5b888d44e4	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TestSample	2013-07-24 15:34:32 +08:00
samuele3hu	ff980477d7	issue #2429:LuaWebSocket supports passing binary string buffer to c++	2013-07-24 15:33:37 +08:00
minggo	ff0cbb9d0b	Merge pull request #3232 from samuele3hu/TestSample ... issue #2426:Add Drawprimitives.lua and Drawprimitives lua test sample	2013-07-23 23:33:28 -07:00
samuele3hu	a52bab7a66	issue #2426:Modify coding style	2013-07-24 11:51:24 +08:00
samuele3hu	4f1a46136a	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TestSample	2013-07-24 10:15:39 +08:00
samuele3hu	e9df175e9a	issue #2426:Add Drawprimitives.lua and Drawprimitives lua test sample	2013-07-24 10:15:16 +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	9b0f2a6e33	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2344-js-scriptprotocol	2013-07-22 17:25:29 +08:00
James Chen	1db847ad7c	issue #2344: ScriptEngineManager::sharedManager --> ScriptEngineManager::getInstance, ScriptEngineManager::purgeSharedManager --> ScriptEngineManager::destroyInstance	2013-07-22 17:24:54 +08:00
James Chen	2228614748	issue #2344: JSB also uses 'ScriptEngineManager::sharedManager()->getScriptEngine()->sendEvent(XXX);' now.	2013-07-22 17:12:53 +08:00
minggo	8660543d77	Merge pull request #3198 from samuele3hu/deprecatedfunc ... issue #2404:Move deprecated functions in Lua	2013-07-22 00:27:06 -07: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
samuele3hu	eed0297c59	Merge branch 'deprecatedfunc' of https://github.com/samuele3hu/cocos2d-x; branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprecatedfunc	2013-07-22 09:39:57 +08:00
samuele3hu	1f5f6e8fa2	issue #2404:Modify configs	2013-07-22 09:36:00 +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
boyu0	ad3ceda3c2	roll back the android project setting	2013-07-19 15:58:33 +08:00
boyu0	948acd6e29	Refactor CCTexture2D and CCImage	2013-07-19 15:37:54 +08:00
samuele3hu	90af254fac	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprecatedfunc	2013-07-19 14:57:38 +08:00
samuele3hu	3b97353e14	issue #2404:Modify Deprecated.lua and set platform config	2013-07-19 14:57:02 +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	7de69edad8	Merge pull request #3187 from dumganhar/ricardoquesada-more_best_practices_fixes ... Merge https://github.com/cocos2d/cocos2d-x/pull/3183	2013-07-18 08:52:15 -07:00
samuele3hu	236b675e21	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprecatedfunc	2013-07-18 23:29:41 +08:00
samuele3hu	78cd3e561e	issue #2404:Move deprecated functions to Deprecated.lua	2013-07-18 23:27:07 +08:00
minggo	208c1312f4	Merge pull request #3171 from samuele3hu/ScriptHandler ... issue #2377:Modify some tolua_*_open functions place and Modify Websocket,OpenGL,ScrollView handlers operation	2013-07-18 02:48:37 -07:00
boyu0	76e05ee802	Merge https://github.com/cocos2d/cocos2d-x into 2345	2013-07-18 17:47:43 +08: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
boyu0	70140bb4cb	refactor CCImage and CCTexture2D	2013-07-17 17:12:04 +08: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
samuele3hu	847b87b297	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler	2013-07-17 14:45:02 +08:00
James Chen	e7452bc912	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2407-class-order	2013-07-17 14:36:55 +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	d3bf9935cd	Merge pull request #3166 from dumganhar/iss2410-blackscreen-android ... Merge PR https://github.com/cocos2d/cocos2d-x/pull/3117	2013-07-16 23:25:01 -07: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
samuele3hu	6ce5bbf09a	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler	2013-07-17 10:16:11 +08:00
samuele3hu	0f1ac9983f	issue #2377:Modify some tolua_*_open functions place and Modify Websocket,OpenGl,Scrollview handlers operation.	2013-07-17 10:15:25 +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
carlo morgantini	9cfe1b7823	new stuff for FreeType	2013-07-16 15:18:39 -07:00
James Chen	80590dcfc1	Merge pull request #3132 from samuele3hu/ScriptHandler ... issue 2377:Add scriptHandlerMgr to manager lua script handler	2013-07-16 02:40:50 -07:00
samuele3hu	596eb9df3e	issue #2377:Modify tojs/cocos2dx.ini and a function name	2013-07-16 16:45:57 +08: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	b543de648c	[iOS, Mac]Adding jsb_deprecated.js to resource folder for JSB projects.	2013-07-16 15:35:13 +08:00
James Chen	f09cf35dba	Updating JS-test to the latest version.	2013-07-16 15:31:23 +08:00
samuele3hu	241c01bec3	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler	2013-07-16 14:47:46 +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
samuele3hu	1761669832	issue #2377:Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandlerMgr	2013-07-16 12:47:40 +08:00
James Chen	b11000908e	Merge pull request #3155 from pktangyue/patch ... issue #2406: Override updateDisplayedColor and updateDisplayedOpacity method in Scale9Sprite class. Resolved issue: Color and Opacity of Scale9Sprite will not be changed when it's added to NodeRGBA and run with FadeIn/Out actions.	2013-07-15 19:40:29 -07:00
James Chen	a36a4bf19b	issue2405: Adding jsb_deprecated.js for the compatibility of deprecated variables and methods.	2013-07-16 10:02:02 +08:00
samuele3hu	c955a559bf	issue #2377:Del register/unregister function in .cpp and .h files	2013-07-16 09:55:06 +08: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
samuele3hu	80a6811f9f	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler	2013-07-15 10:39:08 +08:00
samuele3hu	51c3ced4ba	issue #2377:Modify the ScripthandlerMgr struct and modify some lua test samples	2013-07-15 10:38:16 +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	1bdb8f1bb2	Adding SocketIO test for iOS and Mac projects.	2013-07-13 19:24:09 +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	45f9edcdc3	some more work on freetype	2013-07-12 17:31:23 -07: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
James Chen	33c37f5f9d	issue #2397: CCTextureCache:sharedTextureCache --> CCTextureCache:getInstance.	2013-07-12 14:44:24 +08:00
James Chen	4a7e884de8	issue #2397: UserDefault::sharedUserDefault() --> UserDefault::getInstance(), UserDefault::purgeSharedUserDefault() --> UserDefault::destroyInstance();	2013-07-12 14:34:57 +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	41957f06c9	issue #2397: sharedAnimationCache --> getInstance.	2013-07-12 13:54:56 +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
samuele3hu	ea0a19e7a2	issue #2377:Adjust tab and space	2013-07-11 16:49:29 +08:00
samuele3hu	c4de89870a	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler	2013-07-11 16:43:25 +08:00
samuele3hu	81ad976eed	issue #2377:Remove registerNotificationHandler function	2013-07-11 16:42:11 +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
samuele3hu	ff29d2b5d4	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler	2013-07-11 13:40:16 +08:00
samuele3hu	9007b9feee	issue #2377:Replace the CallFunc script Handler and repair Testlua Bug	2013-07-11 13:38:25 +08:00
carlo morgantini	9264b3de1d	more clean up	2013-07-10 11:59:05 -07:00
samuele3hu	31d0e492c2	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler	2013-07-10 15:05:02 +08:00
samuele3hu	cf1cbe1bd6	issue #2377:add scriptHandlerMgr and modify ActionManager.lua	2013-07-10 15:04:00 +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	05ae6f8518	Fixed some warnings	2013-07-09 16:33:21 +02:00
Éloi Rivard	e6354bbf0a	Various linux eclipse projects compilation fixes	2013-07-09 15:23:19 +02:00
Éloi Rivard	b8242cfe97	Removed unused include in eclipse HelloLua project	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	5ff7baf126	update to latest branch	2013-07-05 17:53:39 +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
James Chen	a996b878cd	issue #2368: Updating JS-test.	2013-07-05 15:30:33 +08:00
James Chen	fcc02d476c	Updating AppDelegate.cpp	2013-07-05 15:24:29 +08:00
James Chen	d2746bbe90	issue #2373: Removing inline for virtual function. Adding more const getter functions.	2013-07-05 15:08:52 +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	3138281cab	issue #2371: [Lua] Only 64bit target needs the linking flag '-pagezero_size 1000 -image_base '	2013-07-04 17:53:23 +08:00
James Chen	6ed014ab00	issue #2371: Removing unused file.	2013-07-04 17:25:52 +08:00
James Chen	dca0874ee3	issue #2371: Removed unused projects.	2013-07-04 17:24:34 +08:00
James Chen	a67ac821f7	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2371-add-lua-ios-mac ... Conflicts: scripting/lua/cocos2dx_support/LuaCocos2d.cpp	2013-07-04 17:15:09 +08:00
James Chen	7d3a63bb23	issue #2371: Adding HelloLua and TestLua projects for MAC.	2013-07-04 17:10:47 +08:00
James Chen	83b23c67fd	issue #2371: Set design resolution for TestLua.	2013-07-04 17:07:34 +08:00
James Chen	808ce2e208	close #2371: Adding Lua projects for Mac.	2013-07-04 16:29:06 +08:00
minggo	f019700b91	Merge pull request #3072 from minggo/const_love ... Fix compiling errors of #3070	2013-07-03 23:19:14 -07:00
James Chen	397b698f07	[iOS] Adding lua projects.	2013-07-04 13:50:09 +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
Ricardo Quesada	d88a4244b9	Obfuscated Test JS added on iOS and Mac ... new version of game.js. I guess it was autogenerated	2013-07-03 15:29:57 -07:00
Ricardo Quesada	d399a044a9	Adds JS tests for iOS	2013-07-03 14:05:02 -07:00
Ricardo Quesada	22b42bfe7d	SimpleGame and HelloCpp works as expected ... their Info.plist was broken	2013-07-03 13:24:39 -07:00
Ricardo Quesada	77dbe995d4	Merge branch 'develop' into ios_mac_one_project	2013-07-03 11:39:00 -07:00
James Chen	7892f1ac9d	Merge pull request #3053 from dumganhar/iss2285-js-motionstreak ... Adding MotionStreak test for TestJavascript.	2013-07-03 01:36:07 -07:00
Ricardo Quesada	2b73d0cb5f	ios and mac projects unified in one simple xcode project ... Not finished yet: - iOS only includes Test Cpp (Simple Game not working yet on iOS) It is easier to maintain and add more targets, files, etc.	2013-07-02 18:20:38 -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
James Chen	54736814fa	issue #2285: New JS-test MotionStreak.	2013-07-02 17:57:48 +08:00
James Chen	53884d8238	issue #2285: Adding MotionStreak test for TestJavascript.	2013-07-02 17:47:33 +08: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
James Chen	eeff9b3d75	issue #2325: [MAC] Adding missing resources for TestCpp.	2013-07-02 10:43:21 +08:00
James Chen	ec5edeb8f6	issue #2325: Updating title for Mac projects.	2013-07-02 10:42:50 +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	92469a635c	CrystalCraze and CocosDragon added	2013-07-01 16:24:41 -07:00
Ricardo Quesada	1e6a7f6bbc	MoonWarriors works on Mac	2013-07-01 16:02:36 -07:00
Ricardo Quesada	631ea4ef1d	restore js shared	2013-07-01 15:26:03 -07:00
Ricardo Quesada	527d209ca8	Tries to compile WaterMelonWithMe	2013-07-01 15:20:31 -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	7dd6218344	issue #2325: [MAC] Setting the windows size to 800x450 which is the same as HTML5-tests.	2013-06-29 12:12:26 +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	9b1684b666	Merge remote-tracking branch 'cocos2d/develop' into js_mac	2013-06-27 22:15:03 -07:00
Ricardo Quesada	b0de6d0e8c	Project fixes ... In debug: optimization is NONE, and other small fixes for Mac	2013-06-27 18:14:24 -07:00
James Chen	89ccd9240e	issue #2340: Using 800x450 as design resolution for TestJavascript.	2013-06-27 16:10:42 +08: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	0fdf4b97d6	Fixing iOS workspace project, using c99 instead of gnu99.	2013-06-26 17:52:54 +08:00
James Chen	afc7e39d0f	issue #2313: Opens stencil for TestJavascript.	2013-06-26 16:28:14 +08: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	28c69b8b16	Merge pull request #2990 from minggo/ccx_filesystem ... fixed a compiling error of AssetsManager on Android	2013-06-25 02:36:34 -07:00
minggo	6539fd52ba	Merge pull request #2989 from samuele3hu/glMoudle ... issue #2276: Add OpenGL lua module	2013-06-25 02:23:15 -07:00
minggo	86646bb820	issue #2329:fixed a compiling error of AssetsManager on Android	2013-06-25 17:09:10 +08:00
minggo	8d782133b8	Merge pull request #2983 from folecr/ccx_filesystem ... Improve Android file system read performance	2013-06-25 02:05:37 -07: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
samuele3hu	46bcf6ddba	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into glMoudle	2013-06-25 15:22:14 +08:00
samuele3hu	3b058fe019	issue #2276: Add OpenGL lua module	2013-06-25 14:55:57 +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	09f141f162	Merge pull request #2962 from samuele3hu/scrollview_develop ... issue #2276: Add ScrollView lua binding and test sample	2013-06-21 01:57:41 -07:00
samuele3hu	e36c6f544a	issue #2276: Modify ScrollView and LuaScrollView class	2013-06-21 14:17:41 +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
samuele3hu	35f0b07aa6	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop	2013-06-21 11:16:46 +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
samuele3hu	a862543a4c	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop	2013-06-21 10:44:03 +08:00
samuele3hu	c527fecfe3	issue #2276: Add scrollview sample test in cocosbuilder and modify some config	2013-06-21 10:43:02 +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	5c4545de3c	[NaCl] Remove use of -lnosys	2013-06-20 12:56:13 -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
samuele3hu	71fe43ee97	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop	2013-06-20 22:40:21 +08:00
samuele3hu	15c69563e2	issue #2276: Add ScrollView lua binding and test sample	2013-06-20 22:39:30 +08: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	fb075d7a7d	issue #2277: Delete some conflict file and resolve some error	2013-06-20 11:28:16 +08:00
samuele3hu	0c4f99080b	issue #2277: modify platform config except win32	2013-06-20 10:19:46 +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
James Chen	504a9e714e	issue #2300: copy --> clone for luabinding.	2013-06-19 12:08:26 +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
samuele3hu	778708426c	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into opengl_develop	2013-06-17 14:38:08 +08:00
samuele3hu	26f1bd5171	issue #2277: Add OpenGL lua binding	2013-06-17 14:19:00 +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	1f2f366ef6	Merge pull request #2868 from folecr/develop ... fixed #2281: When user has built with JS Debugger support ScriptingCore will handle necessary runtime changes	2013-06-12 23:52:53 -07: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
folecr	bab8eff915	enableDebugger() will be called inside ScriptingCore when JSB_ENABLE_DEBUGGER is #defined	2013-06-11 08:18:22 -07:00
Rene Klacan	f31a258c01	Merge pull request from cocos2d/develop	2013-06-11 01:06:12 +02:00
James Chen	d51c03da7e	Updating JS-Test.	2013-06-10 12:12:31 +08: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	b388e7e45e	[win32] Updating TestLua.	2013-06-09 18:34:02 +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	6b0c2667fd	[iOS] Adding i386 arch for MoonWarriors.	2013-06-09 15:57:06 +08:00
James Chen	50de9b7af5	[iOS] Adding i386 arch for MoonWarriors.	2013-06-09 15:29:51 +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	2025e7257f	Merge pull request #2835 from dumganhar/2youyouo2-master ... fixed #2270: Adding Armature(CocoStudio runtime) support.	2013-06-08 20:20:30 -07: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
samuele3hu	bc699c1c1e	issue #2103 modify AudioEngine framework and CocosDenshionTest sample	2013-06-09 10:32:23 +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
James Chen	4edd35e2b1	Merge pull request #2829 from dumganhar/nacl-fix ... Fixing some issues in https://github.com/cocos2d/cocos2d-x/pull/2788	2013-06-08 03:00:04 -07:00
James Chen	aee8e829ca	[Android] Updating Application.mk for HelloLua and TestLua.	2013-06-08 17:28:03 +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	bf781feba1	[NaCL] Updating project.	2013-06-08 16:08:55 +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
James Chen	51aa2433fc	Updating makefile for native client.	2013-06-08 15:35:45 +08:00
samuele3hu	836bfe1d3f	issue #2103 modify audioEngine table name to AudioEngine	2013-06-08 14:06:19 +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
samuele3hu	34b4cb48ab	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into audioEngine	2013-06-08 11:25:51 +08:00
samuele3hu	4be415cc04	issue #2103 encapsulate SimpleAudioEngine to audioEngine in lua and modify CocosDenshionTest.lua	2013-06-08 11:23:21 +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
James Chen	5c8d4378a6	Fixing compilation errors in TestLua for Win32.	2013-06-07 21:23:15 +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	43e8573d8b	Merge pull request #2807 from dumganhar/master ... [BB] Updating project configuration.	2013-06-07 03:49:10 -07: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	e3e90db71c	[BB] Adding extra lua script resource folder for TestLua.	2013-06-07 18:16:10 +08:00
samuele3hu	dda3c34be8	issue #2103 add webSocket lua test sample	2013-06-07 17:48:07 +08:00
James Chen	9298492384	Updating project configuration for Blackberry port.	2013-06-07 16:52:49 +08:00
samuele3hu	16a34b0da3	issue #2103 add webSocket lua test sample	2013-06-07 16:51:50 +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
samuele3hu	a2cf4933c4	issue #2103 add webSocket lua test sample	2013-06-07 14:57:36 +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
samuele3hu	cdbf8b7250	issue #2103 add webSocket lua test sample	2013-06-07 13:55:36 +08:00
samuele3hu	c021f700d3	issue #2103 add webSocket lua test sample	2013-06-07 12:54:39 +08:00
yinkaile	65974f2243	standardize code	2013-06-07 10:52:32 +08:00
samuele3hu	5986d3904d	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_sample_of_http_bind	2013-06-07 10:14:12 +08:00
samuele3hu	66d4acc31a	issue #2103 add webSocket lua test sample	2013-06-07 10:12:01 +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
minggo	1e9397d490	Merge pull request #2793 from minggo/master ... copy CCBReaderLoad.lua to TestLua Resources	2013-06-06 08:07:41 -07:00
minggo	4fa069df58	issue #2103:copy CCBReaderLoad.lua to TestLua Resources	2013-06-06 23:04:26 +08:00
samuele3hu	e4ec801363	issue #2103 add webSocket lua test sample	2013-06-06 22:29:02 +08:00
James Chen	d5bbcce165	[iOS] Enabling multiple touch event for TestJavascript, multi-platform-js, multiplatform-lua.Disabling multiple touch event for multi-platform-cpp.	2013-06-06 18:09:44 +08:00
James Chen	6f52d72b82	[iOS] Enabling multiple touch event for TestJavascript, multi-platform-js, multiplatform-lua.Disabling multiple touch event for multi-platform-cpp.	2013-06-06 18:07:11 +08: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
James Chen	03549e6a59	Updating JS-Test.	2013-06-06 15:47:07 +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
minggo	cdf09c04ea	issue #2103:make HelloLua & TestLua work on vs2010	2013-06-05 17:43:49 +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	3713ff5b71	Merge pull request #2770 from samuele3hu/test_bind_cocosbuilder ... add cocosbuilder lua test sample	2013-06-05 01:38:57 -07: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
samuele3hu	75b26d9cdf	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_bind_cocosbuilder	2013-06-05 15:19:01 +08:00
samuele3hu	6dd077b8bd	issue #2103 add cocosbuilder lua test sample	2013-06-05 15:17:00 +08:00
chengstory	ca3dc682ea	1. change “bool isEnabled()” to "bool isEnabled() const". ... 2. dolete license.	2013-06-05 15:05:49 +08:00
minggo	d71e07db4e	fixed conflict	2013-06-05 13:48:31 +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
david feng	9d9bc1f593	fix a library search path error	2013-06-04 21:13:08 +08:00
James Chen	ddbdb3e983	[iOS] Fixing compilation errors for HelloLua.	2013-06-04 21:11:44 +08: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
minggo	7bd9717944	make lua works ok on iOS	2013-06-04 15:12:16 +08: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
samuele3hu	37b508ad6d	issue #2103 modify some compile setup	2013-06-03 18:25:37 +08:00
samuele3hu	23eec2f1ce	issue #2103 modify some compile setup	2013-06-03 18:14:06 +08:00
samuele3hu	9352b60653	issue #2103 modify some compile setup and del some resource file	2013-06-03 17:40:31 +08:00
samuele3hu	bf1cd2e909	issue #2103 modify some compile setup	2013-06-03 16:56:45 +08:00
samuele3hu	db7a2a1290	issue #2103 modify some compile setup and delete some deprecated lua function	2013-06-03 16:07:06 +08:00
samuele3hu	7101bc4377	issue #2103 remove simple cocosbuilder sample	2013-06-03 14:59:04 +08:00
samuele3hu	af0737ce87	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into bind_cocosbuilder	2013-06-03 13:48:12 +08:00
samuele3hu	afa6b81ba7	issue #2103 add cocosbuilder lua bind and add a simple sample	2013-06-03 13:47:12 +08: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	c29e434ead	Updating JS-Test.	2013-06-02 18:57:01 +08:00
James Chen	4b8f76c903	WS_ERROR -> ERROR, WS_STATE -> STATE.	2013-06-02 18:56:49 +08:00
James Chen	68d0ebfec5	fixed #1647: Updating JS-test.	2013-06-02 18:56:30 +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	62f4e40e4a	Updating JS-Test.	2013-06-01 19:51:59 +08: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	ad05363265	fixed #1647: Updating JS-test.	2013-05-31 23:27:59 +08: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	8b5450ef4a	issue #2103 modify some build script	2013-05-24 13:55:05 +08:00
samuele3hu	0a1c12a2d3	issue #2103 add some overlapping file and delete some comment line	2013-05-24 13:45:06 +08:00
samuele3hu	338c7c8d67	issue #2103 add more test lua	2013-05-24 11:42:27 +08:00
samuele3	24a34e50bf	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into MenuTest	2013-05-23 15:40:48 +08:00
samuele3	5da5407efe	issue #2103 add menu test lua sample	2013-05-23 15:39:41 +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	10ba265f46	Merge pull request #2614 from pyrasis/tizen_2.1 ... Adding lua libaray and sample projects for Tizen.	2013-05-22 06:12:17 -07:00
Lee, Jae-Hong	6acd8c66c2	Adding lua libaray and sample projects for Tizen.	2013-05-22 21:45:53 +09:00
James Chen	a70740bd90	Merge pull request #2613 from dumganhar/iss2214-spidermonkey-v21 ... fixed #2214: Upgrading Spidermonkey to Firefox v21	2013-05-22 03:09:06 -07:00
James Chen	974546557d	fixed #2214: Upgrading Spidermonkey to Firefox v21	2013-05-22 17:31:07 +08: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
James Chen	1128f9dfc6	Merge pull request #2564 from folecr/jsdb ... fixed #2187: JavaScript debugger improved and bugfixed.	2013-05-21 00:31:51 -07: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
folecr	ebf235642d	Call enableDebugger	2013-05-20 14:30:40 -07:00
James Chen	d402b349e2	issue #2092: Updating win32 project configuration.	2013-05-20 21:12:25 +08:00
James Chen	9e9b9ca831	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into issue2092-XMLHttpRequest	2013-05-20 20:55:29 +08:00
James Chen	0e0744faed	fixed #2092: Updating iOS project configuration.	2013-05-20 17:48:52 +08:00
James Chen	c305581bcf	Updating the submodule of JS-Test.	2013-05-20 17:46:59 +08: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
Carsten Sandtner	2b2d7cb665	Merge branch 'master' into XMLHttpRequest_Demo ... # By carlo morgantini (28) and others # Via minggo (6) and zhangbin (3) * master: (40 commits) Update AUTHORS Update AUTHORS fixed #2155 : Resolve the bug of callback methods in plugin. Update AUTHORS fix a warning caused by member variables initialization order in constructor it now shares code between createTextBitmap and createTextBitmapShadowStroke (no more duplication) initWithStringShadowStroke() renamed to initWithString() comment fixed fix alignent problem when rendering text with shadow fix a problem with float stroke size Fix problem with CCLabelTTF + shadow and text alignment; also fontDefinition property names now are lowercase CCLabelTTF C++ test fixed new "manual" conversion for ccFontDefinition in JS and also updated LabelTest.js using this new way of passing parameters to CCLabelTTF through ccFontDefinition initWithStringAndTextDefinition() changed method's signature no more bingins for ccTextDefinition class renamed and moved to ccTypes.h CCTextDefinition is passed now by pointers bindings for CCTextDefinition ccTextDefinition becomes CCTextDefinition changed the label test (shadows + stroke) for using ccTextDefinition when creating CCLabelTTF ...	2013-05-16 10:12:19 +02: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
Carsten Sandtner	b71a88d0fc	updated ios project for Tests.	2013-05-15 17:14:38 +02:00
Carsten Sandtner	89fc8168e5	Added a test to javascript testsuite.	2013-05-15 13:56:58 +02: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
minggo	f34c977520	Merge pull request #2552 from samuele3hu/FirstBranch ... First branch	2013-05-12 19:15:49 -07:00
samuele3	8015520834	issue #2103 Add more lua test case(Replace encoding error)	2013-05-13 10:07:22 +08:00
samuele3	3c9b98cb30	issue #2103 Add more lua test case(Add PerformanceSpriteTest of PerformanceTest)	2013-05-11 17:00:19 +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
samuele3	c47b104eca	issue #2103 Add more lua test case(Add PerformanceParticleTest of PerformanceTest)	2013-05-10 14:59:21 +08:00
samuele3	4e73425622	issue #2103 Add more lua test case(Add ToucheTest of PerformanceTest)	2013-05-09 16:59:39 +08:00
samuele3	e264582254	issue #2103 Add more lua test case(Add TextureTest of PerformanceTest)	2013-05-09 14:46:48 +08:00
samuele3	c39d6e2977	issue #2103 Add more lua test case(Add NodeChildrenTest of PerformanceTest)	2013-05-09 11:31:40 +08:00
samuele3	c76a373c60	issue #2103 Add more lua test case(Add NodeChildrenTest of PerformanceTest)	2013-05-09 09:57: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 Chen	cb6d274fd3	Removing CocosPlayer project since it was moved to https://github.com/cocos2d/cocos2d-player	2013-05-08 10:08:32 +08:00
minggo	b18ddf8b5a	Merge pull request #2524 from samuele3hu/FirstBranch ... issue #2103: Add more lua test case	2013-05-07 19:01:37 -07: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
samuele3	305c7d9deb	Add a newline	2013-05-07 16:14:23 +08: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
samuele3	20e802f1bc	issue #2103: Add more lua test case	2013-05-06 16:05:20 +08: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
James Chen	52efa87b69	Updating JS-Test.	2013-04-27 17:59:22 +08:00
minggo	afb91e752d	include cocos2d.h to make android template work	2013-04-27 17:16:27 +08:00
James Chen	50255d772e	[CocoPlayer] Small fix for iOS project.	2013-04-27 17:15:57 +08:00
James Chen	8f6a271b54	Merge branch 'cocosplayer' of https://github.com/rohankuruvilla/cocos2d-x into rohankuruvilla-cocosplayer	2013-04-27 16:55:29 +08:00
minggo	651a42beaf	set design resolution for WatermelonWithme	2013-04-27 14:54:53 +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	0d18032f38	[Blackberry] Adding the resources of TestCpp for TestLua.	2013-04-27 14:41:30 +08:00
James Chen	6f5970491e	[Blackberry] Adding resources for TestLua.	2013-04-27 14:17:14 +08:00
James Chen	edc8444ca4	Updating blackberry project configurations.	2013-04-27 14:07:54 +08:00
minggo	de60057621	Merge pull request #2472 from minggo/master ... disable depth test for clipping test	2013-04-26 20:34:38 -07:00
minggo	fa0370bba5	disable depth test for clipping test	2013-04-27 11:33:23 +08:00
minggo	9f7d091e95	Merge pull request #2470 from minggo/master ... disable menutest in lua	2013-04-26 20:18:23 -07:00
minggo	ff207b68e0	disable menutest in lua	2013-04-27 11:17:10 +08:00
James Chen	5b45f85216	[HelloLua] print ~> cclog	2013-04-27 09:48:35 +08:00
Rohan Kuruvilla	d7020a7ab2	Adding new status messages for Android	2013-04-26 13:47:26 -07:00
Rohan Kuruvilla	8209fa56a2	Fixing bug where screen rotate would keep creating new NSD services	2013-04-26 13:47:26 -07:00
Rohan Kuruvilla	eb85a6c1fb	Handle evalScript from JNI. Also adds helpers for settings status	2013-04-26 13:47:25 -07:00
Rohan Kuruvilla	615329eee5	Add evalScript over the network code and force portrait mode on stop	2013-04-26 13:47:25 -07:00
Rohan Kuruvilla	374c456749	change orientation to Portrait on CCB Stop	2013-04-26 13:47:25 -07:00
Rohan Kuruvilla	ece710c4d8	Adding eval script wrapper for ScriptingCore to AppDelegate	2013-04-26 13:41:15 -07:00
minggo	d40fdd24b7	fixed #2075:add SpiteTest into Android.mk	2013-04-26 14:02:13 +08:00
minggo	89591fdccc	fixed #2084:add lua loader for all platforms	2013-04-26 12:12:19 +08:00
minggo	62231912be	Merge https://github.com/cocos2d/cocos2d-x	2013-04-26 10:36:46 +08:00
Rohan Kuruvilla	c12268bd70	Modifying little log statements	2013-04-25 18:44:59 -07:00
Rohan Kuruvilla	56a1ba9e42	Removing unneeded code	2013-04-25 18:41:58 -07:00
Rohan Kuruvilla	e2edc04946	Fixing handling starting and stopping of NSD service in Android	2013-04-25 18:41:53 -07:00
Rohan Kuruvilla	8a59680175	Removing onSurfaceChange update since it was being executed after ccb_run. This resulted in frame size being changed after game was running (bug)	2013-04-25 18:41:48 -07:00
Rohan Kuruvilla	188f0354f3	Fixing configChanges flag to disable GL context being deleted on rotate	2013-04-25 18:41:43 -07:00
Rohan Kuruvilla	b1f9dd30e7	Using iOS specific text entry for setting pairing code	2013-04-25 18:41:38 -07:00
Rohan Kuruvilla	76f334797d	Refactoring applicationDidFinishLaunching. Also adding scaling for large non-retina Android tablets	2013-04-25 18:41:33 -07:00
Rohan Kuruvilla	2636bafd0c	Fixing network logging for Android and iOS	2013-04-25 18:41:29 -07:00
Rohan Kuruvilla	cecb157f22	Fixing rotation for iOS	2013-04-25 18:41:24 -07:00
Rohan Kuruvilla	0378a97fa0	Adding sending of filelist when reset is pressed on iOS	2013-04-25 18:41:18 -07:00
Rohan Kuruvilla	7bd3f2a260	Fixing resolution handling for iOS and Android ... 1. Adding iPhone5 support 2. Changing Android resolution management based on DPI (Tablet mode or Phone mode) 3. Modifying distribution of xlarge,large,medium,small and xsmall assets to do it properly 4. Using kResolutionFixedWidth (kResolutionFixedHeight for landscape games) to properly calculate aspect ratio 5. Tested on all iOS devices and Nexus 4 (which is correctly identified as Retina phone)	2013-04-25 18:41:14 -07:00
Rohan Kuruvilla	f95b802866	Adding rudemntary support for Rotation in Android	2013-04-25 18:41:01 -07:00
Rohan Kuruvilla	bb91f1eb30	Adding rudementary support for Rotation in iOS	2013-04-25 18:40:56 -07:00
Rohan Kuruvilla	d8c30e0c5b	Adding log redirect over the network for iOS. Also fixing Stop command crash in Android	2013-04-25 18:39:51 -07:00
Rohan Kuruvilla	e6fc611346	Commiting out orientation change code. was causing gl errors with landscape games	2013-04-25 18:39:47 -07:00
Rohan Kuruvilla	9b86791eef	Adding CocosPlayer for iOS	2013-04-25 18:39:43 -07: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
James Chen	5337234e22	Android also uses executeScript to load lua source file or byte code file. So unused codes need to be deleted.	2013-04-25 21:31:52 +08:00
minggo	b6c8e78149	remove js files from compiling	2013-04-25 18:37:27 +08:00
minggo	3f72473aba	Merge https://github.com/cocos2d/cocos2d-x	2013-04-25 16:25:55 +08:00
James Chen	7bd1d8cde1	Updating cocos2d-js-tests.	2013-04-25 16:16:39 +08:00
James Chen	9913358dde	Updating TestJavascript project configuration.	2013-04-25 14:31:11 +08:00
minggo	9881012459	Merge https://github.com/cocos2d/cocos2d-x	2013-04-25 12:01:59 +08:00
James Chen	631b08e984	Updating project configuration for iOS.	2013-04-25 11:30:35 +08:00
minggo	fb7851b429	define checkAnim() before using it	2013-04-24 17:06:59 +08: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
James Chen	f129b94e2d	Removing unused file(uthash.h) in JSB projects.	2013-04-19 11:09:02 +08:00
minggo	37dc03b7d6	Merge pull request #2404 from minggo/assetmanager ... fix a compiling error	2013-04-18 19:36:03 -07: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
James Chen	41b0345e9c	Removing unused file (uthash.h) in Project.pbxproj.	2013-04-18 13:52:25 +08:00
minggo	78d3c7f048	fixed #1613:not reload resources on Android platform after return from background	2013-04-17 15:34:57 +08:00
James Chen	a005852fa5	issue #1847: Using luajit for win32.	2013-04-17 10:46:38 +08:00
James Chen	928b6ad361	issue #1847: Fix a typo in Ball.lua and Paddle.lua.	2013-04-17 09:52:26 +08:00
James Chen	6a56bb6d73	issue #1847: [iOS] Using LuaJit for HelloLua and TestLua.	2013-04-17 09:51:28 +08:00
James Chen	79d58bcdb9	issue #1847: Adding sources of Luajit2.0.1-hotfix, and adding android support.	2013-04-16 17:34:58 +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
Rohan Kuruvilla	3d7e8f0d84	Fixing CocosPlayer AppDelegate to include openGL bindings. Also adding JNI stubs for changing orientation	2013-04-09 15:29:35 -07: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
James Chen	1a44f776f8	fixed #2005: Adding CurrentLanguageTest for Testlua.	2013-04-07 16:34:07 +08:00
James Chen	268bd4dfad	fixed #2004: Adding UserDefaultTest for TestLua.	2013-04-07 16:20:43 +08:00
James Chen	1913b2b3a5	[TestLua] The menu item of Tests which is not supported will be disabled.	2013-04-07 16:06:53 +08:00
James Chen	fce5deb0ec	Refactoring mainmenu.lua.	2013-04-07 15:56:05 +08:00
James Chen	ef731879f1	Merge pull request #2291 from dumganhar/iss1944-remove-associate-nativeobj ... fixed #1944: The subclass of cc.Sprite,cc.Layer... doesn't need cc.associateWithNative anymore.	2013-04-06 20:20:33 -07:00
James Chen	684c659ba7	Merge pull request #2311 from dumganhar/iss2002-more-luatest ... fixed #2002: Adding Texture2dTest, RenderTexture, ZwoptexTest, FontTest, CocosDenshionTest and EffectsAdvancedTest for TestLua	2013-04-06 19:45:28 -07:00
James Chen	6e1cf1e951	fixed #2002: Adding EffectsAdvancedTest for TestLua.	2013-04-07 10:38:56 +08:00
minggo	2436d87cb3	Merge pull request #2256 from waiter/master ... Add CCRemoveSelf Action	2013-04-06 19:09:17 -07:00
James Chen	85b0fd306a	Adding CocosDenshionTest.	2013-04-06 14:32:46 +08:00
James Chen	63c0ede945	Removing a comment.	2013-04-06 14:00:59 +08:00
James Chen	5171e11765	Adding FontTest for TestLua.	2013-04-06 14:00:17 +08:00
James Chen	17b948367a	Adding ZwoptexTest.	2013-04-05 23:34:46 +08:00
James Chen	e754909c5f	Adding RenderTexture test for TestLua.	2013-04-05 17:13:46 +08:00
James Chen	2bff6d6480	Adding Texture2dTest. And format some lua codes.	2013-04-05 16:13:04 +08:00
James Chen	425b95152c	Merge pull request #2295 from SevInf/master ... fixed #1999: CCEditBox iOS enchantments/bugfixes	2013-04-03 07:37:29 -07:00
Sergej Tatarincev	202edc1597	CCEditBox test for separate font name/size setters	2013-04-03 17:20:01 +03:00
James Chen	031e77ccbe	Updating SceneTest.lua.	2013-04-03 18:31:00 +08:00
James Chen	818a570b7f	fixed #1998: Adding SceneTest.lua for TestLua.	2013-04-03 18:14:03 +08:00
James Chen	229d4329a5	fixed #1997: Adding IntervalTest for TestLua.	2013-04-03 17:00:05 +08:00
James Chen	2d9f8ca8de	fixed #1814: MenuTest for Testlua is ok.	2013-04-03 16:29:16 +08:00
James Chen	686775300d	fixed #1994: ActionManagerTest.lua is ok.	2013-04-03 11:59:17 +08:00
James Chen	6d6bc03465	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss1944-remove-associate-nativeobj	2013-04-03 10:27:01 +08:00
James Chen	c54ee96705	issue #1994: Adding actionManagerTest.lua.	2013-04-03 10:20:12 +08:00
James Chen	46b26cffd3	fixed #1993: Adding ParallaxTest for TestLua.	2013-04-02 18:20:14 +08:00
James Chen	a73395507c	fixed #1942: LayerTest for TestLua is ok.	2013-04-02 17:52:08 +08:00
James Chen	ec7a2f4c5c	fixed #1944: The subclass of cc.Sprite,cc.Layer... doesn't need cc.associateWithNative anymore.	2013-04-02 11:35:55 +08:00
James Chen	930487f6f7	Updating layerTest.lua.	2013-04-02 11:28:31 +08:00
James Chen	d0300d429c	issue #1942: Adding LayerTest, first commit.	2013-04-01 18:05:35 +08:00
James Chen	a7f1fba762	TileMapTest.lua is ok.	2013-04-01 17:39:27 +08:00
James Chen	57a76a3a86	Using universal config for TestLua.	2013-04-01 17:39:27 +08:00
James Chen	be4d15fbba	Updating LabelTest.lua	2013-04-01 17:39:26 +08:00
James Chen	9ea35977db	new tile map tests	2013-04-01 17:39:26 +08:00
James Chen	4a1eab5101	CCLOG -> cclog	2013-04-01 17:39:26 +08:00
James Chen	205123f661	Adding TileMapTest.lua	2013-04-01 17:39:26 +08:00
James Chen	d401fb3771	labeltest.lua finish.	2013-04-01 17:39:25 +08:00
James Chen	8854fc046f	BitmapFontMultiLineAlignment is ok.	2013-04-01 17:39:25 +08:00
James Chen	5a623b9b07	Some tests in LabelTest.lua are ok.	2013-04-01 17:39:25 +08:00
James Chen	a388f401bf	Updating LabelTest.lua.	2013-04-01 17:39:25 +08: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	2fca3b618f	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into openal	2013-03-29 09:37:32 +01:00
Éloi Rivard	b9ec3ead65	* Fixed CocosDenshionTestBug	2013-03-29 09:32:50 +01:00
James Chen	374024cefd	Updating JS Test. OpenGLTest works ok now.	2013-03-28 16:58:36 +08:00
James Chen	4220fd4ca5	fixed #1936: Updating project configuration for TestJavascript.	2013-03-28 16:55:23 +08:00
James Chen	201dc74ecb	fixed #1936: Updating obfuscate.xml.	2013-03-28 16:54:49 +08:00
James Chen	b6556bd41f	fixed #1936: Updating the obfuscated file, game.js in TestJavascript.	2013-03-28 16:54:18 +08:00
Rohan Kuruvilla	57fd3cdb9c	Modifying JS files to load OpenGL bindings. Also modify AppDelegate and Project files and generator template	2013-03-27 23:59:29 -07:00
James Chen	8c5f278d06	Updating mainMenu.lua	2013-03-26 18:18:37 +08:00
James Chen	567e1fa15f	Adding LabelTest.lua. Three tests in LabelTest works ok.	2013-03-26 18:14:14 +08:00
Rohan Kuruvilla	596acfda09	Adding all CocosPlayer Android resource folders for CCB and updating to latest version	2013-03-25 01:28:13 -07:00
Rohan Kuruvilla	6b428aa3eb	Updating CocosPlayer to latest version. Includes following changes: ... 1. Adding support for changing orientation 2. Updating communication protocol to latest CocosPlayer protocol. Including UUID and filelist messages 3. Fixing unzipping of ccb files to maintain proper directory structure	2013-03-25 01:24:24 -07: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
James Chen	54bd3c1925	Updating JSTest.	2013-03-22 15:11:56 +08:00
James Chen	0faeb5da5e	Merge branch 'jsb_obfuscate' of https://github.com/walzer/cocos2d-x into walzer-jsb_obfuscate ... # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.	2013-03-22 14:12:38 +08:00
walzer	9371bbf799	roll back samples/Javascript/Shared to the ref before.	2013-03-22 12:10:21 +08:00
walzer	42c73fb820	Fixed #1841, obfuscated js source can run on iOS correctly now.	2013-03-22 12:06:04 +08:00
fape	e9343c2d8a	- update README files ... - format javascript sample README files like cpp samples	2013-03-21 16:04:53 +01:00
fape	77207ea494	Remove "-o igncr" from CocosPlayer Android Eclipse project	2013-03-21 15:05:02 +01:00
walzer	c52bbec5bc	add icons into TestJavascript.xcodeproj	2013-03-21 20:50:21 +08:00
walzer	6f41b7c4ea	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into jsb_obfuscate	2013-03-21 17:37:28 +08:00
walzer	d1e2cf8b4c	remove jsb_*_.js from compile list	2013-03-21 17:35:36 +08:00
walzer	a590a27606	update submodule samples/Javascript/Shared to the same ref ptr as master branch	2013-03-21 17:10:14 +08:00
walzer	67cda2bfd4	issue #1841, TestJavascript is obfuscated successfully	2013-03-21 16:55:55 +08: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	668d3ce638	Updating TestJavascript.vcxproj and WatermelonWithMe.vcxproj.	2013-03-20 22:07:30 +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
minggo	f33a8fe6f1	remove unsupported parameter in android	2013-03-20 15:37:16 +08:00
James Chen	d68db7e873	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x	2013-03-20 15:19:30 +08:00
James Chen	cf9c01cecf	Updating JSTest, adding new resources.	2013-03-20 15:19:16 +08:00
James Chen	89c4f3a5ba	Updating JSTest.	2013-03-20 14:58:36 +08:00
James Chen	46335a06b8	Updating JSTest	2013-03-20 14:50:20 +08:00
James Chen	49083415d9	Merge branch 'master' of https://github.com/dumganhar/cocos2d-x	2013-03-20 14:46:13 +08:00
James Chen	e728d5d6d0	Updating JS Test.	2013-03-20 14:45:39 +08:00
Rohan Kuruvilla	38f86acd23	Updating CocosPlayer AppDelegate files	2013-03-19 23:42:59 -07:00
James Chen	7e1efa7c89	fix of wrong group of TimelineCallbackTest in TestCpp.vcxproj.filters.	2013-03-20 14:14:01 +08:00
walzer	582e35014f	issue #1841, improve tools/closure-compiler/obfuscate.py to general usage, with input params	2013-03-19 23:53:01 +08:00
James Chen	aa5f7ffb6a	Updating project setting of testcpp for Marmalade.	2013-03-19 17:46:49 +08:00
walzer	0d73934f5c	issue #1841, TestJavascript-ios is obfuscated successfully	2013-03-19 17:21:01 +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
minggo	aa845b10c7	Merge https://github.com/cocos2d/cocos2d-x into test-before-release	2013-03-19 16:49:45 +08:00
minggo	07eaf286fb	add c project setting for lua samples	2013-03-19 16:49:16 +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	42b74758f5	change Android.Manifest.xml to unix style	2013-03-19 16:30:11 +08:00
minggo	6577279ff7	Merge pull request #2200 from minggo/test-before-release ... delete parameter(-o igncr) when running build_native.sh in eclipse project	2013-03-18 23:26:45 -07:00
minggo	0a8b4f923f	delete parameter(-o igncr) when running build_native.sh in eclipse project	2013-03-19 13:48:32 +08:00
James Chen	b4c52f9c5a	Regenerating all resources with the latest CocosBuilder.	2013-03-19 13:05:17 +08:00
James Chen	3380c7cdca	fixed #1838: Updating iOS project setting for CocosDragonJS.	2013-03-19 13:05:06 +08:00
James Chen	6a98553633	Synchronizing the submodule reference of cocos2d-js-test to the latest one.	2013-03-18 18:24:37 +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	1560bb2af8	don't require un-exist file in ActionsTest.lua	2013-03-18 11:26:38 +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
minggo	1382f7efc0	Merge pull request #2175 from ricardoquesada/eclipse_readme_fixes ... README.md eclipse improvements	2013-03-17 18:52:39 -07:00
James Chen	d9c19ab26b	[WIN32]Fixing compilation errors for TestJavascript and WatermelonWithMe.	2013-03-17 10:43:56 +08: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	7c8de5aebe	issue #1803:add SpriteOffsetAnchorFlip	2013-03-14 18:14:01 +08:00
minggo	5936f4db2c	issue #1803:add SpriteBatchNodeOffsetAnchorRotationalSkewScale	2013-03-14 17:45:21 +08:00
minggo	e47baa7984	issue #1803:add SpriteBatchNodeOffsetAnchorSkewScale	2013-03-14 15:49:20 +08:00
minggo	815733e0b7	issue #1803:add SpriteOffsetAnchorRotationalSkewScale	2013-03-14 15:11:55 +08:00
minggo	0fe38f073c	issue #1803:add SpriteOffsetAnchorSkewScale	2013-03-14 14:35:33 +08:00
minggo	d18a664e08	issue #1803:handle onExit event to release resources	2013-03-14 11:53:34 +08:00
minggo	e82074eb4f	issue #1803:refactor lua codes	2013-03-13 17:45:09 +08: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
minggo	6b78e2f341	Merge pull request #2145 from minggo/iss1803-spritetest-lua ... issue #1803:add SpriteBatchNodeOffsetAnchorScale	2013-03-12 03:42:54 -07:00
minggo	e9df9918f7	issue #1803:add SpriteBatchNodeOffsetAnchorScale	2013-03-12 18:21:34 +08: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	c780f2ff78	Merge pull request #2137 from dumganhar/iss1748-jsb-chipmunk-sqlite ... fixed #1748: Separating js extension from cocos2dx.hpp/cpp. 1) Generating jsb_cocos2dx_extension_auto.hpp/.cpp. It was separated from original cocos2dx.hpp/cpp. Developer could remove redundant jsbinding native codes now. 2) cocos2dx.hpp/cpp ~> jsb_cocos2dx_auto.hpp/cpp 3) Adding jsb_cocos2dx_extension_manual.hpp/cpp	2013-03-11 02:31:40 -07:00
James Chen	32f0cf5993	Updating the submodule reference of JS tests.	2013-03-11 17:21:01 +08:00
James Chen	a250d83513	Updating the submodule of cocos2d-js-tests.	2013-03-11 17:13:35 +08:00