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

1223 Commits

Author SHA1 Message Date
James Chen 13793a9d75 fixed #1367: Updated ShaderTest.cpp, TileMapTest.cpp. 2012-06-27 17:08:50 +08:00
James Chen a901b0bb12 fixed #1367: Refactor "createWith***" to "create". 2012-06-27 14:21:29 +08:00
James Chen f6026d2ba3 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-06-26 12:09:48 +08:00
James Chen 95a2696b6b fixed #1365: Some files of Resources folder which is copied by build_native.sh will lost authority in cygwin. 2012-06-26 12:09:23 +08:00
minggo 765da0c80a enable depth test when running test case:Bug-1159 2012-06-26 11:09:37 +08:00
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 2af75ecd65 fixed #1336: HelloCocosBuilder/HelloCocosBuilderLayer.cpp 2012-06-20 12:08:34 +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 07b9db8e91 Merge branch 'gles20' into gles20-ccbi 2012-06-19 17:28:31 +08:00
James Chen c4056b1bb0 fixed #1269: Updated include search paths for win32 and android. 2012-06-19 17:22:55 +08:00
James Chen 591566b43a fixed #1335: Memory leaks in cocos2dx and CCBReader. 2012-06-19 16:31:26 +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 2666df9472 issue #1269:mrege latest code and fix conflict 2012-06-19 13:57:33 +08:00
minggo 9ec29d715a issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx 2012-06-19 13:50:11 +08:00
James Chen 9fa74721a7 fixed #1334: Add ScrollViewTest to CocosBuilderTest. 2012-06-19 10:34:15 +08:00
Nicolas Gramlich 6f26ea7a56 Added actual implementation of CCScrollViewLoader. Added ScrollViewTest to CococsBuilderTest. 2012-06-18 13:59:45 -07:00
Nicolas Gramlich 227683bfa4 Cleaned up CCNodeLoaders by using the Marco instead of having a boilerplate createCCNode method in all the cpp files. 2012-06-18 13:33:19 -07:00
minggo 6d0608d0f1 fixed #1333: add CCScrollView for iOS 2012-06-18 19:24:47 +08:00
James Chen 3cf0f3555c issue #1330: Removed virtual for callback functions. 2012-06-16 15:22:23 +08:00
James Chen 73c9707d5d CCBIReader fixes + building and running flawless on iOS and Android. 
Made it works on win32.
 2012-06-16 12:48:20 +08:00
Nicolas Gramlich 13bcf2180c Merge with gles20. 2012-06-15 16:26:10 -07:00
Nicolas Gramlich c38bfd0a24 Updated xcode project file. 2012-06-15 16:16:08 -07:00
Nicolas Gramlich d175884f79 Added ParticleSystemTest. 2012-06-15 14:48:36 -07: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
minggo 899022d107 fixed #1292:fix some bugs that caused by modify function name 2012-06-15 17:39:13 +08:00
James Chen 595a402c83 fixed #1292:make some function names more readable. 2012-06-15 16:47:30 +08:00
James Chen 0afdfe33da Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-06-15 15:25:37 +08:00
James Chen c17091ac70 fixed #1310: Updated vs2010 project configuration after synchronizing to rc2. 2012-06-15 15:24:22 +08:00
minggo 266a5e5e66 Merge pull request #1028 from minggo/iss1292_moidify_function_name 
issue #1292:make some function names more readable
 2012-06-15 00:14:13 -07:00
minggo d0f905992a issue #1292:make some function names more readable 2012-06-15 15:10:40 +08:00
James Chen 159b91b6cd Fixed a logic error in ActionScaleTest. 2012-06-15 13:56:27 +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
minggo c965c8d770 fixed 1181: synchronize latest codes 2012-06-15 10:27:52 +08:00
folecr d651da6f0d Tests : Ant build project files 2012-06-14 19:21:03 -07:00
folecr d86e088e9f Tests : Use cocos2dandroid library 
* Remove code and resources that are now in a library
     * Add library as a dependency for HelloWorld
     * Use cocos2dx_default_ resources
 2012-06-14 19:21:03 -07:00
