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

155 Commits

Author SHA1 Message Date
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
James Chen 63a8bbf0d9 issue #1194: Updated ios project configurations after adding CCTextureWatcher. 2012-05-02 10:39:39 +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 568bdce6c1 fixed #1188: Removed some unused files. 2012-04-25 17:46:29 +08:00
James Chen af86a52f27 issue #1177:Updated some files for ios port. 2012-04-23 15:40:46 +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
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 783b2fe79b Removed some unused codes regard to WOPHONE. 2012-04-19 10:46: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 b8e6d9c589 fixed memory leak from CCGLProgram.cpp 
enable retina for win32
 2012-04-11 11:15:53 +08:00
Phenix Yu a05757f741 update for msvc2010 2012-04-09 00:10:12 +08:00
minggo 7890333505 fixed #721: cocosdenshion can play local file on android 2012-03-06 16:56:30 +08:00
James Chen 6d97e3e381 fixed #972: update ios project configures. 2012-02-16 11:48:09 +08:00
James Chen bcbb2b571b modify HelloLua project configure for ios platform 2012-02-15 18:17:41 +08:00
James Chen 2c599d31b5 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss972_CCNotificationCenter 2012-02-15 17:02:47 +08:00
James Chen f8ff388e8d rename Resource(in HelloLua and HelloWorld project) and Res(in tests project) to Resources. 
test ok on win32 and android
 2012-02-14 18:04:56 +08:00
minggo fd9f73f43e fixed #957: avoid to go to background when inputting test 2012-02-14 16:02:41 +08:00
minggo 538adcec3e merge code from duleface 2012-02-10 13:56:20 +08:00
minggo 8b855a917f issue #973: refactor lua support 2012-02-10 12:02:46 +08:00
YuLei Liao 791736162f fix tolua_fix.c compile with C++ in VS2008 2012-02-10 12:00:55 +08:00
minggo 5ce4968524 merge from cocos2d-x master 2012-02-10 10:46:58 +08:00
minggo 6ae40fc12f fixed #971: build cocos2dx as static lib 2012-02-10 10:31:56 +08:00
YuLei Liao c02aa9e666 * update windows vs2008 project 2012-02-09 20:08:13 +08:00
minggo 6988964a6e refactor lua support 2012-02-09 18:12:45 +08:00
minggo 141dac47d3 Merge branch 'luafix-master' of https://github.com/dualface/cocos2d-x into lua_support_refactor 2012-02-09 17:58:39 +08:00
YuLei Liao e74b842a58 update HelloLua 2012-02-09 17:48:15 +08:00
minggo 95906c34bf Merge branch 'luafix-master' of https://github.com/dualface/cocos2d-x into lua_support_refactor 2012-02-09 16:14:54 +08:00
minggo ee08c4629e Merge pull request #714 from minggo/ndk_module 
fixed #970: use modules in the android ndk build
 2012-02-07 19:16:01 -08:00
minggo 52de292e20 fixed #970: use modules in the android ndk build 2012-02-08 11:14:47 +08:00
minggo a7c96b5371 fixed #954: correct accelerometer data when set orientation to portrait in tablet 2012-02-07 10:19:40 +08:00
YuLei Liao 7ef0373c8b * update lua application template files 2012-02-02 22:15:56 +08:00
minggo 5e39489c71 fixed #947: fixed a closed loop 2012-02-01 18:18:31 +08:00
minggo 7b67c04f2f fixed #964: compute correct height of a charactor 2012-02-01 18:04:12 +08:00
minggo a2efab73a0 fixed #959: make touch id correct on android 2012-01-31 14:49:02 +08:00
minggo 6c2277757a fixed #958: delete SelectorProtocol and implement it in CCObject 2012-01-30 17:47:47 +08:00
gzito c87881ff94 Added Marmalade support to TextInputTest and HelloLua samples 2012-01-15 15:57:10 +01:00
minggo 0e03c8ca21 fixed #930: linux supports jpg format file 2012-01-12 17:46:53 +08:00
minggo 9890a4f655 modify picture and set android icon for HelloLua 2012-01-12 10:39:39 +08:00
minggo 40b1798f41 fixed #941: limit background music volume in [0, 1.0] 2012-01-11 17:56:11 +08:00
minggo 1bd3601b11 fixed #937: use gnustl_static instead of stlport_static to resolve compiling error on android x86 platform 2012-01-04 18:02:32 +08:00
minggo 61e87f661b issue #888: fix some typo error 2011-12-23 11:12:06 +08:00
minggo e287e74a6e fix a typo error 2011-12-23 10:43:39 +08:00