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

1033 Commits

Author SHA1 Message Date
James Chen 76a560a474 issue #1310: Made CCFileUtils as a singleton. 2012-06-08 16:22:57 +08:00
Nat Weiss 6ee3db827c Allows Cocos2D-X to be built for iOS including all cpp files. 2012-06-07 23:52:15 -07:00
Nat Weiss ed43e6a90b Allows Cocos2D-X to be built for iOS including all cpp files. 2012-06-07 21:16:24 -07:00
minggo 49d8ac72f6 fixed #1202:remove CCFileData 2012-06-07 14:13:44 +08:00
James Chen 2238db301b fixed #1301: CCEGLView::sharedOpenGLView().setScissorInPoints() should apply scissor in points. 2012-06-06 14:13:40 +08:00
James Chen 6bb2941ec9 fixed #1300: Typo: CC_ENABLE_CACHE_TEXTTURE_DATA -> CC_ENABLE_CACHE_TEXTURE_DATA 2012-06-06 10:06:51 +08:00
James Chen 3959fe8f4d typo fixed in CCGL.h 2012-06-01 14:48:45 +08:00
James Chen 2b235fd705 Delete libEGL.dll(.lib). 2012-06-01 13:56:22 +08:00
James Chen ebcc78497f fixed #1282: Can not run samples on windows if the display card is ATI. Use opengl directly. Reverted all project configurations to Unicode characterset to avoid textinput error. 2012-06-01 13:44:28 +08:00
minggo 5ad2bec3d8 Merge pull request #946 from minggo/gles20 
fix some bug
 2012-05-30 03:33:19 -07:00
minggo a698f9bf69 fix some bug 2012-05-30 18:31:20 +08:00
James Chen 6be44ad7b0 fixed #1279: NodeNonOpaqueTest can't be shown correctly. 2012-05-30 18:30:11 +08:00
minggo 80389d0611 Merge pull request #941 from minggo/gles20 
fix some bugs
 2012-05-30 00:44:22 -07:00
minggo 4428810fd5 fixed some bugs 2012-05-30 15:42:29 +08:00
James Chen 895de701ba fixed #1273: Crash appears after clicking closed button in TextureCacheTest. Also fixed a bug about memory leak in CCEGLView.cpp(win32). And updated build-win32.bat. 2012-05-30 14:24:59 +08:00
James Chen ad50d6ee57 fixed #1270: Fixed some warning on win32. 2012-05-29 17:11:33 +08:00
James Chen 19c96632b5 fixed #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces. 2012-05-29 16:21:23 +08:00
James Chen 5f5af82254 fixed #1177: Moved CCStdC.h/.cpp to relevant platform folder. 2012-05-29 15:51:13 +08:00
James Chen 14a218c8cc Merge pull request #922 from dumganhar/gles20 
fixed #1240: Added static libraries of tiff for android.
 2012-05-28 01:07:08 -07:00
James Chen 785c3c5d60 fixed 1240# : Added static libraries of tiff for android. 2012-05-28 16:05:52 +08:00
James Chen 6e59d5eab4 fixed #1264: CCLabelTTF: wrong string alignment when using utf-8 encoded text. 2012-05-28 14:27:32 +08:00
James Chen 99dcb4de86 issue #1263: Removed CCFileUtils::ccLoadFileIntoMemory in CCFileUtils.mm. Removed some comments. 2012-05-28 14:14:19 +08:00
James Chen c902e884f4 fixed #1240: Moved particle files to Particle folder. Fixed a bug in tiff decoding. Refactored CCTextureCache::adddImage. 2012-05-25 16:52:47 +08:00
James Chen 6477a02022 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1240_tiff 2012-05-25 11:00:20 +08:00
James Chen 0b8a75e982 fixed #1240: Used dynamic libtiff library for win32. Fixed some warnings. Added tiff test in Texture2dTest. 2012-05-25 10:58:28 +08:00
Walzer df98ed4792 Merge pull request #914 from walzer/gles20 
javascript binding!
 2012-05-24 03:48:14 -07:00
