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

1292 Commits

Author SHA1 Message Date
minggo e8fda66ccc Merge https://github.com/cocos2d/cocos2d-x 2011-06-24 13:55:52 +08:00
minggo 8440d6a267 [android] fixed #364: show string correct & line break ok 2011-06-24 13:55:00 +08:00
liswei 0c5f28fc11 fixed #539 call unzOpen, then may not call unzClose(WVGA) 2011-06-24 09:29:55 +08:00
liswei 4793713daa fixed #539 call unzOpen, then may not call unzClose(WVGA) 2011-06-23 18:24:32 +08:00
Walzer 156dfa8859 Merge remote branch 'origin/master' 2011-06-23 16:31:52 +08:00
Walzer 9e74b1f50d fixed #534, use #if (CC_TARGET_PLATFORM != CC_PLATFORM_IOS) - #endif to wrap the useless codes on ios. 2011-06-23 16:31:04 +08:00
Walzer 481010a417 Merge pull request #316 from minggo/iss364 
[Android] line break ok on Android
 2011-06-23 01:04:22 -07:00
Walzer 39d62d69a7 add script_support into cocos2dx/proj.wophone/Makefile.ARM, but untest. 2011-06-23 16:02:16 +08:00
Walzer fea9f3b943 add script_support to cocos2d-wophone.vcproj 2011-06-23 15:59:28 +08:00
minggo 53eafa77ff Merge https://github.com/cocos2d/cocos2d-x into iss364 2011-06-23 14:45:25 +08:00
minggo 10cdd7f798 [android] fixed #364: line break ok on Android 2011-06-23 14:44:20 +08:00
minggo d4bd6e63d2 synchrolize java code to HelloLua 2011-06-23 12:47:02 +08:00
Walzer d4e9e5a9d9 Merge pull request #314 from yangws/master 
PVRFrame lib update to version 2.8 r1 (2.08.28.0634)
 2011-06-22 20:10:09 -07:00
Walzer a98a3b9ca7 [airplay] add script_support 2011-06-23 09:31:18 +08:00
yangws 2c22cf0621 fixed #537 update to version 2.8 r1 (2.08.28.0634) 2011-06-22 17:55:03 +08:00
Walzer 45933b177f Merge pull request #313 from minggo/iss535 
[Android] Use Android widget Bitmap to drawing string
 2011-06-22 02:17:07 -07:00
Walzer 67ac46647f issue #531, Merge liswei/issue531 manually. 2011-06-22 17:13:01 +08:00
minggo 1122a7c7d0 [android] use Android widget Bitmap other than skia to drawstring 2011-06-22 16:58:50 +08:00
minggo fd86f1ef8c Merge pull request #309 from minggo/master 
fix a compile bug
 2011-06-21 02:39:45 -07:00
minggo 53a5ec412e fixed #528: fix a compile bug 2011-06-21 17:36:38 +08:00
minggo 6cb6359168 Merge pull request #308 from minggo/master 
fixed #528
 2011-06-21 02:06:11 -07:00
Walzer f3375f0dbb issue #528, improve CCScriptEngineManager. AppDelegate should hold the whole lifecycle of LuaEngine object. 2011-06-21 17:02:08 +08:00
minggo 00cc1d277d fixed #528: safe call of CCScriptEngineManager::sharedScriptEngineManager()->getScriptEngine()->xxx() 2011-06-21 16:59:17 +08:00
Walzer ddbdf67f97 Merge http://github.com/minggo/cocos2d-x into lua 2011-06-21 16:03:34 +08:00
minggo 968779912a fixed #528: add copyright & modify pop menu position 2011-06-21 15:50:47 +08:00
Walzer 175e9394bc Merge https://github.com/minggo/cocos2d-x into lua 2011-06-21 15:22:00 +08:00
Walzer f80948d2eb Merge pull request #303 from natural-law/master 
fixed #323
 2011-06-20 23:03:08 -07:00
minggo d72d8a52f4 Merge https://github.com/cocos2d/cocos2d-x 2011-06-21 13:53:04 +08:00
minggo 8066312098 fixed #528: refactor lua ok 2011-06-21 13:51:36 +08:00
Marat Yakupov 14c43f4246 changed postfix increment of iterators to prefix increment 2011-06-21 09:30:03 +04:00
natural-law 49a4481473 fixed #323, Remove the #include <map> in CCApplication_win32.cpp. 2011-06-21 12:01:59 +08:00
natural-law ba4c3b8928 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-06-21 11:58:52 +08:00
natural-law 960ef65f53 fixed #323, Modify the implement of getCurrentLanguage method on win32. 2011-06-21 11:58:10 +08:00
minggo 80e618f6ed issue #528: fix some bug & complete hello.lua 2011-06-21 11:47:57 +08:00
Walzer 3559258d94 Merge pull request #305 from moadib/cclabelbmfont_ref_instead_copy 
Removed unnecessary copy of ccBMFontDef structure in CCLabelBMFont::createFontChars()
 2011-06-20 20:38:05 -07:00
