286 Commits

Author	SHA1	Message	Date
Huabing.Xu	ec5398e7c6	Merge branch 'develop' into develop_migrate_math_lib_merge ... Conflicts: tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h	2014-04-14 14:08:19 +08:00
koowolf	5b3d5badfa	closed #4763: 1.fix stopalleffect lead to stop background music 2.fix play effect may lead to memory leak	2014-04-11 17:53:00 +08:00
Huabing.Xu	685b9ea297	android can work now	2014-04-11 12:02:56 +08:00
James Chen	efb443dea0	Merge pull request #6200 from dumganhar/iss4729-deprecated-folder ... issue #4729: Move deprecated stuff to deprecated folder	2014-04-10 11:17:21 +08:00
Anton Sokolchenko	eb568998b2	Update SimpleAudioEngineOpenAL.cpp	2014-04-10 01:00:23 +03:00
Anton Sokolchenko	5fadd6f9ab	Fix memory leak ... 471: If this executed "if (!file.file) ", then 473: dynamically allocated variable "data" is leaked.	2014-04-09 23:25:54 +03:00
James Chen	9d8d256bee	issue #4729: Android build works ok.	2014-04-10 00:36:42 +08:00
Dhilan007	d310d8d099	closed #4659:Remove the usage of OpenSL	2014-04-09 14:57:07 +08:00
koowolf	293bd5dc02	fix resume not support in midi file in win32	2014-04-03 09:55:31 +08:00
Dale Stammen	97bdaad41b	added wp8 and winrt support files and projects	2014-03-28 12:53:35 -07:00
andyque	5a9af407dc	closed #4590, remove -> property access	2014-03-28 16:41:33 +08:00
andyque	97883acfb1	closed #4590, fixed rewind problems	2014-03-28 15:59:04 +08:00
andyque	26a04b38f2	closed #4562, fix audio resume bug after stop the music	2014-03-27 10:43:57 +08:00
Ricardo Quesada	c63f210e26	Compiles on Android	2014-03-04 16:59:39 -08:00
WuHuan	1cd68accc1	Merge branch 'develop' of https://github.com/akof1314/cocos2d-x into develop	2014-01-08 17:03:44 +08:00
WuHuan	954ee61022	testcpp mingw	2014-01-08 16:58:36 +08:00
James Chen	2a3481f20c	Moves temp files to CURRENT_BINARY_DIR.	2014-01-06 23:44:36 -08:00
walzer	d4c1aa92d5	add copyrights for 2014, in folders other then 2d.	2014-01-07 11:47:11 +08:00
zarelaky	2822066a5f	openal context not destroy correctly on mac and ios	2013-12-30 08:37:36 +08:00
martell	e5ada6f377	added support for msys2 mingwtoolchains and fix x64 cocos/audio on windows platform for MSVC and Mingw. Also fixed a few very bad type casts very important for future Arm64 bit processors	2013-12-05 03:37:27 +00:00
martell	7a8653525b	fixed Audio for Linux	2013-12-02 06:37:32 +00:00
martell	79401a7596	quickly added win32 cmake	2013-11-30 06:09:12 +00:00
Ricardo Quesada	6a8c4784a4	Adds some #pragma mark love	2013-11-20 11:26:33 -08:00
Ricardo Quesada	6b29391212	Adds markdown comments in the doxstrings ... Since Doxygen 1.8.0 (we are already using it), it is possible to add markdown comments in the doxygen strings. This will make our comments easier to read. This patch only adds markdown to CCNode.h as a test. If you like, I'll keep adding markdown comments as I see them. Please, encourage the rest of the team to do the same.	2013-11-11 20:21:01 -08:00
minggo	1e15071dc7	remove makefiles	2013-11-11 17:29:48 +08:00
Ricardo Quesada	5faae4a51e	removes exe bit from text files	2013-11-08 11:30:50 -08:00
James Chen	f3c40a3e7a	issue #3113: 32Bit fix and 13.10 32bit complication is ok.	2013-11-06 14:54:35 +08:00
James Chen	9be8ca3714	[cmake] output lib to root/lib	2013-11-04 21:03:08 +08:00
James Chen	f17aa8b450	Move the library of fmod to external folder.	2013-11-04 21:03:08 +08:00
James Chen	922924e1ab	TestCpp is ok.	2013-11-04 21:03:07 +08:00
minggo	abcf8f268d	fix conflicts	2013-10-22 18:36:13 +08:00
minggo	6a664d480a	issue #2905:samples build ok on linux	2013-10-22 18:01:56 +08:00
Dhilan007	f11dba586a	issue #2905:modification vs-project for folder structure change	2013-10-21 22:09:21 +08:00
Dhilan007	2865ad798b	issues #2905:Updating project configuration for folder change.	2013-10-15 10:18:37 +08:00
minggo	95acb1b9e3	issue #2905: helloworld build ok on android	2013-10-14 14:01:00 +08:00
minggo	4313c46e93	issue #2905:adjust folder structure	2013-10-12 11:22:05 +08:00