Ricardo Quesada
81c2d92355
yeah... love in includes
...
<3
2014-04-26 10:35:57 -07:00
Ricardo Quesada
9b118e5e96
Squashed commit of the following:
...
commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:10:06 2014 -0700
Updates templates files
commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:08:19 2014 -0700
compiles on Windows
commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:55:30 2014 -0700
adds cocos2d.h
commit 4c3d14f929bac017b93ca843b4f149d352264a30
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:54:24 2014 -0700
re-adds missing files
commit f729181728959260d14c4152555534f5beec8e05
Merge: 148da79 2adac67
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:51:12 2014 -0700
Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes
commit 148da79010c5dffeab885933624cffaf3d588852
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:49:12 2014 -0700
Adds SimpleAudioEngine
commit 2adac67019180ec82b7bd03f0b67c12f62e29e77
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:47:45 2014 -0700
Compiles for Android
commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:13:35 2014 -0700
Fixes the includes
2014-04-26 10:11:22 -07:00
walzer
64af0de648
update copyrights for 2014, in cocos/2d/ folder
2014-01-07 11:25:07 +08:00
James Chen
0ff85852cc
Don’t use FileUtils::getInstance()->getFileData, please use getStringFromFile and getDataFromFile instead.
2013-12-24 18:08:40 +08:00
James Chen
2a7b2c107a
Updates CCUserDefaultAndroid.cpp.
2013-12-20 21:51:53 +08:00
James Chen
21a9f05110
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor
...
Conflicts:
cocos/2d/CCUserDefault.cpp
cocos/2d/CCUserDefault.mm
cocos/2d/CCUserDefaultAndroid.cpp
cocos/2d/ZipUtils.cpp
cocos/2d/platform/CCFileUtils.h
cocos/2d/platform/CCSAXParser.cpp
2013-12-20 21:12:11 +08:00
James Chen
2c590cea3e
closed #3457 : Fix of UserDefault. Infinite loop in UserDefault's destructor on iOS. The destructor of UserDefault is private now.
2013-12-20 14:06:24 +08:00
boyu0
e07c4ffec1
Change NULL to nullptr, edit hungarian notation.
2013-12-18 17:47:20 +08:00
James Chen
2892e8be3f
Refactors Data class, adds FileUtils::getStringFromFile, FileUtils::getDataFromFile and deprecates FileUtils::getFileData.
2013-12-18 14:58:17 +08:00
minggo
eecd5d7980
Merge pull request #4441 from xhcnb/mem_leak_android_userdefault
...
[ci skip]UserDefault::setDataForKey on android will cause memory leak
2013-12-05 22:19:58 -08:00
Jason Xu
29bd5001ae
UserDefault::setDataForKey on android will cause memory leak
2013-12-06 11:53:43 +08:00
minggo
b67d567a79
replace long with int or ssize_t
2013-12-05 17:22:22 +08:00
Huabing.Xu
4894632467
Fix bug: add android, fix android can not compile
2013-11-14 17:14:35 +08:00
Ricardo Quesada
be64dd97cf
replaces `delete[]` with `free()` in C-based API
...
API that returns a newly allocated buffer as an output argument (not return value) are error-prone.
- Users forget to release the newly allocated buffer
- Or the call `delete` instead of `delete[]`
But some of those API need to call `realloc` on the buffer.
But `realloc` is only valid if the buffer was previously allocated with `malloc`.
If a buffer needs to be re-allocated using a C++ API, then `std::vector<char*>` should be used instead...
So, this patch does:
- Migrates the API from `new []` / `delete[]` to `malloc()` / `free()`
- Fixes all the memory issues: incorrect deallocs and memory leaks
- Updates the documentation
- And fixes misc issues with the API: removes `cc` from the ZipUtils class.
2013-11-11 18:09:47 -08:00
minggo
b9b14571ac
fix compiling erros on Android
2013-11-07 17:16:31 +08:00
minggo
95acb1b9e3
issue #2905 : helloworld build ok on android
2013-10-14 14:01:00 +08:00
minggo
49d7bbd600
issue #2905 : remove sub folders except platform
2013-10-12 15:41:45 +08:00