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

3847 Commits

Author SHA1 Message Date
James Chen 2bffd3a565 issue #931: dynamically allocate array(row_pointers) in CCImage::_initWithPngData. 2012-04-26 18:17:57 +08:00
James Chen 1b2bba06c5 Merge branch 'gles20' of https://github.com/minggo/cocos2d-x into gles20_minggo 2012-04-26 17:57:23 +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 7d8fc95297 Merge pull request #871 from dumganhar/iss1190_gles20_lua 
fixed #1190: Updated lua bindings to 2.0 api.
 2012-04-25 23:40:01 -07:00
James Chen ceb5b122b0 fixed #1190: closed CC_LUA_ENGINE_DEBUG by default. 2012-04-26 14:37:28 +08:00
James Chen 6f62251bb6 fixed #1190: Updated some .pkg files. 2012-04-26 14:32:17 +08:00
James Chen f5ffe8249e issue #1190: Updated ios lua project. 2012-04-26 13:05:05 +08:00
James Chen 394622f538 issue #1190: Updated HelloLua.java and Cocos2dxGLSurfaceView.java, make HelloLua app support opengles2.0. 2012-04-26 12:06:51 +08:00
James Chen 8d63e9f1bd issue #1190: Updated some files for android port. 2012-04-26 11:52:21 +08:00
James Chen b21944e1d3 issue #1190: Updated main.cpp and Android.mk for HelloLua project of android. 2012-04-26 11:45:22 +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 f54d9b4184 Merge pull request #870 from dumganhar/iss_1186_gles20_bmf 
fixed #1189: syn 1.0 branch: CCLabelBMFont updateLabel() optimizations and fixes
 2012-04-25 03:19:39 -07: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 a5f0bc3cbc fixed #1189: syn 1.0 branch: CCLabelBMFont updateLabel() optimizations and fixes 2012-04-25 18:08:23 +08:00
James Chen 32f52b12c6 Merge pull request #869 from dumganhar/iss1188_dir 
fixed #1188: Removed some unused files.
 2012-04-25 02:49:25 -07:00
James Chen 568bdce6c1 fixed #1188: Removed some unused files. 2012-04-25 17:46:29 +08:00
James Chen b5c84aff38 Merge pull request #868 from dumganhar/iss1188_dir 
issue #1188: Refactor directories, compile successfully on ios, android and win32(vs2008 debug).
 2012-04-25 02:38:26 -07: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 7c5c583b58 Merge pull request #866 from dumganhar/iss1187_xml 
fixed #1187: spanish(Buen día) cannot be shown completely in CCLabelBMFont unicode test.
 2012-04-24 19:58:24 -07:00
James Chen 12e2f15c4e Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1187_xml 2012-04-25 10:56:19 +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 ff38eda2fe Merge pull request #865 from dumganhar/iss1177_platform 
fixed #1177: Refactor platform.
1. Added some common methods for CCPoint,CCSize,CCRect.
2. Added MutiTouchTest demo.
3. Added CCEGLViewProtocol and CCApplicationProtocol. Make them more convenient for porting cocos2d-x to a new platform.
 2012-04-24 03:09:43 -07:00
James Chen c1bc4fd65a fixed #1177: Updated ios project configuration. 2012-04-24 17:42:06 +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 26763c200b Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1177_platform 
Conflicts:
	tests/proj.ios/test.xcodeproj/project.pbxproj
 2012-04-24 15:44:53 +08:00
minggo 2eda8db7f6 Merge pull request #864 from minggo/gles20 
reload image data and recreate buffer of object when backing to foreground
 2012-04-24 00:04:50 -07:00
minggo 1e20f2b6db fixed #1185: reload image data and recreate buffer of object when backing to foreground 2012-04-24 15:02:18 +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 bf7f23a295 Merge pull request #858 from minggo/iss1179_CCAssert 
popup message box when invoking CCAssert on Android
 2012-04-20 00:17:07 -07:00
minggo 65f4b888f2 fixed #1179: remove test codes 2012-04-20 15:15:18 +08:00
minggo 6277e59b21 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1179_CCAssert 2012-04-20 15:12:46 +08:00
minggo 160c94dd46 fixed #1179: popup message box when invoking CCAssert on Android 2012-04-20 15:12:20 +08:00
minggo 0589faee17 Merge pull request #857 from minggo/iss1180_CCConfiguration 
synchronize CCConfiguration
 2012-04-19 21:43:36 -07:00
minggo f3d97bd9b6 fixed #1180: synchronize CCConfiguration 2012-04-20 11:39:12 +08:00
minggo cbfca9d763 add execution permission 2012-04-20 10:54:58 +08:00
minggo de0ad0dca3 Merge pull request #856 from dumganhar/iss1176_refactor 
fixed #1176: Change linebreak symbol to UNIX format ('\n'),replace 'tab' with four spaces. Other changes as follows:
 2012-04-19 19:31:25 -07:00
James Chen dbeb7423ad Merge branch 'iss1176_refactor' of https://github.com/dumganhar/cocos2d-x into iss1176_refactor 2012-04-19 17:53:15 +08:00
James Chen f619c3e006 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1176_refactor 
Conflicts:
	cocos2dx/misc_nodes/CCRenderTexture.cpp
 2012-04-19 17:51:58 +08:00