Nicolas Gramlich 8d7dce0999 Added glue macros to reduce boilerplate code when implementing CCBSelectorResolver and CCBMemberVariableAssigner. Added LabelTest, MenuTest and SpriteTest. 2012-06-14 18:16:54 -07:00
Nicolas Gramlich a7ad34864f CocosBuilderTest: Simplified the 'XYZLoader' classes to be header only, with nice and short macros to do the boilderplate stuff. 2012-06-14 14:23:53 -07:00
minggo 221be759c6 issue #1324: merge James Chen's codes 2012-06-14 18:54:05 +08:00
minggo 9d9e2579e3 issue #1181: save render texture when comming to background 2012-06-14 18:37:57 +08:00
James Chen 052d8ea931 fixed #1324: Added some create methods. Compiling successfully on win32 by vs2008. 2012-06-14 18:32:44 +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
Nicolas Gramlich cc5eabeb28 ButtonTestLayer: Now showing the CCControlEvent information on screen. Fixed CCLOG -> CCLog (because CCLOG doesn't show up on Android.). 2012-06-14 01:32:52 -07:00
James Chen 23574172ff issue #1324: Added create() for static member functions that new an autorelease object, updated cocoa folder. 2012-06-14 16:05:58 +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
Nicolas Gramlich cdd1fb50ac Moved from std::string to CCString *. Since the std::string utility methods in CCBReader were buggy on Android (for unknown reasons). Made string utility methods in CCBReader static. Android build now working equivalent to iOS build. *YAY* 2012-06-14 00:01:01 -07:00
Nicolas Gramlich 5550d9f2b0 Merge with gles20. 2012-06-13 15:56:52 -07:00
Nicolas Gramlich 3e61e1f014 Updated Android build files to new CCBReader. Fixed a bunch of compiler errors/warnings when building for Android. 2012-06-13 15:25:59 -07:00
Nicolas Gramlich 29b22adccc Batch converted manual 'using namespace cocos2d(::extension);' to USING_NS_CC(_EXT);. CocosBuilderExample: Made HelloCococsBuilderLayer selectors work. Made ButtonTestLayer work. 2012-06-13 14:19:13 -07:00
minggo 9321a8d025 fixed #1322: vertical alignment works ok on android 2012-06-13 18:33:44 +08:00
minggo f80fd0c232 Merge pull request #1015 from minggo/gles20 
issue #1310:synchronize some codes
 2012-06-12 19:46:45 -07:00
minggo b282d52a65 issue #1310:synchronize some codes 2012-06-13 10:41:04 +08:00
Nicolas Gramlich 895604f42e Unified Header Guards. Added CCNodeLoaderListener, simulating the didLoadFromCCB selector. 2012-06-12 11:59:49 -07:00
James Chen d2a16c2b76 issue #1310: Updated MotionStreakTest. 2012-06-12 18:27:36 +08:00
James Chen e943dbf2fd issue #1310: Updated TileMapTest, TransitionsTest, ZwoptexTest. 2012-06-12 18:22:48 +08:00
James Chen 2be8ba120c issue #1310: Updated vs2008 project setting. 2012-06-12 18:15:25 +08:00
James Chen 6d4b80a826 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-06-12 18:13:02 +08:00
James Chen dab90107b9 issue #1310: Updated SchedulerTest. 2012-06-12 18:12:45 +08:00
James Chen 92f0364dca Merge pull request #1008 from dumganhar/gles20 
issue #1310: Reverted floatr to CCTimer.
 2012-06-12 02:09:10 -07:00
James Chen 08fc714a7f issue #1310: Reverted floatr to CCTimer. 2012-06-12 17:07:54 +08:00
minggo 1d77d53af3 Merge pull request #1007 from minggo/gles20 
issue #1310: synchronize some codes
 2012-06-12 01:57:24 -07:00
minggo 9fbe1fef96 issue #1310: synchronize some codes 2012-06-12 16:56:34 +08:00
James Chen c8b5ad0440 issue #1310: Updated RotateWorldTest and SceneTest. 2012-06-12 16:22:25 +08:00
James Chen 23519ef85c issue #1310: Updated ParallaxTest and RenderTextureTest. 2012-06-12 15:55:23 +08:00
James Chen 1c0f391e03 issue #1310: Updated ParticleTest. 2012-06-12 15:40:31 +08:00
James Chen ae1ea76ca1 issue #1310: Updated NodeTest. 2012-06-12 15:22:42 +08:00
James Chen f5b2a5d33d issue #1310: Updated LayerTest. 2012-06-12 15:14:01 +08:00
James Chen b770010c41 issue #1310: Updated LabelTest. Added init method for CCLabelBMFont. Fixed a bug in CCLabelAtlas::initWithString. 
In CCSpriteBatchNode::initWithTexture, when capacity is equal to 0, set it to default value.
 2012-06-12 14:33:53 +08:00
James Chen ef8ec1a941 issue #1310: Added some resources for tests project. 2012-06-12 14:32:57 +08:00
James Chen 9185f771f1 issue #1310: Added some resources for tests project. 2012-06-12 14:29:15 +08:00
minggo 916b276607 issue #1310: synchronize CCTexturePVR 2012-06-12 12:02:15 +08:00
James Chen 974f0d714d issue #1310: Updated FontTest. And fixed a compilation error in FontTest. 2012-06-12 11:16:31 +08:00
Nicolas Gramlich 1f2652a8d7 Made CCBIReaderTest finally work completely. =) Also added support for having a root path when loading a ccb-file (i.e. when you have the two directories, one for the ccb files, one for the spritesheets. <- With a common ancestor.) 2012-06-11 18:31:11 -07:00
Nicolas Gramlich 4c8351f304 Removed Zombie files. 2012-06-11 15:00:11 -07:00
Nicolas Gramlich 342c65e293 Added CCBIReaderTest, which doesn't work since XCode sucks big time, not finding a simple file. 2012-06-11 14:57:30 -07:00
Nicolas Gramlich 58b53be708 Merge with gles20. 2012-06-11 11:50:32 -07:00
Nicolas Gramlich 4378731418 Merge with gles20. 2012-06-11 10:43:07 -07:00
minggo ccbfd24c21 issue #1310: synchronize ActionManagerTest ActionEaseTest ActionsProgressTest ActionsTest 2012-06-11 18:25:57 +08:00
James Chen 2ce7c86c50 fixed #1315: TileMapTest can't be shown correctly in retina mode. 2012-06-11 14:44:32 +08:00
James Chen 33ea7905a5 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 
Conflicts:
	cocos2dx/platform/ios/CCFileUtils.mm
 2012-06-11 11:01:36 +08:00
