Commit Graph

878 Commits

Author SHA1 Message Date
minggo 5ad2bec3d8 Merge pull request 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 : 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 : Updated vs2008 project setting (release target). 2012-05-29 18:29:56 +08:00
James Chen b4fad0bb2b fixed : 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 : modify project setting, because CCStd.h is moved into platform/ios 2012-05-29 16:23:57 +08:00
James Chen 19c96632b5 fixed : Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces. 2012-05-29 16:21:23 +08:00
James Chen a00db6e072 fixed : Updated ios project configuration. 2012-05-25 17:00:33 +08:00
James Chen c902e884f4 fixed : 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 : 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 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 : 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 , rename CCCustomClass to CCCustomClassProtocol, add windows support. 2012-05-08 11:30:08 +08:00
Walzer f10b94fd15 issue , 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 , 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 , 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 from minggo/iss1217_EaseAction_reverse
Iss1217 ease action reverse
2012-05-04 01:26:56 -07:00
minggo 14b923409a fixed : implement reverse() for all subclass of CCEaseAction that missing it 2012-05-04 16:22:50 +08:00
James Chen bf0da624b4 issue : 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 , add CCBReader, CppReflection, CocosBuilderTestCase 2012-05-03 11:58:53 +08:00
James Chen 82439733c5 fixed : 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 : 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 : 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 : 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 : Updated project configuration for android. Null pointer checking in CCNode::removeFromParentAndCleanup. 2012-05-02 12:04:27 +08:00
minggo f37d3dd5d3 issue : simplify writing of Android.mk 2012-05-02 12:00:39 +08:00
James Chen 63a8bbf0d9 issue : 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 : 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 : refactor CCImage and CCTexture2D 2012-04-27 18:37:11 +08:00