Commit Graph

8 Commits

Author SHA1 Message Date
laschweinski 1fc09448a4 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into LinuxPort
Conflicts:
	cocos2dx/actions/CCActionInstant.cpp
	cocos2dx/include/CCActionInstant.h
2011-09-04 14:38:53 +08:00
minggo b38105a70b issue 675: dispatch accelerometer data to one delegate 2011-08-29 18:18:39 +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
liswei 1591c7edc8 fixed fix warnings in /Wall flag 2011-06-10 17:51:37 +08:00
minggo 47173778cc fixed : rename NSArray UIAlignment 2011-03-18 14:31:29 +08:00
minggo f1d13ca2e1 issue : android compiled ok 2011-03-08 13:49:58 +08:00
minggo 7a331e1e14 issue : wophone compiled ok 2011-03-07 18:20:48 +08:00
minggo b5a99f90df issue : rename file names and object names 2011-03-07 17:11:57 +08:00