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

439 Commits

Author SHA1 Message Date
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
minggo 74aaf4c6ca issue #1056:gles20 runs ok on android 2012-03-20 16:10:12 +08:00
James Chen 275891dfb0 issue #1056: synchronise cocos2d-iphone-2.0-rc0a 2012-03-16 13:42:53 +08:00
James Chen aefdb852a2 issue #1056: synchronise cocos2d-iphone gles2.0 branch, HelloWorld on win32 works ok. 2012-03-14 14:55:17 +08:00
minggo 7890333505 fixed #721: cocosdenshion can play local file on android 2012-03-06 16:56:30 +08:00
Walzer 80fca3df67 Update HelloWorld/android/jni/helloworld/main.cpp 2012-03-02 17:02:09 +08:00
James Chen d3dedd19f2 fixed #995: Modify project configure for marmalade port after adding extension support and refactor resource folder. 2012-03-01 17:38:31 +08:00
James Chen dfd5adb3bd fixed #994: add support for bbndk2.0 on blackberry platform. 2012-03-01 16:52:17 +08:00
James Chen 7daeb5cd86 fixed #984: Use static library for cocos2dx project on platforms(bada and qnx) that use gcc compiler. Because dynamic_cast may fail if you use a gcc compiler. 2012-02-28 14:59:46 +08:00
James Chen 6d97e3e381 fixed #972: update ios project configures. 2012-02-16 11:48:09 +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 ac98d22367 update ios project configures for ios, and modify xcode4's template 2012-02-15 16:59:47 +08:00
James Chen e1413dff5e update linux project configure 2012-02-15 15:57:09 +08:00
James Chen a2a5af3348 update bada and qnx project settings 2012-02-15 13:52:41 +08:00
James Chen 3422696145 1.modify some project setting for bada 
2.rename some files
 2012-02-14 22:35:51 +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 e75dbf2bd9 Merge pull request #724 from minggo/iss957_text_input 
fixed #957: avoid to go to background when inputting test
 2012-02-14 00:07:51 -08:00
minggo fd9f73f43e fixed #957: avoid to go to background when inputting test 2012-02-14 16:02:41 +08:00
James Chen c3d23a7923 issue #972: Modify project setting for all platforms. Use new icons for ios template. 2012-02-14 15:13:54 +08:00
minggo 63679ab9f4 remove unneeded file 2012-02-10 14:35:02 +08:00
minggo 6ae40fc12f fixed #971: build cocos2dx as static lib 2012-02-10 10:31:56 +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 29c18c67ca Merge pull request #712 from minggo/ndk_module 
Use modules in the Android NDK build
 2012-02-06 22:36:45 -08:00
minggo 9249328afb fixed #970: use modules in the Android NDK build 2012-02-07 14:34:30 +08:00
minggo a7c96b5371 fixed #954: correct accelerometer data when set orientation to portrait in tablet 2012-02-07 10:19:40 +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