James Chen c95cbb1774 issue #1310: Used CCLabelAtlas instead of CCLabelBMFont to display FPS,SPF status. 
Updated CCFileUtils, added some method, such as sharedFileUtils/purgeFileUtils/purgeCachedEntries.
Fixed a bug in CCDirector, made retina mode work correctly.
 2012-06-11 10:59:57 +08:00
minggo 94235d3602 issue #1310: make tests and HelloWorld work ok 2012-06-11 10:41:52 +08:00
James Chen c9dc60b0f7 issue #1310: fixed a bug in CCSpriteFrameCache.cpp. Disable retina mode for tests project. 2012-06-08 17:58:21 +08:00
James Chen 371b3f9938 issue #1310: Tests project updated!. 2012-06-08 17:34:15 +08:00
minggo cc16320445 issue #1310: syncronize actions 2012-06-08 13:55:28 +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 6bb2941ec9 fixed #1300: Typo: CC_ENABLE_CACHE_TEXTTURE_DATA -> CC_ENABLE_CACHE_TEXTURE_DATA 2012-06-06 10:06:51 +08:00
minggo dc24094b5f fixed #1290:use Shaders folder in correct way 2012-06-04 11:41:03 +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 93b5fc37c7 typo fix 2012-06-01 12:04:04 +08:00
James Chen 9be586e4ec Updated main.cpp for each project of android. 2012-05-31 10:13:05 +08:00
minggo 5ad2bec3d8 Merge pull request #946 from minggo/gles20 
fix some bug
 2012-05-30 03:33:19 -07:00