Walzer 4d161e7948 fix #529, add static node() method to CCLayerColor, CCLayerGradient, CCMultiplexLayer 2011-06-21 10:53:20 +08:00
minggo 2f97a43439 issue #528: refactor lua ok on Android 2011-06-21 10:18:43 +08:00
minggo 022e2b9998 issue #528: refactor ok on win32 2011-06-20 17:31:38 +08:00
Marat Yakupov 0b3586126b Removed unnecessary copy of ccBMFontDef structure in CCLabelBMFont::createFontChars() 2011-06-20 10:40:27 +04:00
natural-law fae0498b3c Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-06-17 10:49:25 +08:00
natural-law cfee246959 fixed #323, Add an interface to get the current language. 2011-06-17 10:49:02 +08:00
Marat Yakupov 7be492d1b5 Parameters should be passed by const reference instead copy 2011-06-16 09:27:51 +04:00
yangws 19eaefab72 CCImage_win32 hasn't release font resource in Destructor. 2011-06-16 10:55:57 +08:00
minggo 33008fc8de Merge pull request #300 from minggo/lua 
Lua support
 2011-06-15 02:24:17 -07:00
minggo 738f0b3426 Merge https://github.com/cocos2d/cocos2d-x into lua 2011-06-15 15:32:09 +08:00
liswei 3e54282e04 fixed #502 modify CCConfiguration to singleton mode 2011-06-15 11:48:00 +08:00
liswei c6cd929dac fixed #516 ccactionmanager.cpp L289: 'if (UINT_MAX == i)' modify to 'if (UINT_MAX != i)' 2011-06-15 09:56:33 +08:00
liswei 585792f3da Merge branch 'work1' 2011-06-14 16:29:41 +08:00
liswei 7c669cfcb4 fixed #523 [all] CCParticleSystemQuad::particleWithFile can't work correctly 2011-06-14 16:27:47 +08:00
natural-law 5d70774b4f fixed #524, Parse the special format of plist files on ios & airplay. 2011-06-14 16:15:20 +08:00
minggo 49f1518893 fix a bug when compile in android 2011-06-14 15:43:45 +08:00
natural-law 214e86a5b6 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 
Conflicts:
	cocos2dx/platform/CCFileUtils.cpp
 2011-06-14 15:05:52 +08:00
natural-law 489fb7824b fixed #524, Parse the special format of plist files. 2011-06-14 14:53:00 +08:00
minggo a7a22e528b remove the usage of NDController 2011-06-14 14:46:39 +08:00
minggo 9c49e27bf1 add extensions & tools directory 2011-06-14 14:31:25 +08:00
minggo 0f19c30921 remove redifine functions 2011-06-14 11:32:01 +08:00
minggo 4d8b2c284c support lua 2011-06-14 11:08:39 +08:00
minggo 8003de7468 update to latest code and merge 2011-06-14 11:01:38 +08:00
liswei 91326028ec fixed #516 Undefined Behaviour in ccCArray.h (signed / unsigned conversion) 2011-06-13 16:58:55 +08:00
liswei 1591c7edc8 fixed #512 fix warnings in /Wall flag 2011-06-10 17:51:37 +08:00
Walzer f600846d4b Merge http://github.com/flyingpacer/cocos2d-x, resolve conflicts in cocos2dx/CCScheduler.cpp 2011-06-08 11:08:29 +08:00
RongHong 67eb87abfe To fix the crash when the gles version is too low 2011-06-08 10:02:07 +08:00
RongHong a13e8ae859 1.修正gles版本过低时会崩溃的问题 
2.修正unscheduleAllSelectors（）中遍历哈希表导致崩溃的问题
 2011-06-03 15:22:50 +08:00