Walzer 1e732930b7 fixed #1258, testjs and spidermonkey-ios is merged. But only test_actions.js works. 2012-05-24 17:48:05 +08:00
minggo c258e1e43a fixed #1247: add profile lib 2012-05-24 17:47:46 +08:00
James Chen e5443d22c1 issue #1240: Added libtiff for android. 2012-05-24 12:00:06 +08:00
James Chen 6a37158100 issue #1240: Used TIFFClientOpen instead of TIFFOpen to decode memory data of tiff format. 2012-05-23 18:20:51 +08:00
James Chen c2591f1e9e issue #1240: Added tiff support, run ok on win32. There is a 'FIXME' needed to be fixed. 2012-05-23 17:26:06 +08:00
James Chen c7359ba1a0 fixed #1252: Added CCEGLViewProtocol::getFrameSize() method for getting the real screen size of device. 2012-05-23 11:57:43 +08:00
James Chen f7ffdd757c fixed #1244: deleted unused method "release" of CCImage class. 2012-05-23 11:22:17 +08:00
James Chen d998b54269 fixed #1224: Memory leak in CCParticleSystem::initWithDictionary() 2012-05-23 11:18:04 +08:00
minggo 683c91bbfa fixed #1236: return empty string when parameter is null 2012-05-16 14:17:37 +08:00
minggo 1d18c6607a fixed #1237: correct line number output by CCAssert 2012-05-16 14:10:27 +08:00
minggo ff6abd1d8c fixed #1230: fix a bug in calculating string width 2012-05-07 10:15:57 +08:00
Walzer f70855e959 fixed #1229, reduce the requirement of gles20 branch from NDK android-10 to android-8 level (official android 2.2 image, the lowest version which supports OpenGL ES 2.0), remove EGL dependency. 2012-05-05 10:06:41 +08:00
minggo 27b5fb8074 merge commit of issue 1216 2012-05-03 16:30:13 +08:00
James Chen 7cdb11b668 fixed #1215: fixed a bug in retina support for win32. 2012-05-03 15:05:19 +08:00
James Chen 82439733c5 fixed #1204: Made CCEGLView::Create(on win32) as a private function. Updated ExtensionsTest. 
And updated the format of source files(changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces).
 2012-05-03 10:12:00 +08:00
James Chen ca5ef69d50 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1204_initInstance 2012-05-02 18:44:30 +08:00
minggo 4bcf67078d fixed #1201: add prebuilt libs 2012-05-02 18:37:37 +08:00
James Chen 395dbc90aa Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1204_initInstance 
Conflicts:
	lua/cocos2dx_support/LuaCocos2d.cpp
 2012-05-02 18:23:16 +08:00
James Chen 4580fffed7 issue #1204: Updated CCApplication.mm and ios template. 2012-05-02 18:18:43 +08:00
James Chen 5fc72581cb issue #1204: Removed CCApplication::initInstance. 2012-05-02 17:50:26 +08:00
minggo c048fe77c6 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1201_android_build 2012-05-02 14:41:49 +08:00
James Chen db92c9c1dc Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1194_tex_wat 2012-05-02 14:32:27 +08:00
minggo 741f219f16 issue 1201: remove module to prebuilt 2012-05-02 10:45:21 +08:00
minggo 57d6884757 rename modules to prebuilt 2012-05-02 10:44:40 +08:00
Walzer 2addd06f21 fixed #1203, remove CCFileUtils::setResource & SimpleAudioEngine::setResource, these 2 methods were created for wophone. 2012-05-02 10:39:17 +08:00
James Chen de35aaa101 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1194_tex_wat 2012-05-02 09:49:12 +08:00
James Chen c5f7f15090 issue #1194: Added extension namespace, all extension classes are in cocos2d::extension namespace, added CCTextureWatcher and CCListView. 2012-04-27 18:47:49 +08:00
minggo a4e8c9ad17 fixed #931: refactor CCImage and CCTexture2D 2012-04-27 18:37:11 +08:00
minggo a1570e931f issue #931:make convert to rgb565 and A8 correct 2012-04-27 15:53:29 +08:00
James Chen 2bffd3a565 issue #931: dynamically allocate array(row_pointers) in CCImage::_initWithPngData. 2012-04-26 18:17:57 +08:00
minggo 602d34ec78 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-04-26 17:36:59 +08:00
minggo 7ecbd8ea6c issue #931: refactor CCImage and CCTexture2D 2012-04-26 17:36:32 +08:00
James Chen f5ffe8249e issue #1190: Updated ios lua project. 2012-04-26 13:05:05 +08:00
James Chen 8d63e9f1bd issue #1190: Updated some files for android port. 2012-04-26 11:52:21 +08:00
James Chen edfb8c1f9c issue #1190: used std::string as key of CCDictionary. Updated CCString.pkg, CCArray.pkg, CCDictionary.pkg. 2012-04-26 11:39:49 +08:00
James Chen 96a177bd37 issue #1190: updated some pkg files for lua binding. 2012-04-26 09:34:42 +08:00
James Chen 1d94ba05a0 fixed #1189: updated linebreak and tab(4 space) for all source files. 2012-04-25 18:17:04 +08:00
James Chen 568bdce6c1 fixed #1188: Removed some unused files. 2012-04-25 17:46:29 +08:00
James Chen 8e5668472f issue #1188: Updated project configuration for ios platform. 2012-04-25 17:33:28 +08:00
James Chen 0f36a89c7e issue #1188: Refactor directory. Compile successfully on android and win32(vs2008 debug). 2012-04-25 16:18:04 +08:00
James Chen e8b826b7a6 fixed #1187: spanish(Buen día) cannot be shown completely in CCLabelBMFont unicode test. 2012-04-25 10:55:59 +08:00
James Chen 062ae1756d fixed #1177: updated project configuration for android and ios platforms. 2012-04-24 17:35:36 +08:00
James Chen f1c5cfef1e fixed #1177: Added CCApplicationProtocol.h. 2012-04-24 17:13:13 +08:00
James Chen 5e0682ed77 Merge branch 'iss1177_platform' of https://github.com/dumganhar/cocos2d-x into iss1177_platform 2012-04-23 15:41:01 +08:00
James Chen af86a52f27 issue #1177:Updated some files for ios port. 2012-04-23 15:40:46 +08:00
James Chen 8fd3518160 issue #1177: fixed a bug about retina in CCDirector. 2012-04-23 15:38:02 +08:00
James Chen 5b77e6e80e Merge branch 'iss1177_platform' of https://github.com/dumganhar/cocos2d-x into iss1177_platform 
Conflicts:
	cocos2dx/platform/CCEGLViewProtocol.cpp
	cocos2dx/platform/CCEGLViewProtocol.h
 2012-04-23 14:39:27 +08:00
