YuLei Liao
|
012ce7a04f
|
* fix merge error 1
|
2011-11-21 17:00:56 +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
|
09d12be875
|
* format cocos2d-x source files
|
2011-11-18 21:23:54 +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 |
Ming
|
17e866f5ac
|
issue #61
|
2010-08-20 01:31:35 +00:00 |
Walzer
|
29d9a489b8
|
issue #18, debug
|
2010-08-19 06:11:35 +00:00 |
Ming
|
2f638dbe14
|
issue #55
|
2010-08-18 06:57:36 +00:00 |
Walzer
|
9510be1d72
|
fixed #41, complete label
|
2010-08-12 09:39:25 +00:00 |
Ming
|
76f62adf62
|
fixed #30: change some header files to include
|
2010-08-04 08:45:00 +00:00 |
Ming
|
7f20bced08
|
issue #6: remove unusable files
|
2010-08-04 08:26:17 +00:00 |
Walzer
|
14427a24d7
|
|
2010-08-04 07:46:12 +00:00 |
Ming
|
52ace69f09
|
issue #23: dll export support
|
2010-08-02 03:13:36 +00:00 |
Ming
|
a324e38cb2
|
issue #21: change INT32 to int, change UINT to unsigned int
|
2010-08-02 02:58:00 +00:00 |
Walzer
|
88ce1c8f83
|
issue #7, implement
|
2010-07-30 08:35:07 +00:00 |
yangws
|
de4cb4fcf7
|
issue #14 add CCXEGLView attach with EGLTouchDelegate
|
2010-07-28 10:18:27 +00:00 |
Ming
|
9c984b8a34
|
issue #17: fixed link error
|
2010-07-28 07:16:00 +00:00 |
Walzer
|
d2f792363c
|
issue #7, debug
|
2010-07-28 05:48:13 +00:00 |
Ming
|
7d32899ef6
|
issue #6: remove the implementation to NSMutableArray.h
|
2010-07-28 03:47:40 +00:00 |
Ming
|
6337e67cc4
|
issue #6: change a function name
|
2010-07-28 03:42:35 +00:00 |
Walzer
|
f6923c09c1
|
issue #7, debug
|
2010-07-28 02:14:27 +00:00 |
Walzer
|
eae22d57e1
|
issue #7, debug
|
2010-07-28 02:02:42 +00:00 |
Walzer
|
9270186b6b
|
issue #7, debug
|
2010-07-28 01:59:32 +00:00 |
Walzer
|
156f0dd7d1
|
issue #7, debug
|
2010-07-28 01:52:37 +00:00 |
Walzer
|
81f5f6cce3
|
issue #7, modify
|
2010-07-27 11:52:33 +00:00 |
Walzer
|
3c798a5c26
|
issue #7, add allKeys() and allKeysForObject() in NSMutableDictionary.h, implement initPremultipliedATextureWithImage() in CCTexture2D.cpp,but still some questions
|
2010-07-27 09:55:06 +00:00 |
Ming
|
5eede62659
|
fixed #16: fixed compile errors
|
2010-07-27 05:47:29 +00:00 |
Walzer
|
0783eddda4
|
issue #7, implementations
|
2010-07-26 09:32:23 +00:00 |
Ming
|
4160abc669
|
issue #6: fixed compile error because some file is deleted
|
2010-07-26 02:35:45 +00:00 |
Ming
|
9bcdca47ca
|
issue #6: update NSMutableArray.h
|
2010-07-23 05:42:55 +00:00 |
Ming
|
a2ed05d205
|
issue #6: delete NSArray.cpp, NSArray.h
|
2010-07-23 01:46:52 +00:00 |
Ming
|
5be2e27424
|
issue #6: update NSMutableArray.h
|
2010-07-22 07:55:28 +00:00 |
Walzer
|
59c7a734ba
|
issue #7 , implement .cpp
|
2010-07-21 09:40:10 +00:00 |
Walzer
|
5f370c3a50
|
add NSMutableDictionary
|
2010-07-21 03:46:18 +00:00 |
Ming
|
98915e1e9e
|
issue #6:update NSMutableArray.cpp
|
2010-07-21 02:07:46 +00:00 |
Walzer
|
9137931b38
|
issue #7, remove ../
|
2010-07-20 06:33:31 +00:00 |
Walzer
|
5d60c2ca0a
|
issue #7, change the use of NSMutableArray
|
2010-07-20 05:49:13 +00:00 |
Ming
|
447c282c82
|
issue #6: update NSAutoreleasePool.cpp, NSAutoreleasePool.h, NSZone.cpp, NSZone.h
|
2010-07-20 03:25:37 +00:00 |
Ming
|
341ede3504
|
issue #6:update NSMutableArray.cpp and NSMutableArray.h
|
2010-07-20 02:45:38 +00:00 |
Ming
|
b8be15e925
|
issue #6: add CGAffineTransform.cpp, CGAffineTransform.h and update CGGeometry.h
|
2010-07-19 06:23:24 +00:00 |
Ming
|
b2d68953b4
|
issue #6: update NSData.cpp and NSData.h
|
2010-07-19 03:42:53 +00:00 |
Ming
|
4bc6383f6b
|
issue #6: remove NSLock.cpp and NSLock.h
|
2010-07-19 03:16:34 +00:00 |
Walzer
|
669f59d721
|
add CGPointZero, CGSizeZero, CGRectZero
|
2010-07-16 09:51:35 +00:00 |
Ming
|
84534a1316
|
issue #6: add replaceObjectAtIndex() to NSMutableArray
|
2010-07-16 06:19:21 +00:00 |
Ming
|
92bf801870
|
issue #6: implement NSSet
|
2010-07-16 02:13:27 +00:00 |
Walzer
|
ee1a33867c
|
issue #5 : add include
|
2010-07-14 03:18:05 +00:00 |
Ming
|
577399d2cb
|
issue #6: add getObjectAtIndex() to NSMutableArray
|
2010-07-14 03:02:06 +00:00 |
Ming
|
9ab774cd8b
|
issue #6: update CCScheduler.h and selector_protocol.h
|
2010-07-14 02:35:20 +00:00 |
Ming
|
b5fcd6177d
|
issue #6: update CGGeometry.h and add CGGeometry.cpp
|
2010-07-13 05:44:00 +00:00 |
Walzer
|
77f69c3d24
|
issue #5, typedef std::vector<NSObject *>::iterator NSMutableArrayIterator;
|
2010-07-13 03:49:11 +00:00 |
Ming
|
e5677e7975
|
issue #6: add selector_protocol.h
|
2010-07-13 01:56:58 +00:00 |
Walzer
|
dadfb6bf55
|
issue #5, change private method to protected
|
2010-07-12 10:20:04 +00:00 |
Ming
|
fb5762c463
|
issue #6: update NSObject.cpp
|
2010-07-12 09:12:08 +00:00 |
Ming
|
7c07335dab
|
issue #6: update NSAutoreleasePool, NSObject.h and NSMutableArray
|
2010-07-12 09:01:26 +00:00 |
Walzer
|
0e8d3a5e9e
|
fixed #2, fix comiple errors. but link error still exists
|
2010-07-08 07:13:07 +00:00 |
Ming
|
dffa1cd731
|
issue #2: change including header file because we change the path of CocosTypes.h
|
2010-07-08 04:02:18 +00:00 |
Ming
|
89dcd544fb
|
fixed #9
|
2010-07-08 03:58:33 +00:00 |
Ming
|
d174b51106
|
issue #9
|
2010-07-08 02:53:52 +00:00 |
Ming
|
d7e1a264ea
|
issue #6: update NSMutableArray.h
|
2010-07-07 06:22:24 +00:00 |
Walzer
|
97d6aaf296
|
issue #2, add link to website at each file header
|
2010-07-06 12:55:05 +00:00 |
Ming
|
924017afdd
|
issue #6
|
2010-07-06 12:40:11 +00:00 |
Ming
|
afffd75d0e
|
issue #6:issue #6
|
2010-07-06 12:23:58 +00:00 |
Ming
|
6d9c6c926e
|
issue #6:issue #6: remove the .h files to cocoa
|
2010-07-06 12:23:19 +00:00 |
Ming
|
2df9706950
|
issue #6:issue #6: remove the .h files to cocoa
|
2010-07-06 12:20:20 +00:00 |
Ming
|
d3bbb92f95
|
issue #6:issue #6: remove the .h files to cocoa
|
2010-07-06 12:19:19 +00:00 |
Ming
|
88ac456ffa
|
issue #6: remove the .h files to cocoa
|
2010-07-06 12:17:34 +00:00 |
Ming
|
6c2b2a940d
|
issue #6
|
2010-07-06 09:55:55 +00:00 |
Ming
|
dafe99ca70
|
issue #2: move to folder cocos2dx
|
2010-07-06 08:28:41 +00:00 |