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

18739 Commits

Author SHA1 Message Date
James Chen c24cdc6eef Update AUTHORS [ci skip] 2014-04-10 11:26:32 +08:00
James Chen 13e0b732d1 Merge pull request #6206 from dumganhar/pull/6197 
Merge PR #6197: Potential leak in CCEditBoxImplIOS.mm
 2014-04-10 11:24:48 +08:00
CocosRobot 782bdd90f5 [AUTO]: updating luabinding automatically 2014-04-10 03:24:38 +00:00
James Chen 0c3c29b50d Remove unused comments in CCEditBoxImplIOS.mm 2014-04-10 11:22:55 +08:00
James Chen 150e73ba62 Merge commit 'refs/pull/6197/head' of git://github.com/cocos2d/cocos2d-x into pull/6197 2014-04-10 11:21:16 +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
James Chen ba1f535201 Merge pull request #6199 from Dhilan007/develop_label 
closed #4743: Label:Makes the create functions of Label clearer.
 2014-04-10 11:15:56 +08:00
James Chen cae0a45c40 Merge pull request #6205 from dumganhar/getData-fix 
Fix for FileUtils::getData
 2014-04-10 11:13:33 +08:00
James Chen 117f248a3b Fix for FileUtils::getData 2014-04-09 20:07:00 -07:00
Dhilan007 8ab372fdd9 Label:Add compatible API of the create functions. 2014-04-10 10:58:49 +08:00
James Chen 782d3cd3be issue #4729: Linux fixes 2014-04-09 19:51:05 -07:00
chuanweizhang2013 18d5317c64 Merge branch 'luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into luaruntime 2014-04-10 10:36:46 +08:00
chuanweizhang2013 c6ec729bf8 modify 2014-04-10 10:35:53 +08:00
chuanweizhang2013 91e42a17f5 Merge pull request #21 from cocos2d/develop 
update cocos2d-x
 2014-04-10 10:28:12 +08:00
Dhilan007 390685ae93 Label:Change setter of system font name. 2014-04-10 10:23:00 +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