James Chen 24515f009e issue #1177: Updated ios project configuration. 2012-04-23 14:35:41 +08:00
James Chen 521155e9e2 issue #1177: Added some common methods for CCPoint,CCSize,CCRect. Added MutiTouchTest demo. 2012-04-23 14:30:38 +08:00
James Chen 0c6d21c0f9 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1177_platform 2012-04-20 17:34:47 +08:00
James Chen 909a759ff6 issue #1177: Updated android project configuration. 2012-04-20 17:33:28 +08:00
James Chen d1d0fd619a issue #1177: Added CCEGLViewProtocol class as CCEGLView's super class. Updated win32, android project configuration. 2012-04-20 15:23:00 +08:00
minggo 160c94dd46 fixed #1179: popup message box when invoking CCAssert on Android 2012-04-20 15:12:20 +08:00
minggo f3d97bd9b6 fixed #1180: synchronize CCConfiguration 2012-04-20 11:39:12 +08:00
James Chen 5b50baffd4 issue #1176: Updated ios project. 2012-04-19 15:03:41 +08:00
James Chen 230b8a386b issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 
with four spaces. Also,
1. Used macro NS_CC_BEGIN instead of namespace cocos2d {, NS_CC_END instead
of }.
2. Removed some unused files.
3. Renamed the name of some folders, for example,
"test.android"-->"proj.android" .
 2012-04-19 14:35:52 +08:00
James Chen 84ffaf130a delete semicolon after NS_CC_BEGIN and NS_CC_END 2012-04-19 11:56:22 +08:00
James Chen 4068be84e9 Refactored project folders. 2012-04-19 11:46:08 +08:00
James Chen 32b53623c7 Removed some unused folders regard to WOPHONE. 2012-04-19 10:52:53 +08:00
James Chen 783b2fe79b Removed some unused codes regard to WOPHONE. 2012-04-19 10:46:37 +08:00
James Chen 7d7baf81a2 refactor updated... 2012-04-18 18:43:45 +08:00
James Chen 77919439bc fixed #1166: Added CCArray::arrayWithContentOfFile function. 2012-04-16 15:41:01 +08:00
James Chen 9ace0d2fdc Fixed memory leaks in CCString and CCDictionary, Updated CCFileUtils_ios.mm.Remove inline prefix for some member function of CCString, so that make it compiled successfully on android and ios. 2012-04-16 10:57:37 +08:00
James Chen d01f1277af optimize data struct. 2012-04-14 19:11:57 +08:00
James Chen 3c0653ffa7 fixed #1164: 1. Add the render mode which uses VBO without VAO in CCParticleSystemQuad. 
2. delete some unused codes for win32 port.
3. Add CC_REBIND_INDICES_BUFFER macro.
 2012-04-13 17:24:50 +08:00
minggo 028cf7874e issue #1156: remove unneeded macros and functions 2012-04-13 11:22:17 +08:00
James Chen 137679d369 Fixed a bug in CCFileUtils::dictionaryWithContentOfFile. 2012-04-10 16:32:53 +08:00
James Chen b4d74700e4 Merge branch 'iss1094_gles20_particlebat' of https://github.com/dumganhar/cocos2d-x into new_ipad 
Conflicts:
	tests/tests/ParticleTest/ParticleTest.cpp
 2012-04-09 10:28:21 +08:00
minggo 86b13a64c4 CCFileUtils::fullPathFromRelativePath() works correct 2012-04-08 14:52:47 +08:00
minggo 9e62841adb fixed #1089: win32 support ipad, new ipad 2012-04-08 14:29:16 +08:00
minggo 29be687f0b merge commit 0e8a8c04a21b7e96a7386237d0e4e4eef2269c89 2012-04-08 14:28:07 +08:00
minggo 355e27dada merge commit 928a28e37d3469fcd41aff14cb136b1415f2fc86 2012-04-08 14:16:29 +08:00
James Chen df58a09255 Update: 
1. init CCSprite::m_pobBatchNode at the beginning of CCSprite::initWithTexture.
2. Add CCAssert in ccArrayRemoveObjectAtIndex.
3. Use new method to allocate CCDirector.
 2012-04-05 18:53:53 +08:00
James Chen c6457dfed8 issue #1056: Updated ios project configuration. 2012-03-29 10:09:41 +08:00