minggo a698f9bf69 fix some bug 2012-05-30 18:31:20 +08:00
James Chen 922f7544ad Updated TouchesTest. 2012-05-30 16:55:46 +08:00
James Chen bd248b5ac0 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-05-30 16:09:52 +08:00
James Chen 7115a7f3c9 issue #1275: Memory leaks in CCBReader and ActionsTest. 2012-05-30 16:09:19 +08:00
minggo 8203cf00ba use fonts/fps_images.png 2012-05-30 13:37:36 +08:00
James Chen ff0dde984c fixed #1240: Updated vs2008 project setting (release target). 2012-05-29 18:29:56 +08:00
James Chen b4fad0bb2b fixed #1240: Updated vs2010 project setting (release target). 2012-05-29 18:06:52 +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 a00db6e072 fixed #1240: Updated ios project configuration. 2012-05-25 17:00:33 +08:00
James Chen c902e884f4 fixed #1240: Moved particle files to Particle folder. Fixed a bug in tiff decoding. Refactored CCTextureCache::adddImage. 2012-05-25 16:52:47 +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 138de3171f Merge pull request #912 from minggo/merge_nicolasgramlich 
Merge pull request by nicolasgramlich
 2012-05-23 19:56:05 -07:00
minggo 0ba62c3854 issue #1246:use CCLabelBMFont instead of CCLabelTTF in CCDirector.cpp 2012-05-24 10:48:39 +08:00
James Chen a5b63d8f6c fixed #1251: Added CocosBuilderTest to the test project for VS2008. 2012-05-23 11:41:42 +08:00
Nicolas Gramlich a62e017977 Made MenuTest use a differently names labelatlas to avoid collision with fps_images.fnt/png. 2012-05-22 13:26:20 -07:00
Walzer 7dadd8128c rename tests/Resource/CocosBuilder to CocosBuilder_v1 2012-05-11 21:22:50 +08:00
Walzer dc18dc0942 test ccb v2 format, add relative-position support 2012-05-11 20:53:30 +08:00
Walzer ae12434128 fixed #1205, rename CCCustomClass to CCCustomClassProtocol, add windows support. 2012-05-08 11:30:08 +08:00
Walzer f10b94fd15 issue #1205, CCBReader works on both iOS & Android now; public APIs of CCBReader are reduced; ccb files in subfolder is supported. 2012-05-07 22:52:58 +08:00
Walzer 1a73064055 issue #1205, refactor the tricky cpp reflection to easier approach, add cocos2d::extension namespace for CCBReader, add doxygen comments. Todo: CCB support on android 2012-05-07 18:14:15 +08:00
Walzer c76e3c0936 remove CppReflection, add CCBCustomClass and CCBCustomClassFactory to implement reflection, leave some jobs to class HelloCocosBuilder: public CCBCustomClass. The approach is not so tricky, much easier to understand now. 2012-05-07 17:05:17 +08:00
Walzer 07276c3bba Merge commit '184b31efa3aaa340621f5aa736d3b16e6ad97327' into gles20 2012-05-05 15:49:11 +08:00
Walzer 6b374881f0 Merge branch 'gles20' of http://github.com/cocos2d/cocos2d-x into gles20 2012-05-05 10:07:21 +08:00
Walzer f70855e959 fixed #1229, reduce the requirement of gles20 branch from NDK android-10 to android-8 level (official android 2.2 image, the lowest version which supports OpenGL ES 2.0), remove EGL dependency. 2012-05-05 10:06:41 +08:00
Walzer be2fa353a7 Merge commit '1afd7f2701b5e9fec0d2a4fd514d1d4e069b3830' into gles20 2012-05-05 09:55:06 +08:00
minggo 1afd7f2701 Merge pull request #893 from minggo/iss1217_EaseAction_reverse 
Iss1217 ease action reverse
 2012-05-04 01:26:56 -07:00
