YuLei Liao
|
1dd0330351
|
* add CCMenuItem script support
|
2012-02-02 10:39:36 +08:00 |
YuLei Liao
|
003fa1f1a0
|
* add some methods for fast read/write position
* add CCNode::getChildrenCount() for Lua
|
2012-02-02 10:39:19 +08:00 |
YuLei Liao
|
32ec256ffb
|
* add Touch event script support
|
2012-02-02 10:38:26 +08:00 |
YuLei Liao
|
9c29758222
|
* add Lua object reference ID to CCObject
|
2012-02-02 10:38:04 +08:00 |
YuLei Liao
|
47d88bfbba
|
* add macro defines for Lua engine
|
2012-02-02 10:37:21 +08:00 |
YuLei Liao
|
9bdde0cb82
|
* remove script support
|
2012-02-01 16:45:23 +08:00 |
YuLei Liao
|
7685982081
|
* remove unused files for script support
|
2012-02-01 16:42:44 +08:00 |
minggo
|
a2efab73a0
|
fixed #959: make touch id correct on android
|
2012-01-31 14:49:02 +08:00 |
dumganhar
|
c6ec949950
|
remove some functions in CCObject
|
2012-01-30 16:07:01 +08:00 |
dumganhar
|
57eee38f4e
|
Merge branch 'master' into moveSel2CCObject
|
2012-01-19 15:46:31 +08:00 |
dumganhar
|
543d96a73f
|
issue 952: make CCLabelBMFont support other language, such as chinese, korean, japanese.
|
2012-01-18 18:02:39 +08:00 |
dumganhar
|
aa4fae3980
|
restore original CCCopying as the parent class of CCObject
|
2012-01-17 10:00:22 +08:00 |
dumganhar
|
ea0fb47f98
|
Merge branch 'master' into moveSel2CCObject
|
2012-01-17 09:37:31 +08:00 |
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 |
dumganhar
|
d61f87ba92
|
modify construct and destruct function of some class, for example CCNode() --> CCNode.cpp(void)
|
2012-01-09 23:21:31 +08:00 |
dumganhar
|
a773e4fb96
|
move SelectorProtocol to CCObject
|
2012-01-08 21:03:16 +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 |