YuLei Liao
|
4bf68e79fd
|
* merge upstream/master to master
|
2011-11-29 19:56:20 +08:00 |
YuLei Liao
|
ebd381af26
|
* merge luafix-0.9.2 to master
|
2011-11-29 19:20:49 +08:00 |
YuLei Liao
|
90ae1aabc7
|
* add CCScene::registerScriptEventsHandler(), CCScene::unregisterScriptEventsHandler()
|
2011-11-29 17:10:58 +08:00 |
YuLei Liao
|
0739c1f262
|
* rename LuaEngine to CCLuaEngine
* add #if LUA_ENGINE
* format source files
|
2011-11-29 15:42:12 +08:00 |
YuLei Liao
|
f1351610d8
|
* merge CCLuaSupport to CCLuaEngine
|
2011-11-29 12:35:48 +08:00 |
minggo
|
f0d22ae504
|
issue #879: replase assert with CCAssert
|
2011-11-28 17:28:43 +08:00 |
Walzer
|
ab7db20809
|
Fix a typo, CCSprite::get/setHornorParnetTransform to get/setHonorParnetTransform
|
2011-11-26 17:20:12 +08:00 |
minggo
|
101f076a44
|
fixed #760: implement functions in .cpp
|
2011-11-25 10:13:59 +08:00 |
minggo
|
c3a034a19b
|
fixed #760: add functions to get/add m_pNotificationNode
|
2011-11-23 17:18:53 +08:00 |
YuLei Liao
|
4ff2bf96d1
|
* ccConfig: add LUA_ENGINE macro, turn on Lua support when LUA_ENGINE defined
|
2011-11-23 13:41:48 +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
|
a1f8433a47
|
* fix merge error 4
|
2011-11-21 18:50:19 +08:00 |
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
|
b34859108e
|
* remove needless files
|
2011-11-21 11:58:55 +08:00 |
YuLei Liao
|
57bf9453b7
|
* add CCLuaSupport.cpp/.h, CCSchedulerFuncEntry class
* move CCTimer from CCScheduler.cpp/.h to CCTimer.cpp/.h
|
2011-11-20 16:38:27 +08:00 |
YuLei Liao
|
09d12be875
|
* format cocos2d-x source files
|
2011-11-18 21:23:54 +08:00 |
minggo
|
a7d6c90adb
|
Merge pull request #571 from jbyu/master
fix memory-leak for lua engine
|
2011-11-17 18:53:14 -08:00 |
minggo
|
cc79e533a3
|
issue #854: add pthread for win32 and implement CCTextureCache::addImageAsync()
|
2011-11-16 11:04:29 +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 |
minggo
|
2c14402107
|
fixed #776: merge pull request and remove unneeded codes
|
2011-10-28 09:46:19 +08:00 |
laschweinski
|
e53649ccaa
|
add a member function to get key string of a texture.
|
2011-10-22 19:39:31 +08:00 |
laschweinski
|
5589335d3a
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into linux_port1
|
2011-10-22 19:27:35 +08:00 |
laschweinski
|
04633242ba
|
fix a bug in audio player
|
2011-10-22 19:10:50 +08:00 |
minggo
|
ba2f2fbc8b
|
Merge https://github.com/reflog/cocos2d-x into reflog
|
2011-10-08 11:28:16 +08:00 |
Eli Yukelzon
|
d23b044782
|
fill for polygon drawing
|
2011-10-05 10:50:00 +02:00 |
minggo
|
c24d1d3fd6
|
Merge branch 'LinuxPort' of https://github.com/laschweinski/cocos2d-x into linux_port
|
2011-09-16 13:53:18 +08:00 |
minggo
|
d763cc3884
|
Merge pull request #503 from minggo/master
fixed #709: write doxygen comment in CCSet.h
|
2011-09-12 23:23:21 -07:00 |
minggo
|
e2315d92b5
|
fixed #709: write doxygen comment in CCSet.h
|
2011-09-13 09:31:54 +08:00 |
Walzer
|
8082b91c0e
|
fix CCPointMake marco in CCPointExtension.h. The bug is reported in forum http://www.cocos2d-x.org/boards/6/topics/3730
|
2011-09-10 08:48:15 +08:00 |
minggo
|
8ccc3321a3
|
Merge pull request #500 from flyingpacer/renderendcrash
Renderendcrash
|
2011-09-05 20:52:50 -07:00 |
RongHong
|
fea3da3156
|
fixed #696 Some android machines may crash at CCRenderTexture::end(bool bIsTOCasheTexture)
|
2011-09-06 11:33:48 +08:00 |
minggo
|
e69d16e7d6
|
change CC_DIRECTOR_FPS_INTERVAL to 0.5, it is more reliable
|
2011-09-06 10:52:37 +08:00 |
RongHong
|
624e27497a
|
fixed #696 Some android machines may crash at CCRenderTexture::end(bool bIsTOCasheTexture)
|
2011-09-06 09:51:35 +08:00 |
laschweinski
|
91f8ed7eb4
|
CCParticleSystemPoint now derive from CCParticleSystemQuade in linux
|
2011-09-05 11:57:10 +08:00 |
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 |
Walzer
|
9f1e26f8a0
|
fixed #700, a stupid typo in CC_SWAP32 marco
|
2011-08-30 15:20:41 +08:00 |
minggo
|
b38105a70b
|
issue 675: dispatch accelerometer data to one delegate
|
2011-08-29 18:18:39 +08:00 |
minggo
|
a411f4877c
|
fixed #698:Not invoke init() in the construction of CCSprite
|
2011-08-29 11:00:31 +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
|
952a01f43e
|
fixed #672: implement copywithzone for CCShow & CCHide
|
2011-08-24 14:21:23 +08:00 |
root
|
11679d9723
|
Merge branch 'master' into LinuxPort
|
2011-08-23 11:49:46 +08:00 |
minggo
|
cd4a08aa6a
|
Merge pull request #479 from minggo/iss678
fixed #679: add constructor for CCArray
|
2011-08-21 20:14:06 -07:00 |
moadib
|
807ae36d6a
|
CCMutableArray optimization
|
2011-08-20 01:30:33 +04:00 |
minggo
|
1f9f1f59d4
|
fixed #679: add constructor for CCArray
|
2011-08-19 16:15:06 +08:00 |
laschweinski
|
871abb4a32
|
Merge branch 'master' into LinuxPort
|
2011-08-19 13:20:23 +08:00 |
Phenix Yu
|
ed42bc388c
|
fixed lua memory leak
|
2011-08-18 12:26:33 +08:00 |
moadib
|
a8d87a9976
|
Non-trivial arguments passed by reference now.
Removed unnecessary cocos2d:: prefix inside namespace.
|
2011-08-17 17:26:26 +04:00 |
minggo
|
e39d551294
|
fixed #680: fix the bug that CCTouchDispatcher::rearrangeHandlers() crashed
|
2011-08-17 15:00:32 +08:00 |