Commit Graph

18922 Commits

Author SHA1 Message Date
Huabing.Xu d865341694 remove kmMat4 interface in cpp-tests 2014-04-10 10:16:16 +08:00
James Chen 9a25613eb2 Merge pull request #6203 from dumganhar/develop
Fix for CC_CALLBACK_3 macro
2014-04-10 10:08:34 +08:00
James Chen 7db741cf42 Fix for CC_CALLBACK_3 macro 2014-04-10 10:07:01 +08:00
James Chen 3fca2a2c35 Merge pull request #6202 from natural-law/develop
Update the reference of submodule cocos2d-console.
2014-04-10 09:56:49 +08:00
zhangbin cd6ff8f391 Update the reference of submodule cocos2d-console. 2014-04-10 09:51:46 +08:00
James Chen a2fcc79ad0 Merge pull request #6201 from iSevenDays/patch-6
Fix potential  memory leak in SimpleAudioEngine::preloadEffect
2014-04-10 09:37:12 +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 890dd64d38 issue #4729: some warning fixes and compilation error fixes on win32. 2014-04-10 01:29:13 +08:00
James Chen 364fc4722a issue #4729: Updates CCInputDelegate.h 2014-04-10 00:52:41 +08:00
James Chen 7cdd041b79 issue #4729: Adds missing include path in cocos2dx_physics.ini 2014-04-10 00:37:42 +08:00
James Chen 5dc6dd87e9 issue #4729: include "ccTypes.h" in ccCArray.cpp for CC_INVALID_INDEX 2014-04-10 00:36:43 +08:00
James Chen 5615717617 issue #4729: NULL -> nullptr in constructor or setXXX(NULL) 2014-04-10 00:36:43 +08:00
James Chen 377086d67a issue #4729: don't use 'using namespace std;' 2014-04-10 00:36:42 +08:00
James Chen e59374de81 issue #4729: Move CC_INVALID_INDEX from ccCArray.h to ccTypes.h,
probably there is a better place to define this variable, but let's just
choose ccTypes.h now.
2014-04-10 00:36:42 +08:00
James Chen 0af6057996 issue #4729: [ios/mac] Updates cocos2d_libs.xcodeproj 2014-04-10 00:36:42 +08:00
James Chen 9d8d256bee issue #4729: Android build works ok. 2014-04-10 00:36:42 +08:00
James Chen a240c7b240 issue #4729: Moved CCNotificationCenter.h/.cpp to deprecated folder. 2014-04-10 00:36:42 +08:00
James Chen 0bb8f3da78 issue #4729: Updates win32/winrt xxx_headers.props 2014-04-10 00:36:42 +08:00
James Chen a2a712bc17 issue #4729: Updates tools/tolua/cocos2dx.ini 2014-04-10 00:36:42 +08:00
James Chen 43d6e1176a issue #4729: Compilation error fixes for linux 2014-04-10 00:36:42 +08:00
James Chen 2fc6c0150c issue #4729: iOS/Mac works fine 2014-04-10 00:36:41 +08:00
James Chen 5b296a62e9 issue #4729: Moved deprecated classes to 'cocos/deprecated' folder 2014-04-10 00:36:41 +08:00
minggo 2beed5d398 Merge pull request #6166 from dabingnn/develop_fix_rendererBug
Develop fix renderer bug
2014-04-10 00:27:33 +08:00
Nick Barrios 64fc13cae2 CCGLView.h: Remove createWithFullscreen declaration. 2014-04-09 12:15:24 -04:00
Dhilan007 05b8123803 Label:Makes the create functions of Label just do one thing. 2014-04-09 23:31:05 +08:00
Dhilan007 76689cda1a fixed compile errors. 2014-04-09 21:40:10 +08:00
Dhilan007 67652357e1 1.Makes the create functions of Label clear. 2014-04-09 21:35:08 +08:00
James Chen a9714f1859 Merge pull request #6198 from dumganhar/xcode-analyze-fix
Some fixes detected by xcode analyze
2014-04-09 21:03:12 +08:00
James Chen 61134426a8 Some fixes detected by xcode analyze 2014-04-09 20:41:09 +08:00
James Chen 2c4d17a3e8 Merge pull request #6195 from iSevenDays/patch-3
Incompatible pointer type fix in cpArrayNew
2014-04-09 20:37:35 +08:00
chuanweizhang2013 d4e2b72f12 add platform symbol 2014-04-09 19:17:13 +08:00
chuanweizhang2013 e9c0d1a72a add luasocket 2014-04-09 18:29:32 +08:00
chuanweizhang2013 b077ed40e8 Merge branch 'luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into luaruntime 2014-04-09 17:55:58 +08:00
chuanweizhang2013 e97552c2d3 add reload 2014-04-09 17:54:10 +08:00
cw d34fddb06e rename lua folder 2014-04-09 17:03:38 +08:00
Anton Sokolchenko e98e4c403f Potential leak of an object stored into "self"
1. By executing 314: _systemControl = [[CCEditBoxImplIOS_objc alloc] initWithFrame:rect editBox:this];
2. We entered to the function 67: -(id) initWithFrame: (CGRect) frameRect editBox: (void*) editBox
3. Then 69: "self = [super init];" returns object with +1 retain count
4. 93: "return nil" Potential leak of an object stored into "self".
2014-04-09 12:00:15 +03:00
James Chen 8fadeeb3e8 Update CHANGELOG [ci skip] 2014-04-09 16:49:48 +08:00
James Chen ae02555120 Update AUTHORS [ci skip] 2014-04-09 16:47:36 +08:00
Anton Sokolchenko e063e97a5d Incompatible pointer type?
Why sizeof(void**) and not sizeof(void*)?
2014-04-09 11:44:01 +03:00
James Chen 1eae592ed8 Merge pull request #6194 from iSevenDays/patch-2
Result of 'malloc' is incompatible with type 'unsigned char *' in Image::saveImageToPNG.
2014-04-09 16:43:13 +08:00
James Chen cb2f48c1e0 Merge pull request #6193 from shujunqiao/autotest-mac
not excute android autotest now.[ci skip]
2014-04-09 16:40:05 +08:00
Anton Sokolchenko 87015ae888 2026:72: Result of 'malloc' is incompatible with type 'unsigned char *'
2026:72: Result of 'malloc' is converted to a pointer of type 'unsigned char', which is incompatible with sizeof operand type 'unsigned char *'
2014-04-09 11:37:56 +03:00
James Chen 9bd3be1d03 Merge pull request #6186 from samuele3hu/develop_new_label
close #4721:clone for EventListeners of lua didn't clone the related property and add more EventDispatcher test cases
2014-04-09 16:34:37 +08:00
shujunqiao 71bc948369 not excute android autotest now. 2014-04-09 16:30:08 +08:00
samuele3hu b6579aa322 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label 2014-04-09 16:25:44 +08:00
James Chen 804c436433 Merge pull request #6192 from CocosRobot/update_cocosfiles_1397030961
[AUTO][ci skip]: updating cocos2dx_files.json
2014-04-09 16:23:43 +08:00
samuele3hu 7de6552f54 Update the NewEventDispatcherTest 2014-04-09 16:22:03 +08:00
CocosRobot e272c66932 [AUTO][ci skip]: updating cocos2dx_files.json 2014-04-09 08:09:22 +00:00
James Chen 83eed34537 Merge pull request #6191 from CocosRobot/update_cocosfiles_1397030339
[AUTO][ci skip]: updating cocos2dx_files.json
2014-04-09 15:59:35 +08:00