Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
13,665 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

13665 Commits

Author SHA1 Message Date
samuele3 482ee5d47f issue #2868:Add more ccs lua test samples 2013-11-12 15:25:47 +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 e2224d5316 [ci skip] 2013-11-12 11:24:59 +08:00
Liam f0ca796da1 merge from develop 2013-11-12 11:20:29 +08:00
James Chen 42ca4f6122 Merge pull request #4187 from dumganhar/develop 
#include <algorithm> for std::max, std::min on VS2013.
 2013-11-11 18:52:16 -08:00
James Chen db07c781ab #include <algorithm> for std::max, std::min on VS2013. 2013-11-12 10:35:50 +08:00
James Chen 0358eae8f0 Update CHANGELOG [ci skip] 2013-11-12 10:33:18 +08:00
James Chen 8c42e62a3f Update AUTHORS [ci skip] 2013-11-12 10:32:22 +08:00
James Chen cfd82a26bb Merge pull request #4156 from bopohaa/patch-1 
closed #3159: Webp Test Crashes.
 2013-11-11 18:31:03 -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
boyu0 dbafd9af2b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2770_fix_warnings 2013-11-12 10:07:26 +08:00
James Chen 412712c5e4 Update CHANGELOG[ci skip] 2013-11-12 09:45:07 +08:00
James Chen d7a0787336 Up 2013-11-12 09:44:07 +08:00
James Chen cc3a6ebda9 Merge pull request #4150 from ledyba/fix_ccdevice 
Close X Display
 2013-11-11 17:40:32 -08:00
minggo 44bed76c21 Merge pull request #4175 from nutty898/develop_nutty_optimizeguireader_3 
[ci skip]Develop nutty optimizeguireader 3
 2013-11-11 17:36:22 -08:00
Ricardo Quesada 0e642013db Merge pull request #4182 from ricardoquesada/android_create_fixes 
fixes for android create
 2013-11-11 16:10:19 -08:00
Ricardo Quesada a5eeff4f4f fixes for android create 
improves the message.
fixes some grammar errors
 2013-11-11 16:09:32 -08:00
Ricardo Quesada 4b2eda3cdc Merge pull request #4181 from ricardoquesada/delete_fixes 
calls `delete[]` instead of `delete`
 2013-11-11 16:08:35 -08:00
Ricardo Quesada d6446e9b14 calls `delete[]` instead of `delete` 
calls `delete[]` instead of `delete`
 2013-11-11 16:07:46 -08:00
Nite Luo a28f3f6f03 Merge branch 'develop' into newRenderer 2013-11-11 12:04:28 -08:00
Nite Luo f6fb48ba56 Fix crashing bug 2013-11-11 11:54:08 -08:00
James Chen 51cfd3fb4b Merge pull request #4151 from pyrasis/develop 
[Win32] fix compile error.
 2013-11-11 04:42:42 -08:00
James Chen a951ba600f Merge pull request #4179 from CocosRobot/updategeneratedsubmodule_1384167474 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-11-11 03:02:04 -08:00
CocosRobot 3472d7ad50 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-11 10:57:57 +00:00
James Chen d64de4f74d Merge pull request #4178 from dumganhar/develop 
[develop] Updating bindings-generator, fixing forward declare that gener...
 2013-11-11 02:46:48 -08:00
James Chen df214acb6f [develop] Updating bindings-generator, fixing forward declare that generates binding glue codes which is an empty class. 2013-11-11 18:42:39 +08:00
boyu0 d75c96443d issue #2770: fix some warning 2013-11-11 18:28:59 +08:00
CaiWenzhi b688e39584 Merge branch 'develop' into develop_nutty_optimizeguireader_3 2013-11-11 18:23:21 +08:00
CaiWenzhi 4f76141c41 optimize guireader 2013-11-11 18:22:14 +08:00
minggo b868c3f1dc Merge pull request #4173 from minggo/remove-makefile 
[ci skip]remove makefiles
 2013-11-11 02:19:16 -08:00
minggo d3cf36ba37 Merge pull request #4171 from dumganhar/jsb-64bit-fix 
[ci skip]Jsb 64bit fix
 2013-11-11 02:17:42 -08:00
CaiWenzhi 782c26bc37 Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch 2013-11-11 17:57:43 +08:00
minggo d1a414194e [ci skip]update linux build commands 2013-11-11 17:36:23 +08:00
2youyou2 cdae8f51bc Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop 2013-11-11 17:30:52 +08:00
2youyou2 528c257497 add setUserObject method to CCArmatureAnimation 2013-11-11 17:30:37 +08:00
minggo 1e15071dc7 remove makefiles 2013-11-11 17:29:48 +08:00
James Chen 394f4e703b Reverting AssetsManager::update. 2013-11-11 17:06:32 +08:00
samuele3 7cfe890d5d Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-11 17:04:37 +08:00
samuele3 06c7d3e96d issue #2868:Add ccd lua test samples 2013-11-11 17:03:43 +08:00
James Chen 22584ca9c2 Updating submodule of bindings-generator. 2013-11-11 16:50:07 +08:00
minggo 2a31ff04c2 Merge pull request #4166 from dabingnn/iss3025_TextureCache 
[ci skip]issue #3025: move deprecated texture cache implementation to cpp file
 2013-11-11 00:46:46 -08:00
James Chen 49289d7576 Adding cc.TextureCache.getInstance() to jsb_deprecated.js. 2013-11-11 16:45:44 +08:00
James Chen 20b350a58b Removing cocosjs_manual_conversions.h(.cpp). Put all jsval <-> native value conversion codes to js_manual_conversions.h(.cpp). 2013-11-11 16:45:44 +08:00
James Chen 0151ac60ba fix 64bit warning. unsigned int (int) —> long. 2013-11-11 16:45:44 +08:00
boyu0 a54603390e issue #2771: change pointQuery implements 2013-11-11 16:23:42 +08:00
Nite Luo f68a2a47e7 Improved batching 2013-11-11 00:14:29 -08:00
James Chen f25bd8ddb1 Merge pull request #4170 from CocosRobot/updategeneratedsubmodule_1384157112 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-11-11 00:06:44 -08:00
CocosRobot 2e52dd4905 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-11 08:05:15 +00:00
Huabing.Xu dfcae4ed0d issue #3025: change TextureCache::purgeSharedTextureCache() and TextureCache::sharedTextureCache() to do not call deprecate function anymore 2013-11-11 16:04:34 +08:00
James Chen a255fadd70 Merge pull request #4169 from dumganhar/develop 
Updating Bindings-generator.
 2013-11-10 23:58:02 -08:00