gzito
|
c87881ff94
|
Added Marmalade support to TextInputTest and HelloLua samples
|
2012-01-15 15:57:10 +01:00 |
minggo
|
cfe02e39ef
|
Broken include guard in CCActionEase.h
|
2012-01-12 17:06:46 +08:00 |
minggo
|
75216ac9ca
|
make CCTouchDelegate::touchDelegateRetain() and touchDelegateRelease as pure virtual function
|
2012-01-11 16:54:14 +08:00 |
minggo
|
f776ecc7e0
|
Merge pull request #650 from dumganhar/issue#934_add_isEqual
Add 'isEqual' function for CCString, make CCObject::isEqual to virtual function
|
2011-12-30 18:18:39 -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
|
53fae04ba8
|
fixed #752: make add/remove touch delegate in menu callback function correctly
|
2011-12-30 15:43:36 +08:00 |
minggo
|
fcb2294e20
|
fixed #926: subclass should retain/release when dynamic_cast fail.
|
2011-12-28 14:47:54 +08:00 |
minggo
|
37915cfed6
|
remove unneeded function, and make protocol an abstract class
|
2011-12-28 14:46:49 +08:00 |
minggo
|
bb4b1d02bb
|
Merge pull request #608 from GMTDev/patch-2
issue #903: Update CCTouch to include the ID/PID of the touch
|
2011-12-20 21:48:30 -08:00 |
GavT
|
36f8e43dd8
|
Update cocos2dx/include/CCTouch.h
|
2011-12-20 20:40:48 -08:00 |
minggo
|
01cf5793ad
|
fixed #922: rename CCTexture2D::setPVRImagesHavePremultipliedAlpha() and change it to a static method
|
2011-12-20 14:59:15 +08:00 |
minggo
|
faa8b59b6d
|
fixed #920: export functions in CCAffineTransform
|
2011-12-20 10:39:10 +08:00 |
minggo
|
15fca8b4b4
|
issue #892: use RTTI instead of selectorRetain() and selectorRelease()
|
2011-12-15 10:26:31 +08:00 |
dumganhar
|
4b9cbb85ff
|
#issue 908: Merge marmalade to latest cocos2d-x source
Merge branch 'master' of https://github.com/gzito/cocos2d-x into marmalade
Conflicts:
cocos2dx/platform/CCFileUtils.cpp
cocos2dx/platform/CCPlatformConfig.h
cocos2dx/support/zip_support/ioapi.cpp
|
2011-12-12 17:46:21 +08:00 |
dumganhar
|
baf3755142
|
remove some '__QNX__' macros
|
2011-12-12 16:14:12 +08:00 |
styck
|
bcf63d0e96
|
Merged from gitbub.gom/gzito, marmalade support, remove airplay
|
2011-12-10 20:59:48 -08:00 |
minggo
|
3bf11dba7e
|
issue #892: modify pkg for lua
|
2011-12-07 15:24:03 +08:00 |
minggo
|
cdc842051f
|
issue #892: use RTTI to simplify codes, work ok on win32
|
2011-12-07 14:28:22 +08:00 |
GavT
|
6ab60118af
|
Update cocos2dx/include/CCTouch.h
|
2011-12-06 20:31:40 -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 |
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 |