YuLei Liao
|
7a6253d9aa
|
* merge cocos2d-1.0.1-x-0.9.2-luafix to master
|
2011-11-21 16:38:00 +08:00 |
|
YuLei Liao
|
09d12be875
|
* format cocos2d-x source files
|
2011-11-18 21:23:54 +08:00 |
|
Phenix Yu
|
786feb6a8d
|
Merge remote-tracking branch 'remotes/upstream/master'
Conflicts:
HelloLua/Classes/AppDelegate.cpp
HelloLua/Resource/hello.lua
HelloLua/ios/HelloLua.xcodeproj/project.pbxproj
HelloLua/win32/HelloLua.win32.vcproj
HelloLua/win32/HelloLua.win32.vcxproj.filters
cocos2dx/include/ccMacros.h
cocos2dx/platform/ios/AccelerometerDelegateWrapper.mm
lua/cocos2dx_support/LuaCocos2d.cpp
lua/cocos2dx_support/LuaEngineImpl.cpp
template/xcode3/cocos2d-x_lua_app/___PROJECTNAME___.xcodeproj/project.pbxproj
template/xcode4/cocos2dx_lua.xctemplate/Resources/hello.lua
template/xcode4/cocos2dx_lua.xctemplate/TemplateInfo.plist
tests/test.win32/test.win32.vcxproj.filters
|
2011-11-15 14:43:55 +08:00 |
|
Phenix Yu
|
441f8e6da9
|
Merge branch 'master' of https://github.com/jbyu/cocos2d-x
Conflicts:
cocos2dx/CCScheduler.cpp
lua/cocos2dx_support/LuaEngine.cpp
lua/cocos2dx_support/LuaEngine.h
|
2011-11-15 14:00:52 +08:00 |
|
Leon
|
785b79d263
|
fix compile errors under ubuntu 11.10
|
2011-10-31 23:50:08 -07: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 |
|
moadib
|
807ae36d6a
|
CCMutableArray optimization
|
2011-08-20 01:30:33 +04:00 |
|
minggo
|
e39d551294
|
fixed #680: fix the bug that CCTouchDispatcher::rearrangeHandlers() crashed
|
2011-08-17 15:00:32 +08:00 |
|
Walzer
|
059e5ebc0b
|
add "virtual" keyword to the destructor of CCMutableArray, to prevent someone delete it as a CCObject and cause memory leak
|
2011-07-25 15:00:00 +08:00 |
|
Walzer
|
45e8915963
|
fixed #628, CCMutableArray::arrayWithObjects & arrayWithArray should set the return object to autorelease. And add CCAnimation::m_pobFrames->retain() after it get value from arrayWithArray. (it's property with retain in -iphone version but we miss the retain)
|
2011-07-24 08:30:49 +08:00 |
|
Walzer
|
175e9394bc
|
Merge https://github.com/minggo/cocos2d-x into lua
|
2011-06-21 15:22:00 +08:00 |
|
Marat Yakupov
|
14c43f4246
|
changed postfix increment of iterators to prefix increment
|
2011-06-21 09:30:03 +04:00 |
|
minggo
|
022e2b9998
|
issue #528: refactor ok on win32
|
2011-06-20 17:31:38 +08:00 |
|
minggo
|
a8b6b850de
|
use precompile macro to cantrol if enable lua support
|
2011-06-01 17:51:08 +08:00 |
|
minggo
|
697368cf20
|
support lua
|
2011-05-31 14:04:14 +08:00 |
|
Walzer
|
735b6ce97b
|
CCMutableArray::count() may crash if m_array is empty. Detect empty() before iteration
|
2011-04-19 11:23:02 +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 |