Walzer 97afafd856 Merge remote branch 'origin/master' 2011-06-02 22:26:53 +08:00
Walzer 3cba64679c add std::string CCString::toStdString() method 2011-06-02 22:26:38 +08:00
minggo 4f20deff30 fixed #518: fix a bug that use tHashSelectorEntry in wrong way 2011-06-02 10:07:17 +08:00
minggo 83e1e0ebd1 tests run ok when it don't enable lua 2011-06-01 20:29:05 +08:00
minggo a8b6b850de use precompile macro to cantrol if enable lua support 2011-06-01 17:51:08 +08:00
minggo dedbd638d3 lua runs ok on Android 2011-06-01 14:35:28 +08:00
minggo fe8fcb0b00 invode lua registerred tick 2011-05-31 14:49:47 +08:00
minggo 697368cf20 support lua 2011-05-31 14:04:14 +08:00
yangws de977bc6c2 use 0 replace NULL 2011-05-30 16:49:08 +08:00
yangws 7e2d1d5c48 fixed #490 Text input on android use a different way, TextInputTest OK now. 2011-05-30 16:36:12 +08:00
Walzer c790fba340 avoid a bug in clang, see this post http://www.cocos2d-x.org/boards/7/topics/1638 Thanks to Cem Aslan's contribution! 2011-05-27 16:26:59 +08:00
Walzer 03b1bb6c52 fix a typo in CCTextFieldTTF. add comment for in helloworld/AppDelegate.cpp 2011-05-26 10:08:05 +08:00
yangws ec23d7ed55 fixed #508 Dynamic switch retina display support. 2011-05-23 16:21:31 +08:00
yangws 4c0008cd73 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 489 2011-05-20 10:02:16 +08:00
unknown 97142d4a59 Use GetCurrentDirectory instead GetModuleName in CCFileUitls_win32.cpp and compile OK on vs2010 2011-05-19 21:11:29 +08:00
unknown b940676cab Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 489 2011-05-19 20:55:39 +08:00
yangws 02774dd963 fixed #499 Move CCRGBAProtocol implement from CCMenuItemImage to CCMenuItemSprite. 2011-05-19 17:00:13 +08:00
minggo ff1017d86f Merge pull request #276 from minggo/iss496 
[android] fixed #496 fixed #497
 2011-05-18 23:18:37 -07:00
minggo 073260e0a9 [android] fixed #496 fixed #497: tests and HelloWorld work ok on Android3.0 2011-05-19 11:26:57 +08:00
Walzer 2dd11490ad Merge pull request #274 from yangws/master 
Fixed some bugs on wophone and modify CClog output utf-8 string on win32 and wophone emulator.
 2011-05-18 18:51:38 -07:00
minggo 822016e375 [android] fixed #495: fix a memory leak 2011-05-18 13:56:35 +08:00
yangws 8e07ab7dc9 Modify CCLog out utf-8 string on win32 and wophone emulator. 2011-05-18 11:25:54 +08:00
yangws 5173738f37 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-05-18 11:08:44 +08:00
yangws 7a6a891242 fixed bugs: the image stoped when switch app fore/background several times. The background music not stoped when app enter background some time. 2011-05-18 11:08:18 +08:00
natural-law 95a46bd5f8 [ios] fixed #493, The return value of CCFileUtils::getWriteablePath() should be end with '/'. 2011-05-17 10:44:56 +08:00
natural-law 0466166935 [win32] fixed #492, Consider the path separated by '\' in function CCFileUtils::fullPathFromRelativeFile(). 2011-05-16 17:13:15 +08:00
yangws aba77f4cae issue #489 modified for vs2008. 2011-05-13 14:13:30 +08:00
Walzer c7fb183dcb [airplay] After exclude CurlTest & CCUserDefault, UserDefaultTest, HelloWorld & Tests can be compiled successfully now. 2011-05-12 21:58:11 +08:00
Walzer 1340bbf842 [android] fix a compilation error in CCFileUtils_android.cpp, getWritablePath() method 2011-05-12 21:12:15 +08:00
Walzer f17a8f6226 Merge pull request #271 from minggo/iss488 
[Android] CCUserDefault works ok on android2.2
 2011-05-12 05:40:15 -07:00
minggo 91bc9a3f7a [android] fixed #488: fix memory leak 2011-05-12 18:55:32 +08:00
minggo d8f3b0c25b [android] CCUserDefault works ok on android2.2 2011-05-12 18:32:13 +08:00
yangws c73c1a9ab6 compile ok in vs2010 2011-05-12 16:15:10 +08:00
Walzer 78d49e9806 [win32] dllexport 2 pure C functions from CCLabelBMFont.h 2011-05-12 08:40:19 +08:00
Walzer 249724f8d8 [ios] issue #371, fix the error when invoke CCImage::initWithString with null string "" 2011-05-12 08:24:29 +08:00
Walzer d0ff1f274e Merge pull request #264 from yangws/master 
fixed a bug: TextInputTextWithAction can't stop CCTextFieldTTF's action when click enter button.
 2011-05-11 03:28:16 -07:00
yangws b8a9db98dc fixed a bug: TextInputTextWithAction can't stop CCTextFieldTTF's action when click enter button. 2011-05-11 18:22:55 +08:00