Commit Graph

13 Commits

Author SHA1 Message Date
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 64665fe7c8 issue #1094: Make ParticleBatchNode works on win32. 2012-04-07 12:02:40 +08:00
YuLei Liao e74b842a58 update HelloLua 2012-02-09 17:48:15 +08:00
YuLei Liao 69a7e2a2e3 * change unsigned int CCObject::m_uLuaID -> int CCObject::m_nLuaID, because LUA_INTEGER is int. 2012-02-04 11:34:17 +08:00
dumganhar 6fbf2f1d09 move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
YuLei Liao 9660bcd165 * merge upstream/master to master 2012-01-20 19:08:21 +08:00
dumganhar 8c65786dce fixed #934: Add 'isEqual' function for CCString, make CCObject::isEqual to virtual function 2011-12-31 10:10:41 +08:00
minggo 37915cfed6 remove unneeded function, and make protocol an abstract class 2011-12-28 14:46:49 +08:00
YuLei Liao 151b373239 * ccConfig: add LUA_ENGINE macro, turn on Lua support when LUA_ENGINE defined 2011-11-23 00:58:31 +08:00
YuLei Liao 09d12be875 * format cocos2d-x source files 2011-11-18 21:23:54 +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
Walzer 348a05a329 fix a typo, CCObject::m_uRefrence -> CCObject::m_uReference 2011-07-07 08:23:31 +08:00
minggo b5a99f90df issue #375: rename file names and object names 2011-03-07 17:11:57 +08:00