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

467 Commits

Author SHA1 Message Date
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 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 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 abdc94ae3c Merge branch 'iss1194_tex_wat' of https://github.com/dumganhar/cocos2d-x into iss1194_tex_wat 2012-05-02 12:05:39 +08:00
James Chen a998062c57 issue #1194: Updated project configuration for android. Null pointer checking in CCNode::removeFromParentAndCleanup. 2012-05-02 12:04:27 +08:00
minggo f37d3dd5d3 issue #1201: simplify writing of Android.mk 2012-05-02 12:00:39 +08:00
James Chen 63a8bbf0d9 issue #1194: Updated ios project configurations after adding CCTextureWatcher. 2012-05-02 10:39:39 +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 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 96a177bd37 issue #1190: updated some pkg files for lua binding. 2012-04-26 09:34:42 +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 c1bc4fd65a fixed #1177: Updated ios project configuration. 2012-04-24 17:42:06 +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 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 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 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 cbfca9d763 add execution permission 2012-04-20 10:54:58 +08:00
James Chen e28c77b574 issue #1176: Updated ios project configuration. 2012-04-19 15:26:24 +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 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
minggo cfdc5edf87 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1139_screen_black 2012-04-17 17:55:59 +08:00
minggo 04c0d794af fixed #1139: fix the bug that screen becomes black when backing to foreground on Android 2012-04-17 17:55:26 +08:00
James Chen 0848e94efb Updated HelloWorld project configuration for ios platform. 2012-04-17 16:20:35 +08:00
James Chen a71e5be0d8 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20_optimize_data 
Conflicts:
	cocos2dx/shaders/CCGLProgram.cpp
 2012-04-16 12:45:47 +08:00
James Chen 88951bfeec fixed #1165: Close retinaDisplay for HelloWorld by default. Removed ENABLE_ALL_SHADER macro. Fixed some issues in CCSprite.cpp. 2012-04-16 12:00:35 +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
Phenix Yu e623cd6357 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 
Conflicts:
	cocos2dx/include/CCTexture2D.h
	cocos2dx/include/ccMacros.h
	cocos2dx/textures/CCTexture2D.cpp
	lua/cocos2dx_support/LuaCocos2d.cpp
 2012-04-15 15:46:01 +08:00
Phenix Yu 61a7ca71c5 fixed getContentSize pass by reference issue 
update project setting for release mode
 2012-04-14 17:13:38 +08:00
minggo 9bbac0d33d issue #1156: remove unneeded macros and functions 2012-04-13 11:45:41 +08:00
minggo 028cf7874e issue #1156: remove unneeded macros and functions 2012-04-13 11:22:17 +08:00
minggo 7cf16dbb32 Merge pull request #836 from minggo/touch_case 
fix TouchesTest crashed on Android and iOS
 2012-04-12 18:47:41 -07:00
minggo 3fbfeeb7e8 fixed #1142: fix TouchesTest crashed on Android and iOS 2012-04-13 09:45:31 +08:00
Phenix Yu b8e6d9c589 fixed memory leak from CCGLProgram.cpp 
enable retina for win32
 2012-04-11 11:15:53 +08:00
James Chen 2b5af66974 updated win32 projects configuration release version. 2012-04-10 23:09:58 +08:00
Phenix Yu a05757f741 update for msvc2010 2012-04-09 00:10:12 +08:00
James Chen 8ef5e4ae3b issue #1056: Update the configuration of ios project.Sort the the project folder. 2012-03-21 11:07:31 +08:00
James Chen 02ae04c1d6 issue #1056: Modified the configuration of ios project. 2012-03-21 10:41:21 +08:00
James Chen 321771a7ea issue #1056: Added gles2.0 support for ios platform. 2012-03-21 10:05:23 +08:00