minggo 14b923409a fixed #1217: implement reverse() for all subclass of CCEaseAction that missing it 2012-05-04 16:22:50 +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
Walzer ebaf1da460 issue 1205, CCBReader. Not perfect yet, I will use CCNotificationCenter to improve SET macro/assign var to parent. 2012-05-03 15:29:27 +08:00
Walzer 2fc1322cc8 update copyright and license declaration of CCCBReader relative files 2012-05-03 14:43:27 +08:00
Walzer 5faaab0d16 add CocosBuilderTest into extension test. fix a bug in CCLayerGradient::updateColor 2012-05-03 12:17:28 +08:00
Walzer 160b0aba88 Merge commit 'b7b21f3dc2e2c541a06fdd381b6b43d213a90093' into gles20 2012-05-03 12:02:13 +08:00
Walzer 9e62412ce9 issue #1205, add CCBReader, CppReflection, CocosBuilderTestCase 2012-05-03 11:58:53 +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 136866bc12 issue #1204: Updated tests/proj.win32/main.cpp 2012-05-02 18:56:03 +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 77d9b811be issue #1194: Updated ChipmunkAccelTouchTest. 2012-05-02 14:06:40 +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 a1570e931f issue #931:make convert to rgb565 and A8 correct 2012-04-27 15:53:29 +08: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 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 af86a52f27 issue #1177:Updated some files for ios port. 2012-04-23 15:40:46 +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
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
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
minggo 4e4a26a2db Merge pull request #855 from minggo/iss1150_rendertexture_crash 
use texture format kCCTexture2DPixelFormat_RGBA8888 to save image
 2012-04-19 02:05:04 -07:00
minggo 92043b4db3 fixed #1150: use texture format kCCTexture2DPixelFormat_RGBA8888 to save image 2012-04-19 17:01:24 +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
James Chen 42007ea71c deleted some unused codes. 2012-04-18 14:15:11 +08:00
James Chen e673bfae90 fixed #1114: Updated SchedulerTest and ShaderTest. Used CCControlSlider instead of UISlider. Added some resources. 2012-04-18 13:58:24 +08:00
James Chen c501255a7a Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1114_CCControlExt 2012-04-18 09:40:08 +08:00
James Chen f8dfe1fca0 issue #1114: Updated ShaderTest.Added ShaderBlur. 2012-04-17 18:31:31 +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 14c10a470a Updated project configuration for android platform. 2012-04-17 16:41:07 +08:00
James Chen 92e44f1c78 Updated ios project configuration. 2012-04-17 16:14:32 +08:00
James Chen 413bc3c343 Finished CCControlSwitch.Added CCActionTween. 2012-04-17 16:00:18 +08:00
James Chen d4f1dcfc44 finished CControlColourPickerTest. 
moved extension resources to 'extensions' folder.
 2012-04-17 11:12:05 +08:00
James Chen 044729dab9 Updated CCControlExtension 2012-04-16 23:16:03 +08:00
James Chen 959acd556f first commit CCControlExtension. 2012-04-16 18:58:43 +08:00
James Chen be129913a8 issue #1166: Updated the project configuration for VS2010, android, ios port. 2012-04-16 13:02:44 +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 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
James Chen d01f1277af optimize data struct. 2012-04-14 19:11:57 +08:00
minggo 34c805590f Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1156_director 2012-04-13 14:11:58 +08:00
minggo b43d5aa654 fixed #1156 syn CCDirector 2012-04-13 14:11:35 +08:00
James Chen e9e6256815 Merge pull request #839 from dumganhar/gles20 
fixed #1160: Renamed 'CGFloat' to 'CCFloat'.
 2012-04-12 23:10:57 -07:00
James Chen 94e056d964 fixed #1160: Renamed 'CGFloat' to 'CCFloat'. 2012-04-13 14:09:02 +08:00
James Chen 91b4d52c31 Merge pull request #838 from dumganhar/gles20 
fixed #1159: Updated "CallFuncND + auto remove" test demo.
 2012-04-12 20:56:05 -07:00
James Chen 47af0886d3 fixed #1159: Updated "CallFuncND + auto remove" test demo. 2012-04-13 11:54:29 +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
James Chen 2b5af66974 updated win32 projects configuration release version. 2012-04-10 23:09:58 +08:00
James Chen ba37e0e42f Merge pull request #834 from dumganhar/gles20 
fixed #1138: Fixed a memory leak in CCTextureCache::addPVRImage.
 2012-04-10 03:45:27 -07:00
