Commit Graph

32 Commits

Author SHA1 Message Date
minggo 355e27dada merge commit 928a28e37d3469fcd41aff14cb136b1415f2fc86 2012-04-08 14:16:29 +08:00
James Chen c5d0b1ca6f issue #1056: Updated ParticleTest. 2012-03-22 18:29:07 +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
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 #561: upgrade particle_nodes to 1.0.0-rc3 2011-07-04 19:20:16 +08:00
minggo 6b97a381e9 fixed #560: upgrade misc_nodes to 1.0.0-rc3 2011-07-04 16:01:57 +08:00
minggo 22b55eaf78 issue #418: add copyright of original author to each file 2011-03-19 10:59:01 +08:00
minggo 47173778cc fixed #409: rename NSArray UIAlignment 2011-03-18 14:31:29 +08:00
minggo b5a99f90df issue #375: 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 #292 2010-12-28 15:05:55 +08:00
Walzer 820c2f0714 issue #211 cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
Walzer b4328354af issue #211 cocos2dx -> cocos2d-x 2010-11-18 14:07:17 +00:00
Ming 416a319344 fixed #203 2010-11-13 03:34:49 +00:00
Ming 6062cf1558 issue #202 2010-11-12 09:26:01 +00:00
Ming a50b1b97bb issue #151: 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 #151: change the function name 2010-09-18 07:44:56 +00:00
Ming 93135d1366 issue #151 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 #42: implement CCProgressTimer 2010-08-11 10:15:52 +00:00
Ming 76f62adf62 fixed #30: 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 #21: change INT32 to int, change UINT to unsigned int 2010-08-02 02:58:00 +00:00
Ming 5eede62659 fixed #16: fixed compile errors 2010-07-27 05:47:29 +00:00
Ming 4160abc669 issue #6: fixed compile error because some file is deleted 2010-07-26 02:35:45 +00:00
Ming bfb9133ca5 issue #6: add function vertex3 2010-07-22 06:51:37 +00:00
Walzer c8d3a1754f issue #7, remove ../ 2010-07-20 06:34:25 +00:00
Walzer 0e8d3a5e9e fixed #2, fix comiple errors. but link error still exists 2010-07-08 07:13:07 +00:00
Ming dffa1cd731 issue #2: change including header file because we change the path of CocosTypes.h 2010-07-08 04:02:18 +00:00
Walzer 97d6aaf296 issue #2, add link to website at each file header 2010-07-06 12:55:05 +00:00
Ming 95699af69d issue #6 2010-07-06 09:55:33 +00:00
Ming dafe99ca70 issue #2: move to folder cocos2dx 2010-07-06 08:28:41 +00:00