YuLei Liao
|
9c29758222
|
* add Lua object reference ID to CCObject
|
2012-02-02 10:38:04 +08:00 |
dumganhar
|
cea250a962
|
restore original CCCopying as the parent class of CCObject
|
2012-01-17 10:54:21 +08:00 |
dumganhar
|
aa4fae3980
|
restore original CCCopying as the parent class of CCObject
|
2012-01-17 10:00:22 +08:00 |
dumganhar
|
a773e4fb96
|
move SelectorProtocol to CCObject
|
2012-01-08 21:03:16 +08:00 |
Didiet Noor
|
00e504356a
|
Fixing Warning on CLang 3.0 on XCode 4.2
|
2011-12-15 01:46:55 +08:00 |
dumganhar
|
baf3755142
|
remove some '__QNX__' macros
|
2011-12-12 16:14:12 +08:00 |
dumganhar
|
bfdb908d01
|
add Cocos2dx project
add HelloWorld project and rename proj.blackberry fold to proj.qnx
|
2011-12-06 14:56:37 +08:00 |
minggo
|
f0d22ae504
|
issue #879: replase assert with CCAssert
|
2011-11-28 17:28:43 +08:00 |
U-zhangxm-PC\zhangxm
|
d84b6c25be
|
issue #223: merge bada branch and fix some error
|
2011-11-18 18:45:05 +08:00 |
Leon
|
785b79d263
|
fix compile errors under ubuntu 11.10
|
2011-10-31 23:50:08 -07:00 |
dumganhar
|
fd3f496b76
|
use system orientation
|
2011-10-13 11:55:48 +08:00 |
dumganhar
|
db4d51496e
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into bada
Conflicts:
cocos2dx/platform/CCAccelerometer_platform.h
cocos2dx/platform/CCApplication_platform.h
cocos2dx/platform/CCArchOptimalParticleSystem.h
cocos2dx/platform/CCEGLView_platform.h
cocos2dx/platform/CCPlatformConfig.h
cocos2dx/platform/CCSAXParser.h
cocos2dx/platform/CCStdC.h
tests/AppDelegate.cpp
tests/tests/Box2DTestBed/Tests/EdgeShapes.h
|
2011-09-29 16:03:37 +08:00 |
dumganhar
|
c94adc58b9
|
changed bada projects directory, add bada macro
|
2011-09-19 17:53:45 +08:00 |
dumganhar
|
3c795073e0
|
Merge branch 'master' into bada
Conflicts:
HelloWorld/iphone/HelloWorld.xcodeproj/project.pbxproj
cocos2dx/CCamera.cpp
cocos2dx/cocoa/NSData.cpp
cocos2dx/label_nodes/CCBitmapFontAtlas.cpp
cocos2dx/platform/CCFileUtils_platform.h
cocos2dx/platform/CCXApplication_platform.h
cocos2dx/platform/CCXCocos2dDefine_platform.h
cocos2dx/platform/CCXEGLView_platform.h
cocos2dx/platform/CCXMath.h
cocos2dx/platform/CCXUIAccelerometer_platform.h
cocos2dx/platform/CCXUIImage_platform.h
cocos2dx/platform/ccxCommon_platform.h
cocos2dx/platform/config_platform.h
cocos2dx/platform/platform.h
cocos2dx/support/base64.cpp
cocos2dx/tileMap_parallax_nodes/CCTMXXMLParser.cpp
tests/AppDelegate.cpp
tests/test.iphone/test.iphone.xcodeproj/project.pbxproj
|
2011-09-19 13:42:08 +08:00 |
root
|
11679d9723
|
Merge branch 'master' into LinuxPort
|
2011-08-23 11:49:46 +08:00 |
minggo
|
d5457526d4
|
fixed #689: the width & height of CCRect should big or equal to 0
|
2011-08-23 10:46:00 +08:00 |
minggo
|
19244406d6
|
fixed #689: assert the width and height of rect is big than 0
|
2011-08-22 14:55:51 +08:00 |
laschweinski
|
871abb4a32
|
Merge branch 'master' into LinuxPort
|
2011-08-19 13:20:23 +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 |
laschweinski
|
5d20ebe24b
|
modified: HelloWorld/AppDelegate.cpp
modified: HelloWorld/HelloWorldScene.cpp
modified: cocos2dx/cocoa/CCNS.cpp
modified: cocos2dx/include/CCActionInstant.h
modified: cocos2dx/misc_nodes/CCRenderTexture.cpp
modified: cocos2dx/particle_nodes/CCParticleSystemQuad.cpp
modified: cocos2dx/platform/CCAccelerometer_platform.h
modified: cocos2dx/platform/CCApplication_platform.h
modified: cocos2dx/platform/CCArchOptimalParticleSystem.h
modified: cocos2dx/platform/CCCommon.cpp
modified: cocos2dx/platform/CCEGLView_platform.h
modified: cocos2dx/platform/CCGL.cpp
modified: cocos2dx/platform/CCGL.h
modified: cocos2dx/platform/CCImage.cpp
modified: cocos2dx/platform/CCPlatformConfig.h
modified: cocos2dx/platform/CCPlatformMacros.h
modified: cocos2dx/platform/CCSAXParser.h
modified: cocos2dx/platform/CCStdC.h
modified: cocos2dx/support/CCUserDefault.cpp
modified: cocos2dx/support/data_support/ccCArray.h
modified: tests/AppDelegate.cpp
deleted: tests/Res/music.mid
modified: tests/tests/controller.cpp
modified: tests/tests/tests.h
HelloWorld/Linux/
cocos2dx/.settings/
cocos2dx/platform/Linux/
tests/test.linux/
|
2011-08-17 11:36:54 +08:00 |
minggo
|
4694926edb
|
[android] fixed #609: retain & release obj in CCSet
|
2011-07-14 15:32:11 +08:00 |
Walzer
|
48420dca0c
|
fixed #605, add CC_DLL to pure C methods in CCNS.h
|
2011-07-12 17:10:10 +08:00 |
Walzer
|
348a05a329
|
fix a typo, CCObject::m_uRefrence -> CCObject::m_uReference
|
2011-07-07 08:23:31 +08:00 |
Marat Yakupov
|
14c43f4246
|
changed postfix increment of iterators to prefix increment
|
2011-06-21 09:30:03 +04:00 |
liswei
|
1591c7edc8
|
fixed #512 fix warnings in /Wall flag
|
2011-06-10 17:51:37 +08:00 |
minggo
|
7d52161804
|
fixed #441: Initialize pointer in contruction & detect pointer value in destruction
|
2011-04-01 16:06:53 +08:00 |
yangws
|
7e81c56231
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 439
Conflicts:
cocos2dx/platform/ios/CCFileUtils_ios.mm
|
2011-03-30 11:05:23 +08:00 |
yangws
|
041953151a
|
issue #439 CCFileData and imageWithImageFile modified on win32.
|
2011-03-29 11:41:44 +08:00 |
natural-law
|
1991a65b0b
|
Merge branch 'master' into iss391
Conflicts:
HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj
cocos2dx/proj.win32/cocos2d-win32.vcproj
cocos2dx/proj.wophone/Makefile.ARM
cocos2dx/proj.wophone/cocos2d-wophone.vcproj
template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj
template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj
template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
tests/test.ios/test.xcodeproj/project.pbxproj
|
2011-03-29 10:20:57 +08:00 |
natural-law
|
28a940ab57
|
issue #434,refactor class CCFileUtils on win32 and wophone.
|
2011-03-26 13:52:33 +08:00 |
natural-law
|
55143e3b9e
|
issue #391,implement functions:CCRectFromString, CCPointFromString and CCSizeFromString.
|
2011-03-24 10:38:08 +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 |
walzer
|
8c47a5b254
|
fix bug in CGRect::CGRectIntersectsRect(..) method, CGGeometry.cpp, according to this solution http://www.cocos2d-x.org/boards/6/topics/387
|
2011-01-21 08:54:45 +08:00 |
minggo
|
53753b65b5
|
merge bada platform
|
2010-12-15 18:05:02 +08:00 |
natural-law
|
4d98faabc5
|
fixed #226 add support read resource file from zip file in cocos2d-uphone
|
2010-11-29 10:49:43 +08:00 |
Walzer
|
820c2f0714
|
issue #211 cocos2d-x back to cocos2dx
|
2010-11-18 15:01:42 +00:00 |
Walzer
|
b4328354af
|
issue #211 cocos2dx -> cocos2d-x
|
2010-11-18 14:07:17 +00:00 |
yangws
|
e7502ad66f
|
Add PowerVR Lib to platform/win32/third_party.
|
2010-10-10 13:03:11 +00:00 |
Walzer
|
371baf3efc
|
add NSSet::anyObject method
|
2010-10-01 15:05:05 +00:00 |
Walzer
|
1b385bfe20
|
fix warnings in NSSet & CCXUIImage_uphone. NSSet will alloc std::set in heap, instead of in stack, to avoid compile warning
|
2010-10-01 06:34:47 +00:00 |
Walzer
|
f1c48be489
|
issue #171, implement CGRectIntersectsRect
|
2010-09-29 08:06:03 +00:00 |
Walzer
|
b8f59f623d
|
issue #171, implement CGRectIntersectsRect
|
2010-09-29 07:24:51 +00:00 |
Walzer
|
d93aae9133
|
issue #171, add annotate for protected member variable
|
2010-09-29 04:03:21 +00:00 |
yangws
|
c8439ca79e
|
change CGPoint CGSize CGRect function's parameter pass by value to pass by reference,
impliment CGRectIntersectsRect function
|
2010-09-29 03:49:38 +00:00 |
natural-law
|
44ce8d9c5a
|
issue #143
Clear memory leaks
|
2010-09-11 08:18:18 +00:00 |
yangws
|
4a52e5aaf9
|
impliment CCXEGLView for uPhone device.
|
2010-09-06 10:35:24 +00:00 |
Ming
|
d52678bca9
|
issue #61
|
2010-09-04 03:36:40 +00:00 |
Ming
|
05259df015
|
issue #61: the destruction of NSObject should be virtual
|
2010-09-01 04:01:48 +00:00 |
Ming
|
c36b833784
|
issue #81: remove including header of "platform/platform.h"
|
2010-08-25 03:44:26 +00:00 |