James Chen b6cc0658f3 invalid pointer check in void TexturePVRRGB888::onEnter(). 2012-04-10 18:43:00 +08:00
James Chen 429e0bcb46 Merge pull request #832 from dumganhar/gles20 
fixed #1136: Fixed some bugs as follows:
1. Using std::string parameter as the key of CCDictionary
2. Deep copy for CCDictionary and CCArray, the classes of elements's type must implement copyWithZone.
3. Added toBool() function to CCString.
4. Retina support for all platforms.
5. Include "CCString.h" and "cocoa/CCNS.h" in cocos2d.h.
6. Added a new constructor(CCArray::CCArray(unsigned int capacity)) for CCArray. And fixed a bug in CCArray.
7. Fixed a memory leak in CCLabelBMFont.cpp.
8. Fixed an error in strings.xml.
 2012-04-10 02:46:38 -07:00
James Chen 675f2b5dd0 Updated strings.xml 2012-04-10 16:21:23 +08:00
minggo c9b1943559 create folder for shader 2012-04-10 15:30:11 +08:00
James Chen 6cd69523c8 Merge pull request #829 from dumganhar/iss1094_gles20_particlebat 
issue #1094: Make ParticleBatchNode works on win32 and fixed some issues as follows:
1. renamed CCPoolManager::getInstance() to CCPoolManager::sharedPoolManager(), and added CCPoolManager::purgePoolManager() method. Using pointer rather than global variable to make a singleton.
2.fixed a memory leak in CCParticleSystem.
3.init CCSprite::m_pobBatchNode at the beginning of CCSprite::initWithTexture.
4.Add CCAssert in ccArrayRemoveObjectAtIndex.
5.Use new method to allocate CCDirector.
 2012-04-08 19:45:38 -07:00
James Chen b4d74700e4 Merge branch 'iss1094_gles20_particlebat' of https://github.com/dumganhar/cocos2d-x into new_ipad 
Conflicts:
	tests/tests/ParticleTest/ParticleTest.cpp
 2012-04-09 10:28:21 +08:00
James Chen 3d601048c6 Merge pull request #831 from dumganhar/new_ipad 
fixed #1095: IOS screen resolution(iphone, iphone-retina, ipad, ipad-retina) support.
 2012-04-08 19:02:16 -07:00
Phenix Yu a05757f741 update for msvc2010 2012-04-09 00:10:12 +08:00
minggo 355e27dada merge commit 928a28e37d3469fcd41aff14cb136b1415f2fc86 2012-04-08 14:16:29 +08:00
Walzer 203f40a00d add shader files correctly in test.xcodeproj, fix a warning in CCLabelBMFont.cpp, 2012-04-06 23:33:42 +08:00
James Chen 931c42a621 Updated some files. 2012-04-04 21:58:04 +08:00
James Chen c759f29d76 Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20 2012-03-29 10:11:42 +08:00
James Chen c6457dfed8 issue #1056: Updated ios project configuration. 2012-03-29 10:09:41 +08:00
James Chen bb7485621e issue #1056: Updated ParticleTest, CCParticleSystem, CCParticleSystemQuad. 2012-03-28 21:44:28 +08:00
James Chen 0f1ab7ab37 issue #1056: Updated SpriteTest, reverted the last parameter of glDrawElement in CCTextureAtlas.cpp and CCParticleSystemQuad.cpp. 2012-03-27 10:55:13 +08:00
James Chen d36933d542 issue #1056: Update ios project. 2012-03-26 20:29:50 +08:00
James Chen d67ea955f2 Delete some shader files. 2012-03-26 20:03:54 +08:00
James Chen 85c13998ee issue #1056: Added CCTransitionProgress class, Updated Texture2dTest, TileMapTest, TransitionsTest. 2012-03-26 16:46:23 +08:00
James Chen 6f5603cfe6 issue #1056: Updated CCTexture2dTest. Added CCTextureAsyncTest. 2012-03-23 18:16:47 +08:00
James Chen 9c9230a43f #issue #1056: Updated SpriteTest. 2012-03-23 17:31:28 +08:00
James Chen 2a459e23a6 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-03-23 10:27:35 +08:00
James Chen 0ef65d1ed5 issue #1056: Renamed CC_COCOSNODE_RENDER_SUBPIXEL to CC_NODE_RENDER_SUBPIXEL in CCNode.cpp 2012-03-23 10:26:36 +08:00
minggo 728835c77b Merge pull request #806 from minggo/SpriteTest 
Sprite test
 2012-03-22 19:25:24 -07:00
