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

505 Commits

Author SHA1 Message Date
minggo 5cc1f7d230 fixed #1338:stop animation when entering background and start animation when comming to foreground 2012-06-21 11:42:49 +08:00
James Chen f748b87268 fixed #1336: Updated HelloWorldScene.cpp 2012-06-20 13:56:09 +08:00
James Chen b818c0afa6 fixed #1336: Used CC_DEPRECATED_ATTRIBUTE macro to mark deprecated interfaces. 2012-06-20 11:48:31 +08:00
James Chen c4056b1bb0 fixed #1269: Updated include search paths for win32 and android. 2012-06-19 17:22:55 +08:00
minggo 90448ec7d0 issue #1269:fix some compiling error because of including error header files 2012-06-19 16:20:46 +08:00
minggo 9ec29d715a issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx 2012-06-19 13:50:11 +08:00
minggo d53a9fc06e modify xcode project setting for HelloWorld HelloLua and testjs 2012-06-18 11:48:03 +08:00
James Chen cc572ab8e7 fixed #1329: Moved all java files part of engine into a certain directory, then all projects refer to them. 2012-06-15 18:15:43 +08:00
James Chen 24cc0796b6 Merge branch 'cocos2dxandroidlibrary' of https://github.com/folecr/cocos2d-x into folecr_android 2012-06-15 17:47:04 +08:00
James Chen bc150ea5a9 fixed #1327: Exported 'create' method for lua bindings. 2012-06-15 11:46:51 +08:00
folecr 6fc2dc5ed9 Use Java code instead of XML to define layout 
* Android layout for cocos apps are very simple (full screen)
 * Avoids creation of R.java for loading the layout
 * Can package entire library in jar
 * Remove unused layout resource
 2012-06-14 19:52:45 -07:00
folecr 32497bb3d6 HelloWorld : Ant build file 2012-06-14 19:21:03 -07:00
folecr 6bd444913c HelloWorld : Use cocos2dandroid library 
* Add library as a dependency for HelloWorld
 * Use cocos2dx_default_ resources
 2012-06-14 19:21:02 -07:00
folecr b6164c7590 Create a library named cocos2dandroid 
* Based on sources from HelloWorld that should be common across all cocos2d-x android projects
 * Rename, use prefix cocos2dx_default_ for items in layout
 * Project files for android library, targeted to android-8
 2012-06-14 19:21:02 -07:00
minggo 221be759c6 issue #1324: merge James Chen's codes 2012-06-14 18:54:05 +08:00
James Chen 3a410c14a1 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create 
Conflicts:
	cocos2dx/extensions/CCBReader/CCBReader_v2.cpp
	cocos2dx/extensions/CCControlExtension/CCScale9Sprite.cpp
	cocos2dx/label_nodes/CCLabelBMFont.cpp
	cocos2dx/menu_nodes/CCMenuItem.cpp
	cocos2dx/menu_nodes/CCMenuItem.h
	cocos2dx/misc_nodes/CCRenderTexture.h
	cocos2dx/tileMap_parallax_nodes/CCTileMapAtlas.cpp
	tests/tests/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder.cpp
	tests/tests/LabelTest/LabelTest.cpp
 2012-06-14 17:36:31 +08:00
James Chen 3f7b44fc23 issue #1324: Added create() for static member functions that new an autorelease object 2012-06-14 15:13:16 +08:00
minggo 9321a8d025 fixed #1322: vertical alignment works ok on android 2012-06-13 18:33:44 +08:00
minggo 94235d3602 issue #1310: make tests and HelloWorld work ok 2012-06-11 10:41:52 +08:00
minggo 6cf8ea283d Merge pull request #973 from minggo/iss1278_effect_android 
fixed #1278: stop effect when unloading effect
 2012-06-06 00:41:26 -07:00
minggo 1ff04700b5 fixed #1278: stop effect when unloading effect 2012-06-06 15:38:25 +08:00
James Chen 37aa196c73 Removed some unused codes. 2012-06-06 14:31:49 +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 cfbf29ccfc Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1282_ati 2012-06-01 13:47:23 +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 dfa1216ba9 add CCBReader into project 2012-06-01 11:01:09 +08:00
James Chen 9be586e4ec Updated main.cpp for each project of android. 2012-05-31 10:13:05 +08:00
minggo a698f9bf69 fix some bug 2012-05-30 18:31:20 +08:00
James Chen 1ddb5d51b5 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-05-29 17:13:21 +08:00
minggo a09bbbd0ba fixed #1177: modify project setting, because CCStd.h is moved into platform/ios 2012-05-29 16:23:57 +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 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
minggo 0ba62c3854 issue #1246:use CCLabelBMFont instead of CCLabelTTF in CCDirector.cpp 2012-05-24 10:48:39 +08:00
James Chen bf0da624b4 issue #1191: Updated win32 templates, tested by vs2008 and vs2010. Updated win32 project configurations for VS2O10. 2012-05-04 11:16:57 +08:00
James Chen 47b8148064 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1191_gles20_template 2012-05-04 02:08:31 +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 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 9886f281ee issue #1191: Updated win32 project files. 2012-04-27 18:50:55 +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