Commit Graph

44 Commits

Author SHA1 Message Date
walzer 06f639edab update copyright to 2012, update cocos2d version to 2.0.3
1. update all copyright from 2010-2011 to 2010-2012 cocos2d-x.org
2. update COCOS2D_VERSION to 0x00020003
3. update const char* cocos2dVersion() to "cocos2d-2.0-x-2.0.3"
2012-09-24 21:22:20 +08:00
Donald Alan Morrison 4cbd993091 Minor English Spelling Corrections. A few grammar corrections. 2012-09-17 00:02:24 -07:00
minggo cc39dc55f4 issue #1405:remove unneeded functions of CCFileUtils 2012-08-08 18:39:33 +08:00
minggo 9ec29d715a issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx 2012-06-19 13:50:11 +08:00
minggo 15ad463fbe issue : vertical alignment ok on iOS 2012-06-13 16:20:58 +08:00
James Chen 26cf81e42e Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Conflicts:
	cocos2dx/CCScheduler.h
	cocos2dx/include/ccTypes.h
2012-06-08 14:14:13 +08:00
James Chen c5cf23c859 issue : First commit since sync to rc2. 2012-06-08 14:11:48 +08:00
minggo cc16320445 issue : syncronize actions 2012-06-08 13:55:28 +08:00
James Chen 0f36a89c7e issue : Refactor directory. Compile successfully on android and win32(vs2008 debug). 2012-04-25 16:18:04 +08:00
James Chen 230b8a386b issue : 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 7d7baf81a2 refactor updated... 2012-04-18 18:43:45 +08:00
James Chen baa27540a0 Updated the implementation of ccc4f. Initialize the ccResolutionType resolution variable in CCTextureCache::addImage. 2012-04-09 09:55:06 +08:00
minggo 355e27dada merge commit 928a28e37d3469fcd41aff14cb136b1415f2fc86 2012-04-08 14:16:29 +08:00
James Chen c5d0b1ca6f issue : Updated ParticleTest. 2012-03-22 18:29:07 +08:00
James Chen aefdb852a2 issue : synchronise cocos2d-iphone gles2.0 branch, HelloWorld on win32 works ok. 2012-03-14 14:55:17 +08:00
laschweinski 606c8803bc modified: CocosDenshion/Linux/FmodAudioPlayer.cpp
modified:   CocosDenshion/Linux/FmodAudioPlayer.h
	deleted:    HelloWorld/AppDelegate.cpp
	deleted:    HelloWorld/AppDelegate.h
	deleted:    HelloWorld/HelloWorldScene.cpp
	deleted:    HelloWorld/HelloWorldScene.h
	modified:   cocos2dx/.cproject
	modified:   cocos2dx/actions/CCActionInstant.cpp
	modified:   cocos2dx/include/CCActionInstant.h
	modified:   lib/android/Debug/libcocos2d.so
	modified:   lib/android/Release/libcocos2d.so
	modified:   lib/linux/Debug/libcocos2d.so
	modified:   lib/linux/Debug/libcocosdenshion.so
	modified:   lib/linux/Release/libcocos2d.so
	modified:   lib/linux/Release/libcocosdenshion.so
	HelloWorld/AndroidDebug/
	HelloWorld/AndroidRelease/
	HelloWorld/Classes/
	HelloWorld/android/assets
	HelloWorld/postCompiled.sh
	cocos2dx/platform/third_party/linux/
	installLinuxLib.sh
	tests/Res/gui_close.WAV
2011-08-25 19:04:29 +08:00
minggo 0e6bf40e7c fixed : upgrade particle_nodes to 1.0.0-rc3 2011-07-04 19:20:16 +08:00
minggo 6b97a381e9 fixed : upgrade misc_nodes to 1.0.0-rc3 2011-07-04 16:01:57 +08:00
minggo 22b55eaf78 issue : add copyright of original author to each file 2011-03-19 10:59:01 +08:00
minggo 47173778cc fixed : rename NSArray UIAlignment 2011-03-18 14:31:29 +08:00
minggo b5a99f90df issue : rename file names and object names 2011-03-07 17:11:57 +08:00
minggo d0a16a246e fixed comipling error and link error of upto-0.99.5 2010-12-31 14:56:24 +08:00
minggo 355570ea8f issue 2010-12-28 15:05:55 +08:00
Walzer 820c2f0714 issue cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
Walzer b4328354af issue cocos2dx -> cocos2d-x 2010-11-18 14:07:17 +00:00
Ming 416a319344 fixed 2010-11-13 03:34:49 +00:00
Ming 6062cf1558 issue 2010-11-12 09:26:01 +00:00
Ming a50b1b97bb issue : because now the r, g, b is correct, so we should not
change it
2010-09-21 08:15:23 +00:00
Ming 556b8ed455 issue : change the function name 2010-09-18 07:44:56 +00:00
Ming 93135d1366 issue 2010-09-18 07:22:07 +00:00
Walzer bb04891ccb issue $48, implement CCXBitmapDC 2010-08-16 07:02:17 +00:00
Ming fa71e45ac0 issue : implement CCProgressTimer 2010-08-11 10:15:52 +00:00
Ming 76f62adf62 fixed : change some header files to include 2010-08-04 08:45:00 +00:00
Walzer 14427a24d7 2010-08-04 07:46:12 +00:00
Ming a324e38cb2 issue : change INT32 to int, change UINT to unsigned int 2010-08-02 02:58:00 +00:00
Ming 5eede62659 fixed : fixed compile errors 2010-07-27 05:47:29 +00:00
Ming 4160abc669 issue : fixed compile error because some file is deleted 2010-07-26 02:35:45 +00:00
Ming bfb9133ca5 issue : add function vertex3 2010-07-22 06:51:37 +00:00
Walzer c8d3a1754f issue , remove ../ 2010-07-20 06:34:25 +00:00
Walzer 0e8d3a5e9e fixed , fix comiple errors. but link error still exists 2010-07-08 07:13:07 +00:00
Ming dffa1cd731 issue : change including header file because we change the path of CocosTypes.h 2010-07-08 04:02:18 +00:00
Walzer 97d6aaf296 issue , add link to website at each file header 2010-07-06 12:55:05 +00:00
Ming 95699af69d issue 2010-07-06 09:55:33 +00:00
Ming dafe99ca70 issue : move to folder cocos2dx 2010-07-06 08:28:41 +00:00