minggo ad8d7cdeff SpriteTest 2012-03-23 10:23:02 +08:00
James Chen 900de7328a Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-03-22 18:29:26 +08:00
James Chen c5d0b1ca6f issue #1056: Updated ParticleTest. 2012-03-22 18:29:07 +08:00
minggo a8eaf85cfb Merge pull request #804 from minggo/RenderTextureTest 
Rendertexturetest
 2012-03-22 01:37:58 -07:00
minggo 39ba6b4618 issue #1506: RenderTextureTest 2012-03-22 16:36:03 +08:00
minggo 56f27c495b Merge pull request #803 from minggo/MotionStreak 
issue #1506: MotionStreakTest
 2012-03-21 23:33:03 -07:00
minggo 6b7716770e issue #1506: MotionStreakTest 2012-03-22 14:32:32 +08:00
James Chen 3a50022399 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-03-22 14:24:08 +08:00
James Chen b1f293e089 issue #1056: Updated MenuTest. Added CCArray::arrayWithObject function. 2012-03-22 14:22:06 +08:00
minggo 2aa61bf798 issue #1506: LyaerTest 2012-03-22 13:59:47 +08:00
minggo 85de198511 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into test_sync 2012-03-22 11:49:04 +08:00
minggo 3d10006d6f issue #1506: implement CCLabelTest 2012-03-22 11:48:37 +08:00
James Chen 925fee4820 issue #1056: Added kazmath license file. Used CCCallFuncN instead of CCCallBlock and updated ActionsTest. 2012-03-22 11:26:39 +08:00
James Chen 3a287db954 issue #1056: Update ActionsTest. 2012-03-22 10:27:28 +08:00
minggo b1607b2106 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into test_sync 2012-03-22 09:41:03 +08:00
minggo e8b7bc7c7e issue #1056: LabelTest 2012-03-22 09:40:32 +08:00
James Chen 2e8bae8ebf issue #1056: Update Android.mk. Make tests project being compiled successfully. 2012-03-21 22:49:58 +08:00
James Chen 6f4a01f454 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-03-21 17:35:39 +08:00
James Chen f529bcd659 issue #1056: Move some singletons to CCDirector. It is easily managed by CCDirector. 2012-03-21 17:35:20 +08:00
minggo e75e35b23f issue #1506: add ShaderTest source code 2012-03-21 17:27:13 +08:00
minggo 6242656049 issue #1506: fix a confict 2012-03-21 17:23:33 +08:00
minggo 92c30a328e issue #1506: implement ShaderTest 2012-03-21 17:02:52 +08:00
James Chen 159b677dc0 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-03-21 16:09:26 +08:00
James Chen 8ad598241f issue #1056: Update Tests project for ios platform. 2012-03-21 16:05:24 +08:00
James Chen 9b4a42c494 issue #1056: Update Box2dTest and ChipmunkAccelTouchTest. 2012-03-21 15:54:48 +08:00
James Chen 2ac2da9c97 issue #1056: 1. Removed ChipmunkTest, added ChipmunkAccelTouchTest. 
2. Added Box2DTest and Box2DTestBed.
Tested on win32.
 2012-03-21 15:43:35 +08:00
minggo bb908f5a5e Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into ActionsEaseTest 2012-03-21 13:36:51 +08:00
minggo f6c113993a issue #1506: rename CocosNodeTest to NodeTest and SC 2012-03-21 13:36:24 +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 321771a7ea issue #1056: Added gles2.0 support for ios platform. 2012-03-21 10:05:23 +08:00
minggo a3441a39e7 issue #1056: rename EaseTatinosTest to ActionsEaseTest and SC 2012-03-20 18:07:42 +08:00
minggo 7ccb38556e Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into android_gles20 2012-03-20 16:10:53 +08:00
minggo 74aaf4c6ca issue #1056:gles20 runs ok on android 2012-03-20 16:10:12 +08:00
James Chen ae2b3307fa Merge pull request #779 from dumganhar/iss1056_CCDict 
issue #1056: Removed CCMutableArray and CCMutableDictionary template, offered CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost.
 2012-03-20 00:07:58 -07:00
