James Chen
7d7baf81a2
refactor updated...
2012-04-18 18:43:45 +08:00
James Chen
77919439bc
fixed #1166 : Added CCArray::arrayWithContentOfFile function.
2012-04-16 15:41:01 +08:00
James Chen
94e056d964
fixed #1160 : Renamed 'CGFloat' to 'CCFloat'.
2012-04-13 14:09:02 +08:00
James Chen
2885664c85
fixed #1136 : Fixed some bugs as follows:
...
1. Using std::string parameter as the key of CCDictionary
2. Deep copy for CCDictionary and CCArray, the classes of elements's type must implement copyWithZone.
3. Added toBool() function to CCString.
4. Retina support for all platforms.
5. Include "CCString.h" and "cocoa/CCNS.h" in cocos2d.h.
6. Added a new constructor(CCArray::CCArray(unsigned int capacity)) for CCArray. And fixed a bug in CCArray.
7. Fixed a memory leak in CCLabelBMFont.cpp.
8. Fixed an error in strings.xml.
2012-04-10 17:17:24 +08:00
James Chen
5ad6c38500
Fixed two memory leaks in CCArray::copyWithZone and CCDictionary::copyWithZone.
2012-04-10 15:01:29 +08:00
James Chen
64665fe7c8
issue #1094 : Make ParticleBatchNode works on win32.
2012-04-07 12:02:40 +08:00
James Chen
df58a09255
Update:
...
1. init CCSprite::m_pobBatchNode at the beginning of CCSprite::initWithTexture.
2. Add CCAssert in ccArrayRemoveObjectAtIndex.
3. Use new method to allocate CCDirector.
2012-04-05 18:53:53 +08:00
James Chen
85c13998ee
issue #1056 : Added CCTransitionProgress class, Updated Texture2dTest, TileMapTest, TransitionsTest.
2012-03-26 16:46:23 +08:00
James Chen
b1f293e089
issue #1056 : Updated MenuTest. Added CCArray::arrayWithObject function.
2012-03-22 14:22:06 +08:00
James Chen
7c0af610ff
issue #1056 : Added CCArray::copyWithZone implementation. CCDictElement bound check.
2012-03-20 23:30:18 +08:00
minggo
382e4e7eb8
issue #1056 : modify code according new code after pull
2012-03-20 17:27:06 +08:00
James Chen
6ce06bd906
issue #1056 : Remove CCMutableArray and CCMutableDictionary template, offer CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost.
2012-03-20 15:04:53 +08:00
James Chen
e021ae9821
#1056 : issue #1056 : synchronise cocos2d-iphone-2.0-rc0a, update some files.
2012-03-16 17:56:19 +08:00
James Chen
b8d760064d
issue #1056 : Add CCVertex.h CCVertex.cpp, implement CCMotionStreak.
2012-03-14 16:10:01 +08:00
James Chen
e3e016331c
issue #972 : move extensions folder to cocos2dx
2012-02-14 16:08:12 +08:00
James Chen
0adca5774c
move CCNotificationCenter to extensions folder
2012-02-14 11:45:59 +08:00
James Chen
81ec2c8586
issue #972 : add support for CCNotificationCenter, and add the test demo for it.
...
modify the project setting for VS2008 and VS2010
2012-02-10 11:48:33 +08:00
minggo
2b91b1c7cf
fixed #933 : free doc
2012-02-02 14:24:51 +08:00
minggo
591b7d0619
fixed #933 : profile CCUserDefault
2012-02-02 14:18:13 +08:00
Didiet Noor
00e504356a
Fixing Warning on CLang 3.0 on XCode 4.2
2011-12-15 01:46:55 +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
Giovanni Zito
0a7a000c2d
Changed symbols from "airplay" to "marmalade", added files and folders for marmalade
2011-12-08 12:21:48 +01: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
Walzer
8edbbd56a9
Fix a typo here. Two values are not swapped correctly, max_inclusive is still equal to itself.
2011-11-26 17:07:36 +08:00
U-zhangxm-PC\zhangxm
d84b6c25be
issue #223 : merge bada branch and fix some error
2011-11-18 18:45:05 +08:00
dumganhar
da794c1613
Merge branch 'master' into bada
2011-10-21 09:28:29 +08:00
Leon
70a4942ea6
fix some warning
2011-10-19 15:24:19 +08:00
Walzer
ae411f9503
fix some warnings detected by xcode4.2, fix a stupid typo in RayCasts.h
2011-10-18 17:41:19 +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
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
554e3fda52
fixed #701 , CCZHeader.version should be an unsigned short, instead of unsigned char. Keep the same to cocos2d-iphone
2011-08-30 15:26:17 +08: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
Walzer
3afe6ebfb2
fixed #638 , add support for pvr ccz format. I've tested it on both ios & android, also with instrument memleak detection. But haven't tested on win32 & marmalde, in thoery it will work.
2011-08-16 11:56:17 +08:00
minggo
dd43f16c8e
fixed #622 : add comment of CCUserDefault
2011-08-05 11:02:42 +08:00
Eli Yukelzon
41bdb281dc
corrected bug and leak in getBool
2011-07-31 15:31:39 +03:00
Eli Yukelzon
af61a7c650
added support for optional default values in CCUserDefault getters
2011-07-31 15:08:25 +03:00
RongHong
8afa3a9be1
fixed #619 CCFadeTo may crashed on android
2011-07-27 16:21:00 +08:00
natural-law
fcbe0443be
Resolve a bug in ZipUtils.cpp. And modify the Makefile of tests on wophone.
2011-07-11 15:16:29 +08:00
natural-law
db6a5fce23
fixed #588 .
2011-07-08 14:16:10 +08:00
natural-law
5db1719302
fixed #587
2011-07-08 14:15:51 +08:00
natural-law
7107c6612b
fixed #563 , Upgrade folder support to rc3.
2011-07-05 12:05:19 +08:00
minggo
70ce4f877f
fixed #565 : upgrade tileMap_parallax_nodes to 1.0.0-rc3
2011-07-04 14:11:43 +08:00
liswei
91326028ec
fixed #516 Undefined Behaviour in ccCArray.h (signed / unsigned conversion)
2011-06-13 16:58:55 +08:00
liswei
1591c7edc8
fixed #512 fix warnings in /Wall flag
2011-06-10 17:51:37 +08:00
minggo
e14040730b
fixed #455 : release CCUserDefault at end & fix a bug when the user delete CCUserDefault carelessly
2011-05-06 17:46:19 +08:00
minggo
33648a9e9b
issue #455 : add compile CCUserDefault to WoPhone, but not test, because the path will change later
2011-05-06 16:14:07 +08:00
minggo
2c0bd49513
issue #455 : CCUserDefault ok on win32 & Android
2011-05-06 15:31:51 +08:00
Walzer
bdd0b44b99
fixed a warning in CCProfiling.cpp
2011-04-29 10:08:35 +08:00
natural-law
71e4ec6aca
issue #468 , Fix the compile error when the target platform is not win32.
2011-04-25 15:05:16 +08:00
natural-law
7231120b16
fixed #468 , Implement CCProfiler & CCProfilingTimer. And use them in PerformanceNodeChildrenTest.
2011-04-25 14:30:30 +08:00
natural-law
5d2ac1fc0c
fixed #428 , Use CCArray instead of CCMutableArray as the parameter type of CCNode::m_pChildren.
2011-04-21 14:46:15 +08:00
moadib
03093a98b5
In pointmath-related functions parameters should be passed by reference
2011-04-16 10:55:02 +04:00
yangws
041953151a
issue #439 CCFileData and imageWithImageFile modified on win32.
2011-03-29 11:41:44 +08:00
natural-law
e38d3a2277
Merge branch 'master' into iss434
...
Conflicts:
cocos2dx/platform/airplay/CCFileUtils_airplay.h
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
2011-03-28 17:06:32 +08:00
natural-law
ed2566e201
issue #434,Refactor class CCFileUtils on platform airplay.
2011-03-28 16:27:26 +08:00
natural-law
cee82fe9fa
issue #434,refactor class CCFileUtils on android and ios.
2011-03-26 17:24:37 +08:00
walzer
f568ad8487
issue #379 , fix a bug caused by airplay port integration, which makes android port unable to load resources by zlib.
2011-03-26 14:09:42 +08:00
natural-law
28a940ab57
issue #434,refactor class CCFileUtils on win32 and wophone.
2011-03-26 13:52:33 +08:00
walzer
ed492bbd1e
[airplay] first commit of airplay port. Thanks for Аксёнов Максим's contribution!
2011-03-23 22:16:20 +08:00
walzer
81fa070125
fixed #418 , add copyright of original authors, merge Bin's commit
2011-03-19 14:45:51 +08:00
unknown
0d51d129b5
fixed #253 TileMapTest crash in windows7.
2011-03-10 23:16:38 +08:00
natural-law
7c6147421b
[wophone]fixed #377,Replace the word "uphone" with "wophone".
2011-03-09 17:28:35 +08:00
minggo
63d283d3e8
delete ccxString.h
2011-03-09 12:00:04 +08:00
minggo
b5a99f90df
issue #375 : rename file names and object names
2011-03-07 17:11:57 +08:00
minggo
4379a1c96f
Move ccxApplication to cocos2dx/platform on ios.
2011-03-02 17:05:22 +08:00
yangws
63cedd1317
Merge code of Platform_support for IOS.
2011-02-23 18:22:05 +08:00
yangws
85b9c9ae21
Retina display support and scale with keep w/h rate ok on win32.
2011-02-18 18:30:22 +08:00
yangws
67c0ad6332
add platform support project on win32.
...
Move macros, CCXUIImage, ccxCommon, CCXCocos2dDefine, 3rd party libraries, glu, NSLock, ccxConfig from platform/win32 to platform_support.
2011-01-15 18:05:35 +08:00
minggo
1f08213563
HelloWorld runs ok on iphone
2011-01-07 11:27:42 +08:00
natural-law
25e9721678
fix bugs.
2011-01-04 17:46:23 +08:00
minggo
dc55c164ba
fixed #292
2010-12-29 18:01:37 +08:00
minggo
b2b8591b26
fixed #279
2010-12-28 10:23:14 +08:00
Walzer
5c858b182c
issue #243 , fix warnings
2010-12-18 12:02:57 +08:00
Walzer
edc742d41b
Merge branch 'master' of https://github.com/leon-li/cocos2d-x into leon-li-master
2010-12-18 10:26:22 +08:00
Walzer
5f563102e9
fixed #265
2010-12-18 08:17:53 +08:00
Leon
96f4f5c9fd
fix some compiling warning for iOS
2010-12-17 23:44:19 +08:00
natural-law
95e697d316
fixed #262 Add namespace for the project CocosDenshion.
2010-12-15 18:28:18 +08:00
natural-law
2c84b167e0
fixed #258 Move FileUtils.h from path "support/file_support" to path "include".
2010-12-14 10:45:23 +08:00
Walzer
dec419be71
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
2010-12-10 10:34:41 +08:00
minggo
534a55eaa1
issue #220 : All tests run on android emulator, but the effect of some tests are wrong
2010-12-06 09:51:21 +08:00
natural-law
3a0ae951b7
fixed #236 Fix the bug of cross-compile in cocos2d-uphone
2010-12-03 11:08:30 +08:00
minggo
7fa8d72076
commit before merging the code from https://walzer@github.com/cocos2d/cocos2d-x.git
2010-11-29 15:54:32 +08:00
natural-law
b1d3e66e68
1. Check the return value of FileData::getFileData()
...
2. Fix a bug of CCBitmapFontConfiguration::parseConfigFile()
3. Move the function CCFileUtils::getFileDataFromZip() to class of FileUtils.
2010-11-29 14:21:33 +08:00
natural-law
94c9addace
fixed #226 add support read resource file from zip file in cocos2d-uphone
2010-11-29 10:55:32 +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
Walzer
fb25984f12
rename getShared methods to shared
2010-11-16 07:12:09 +00:00
Ming
416a319344
fixed #203
2010-11-13 03:34:49 +00:00
Ming
6062cf1558
issue #202
2010-11-12 09:26:01 +00:00
Ming
6853385c8d
resolve compile error for android
2010-11-03 02:59:07 +00:00
yangws
cf0a2c5665
add cocos2dx-win32 framework, can't work yet.
2010-10-08 09:53:04 +00:00
Walzer
b86a666269
fix some warnings during compile phase
2010-09-30 23:51:06 +00:00
Ming
12d6df9717
issue #154
2010-09-24 10:10:32 +00:00
Ming
543c3f5a96
issue #61 : free the memory in void to memory leak
2010-09-03 10:00:48 +00:00
Ming
acfe962059
issue #116
2010-09-03 07:01:55 +00:00
Ming
34e4254957
issue #116 : remove the using of itoa, use "/" as path separator
2010-09-03 06:40:48 +00:00
Walzer
43a4664534
issue #114 , CCTMXTiledMap debug
2010-09-02 07:31:37 +00:00
Ming
6a4af3bcfd
issue #116
2010-09-02 02:33:39 +00:00
Ming
60adec78e8
issue #85 : avoid virtual inheriting from NSObject, and remove the using of dynamic_cast()
2010-08-27 06:13:32 +00:00
Ming
710e29b086
issue #80
2010-08-25 02:19:20 +00:00
Ming
c085826f9a
fixed #77
2010-08-23 08:32:37 +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
3e2ee37a8a
issue #35 : fixed some bugs
2010-08-09 03:46:35 +00:00
Ming
76f62adf62
fixed #30 : change some header files to include
2010-08-04 08:45:00 +00:00
Walzer
14427a24d7
2010-08-04 07:46:12 +00:00
Ming
a324e38cb2
issue #21 : change INT32 to int, change UINT to unsigned int
2010-08-02 02:58:00 +00:00
Ming
5eede62659
fixed #16 : fixed compile errors
2010-07-27 05:47:29 +00:00
Ming
4160abc669
issue #6 : fixed compile error because some file is deleted
2010-07-26 02:35:45 +00:00
Walzer
c8d3a1754f
issue #7 , remove ../
2010-07-20 06:34:25 +00:00
Walzer
5d60c2ca0a
issue #7 , change the use of NSMutableArray
2010-07-20 05:49:13 +00:00
Ming
cff5590721
issue #11 : add TransformUtils.cpp and TransformUtils.h
2010-07-19 06:24:04 +00:00
Ming
cb433f5988
issue #11 : add glu.cpp, glu.h and OpenGL_Internal.h
2010-07-19 03:13:54 +00:00
Ming
0e6a96423c
issue #11 : add TGAlib.cpp and TGAlib.h
2010-07-19 02:50:47 +00:00
Walzer
cc9c52d0c7
issue #5 , do some implementation
2010-07-16 09:53:59 +00:00
Ming
2cf4ef0567
issue #11 : add base64.cpp and base64.h
2010-07-16 07:07:38 +00:00
Ming
132164cf2c
issue #11 : add CGPointExtension.cpp and CGPointExtension.h
2010-07-16 06:54:26 +00:00
Ming
3e89679570
issue #11 : add uthash.h and utlist.h
2010-07-14 03:06:09 +00:00