James Chen 6ce06bd906 issue #1056: Remove CCMutableArray and CCMutableDictionary template, offer CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost. 2012-03-20 15:04:53 +08:00
minggo 39738e4270 issue #1056: implement ActionsProgressTest and run ok on win32 2012-03-19 18:20:32 +08:00
minggo 68809fd5ed Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-03-19 13:54:34 +08:00
James Chen e021ae9821 #1056: issue #1056: synchronise cocos2d-iphone-2.0-rc0a, update some files. 2012-03-16 17:56:19 +08:00
James Chen 275891dfb0 issue #1056: synchronise cocos2d-iphone-2.0-rc0a 2012-03-16 13:42:53 +08:00
minggo 41fad74017 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-03-15 10:05:42 +08:00
James Chen 8aa3f7f9ae issue #1056: TestCases works ok except Box2dTest and ChipmunkTest. 2012-03-14 18:11:25 +08:00
folecr 6336df4024 Fix test to match newer API 2012-03-13 23:07:42 -07:00
Wartortle 7321d33aaf Added support files for Accelerometer Simulation for iPhone Simulator and 
Unimotion
Ref: http://code.google.com/p/accelerometer-simulator/wiki/Home
Ref: https://github.com/gmarik/unimotion
 2012-03-08 11:23:47 +00:00
minggo 645d561276 fixed #737: remove view id 2012-03-08 12:40:27 +08:00
minggo 7890333505 fixed #721: cocosdenshion can play local file on android 2012-03-06 16:56:30 +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 abefe50ef7 modify marmalade project setting 2012-02-14 18:25:20 +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
James Chen 65b1b20c8d Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss972_CCNotificationCenter 
Conflicts:
	cocos2dx/proj.win32/cocos2d-win32.vcxproj.filters
	tests/test.win32/test.win32.vcxproj.filters
 2012-02-14 11:43:04 +08:00
James Chen 4b9ee55145 issue #972: modify project settings for linux and marmalade. 2012-02-10 13:39:39 +08:00
minggo 8b855a917f issue #973: refactor lua support 2012-02-10 12:02:46 +08:00
James Chen 81ec2c8586 issue #972: add support for CCNotificationCenter, and add the test demo for it. 
modify the project setting for VS2008 and VS2010
 2012-02-10 11:48:33 +08:00
minggo 3c41164b23 Merge pull request #716 from minggo/iss971_rtti 
build cocos2dx as static lib and remove some unneeded codes
 2012-02-09 18:35:28 -08:00
minggo 6ae40fc12f fixed #971: build cocos2dx as static lib 2012-02-10 10:31:56 +08:00
minggo 481f1c2532 fix a typo error 2012-02-09 18:17:25 +08:00
minggo 357c825fa5 issue #971: set JavaVM at JNI_Onload() 2012-02-09 16:27:15 +08:00
minggo 153d2b8192 issue #971: build cocos2dx as static lib and remove some unneeded codes 2012-02-09 15:49:14 +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
dumganhar ee2139023a Merge pull request #708 from Wartortle/master 
fixed #969: Addition of Accelerometer Simulation for Win32.
 2012-02-06 18:57:41 -08:00
minggo a7c96b5371 fixed #954: correct accelerometer data when set orientation to portrait in tablet 2012-02-07 10:19:40 +08:00
Wartortle aa06de2fb3 Second half of commit for adding Accelerometer simulation to Win32. 2012-02-06 11:38:53 +00:00
minggo 591b7d0619 fixed #933: profile CCUserDefault 2012-02-02 14:18:13 +08:00
minggo 1ae8f001b8 Merge pull request #702 from minggo/iss947_closed_loop 
fixed #947: fixed a closed loop
 2012-02-01 02:22:02 -08:00
minggo 5e39489c71 fixed #947: fixed a closed loop 2012-02-01 18:18:31 +08:00
minggo 56677be235 Merge pull request #701 from minggo/iss964_label 
fixed #964: compute correct height of a charactor
 2012-02-01 02:05:50 -08:00
minggo 7b67c04f2f fixed #964: compute correct height of a charactor 2012-02-01 18:04:12 +08:00