Walzer
735b6ce97b
CCMutableArray::count() may crash if m_array is empty. Detect empty() before iteration
2011-04-19 11:23:02 +08:00
minggo
c38af3c28d
fixed #456 : integrate libcurl into cocos2dx
2011-04-19 10:57:44 +08:00
yangws
d11bd85d00
CCTextFieldTTF works on win32.
2011-04-19 09:32:33 +08:00
minggo
a4e9f1c18d
libcurl works ok on ios
2011-04-18 14:12:41 +08:00
natural-law
adbf349116
fixed #449 . Modify the wophone Makefile.ARM for remove mac support.
2011-04-18 11:35:57 +08:00
walzer
0738f751d1
Merge branch 'point_math' of https://github.com/moadib/cocos2d-x
2011-04-16 15:22:44 +08:00
walzer
eb4b31e4da
update config file from doxygen 1.7.2 to 1.7.4. add simple brief for CCMessageBox
2011-04-16 15:21:50 +08:00
moadib
03093a98b5
In pointmath-related functions parameters should be passed by reference
2011-04-16 10:55:02 +04:00
minggo
37e7fad0d3
issue #456 : add curl test & libcurl.so works ok on android
2011-04-15 17:15:05 +08:00
walzer
73f2c5297c
#define ccp CCPointMake(...) to cocos2d::CCPointMake(...). Thanks Marat Yakupov's fix. http://www.cocos2d-x.org/boards/6/topics/1200
2011-04-14 16:15:12 +08:00
minggo
932b475170
fixed #448 : make CCCallFuncO invoke correct parameter
2011-04-13 11:53:25 +08:00
minggo
7f6e0052a1
Merge branch 'iss341' of https://github.com/natural-law/cocos2d-x into natural-law-iss341
2011-04-12 15:43:48 +08:00
natural-law
da7c608ab8
fixed #341 . Modify the location of allocate memory for m_pTMXLayers.
2011-04-12 15:31:54 +08:00
minggo
3d6fd051ab
issue #449 : refactor CCTransition
2011-04-11 16:09:14 +08:00
natural-law
ba933f9456
fixed #341 , modify the implementation of function CCTMXTiledMap::layerNamed().
2011-04-11 15:59:59 +08:00
minggo
37bb33d9e5
fixed #452 : refactor CCDirector CCNode CCGrid
2011-04-11 15:10:09 +08:00
natural-law
d4dbedca4d
fixed #451,remove the code of support mac platform.
...
1. Remove the EventDispatcher.
2. Refactor CCLayer, CCMenu and CCParticleSystemPoint.
3. Modify the project file of win32, wophone and android.
2011-04-11 11:24:10 +08:00
yangws
d3ef9e7da7
Merge branch '0.8.2_vc10' of https://github.com/yangws/cocos2d-x into master.cocos2d
2011-04-07 14:30:28 +08:00
yangws
455ec071b3
VC2010 compile ok.
2011-04-07 14:20:04 +08:00
yangws
b1ab937ec3
fix MouseEvent bug
2011-04-07 11:05:44 +08:00
natural-law
1af4aa1138
[android] fixed #374,Modify the approach of cache the textures when EGL rendering context lost.
2011-04-06 16:29:58 +08:00
natural-law
f3b1385279
fixed #446,read the .fnt file by it's full path.
2011-04-06 10:20:01 +08:00
Max Aksenov
b33aeac164
[airplay] renamed "CCEGLView::setFrameWitdAndHeight" to "CCEGLView::setFrameWidthAndHeight".
...
reformatted CCEGLView::setMotionTouch for unification with other functions of "setTouche".
2011-04-04 01:58:07 -07:00
Max Aksenov
6927dae38f
[airplay] renamed "CCEGLView::setFrameWitdAndHeight" to "CCEGLView::setFrameWidthAndHeight".
...
reformatted CCEGLView::setMotionTouch for unification with other functions of "setTouche".
2011-04-04 01:56:15 -07:00
walzer
cb65469103
[airplay] move .mkf to proj.airplay folder, improve SimpleAudioEngine implementation, integrate chipmunk
2011-04-04 00:40:39 +08:00
walzer
de81120b6a
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
2011-04-03 09:51:01 +08:00
walzer
28fbfb04dc
Merge branch 'iss349' of https://github.com/natural-law/cocos2d-x into natural-law-iss349
2011-04-03 09:30:26 +08:00
minggo
0aa8eb2892
fixed #350 : transitionfade flickers on both android and iphone
2011-04-02 16:16:19 +08:00
natural-law
72f11cb421
[ios]fixed #349,Modify the method of parse *.plist files in order to deal with *.plist files in binary format.
2011-04-02 11:32:15 +08:00
minggo
39b60291ed
Merge branch 'issue_441' of https://github.com/minggo/cocos2d-x into minggo-issue_441
2011-04-01 17:34:17 +08:00
minggo
8fbfc2773a
Merge branch 'issue_440' of https://github.com/minggo/cocos2d-x into minggo-issue_440
2011-04-01 17:19:30 +08:00
minggo
7d52161804
fixed #441 : Initialize pointer in contruction & detect pointer value in destruction
2011-04-01 16:06:53 +08:00
Marat Yakupov
ac84278dae
[android] #443 implemented CCKeypadDelegate on android
2011-04-01 11:27:06 +04:00
minggo
2c539a1df5
[android] fixed #440 : CCMessage works ok on android
2011-04-01 11:35:26 +08:00
yangws
0efeaa6696
fixed #420 deal with ccsprite init failed case in CCSprite.cpp.
2011-03-31 14:56:49 +08:00
yangws
63801db3f6
fixed #440 Commit missing file last commit.
2011-03-31 11:23:58 +08:00
yangws
20539d4b89
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 439
2011-03-31 10:51:00 +08:00
yangws
f8a5a4ecf3
CCMessageBox works on ios.
2011-03-31 10:36:53 +08:00
walzer
87bd4a2938
fixed #438 , rename CCMotionStreak::update to CCMotionStreak::updateMotion to avoid this crash
2011-03-30 15:00:13 +08:00
walzer
70eb85e6df
Merge branch 'yangws-439'
2011-03-30 11:47:10 +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
walzer
35d94eb3a5
Merge branch 'iss411' of https://github.com/natural-law/cocos2d-x into natural-law-iss411
2011-03-30 10:44:34 +08:00
yangws
ba68a5b966
fixed #439 test OK.
2011-03-29 17:32:52 +08:00
natural-law
87ea85a986
fixed #411,support .plist format generated by zwoptex in the last version.
2011-03-29 16:59:50 +08:00
yangws
48d57b88e2
issue #439 ios and airplay midified.
2011-03-29 15:59:37 +08:00
yangws
1887417472
issue #439 ios and airplay midified.
2011-03-29 15:56:55 +08:00
walzer
5811fb7c76
Merge branch 'issue_422' of https://github.com/minggo/cocos2d-x into minggo-issue_422
2011-03-29 15:50:28 +08:00
yangws
6c5cf577b7
issue #439 wophone and android modified.
2011-03-29 15:05:53 +08:00
minggo
c686047f83
[android] fixed #422 : multitouch for android
2011-03-29 14:20:05 +08:00
natural-law
334786c633
fixed #391,Add implement of CCNS on airplay.
2011-03-29 13:59:10 +08:00
natural-law
edc33952be
fixed #391,Add support on ios and airplay.
2011-03-29 12:50:25 +08:00
natural-law
5f7357bf09
fixed #391,CCSpriteFrameCache support *.plist files with format value is not 0.
2011-03-29 11:56:14 +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
walzer
6cc09aa4dc
Merge branch '396' of https://github.com/yangws/cocos2d-x into yangws-396
2011-03-28 21:08:56 +08:00
yangws
6b66affbab
fixed #396 wophone modified.
2011-03-28 17:20:39 +08:00
yangws
a9f85a2daa
issue #396 airplay modified.
2011-03-28 17:10:05 +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
yangws
a5040e0ccb
issue 396 ios modified.
2011-03-28 13:41:14 +08:00
yangws
814b66b089
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 396
2011-03-28 11:11:50 +08:00
yangws
dceff2d179
issue #396 android modified.
2011-03-28 11:09:49 +08:00
yangws
4b86cec4be
issue #396 win32 modifyed.
2011-03-28 10:44:14 +08:00
walzer
2f573a784e
fixed #435 , CocosDenshion crashes at foreground/background switching
2011-03-27 22:17:18 +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
3029b66fbc
Merge branch '417' of https://github.com/yangws/cocos2d-x into yangws-417
2011-03-26 13:35:53 +08:00
yangws
2015e468ca
fixed #417 When mouse pressed, capture it in EGLView.
2011-03-26 11:34:18 +08:00
yangws
cd6352adec
add new files to vc2010 project.
2011-03-25 17:41:54 +08:00
walzer
326bc998da
typo fixed, sorry :(
2011-03-25 16:13:18 +08:00
walzer
95d672a858
add copyright & author name for airplay port
2011-03-25 15:30:10 +08:00
walzer
e4ae24a20c
Merge branch 'yangws-430'
2011-03-25 14:25:52 +08:00
walzer
9c1d462275
Merge branch '430' of https://github.com/yangws/cocos2d-x into yangws-430
2011-03-25 14:23:05 +08:00
walzer
9b8bc8373b
fixed #431 , manually merge the WenSheng's work
2011-03-25 14:20:53 +08:00
walzer
fa5e71916b
issue #431 , manually merge WenSheng's work
2011-03-25 14:16:58 +08:00
yangws
be966dbddb
fixed #430 Solved bug by replacing glColor4ub with glColor4f.
2011-03-25 13:50:57 +08:00
walzer
7e7e8e2b4c
Merge branch 'issue427'
2011-03-25 13:45:49 +08:00
walzer
ff91c91ea9
issue #427 android HelloWorld ok
2011-03-25 12:01:56 +08:00
walzer
d58a1ac9bc
issue #427 projct configs for win32-vs2008, wophone emu & device are ok
2011-03-25 11:23:21 +08:00
walzer
0450048a41
[all] typo fixed, CCSprite::isTextureRectTotated -> CCSprite::isTextureRectRotated
2011-03-25 09:48:43 +08:00
walzer
799fb0994f
issue #427 , airplay port ok
2011-03-24 18:17:35 +08:00
walzer
db4fb7cc9c
issue #427 , refactor ios port ok.
2011-03-24 17:51:29 +08:00
walzer
b9c56f1728
issue #427 , try to add CCSAXParser.h
2011-03-24 16:16:49 +08:00
natural-law
55143e3b9e
issue #391,implement functions:CCRectFromString, CCPointFromString and CCSizeFromString.
2011-03-24 10:38:08 +08:00
walzer
ed492bbd1e
[airplay] first commit of airplay port. Thanks for Аксёнов Максим's contribution!
2011-03-23 22:16:20 +08:00
unknown
7fa4e43ee5
fixed #424 CCamera.cpp rename to CCCamera.cpp, re-add the file to vc2010 project.
2011-03-23 10:01:37 +08:00
walzer
2b7a324c47
fix compilation error when COCOS2D_DEBUG = 2
2011-03-21 10:50:24 +08:00
walzer
81fa070125
fixed #418 , add copyright of original authors, merge Bin's commit
2011-03-19 14:45:51 +08:00
walzer
adfad22b2e
Merge branch 'issue_418' of https://github.com/minggo/cocos2d-x into minggo-issue_418
2011-03-19 14:20:30 +08:00
minggo
22b55eaf78
issue #418 : add copyright of original author to each file
2011-03-19 10:59:01 +08:00
walzer
abd2725ed4
issue #148 , add copyright
2011-03-19 10:34:26 +08:00
walzer
08a5f8029e
issue #418 add copyright of original authors to particle module
2011-03-19 10:07:16 +08:00
walzer
ffeb116542
Merge branch 'issue_400' of https://github.com/minggo/cocos2d-x into minggo-issue_400
2011-03-18 16:32:20 +08:00
walzer
d8c28d3754
Merge branch 'issue_409' of https://github.com/minggo/cocos2d-x into minggo-issue_409
2011-03-18 15:59:01 +08:00
walzer
b56014c70f
issue #376 , ios version compilation error when when COCOS2D_DEBUG = 1, fix CCLOG(@"...") to CCLOG("")
2011-03-18 15:17:15 +08:00
minggo
6524d037db
issue #400 : change vs2010 vcproj to include CCCamera.cpp
2011-03-18 15:06:26 +08:00
minggo
1ce64f1ecf
issue #400 : rename CCamera.cpp to CCCamera.cpp
2011-03-18 14:54:24 +08:00
minggo
7d39629c8c
issue #400 : rename CCamera.cpp to CCCamera.cpp
2011-03-18 14:54:03 +08:00
minggo
47173778cc
fixed #409 : rename NSArray UIAlignment
2011-03-18 14:31:29 +08:00
walzer
724ac1d0a9
Merge branch 'issue_403' of https://github.com/minggo/cocos2d-x into minggo-issue_403
2011-03-18 10:08:43 +08:00
minggo
7c52a521fa
fixed #403 : change UIEvent to CCEvent
2011-03-18 09:39:34 +08:00
walzer
b4d757ce9e
fixed #408 @5m , fix memory leak in CCImage::_initWithPngData
2011-03-17 14:26:36 +08:00
walzer
fe6487b33a
Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master
2011-03-17 11:58:38 +08:00
yangws
dd7934a19e
Merge branch 'master' of https://github.com/yangws/cocos2d-x
2011-03-17 11:11:56 +08:00
yangws
fc2818cf21
fixed #404 enableRitinaDisplay return false on iphone3
2011-03-17 11:10:50 +08:00
walzer
0f760e89fa
#include "ccGL.h" -> #include "CCGL.h" in CCamera.cpp, for case-sensitive systems
2011-03-17 09:48:28 +08:00
walzer
59b65373e7
[bug fix] CCConfiguration::checkForGLExtension(const string&) sometimes crashes. Define it!
2011-03-16 20:53:08 +08:00
walzer
19d8dc6978
Merge branch 'dev' of https://github.com/yangws/cocos2d-x into yangws-dev
2011-03-15 15:44:53 +08:00
yangws
61e2f56439
Add Retina display resource for tests.
...
Modify CCDrawingPrimitives.cpp for retina display support.
2011-03-15 15:12:50 +08:00
natural-law
06ad40f101
[android]fixed #356,modify the parameter type form ccxScopedPtr<std::string> to std::string *.
2011-03-15 11:59:45 +08:00
minggo
89db0334a3
revert the modification of CCNode_mobile.cpp and CCSprite.cpp
2011-03-15 10:27:16 +08:00
minggo
4b61e713e5
Merge branch 'dev' of https://github.com/yangws/cocos2d-x into yangws-dev
2011-03-15 10:20:56 +08:00
natural-law
0c75af0f97
[android]fixed #356,CCLabelTTF::initWithString not crashed anymore.
2011-03-14 18:29:15 +08:00
yangws
1e67709e34
fixed #392 CC_SPRITE_DEBUG_DRAW OK.
2011-03-12 15:20:26 +08:00
natural-law
dd675f8cf1
[wophone]Resolve the memory leak of CCAccelerometer.
2011-03-11 17:41:19 +08:00
natural-law
6d028007c2
Fix the bug of CCAnimationCache and CCSpriteFrame.Run SpriteTest successful.
2011-03-11 17:00:10 +08:00
minggo
69dcaddb51
Merge branch 'dev' of https://github.com/yangws/cocos2d-x into yangws-dev
2011-03-11 12:01:58 +08:00
yangws
f0661a2679
fix 4 bugs:
...
1 call CCTextureCache::purgeSharedTextureCache() to release cached texture when enableRetinaDisplay is called.
2 enableRetinaDisplay performence correctly.
3 Modify libcocos2d project pre-link event performence corretly when the source in the path which contain white blacks.
4 Modify HiResTest, that can switch resouce dynamicly now.
2011-03-11 11:04:22 +08:00
unknown
0d51d129b5
fixed #253 TileMapTest crash in windows7.
2011-03-10 23:16:38 +08:00
unknown
8e429c422d
Build-win32.bat OK on win7
2011-03-10 21:11:14 +08:00
unknown
795f1b985f
Add VC2010 project files on win32
2011-03-10 19:50:17 +08:00
minggo
a45125dafe
Merge branch 'issue385' of https://github.com/yangws/cocos2d-x into yangws-issue385
2011-03-10 17:20:32 +08:00
minggo
9a67fa6df1
Merge branch 'dev' of https://github.com/yangws/cocos2d-x into yangws-dev
2011-03-10 17:16:15 +08:00
yangws
8335e30aef
fixed #385 Impliment CCLog on ios.
2011-03-10 17:08:38 +08:00
natural-law
93aebbc469
[wophone]fixed #386,Resolve the compile conflict on wophone sdk.Modify the makefiles for wophone.
2011-03-10 14:24:13 +08:00
yangws
3fc701f1d2
fixed #300 Cocos2d-win32 application wizard for vs ok.
2011-03-10 12:00:29 +08:00
minggo
cb24e03466
Merge branch 'iss377' of https://github.com/natural-law/cocos2d-x into natural-law-iss377
2011-03-10 09:37:26 +08:00
natural-law
7c6147421b
[wophone]fixed #377,Replace the word "uphone" with "wophone".
2011-03-09 17:28:35 +08:00
minggo
12981fac89
fixed #375
2011-03-09 16:19:20 +08:00
minggo
19470fda34
Merge branch 'iss383' of https://github.com/natural-law/cocos2d-x into natural-law-iss383
2011-03-09 14:55:45 +08:00
minggo
15368e6169
Merge branch 'issue373' of https://github.com/yangws/cocos2d-x into yangws-issue373
2011-03-09 14:53:51 +08:00
minggo
75e2ecc16d
issue #387 : move platform_support into cocos2dx/platform
2011-03-09 14:40:05 +08:00
minggo
63d283d3e8
delete ccxString.h
2011-03-09 12:00:04 +08:00
minggo
7aaf4be85f
move platform_support into cocos2dx/platform
2011-03-09 11:38:36 +08:00
natural-law
4c0ace849a
[wophone]fixed #383
...
1. Modify the approach of handle left soft-key clicked.
2. Fix some compile error.
2011-03-09 11:26:13 +08:00
yangws
151a0096fa
fixed #373 Hide PVRFrame window on win32.
...
Modify the PVR registry "hide_gui" false in CCApplication_win32.cpp.
2011-03-09 10:39:08 +08:00
minggo
1aafd4fc56
issue #375 : fix some compile error
2011-03-09 10:21:29 +08:00
minggo
f1d13ca2e1
issue #375 : android compiled ok
2011-03-08 13:49:58 +08:00
minggo
837b8c04bf
issue #375 : rename some macros
2011-03-08 09:29:41 +08:00
minggo
7a331e1e14
issue #375 : wophone compiled ok
2011-03-07 18:20:48 +08:00
minggo
b5a99f90df
issue #375 : rename file names and object names
2011-03-07 17:11:57 +08:00
minggo
632cf39a8a
fix a bug when merging master into dev
2011-03-07 10:34:42 +08:00
minggo
d3f93b658d
rename libs to libraries and modify cocos2dx/Android.mk
2011-03-07 10:00:33 +08:00
minggo
aaf898cb72
merge master into dev
2011-03-07 09:52:45 +08:00
minggo
661bae2797
merge natural-law-iss370
2011-03-04 16:32:54 +08:00
natural-law
aef83b2660
[uphone]Move Application from Application code to Cocos2dx/platform/ccxApplication.
2011-03-02 17:45:04 +08:00
minggo
4379a1c96f
Move ccxApplication to cocos2dx/platform on ios.
2011-03-02 17:05:22 +08:00
minggo
f7b401163b
Merge branch 'multitouchController' of https://github.com/Macarse/cocos2d-x into Macarse-multitouchController
2011-03-02 09:38:23 +08:00
minggo
89b4d07ed8
[android] fixed #368 : move Application code to cocos2dx/platform/ccxApplication
2011-03-01 19:53:39 +08:00
minggo
fc75306402
[android] fix a bug when run in HVGA
2011-03-01 18:34:06 +08:00
minggo
b65d84551b
resolve confict when merging branch yangws-issue366
2011-03-01 14:08:18 +08:00
yangws
7bc7d32001
fixed #366 [win32] Move Application from Application code to Cocos2dx/platform/ccxApplication
2011-03-01 12:41:57 +08:00
minggo
1b6602f582
Merge branch 'WVGA_scale_android' of https://github.com/minggo/cocos2d-x into minggo-WVGA_scale_android
2011-02-28 10:00:55 +08:00
minggo
f504211e56
merge natural-law-iss332 to dev
2011-02-28 09:48:14 +08:00
minggo
498e0072e1
[android] fixed #358 : autoscale HVGA resource to WVGA
2011-02-26 15:52:57 +08:00
minggo
0453eb0266
[android] issue #338:refactor platform_support
2011-02-24 19:42:45 +08:00
yangws
03e946a34f
Delete unused files.
2011-02-23 18:24:29 +08:00
yangws
63cedd1317
Merge code of Platform_support for IOS.
2011-02-23 18:22:05 +08:00
natural-law
949c1000a8
update tests to 0.99.5.
2011-02-23 16:47:25 +08:00
minggo
36cb90aaa0
Merge branch 'jpgsupport' of https://github.com/minggo/cocos2d-x into minggo-jpgsupport
2011-02-23 14:13:48 +08:00
minggo
3dde0ebcf5
[android] fixed #353 : support jpg on android
2011-02-23 13:43:45 +08:00
natural-law
4362a5f381
[uphone]issue #316,Resolution auto adjustment.
2011-02-19 17:44:43 +08:00
natural-law
60e9ae873c
Merge branch 'dev-retina' of https://github.com/yangws/cocos2d-x into iss316
...
Conflicts:
HelloWorld/AppDelegate.cpp
tests/AppDelegate.cpp
2011-02-19 10:19:14 +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
Macarse
4267593bf9
Used an array approach
2011-02-17 23:23:36 -03:00
natural-law
8035fc366c
[uphone]Support read image file from zip file.
2011-02-17 16:16:50 +08:00
natural-law
e4063fd190
[uphone]issue #340.Refactor platform_support on uphone,and run HelloWorld successful on both simulator and device.
2011-02-17 14:31:52 +08:00
natural-law
0f52839efb
[uphone]support wrap when the dimensions is specified in CCLabelTTF.
2011-02-16 11:03:32 +08:00
walzer
693a8f049b
[iphone] test alignment in labels, ref to the post http://www.cocos2d-x.org/boards/6/topics/588?r=589#message-589 Thanks to Slaz
2011-02-14 11:51:56 +08:00
walzer
626a3f8b74
[uphone] fixed #348 , text drawing blur if color=white and fontSize<24
2011-02-12 22:42:42 +08:00
yangws
8458476597
Merge branch 'dev' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
...
Conflicts:
.gitignore
2011-02-12 16:42:47 +08:00
minggo
81848f19e6
Merge branch 'bug345' of https://github.com/minggo/cocos2d-x into minggo-bug345
2011-02-12 11:29:27 +08:00
walzer
7e039fbaa1
[win32] add CCX_DLL to CCLayerGradient & CCTimer
2011-02-11 17:30:11 +08:00
minggo
eef0bd4578
[iphone] fixed bug #345 : remove init invoking
2011-02-11 16:06:09 +08:00
yangws
36d68eeb41
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
2011-02-11 09:34:12 +08:00
Macarse
8d5995d5a6
First approach
2011-02-06 17:05:56 -03:00
Macarse
66038230eb
Added logic to disable sensors from the c++ code
2011-02-05 20:17:24 -03:00
Macarse
284c330569
Added code from walzer's comment
2011-02-01 00:11:42 -03:00
Macarse
fce540989d
First approach
2011-01-30 20:05:30 -03:00
natural-law
d0b27c4222
fix bug,MenuTest crash.
2011-01-28 16:05:21 +08:00
yangws
34a6ca5208
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
...
Conflicts:
cocos2dx/platform/win32/CCXUIImage_win32.cpp
cocos2dx/platform/win32/CCXUIImage_win32.h
tests/test.win32/test.win32.vcproj
2011-01-28 14:33:47 +08:00
yangws
76ea63da7f
Change prefix CCX to ccx.
2011-01-27 17:07:36 +08:00
walzer
3260eddd75
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-01-26 17:11:39 +08:00
walzer
ead71525e2
[uphone] don't block when zip resources loading failed
2011-01-26 17:08:19 +08:00
minggo
a0ecaed1ef
[android] define s_bPopupNotify
2011-01-26 16:45:27 +08:00
minggo
54dc660f6b
[android] change the declaration of s_bPopupNotify from public to private
2011-01-26 16:44:58 +08:00
minggo
39165142b8
[iphone] change the declaration of s_bPopupNotify from public to private and define it
2011-01-26 16:44:12 +08:00
minggo
31d287a77d
[uphone]change the declaration of s_bPopupNotify from public to private
2011-01-26 16:42:48 +08:00
minggo
072ed1651e
[win32] change the declaration of s_bPopupNotify from public to private
2011-01-26 16:41:59 +08:00
walzer
a732665b85
Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master
2011-01-26 15:48:02 +08:00
natural-law
3746af1d63
fixed #328.Modify the function and parameter name.
2011-01-26 15:43:12 +08:00
natural-law
7015e85918
fixed #328.By default,pop up a err dialog when loading textures failed.
2011-01-26 11:50:13 +08:00
walzer
950a284b94
[iphone] fixed #289 , clear a warning.
2011-01-26 11:31:01 +08:00
minggo
9e2587c26c
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
2011-01-25 17:09:11 +08:00
natural-law
6a1b8d64aa
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-01-25 15:09:34 +08:00
natural-law
d56575dd5a
[uphone]change the parameter order of function setResource.And add default value of the parameter pszResPath.
2011-01-25 14:26:26 +08:00
walzer
04aab22145
Merge branch 'natural-law-master'
2011-01-25 11:43:57 +08:00
walzer
462ac4823f
bug fix, CCDirect_mobile.cpp crash m_bPurgeDirecotorInNextLoop, according to this post http://www.cocos2d-x.org/boards/6/topics/422
2011-01-25 11:33:03 +08:00
natural-law
800033d98b
fixed #329,use std::string to implement function CCBMFontConfiguration::parseConfigFile.
2011-01-24 15:53:52 +08:00
minggo
9eff0da20a
fix warning when building on android
2011-01-24 10:51:30 +08:00
yangws
1a17f3ea55
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
...
Conflicts:
cocos2dx/platform/win32/CCXApplication_win32.cpp
tests/test.win32/test.win32.vcproj
2011-01-22 17:52:06 +08:00
minggo
e23c1eb2f6
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
2011-01-22 16:45:26 +08:00
yangws
bc9bfdc30c
Move win32/CCXApplication to platform_support
2011-01-22 16:24:54 +08:00
minggo
4a4c0d3485
[android] fixed #321 : Frame control of android. It is not so accuracy.
2011-01-22 15:10:18 +08:00
minggo
9d8f0f4b17
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
2011-01-21 18:18:13 +08:00
minggo
882b473291
[iphone]: font support
2011-01-21 18:15:12 +08:00
natural-law
48d1791341
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge
2011-01-21 17:33:43 +08:00
minggo
cb7a0e553a
[iphone]: frame control
2011-01-21 17:33:15 +08:00
natural-law
6bde512cbe
[android]issue #268,support more fonts on cocos2d-android.
2011-01-21 17:32:11 +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
natural-law
31fc6c0039
[uphone]fixed #308,Modify the code,remove the function CCXApplication::setIsInBackground().
2011-01-20 13:55:45 +08:00
natural-law
f7107fb015
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge
...
Conflicts:
cocos2dx/platform/uphone/CCXApplication_uphone.h
2011-01-20 13:47:01 +08:00
natural-law
3d225465c0
[uphone]fixed #308,BGM is paused when press power key to make uphone sleep.
2011-01-20 13:41:58 +08:00
walzer
dc11bdf16a
Merge remote branch 'origin/master'
2011-01-20 11:41:41 +08:00
yangws
333f0b5574
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
...
Conflicts:
HelloWorld/AppDelegate.cpp
cocos2dx/particle_nodes/CCParticleSystem.cpp
cocos2dx/proj.win32/cocos2d-win32.vcproj
tests/AppDelegate.cpp
2011-01-20 11:18:35 +08:00
yangws
ee50078b3e
implement FPS limitation on UPhone.
2011-01-20 10:49:30 +08:00
walzer
a9f90256b8
fix the wrong direction of particle system
2011-01-20 10:21:41 +08:00
walzer
b7e109f6e6
fixed iphone/android/uphone compilation errors brought by the prevous commit of #322
2011-01-19 22:29:57 +08:00
walzer
9347fadc71
[win32] fixed #322 , FPS control on win32
2011-01-19 18:23:42 +08:00
walzer
e404a6aeb9
Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master
2011-01-19 18:11:21 +08:00
yangws
d627608ff4
win32 platform fps limitation support.
2011-01-19 17:59:20 +08:00
walzer
816deced9e
Merge branch 'upto-0.99.5' of https://github.com/natural-law/cocos2d-x into natural-law-upto-0.99.5
2011-01-19 16:41:47 +08:00
walzer
a0c50d3edb
[iphone] support UTF8 Chinese chars
2011-01-19 16:26:55 +08:00
yangws
804dc4ef7c
Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
...
Conflicts:
cocos2dx/platform/CCArchOptimalParticleSystem.h
cocos2dx/platform/win32/CCXBitmapDC.cpp
cocos2dx/proj.win32/cocos2d-win32.vcproj
2011-01-19 15:29:08 +08:00
yangws
79b711a758
move CCXBitmapDC from cocos2d/platform to platform_support.
2011-01-19 14:23:26 +08:00
natural-law
f992838f96
[uphone]fixed #293,Modify the absolute path method in CCFileUtils.
2011-01-18 18:21:06 +08:00
natural-law
c682dd7084
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge
2011-01-18 10:16:35 +08:00
natural-law
acb4a6a369
[uphone]fixed #293,modify the absolute path method in CCFileUtils.
2011-01-18 10:14:44 +08:00
walzer
e399a77369
fixed #306 , invoke CCDirector::end() method in next msgloop, otherwise the flow will crashes when end() is called in an ActionInterval.
2011-01-17 22:01:15 +08:00
walzer
04c685b95a
issue #289 , fix some warnings
2011-01-17 21:16:25 +08:00
walzer
b60e1e1ff8
Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master
2011-01-17 20:37:23 +08:00
yangws
d2a116b001
fixed bug: Post build error on win32 when compiled project which the project's path string has space.
2011-01-17 18:01:20 +08:00
walzer
ad5ee3c9f6
Merge remote branch 'remotes/origin/upto-0.99.5' Fix some conflicts manually.
2011-01-17 16:21:11 +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
natural-law
acff950860
[uphone]fixed #315,remove the way which use resource in ResourceMap.
2011-01-14 17:42:37 +08:00
minggo
6043008a11
Merge branch 'track' of https://github.com/leon-li/cocos2d-x into leon-li-track
2011-01-13 13:52:20 +08:00
natural-law
5fe891408c
[win32]fixed #314,when function CCDirector::setDeviceOrientation() be called calculate the Projection and window size again.
2011-01-13 10:14:32 +08:00
Walzer
c9d52d2a48
[uphone] add CCNS_uphone.cpp into Makefile.ARM
2011-01-12 17:35:53 +08:00
natural-law
d1c6c466d3
fixed #312,fix the bug of CCXBitmapDC in cocos2d-win32.
2011-01-12 15:48:36 +08:00
natural-law
5155980ef9
fixed #309,optimize code.
2011-01-11 13:57:13 +08:00
natural-law
00a9615e0f
Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into merge
2011-01-10 18:08:57 +08:00
natural-law
237042f7dd
fixed #309,App will not crash any more when surface re-created.
2011-01-10 17:54:44 +08:00
minggo
d405d3a1ba
fixed #310 :
2011-01-10 16:03:53 +08:00
minggo
7e30615d02
issue #304 Remove codes for controlling frame rate.
2011-01-10 15:13:30 +08:00
Walzer
653cb2d76d
[uphone] fixed #308 , BGM can be paused after power key pressed to make uphone sleep.
2011-01-10 11:03:58 +08:00
minggo
78a7329054
Merge branch 'upto-0.99.5' of https://github.com/natural-law/cocos2d-x into natural-law-upto-0.99.5
2011-01-08 09:27:58 +08:00
natural-law
c02a9a4dd5
Setting apk file path at runtime in cocos2d-android.
2011-01-07 16:29:06 +08:00
natural-law
ec7fbd0e69
Fix bugs.
...
1. Run tests and HelloWorld in cocos2d-android.
2. Modify the makefile of cocos2d-uphone.
2011-01-07 11:30:19 +08:00
minggo
1f08213563
HelloWorld runs ok on iphone
2011-01-07 11:27:42 +08:00
minggo
a391c8ef99
fixed some errors for iphone platform
2011-01-07 10:25:32 +08:00
minggo
99dd33f94a
Merge branch 'upto-0.99.5' of https://github.com/minggo/cocos2d-x into upto-0.99.5
2011-01-07 09:33:09 +08:00
minggo
9a959c299f
fixed some errors of iphone platform
2011-01-07 09:35:27 +08:00
minggo
0a7b16f9c0
Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
2011-01-06 14:15:45 +08:00
natural-law
e0570d43ad
Fix bugs.Run HelloWorld and tests in cocos2d-win32 successful.
2011-01-06 14:04:03 +08:00
minggo
e312bb4d18
Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into merger
2011-01-06 10:24:29 +08:00
natural-law
0d2d746aec
Fix bugs.Run tests in cocos2d-uphone successful.
2011-01-05 17:01:08 +08:00
natural-law
1b37dd27ad
Fix bugs.Run HelloWorld successful.
2011-01-05 11:24:52 +08:00
natural-law
25e9721678
fix bugs.
2011-01-04 17:46:23 +08:00
Walzer
4a6989b6ff
[uphone] add keyMenuBack to CCKeypadDelegate
2010-12-31 18:15:30 +08:00
natural-law
711f3a2906
modify YES to true,and No to false.
2010-12-31 17:56:46 +08:00
minggo
f3e8665387
remove the usage of YES and NO
2010-12-31 16:37:00 +08:00
Walzer
56f8bf3c40
[uphone] use a shared TWindow to draw bitmaps and texts, this optimization promotes the performance on uphone about 5%~6%
2010-12-31 16:07:52 +08:00
minggo
d0a16a246e
fixed comipling error and link error of upto-0.99.5
2010-12-31 14:56:24 +08:00
natural-law
3dfd530b38
Merge branch 'iss295' into upto-0.99.5
2010-12-31 09:48:48 +08:00
natural-law
34f45c8faa
Implement CCEventDispatcher.
2010-12-31 09:36:53 +08:00
minggo
942d0233cf
fixed #290
2010-12-30 17:30:11 +08:00
Walzer
eac572b2c9
[uphone] remove CfgGetScreenStatus call from EVENT_WinPaint, this api is out-of-process & inefficient
2010-12-30 15:42:11 +08:00
minggo
0a4ff84f87
fix an error of cocos2d-uphone.vcproj
2010-12-30 15:30:30 +08:00
minggo
8af9edbcf8
Merge branch 'upto-0.99.5' of https://github.com/minggo/cocos2d-x into minggo-upto-0.99.5
2010-12-30 14:44:34 +08:00
minggo
88de01d915
update some files in platfomr/iphone to 0.99.5
2010-12-30 14:22:25 +08:00
minggo
b0e5c06d37
Merge branch 'upto-0.99.5' of https://github.com/minggo/cocos2d-x into minggo-upto-0.99.5
2010-12-30 10:36:17 +08:00
minggo
da00d82117
fix some error in CCGrid and CCDirector.h
2010-12-30 10:28:13 +08:00
minggo
7b804d985b
merge yangws-upto-0.99.5 into upto-0.99.5
2010-12-30 10:25:35 +08:00
minggo
94c7f968e1
Merge branch 'minggo-upto-0.99.5' into upto-0.99.5
2010-12-29 18:18:14 +08:00
minggo
dc55c164ba
fixed #292
2010-12-29 18:01:37 +08:00
Li Lirong
e58ba468ee
fix some warnings under android
2010-12-29 10:30:42 +08:00
natural-law
35d611155b
add functions:
...
void CCSpriteBatchNode::addQuadFromSprite(CCSprite *sprite, unsigned int index);
CCSpriteBatchNode * CCSpriteBatchNode::addSpriteWithoutQuad(CCSprite*child, unsigned int z, int aTag);
2010-12-28 17:42:23 +08:00
natural-law
05bf58b488
Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into merge
2010-12-28 17:24:56 +08:00
natural-law
a48b4b762b
update tileMap_parallax_nodes to 0.99.5.
2010-12-28 15:17:59 +08:00
minggo
355570ea8f
issue #292
2010-12-28 15:05:55 +08:00
yangws
0edf124e4f
issue #281 CCParticleExamples upto-0.99.5
2010-12-28 14:04:28 +08:00
yangws
706f97114b
issue #281 CCParticleSystemQuad upto-0.99.5
2010-12-28 11:55:34 +08:00
yangws
5e377f9368
issue #281 CCParticleSystemPoint.h upto-0.99.5
2010-12-28 11:09:40 +08:00
minggo
b2b8591b26
fixed #279
2010-12-28 10:23:14 +08:00
yangws
afd9675854
CCParticleSystem upto-0.99.5
2010-12-27 17:39:15 +08:00
minggo
33ad2881b7
merge mingo-upto-0.99.5 to upto-0.99.5
2010-12-27 11:06:44 +08:00
minggo
28a3857f95
Merge branch 'natural-law-upto-0.99.5' into upto-0.99.5
2010-12-27 10:59:03 +08:00
minggo
4e35a660dc
Merge branch 'upto-0.99.5' of https://github.com/yangws/cocos2d-x into yangws-upto-0.99.5
2010-12-27 10:55:59 +08:00
minggo
4cd3e59e2b
fixed #278
2010-12-27 10:26:56 +08:00
natural-law
46e78ab7a1
update layers_scenes_transition_nodes to 0.99.5.
2010-12-25 18:07:34 +08:00
yangws
c142070c2c
misc_node upto-0.99.5.
...
Signed-off-by: yangws <yangws@cocos2d-x.org>
2010-12-25 15:09:42 +08:00
natural-law
6ee16ce878
update menu_nodes to 0.99.5
2010-12-25 11:15:19 +08:00
minggo
07b774bc6f
Merge branch 'natural-law-upto-0.99.5' into upto-0.99.5
2010-12-25 09:24:15 +08:00
natural-law
969e65b959
Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into merge
2010-12-24 17:33:18 +08:00
natural-law
4a64f899fe
update label_nodes to 0.99.5.
2010-12-24 17:07:31 +08:00
minggo
e7231f232c
fixed #276
2010-12-24 15:53:51 +08:00
minggo
c6b7fd82a9
Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into merger
2010-12-24 15:25:28 +08:00
minggo
d6fb209861
merged from minggo-upto-0.995 to upto-0.99.5
2010-12-24 15:21:57 +08:00
minggo
f92b0d514e
fixed #273
2010-12-24 15:04:26 +08:00
natural-law
0f0a8ed956
rename the files related to label_nodes.
2010-12-24 14:00:49 +08:00
natural-law
e11ccb50fe
fixed #283 Add member data m_positionInPixels for some classes.
2010-12-24 11:40:44 +08:00
minggo
e3b49d7504
merge from minggo and natual-raw
2010-12-23 17:40:23 +08:00
natural-law
3c6d1d8317
update actions to 0.99.5
2010-12-23 16:47:29 +08:00
minggo
6d98bc7b5d
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge
2010-12-23 16:22:37 +08:00
minggo
7e4d8b9d1c
set up base environment
2010-12-23 16:16:11 +08:00
minggo
3692d01c5a
fixed #288
2010-12-23 14:18:08 +08:00
minggo
994a3b05ea
fixed #273
2010-12-23 11:19:56 +08:00
natural-law
eeb4e99804
rename the action classes.
2010-12-22 15:43:54 +08:00
natural-law
4a765d33a3
rename the CCXXXAction files to CCActionXXX.
2010-12-22 15:15:04 +08:00
Walzer
f65a6eb90b
[iphone-cpp] load image from buffer, support some PD formats
2010-12-20 18:46:58 +08:00
walzer
02bbc49111
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
2010-12-18 16:47:27 +08:00
Walzer
639d75e6eb
Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master
2010-12-18 16:36:08 +08:00
minggo
9aa7e1bc84
fixed #245
2010-12-18 16:12:59 +08:00
minggo
87b926c74f
match the declaration of cocos2dVersion
2010-12-18 16:08:57 +08:00
yangws
6d71a5b0f2
if defined COCOS2D_DEBUG, show messagebox when UIImage can't find resource file on disk.
2010-12-18 15:00:26 +08:00
natural-law
792781f5d6
fixed #266 fix a bug of message box in cocos2d-uphone pop-up at the wrong time.
2010-12-18 14:44:24 +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
Walzer
6de3f0f404
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2010-12-18 08:10:14 +08:00
Leon
96f4f5c9fd
fix some compiling warning for iOS
2010-12-17 23:44:19 +08:00
Walzer
641bea0abc
fixed #265 compile error when enable CC_XXX_DEBUG_DRAW switchs in ccConfig.h
2010-12-17 23:18:03 +08:00
Walzer
988d7289b8
Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master
2010-12-17 20:40:16 +08:00
Walzer
63bfa195db
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
2010-12-17 20:36:24 +08:00
yangws
53bc90f634
fix UImage Constructor error
2010-12-17 18:16:31 +08:00
yangws
caf518f97d
fixed: helloworld win32 release configure build error, CCTMXTiledMap.cpp Access NULL pointer error.
2010-12-17 17:20:39 +08:00
minggo
012812a8f5
Because platform/android/ccx_Common_android.cpp is rename to platform/android/ccxCommon_android.cpp, so the Android.mk should change too.
2010-12-17 11:48:46 +08:00
minggo
e287466c2f
fixed #246
2010-12-17 11:39:25 +08:00
Walzer
c8989c7941
fix a memory leak when invoking png_destroy_read_struct, for uphone & andorid platform
2010-12-17 10:14:56 +08:00
Walzer
b55ef3cd69
Merge branch 'master' of https://github.com/mattjesson/cocos2d-x into mattjesson-master
2010-12-17 10:03:57 +08:00
Walzer
0b8d5c96f7
fixed #263 , compilation error while enableing CC_SPRITE_DEBUG_DRAW
2010-12-16 22:37:15 +08:00
unknown
31951603a4
Fixed a memory leak in the Win32 version of the PNG reading code.
...
The png_info struct wasn't being properly free'd (leaving behind row data).
(looks like it might also apply to the 'uphone' version but I have no way of testing)
2010-12-16 12:23:27 +00:00
Walzer
063f595e9a
Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master
2010-12-16 12:03:25 +08:00
natural-law
95e697d316
fixed #262 Add namespace for the project CocosDenshion.
2010-12-15 18:28:18 +08:00
minggo
53753b65b5
merge bada platform
2010-12-15 18:05:02 +08:00
impact
7434748d4a
Capitalization changes for building on linux (case-sensitive filesystem)
2010-12-15 01:00:35 -05:00
natural-law
b8b5c2e8cd
fixed #258 Modify the files which include FileUtils.h.
2010-12-14 14:05:35 +08:00
natural-law
2576bbe5b4
Merge branch 'master' into iss258
2010-12-14 13:53:25 +08:00
Walzer
02e95f6b06
issue #243 fix a memory leak point of iphone-cpp version. but the leaks isn't completely clear yet.
2010-12-14 11:21:44 +08:00
unknown
acc30e35b1
Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master
2010-12-14 11:10:46 +08:00
unknown
57770086e6
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
2010-12-14 11:09:36 +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
minggo
a33823706d
fixed #259
2010-12-14 09:42:39 +08:00
natural-law
8cb331994d
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge
2010-12-13 17:55:02 +08:00
natural-law
2706e3a003
fixed #251 CCKeypadDelegate implement
2010-12-13 14:10:39 +08:00
minggo
1f34709c03
Merge branch 'master' of https://github.com/minggo/cocos2d-x
2010-12-11 13:40:16 +08:00
minggo
562930f816
fixed #252
2010-12-11 13:33:53 +08:00
Walzer
9737e908ab
Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master
2010-12-11 09:49:59 +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
Walzer
5babcbca6b
fixed #248 , crashed in CCSprite::setDisplayFrame
2010-12-10 10:31:14 +08:00
natural-law
6c1eb5d5c0
fixed #227 integrate multi-touch support on uphone
2010-12-09 18:28:16 +08:00
minggo
f3126de646
Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master
2010-12-09 13:59:02 +08:00
yangws
1151cea7dd
fixed 233 keep the backlight on when the cocos2d-game at foreground.
...
Signed-off-by: yangws <yangws@cocos2d-x.org>
2010-12-09 11:41:32 +08:00
minggo
6b37bc97d4
fixed #220 : run tests on android
2010-12-09 10:50:02 +08:00
unknown
9c06a69ed9
Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master
2010-12-08 18:05:17 +08:00
unknown
4d22e3b263
Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master
2010-12-08 18:03:35 +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
yangws
5b51bd049b
issue #233 prevent KeyLock when playgame on uphone.
2010-12-04 18:16:09 +08:00
Walzer
c02230b4ae
fixed #240 , CCSequence(..., CCHide::action(), ...) will not break down now.
2010-12-04 15:03:07 +08:00
natural-law
8891b894d6
fixed #239 Clear memory leak in cocos2d-uphone
2010-12-03 16:42:31 +08:00
yangws
96115bc26e
fixed #233 now don't call preMainLoop when application enter background, test ok on uphone device.
...
fixed a CCXAppWiz.uphone bug, create a empty file named xxxxx_str_str.h when build.
Signed-off-by: yangws <yangws@cocos2d-x.org>
2010-12-03 15:27:55 +08:00
yangws
4df7cbcc40
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2010-12-03 11:24:39 +08:00
natural-law
3a0ae951b7
fixed #236 Fix the bug of cross-compile in cocos2d-uphone
2010-12-03 11:08:30 +08:00
yangws
687fb199fc
issue #233 stop main loop when application enter background. test ok on emulator
2010-12-02 18:44:13 +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
minggo
9a2ff2407a
commit the change before merging master of cocos2d-x
2010-11-29 15:08:21 +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
8854ec5b10
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
2010-11-26 11:59:56 +08:00
minggo
b695c42655
Merge branch 'master' of https://github.com/minggo/cocos2d-x
2010-11-26 11:39:26 +08:00
minggo
aa826970eb
fixed #224
2010-11-26 11:38:10 +08:00
walzer
29191a385e
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
2010-11-24 10:38:01 +08:00
yangws
852c57d2c6
add CCLOG support on win32 and uphone
2010-11-23 18:20:46 +08:00
minggo
59a986438f
Remove unneeded predefined macro _ADNROID, because ndk build chain has already defined a macro named ANDROID
2010-11-23 18:02:42 +08:00
natural-law
3eba79ec07
fixed #217
2010-11-23 15:15:07 +08:00
minggo
98c5546658
fixed #216 : Accelerometer is correct
2010-11-23 14:40:10 +08:00
yangws
de97900b6c
CCLOG support for cocos2d-win32
2010-11-23 11:23:29 +08:00
minggo
22f7521cd3
fixed #215
2010-11-22 18:09:38 +08:00
yangws
efd69c7023
re-add source files to cocos2d-win32.proj.
2010-11-22 15:40:43 +08:00
minggo
96ea648820
fixed #213 : fixed the bug.
2010-11-22 11:36:40 +08:00
minggo
8be8a02e73
fixed #210 : support accelemeter
2010-11-22 11:11:20 +08:00
Walzer
224e9cfb6c
fixed #210 : support accelemeter
2010-11-22 10:48:19 +08:00
Ming
e379786e4d
2010-11-19 06:57:58 +00:00
yangws
d96599e787
2010-11-19 02:48:08 +00:00
natural-law
fc745a6a70
debug
2010-11-19 01:21:47 +00:00
Walzer
78a2792dcb
issue #211 cocos2d-x.abc -> cocos2d-abc
2010-11-18 15:58:58 +00:00
Walzer
0ad77b779a
issue #211 don't checkout
2010-11-18 15:55:00 +00: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
79ed40ef38
issue #211 don't check out
2010-11-18 13:47:14 +00:00
Walzer
a96bb3ef0c
rename projects
2010-11-18 12:36:14 +00:00
Walzer
6afe5752f2
rename directories
2010-11-18 12:32:01 +00:00
natural-law
2b23e0f6d5
debug
2010-11-18 10:27:05 +00:00
Ming
dc2f5f604f
fixed #208
2010-11-18 07:38:47 +00:00
Ming
31809a3774
issue #208
2010-11-18 06:50:28 +00:00
Walzer
0a2567c646
SEL_MunuHandler -> SEL_MenuHandler & SimpleAudioEngine::sharedEngine
2010-11-17 08:31:48 +00:00
Walzer
0c687c3aac
jump a messagebox when load image failed in uphone.
2010-11-17 07:24:50 +00:00
natural-law
575922ab7c
debug
2010-11-17 06:32:44 +00:00
yangws
b181701039
change win32 porject name
2010-11-17 02:46:43 +00:00
yangws
0618af9711
change win32 project name
2010-11-17 02:16:21 +00:00
natural-law
84ece545bd
issue #189
...
add support of Accelerometer sensor
2010-11-16 07:13:20 +00:00
Walzer
fb25984f12
rename getShared methods to shared
2010-11-16 07:12:09 +00:00
Ming
26363b5f9a
fixed #207
2010-11-16 06:33:00 +00:00
Ming
0aab635d85
fixed #206
2010-11-16 04:02:45 +00:00
yangws
2e6f7c0623
issue #205 vs2008 run tests win32 OK.
2010-11-15 02:57:15 +00:00
yangws
278fc00906
issue #205 update third_party's libraries to the latest release version.
2010-11-13 10:19:08 +00:00
natural-law
d2006ec7a9
debug
2010-11-13 09:55:41 +00:00
natural-law
a0930a2991
debug
2010-11-13 09:01:35 +00:00
Ming
416a319344
fixed #203
2010-11-13 03:34:49 +00:00
Ming
0e78c9071a
issue #202
2010-11-12 10:21:52 +00:00
Ming
3a5ce078cf
issue #202
2010-11-12 09:44:13 +00:00
Ming
64ac386384
issue #202
2010-11-12 09:29:14 +00:00
Ming
6062cf1558
issue #202
2010-11-12 09:26:01 +00:00
Ming
026713cf76
issue #202
2010-11-12 09:18:54 +00:00
Ming
0a4e9885f3
issue #202
2010-11-12 09:16:15 +00:00
Walzer
916b620259
fixed #201 when load image fails, it will jump a MessageBox now, and return a transparent sprite
2010-11-12 07:55:28 +00:00
Walzer
d842a47e10
fix win32 version to sync with uphone-0.9.0-stable
2010-11-11 07:26:16 +00:00
Walzer
94806c9194
merge with tag/0.99.4-uphone-0.9.0
2010-11-11 03:18:58 +00:00
natural-law
000bdeeb42
issue #189
...
add support of Accelerometer sensor
2010-11-10 08:29:52 +00:00
natural-law
c165ad36a7
debug
2010-11-05 09:29:24 +00:00
Ming
0ea2035ec6
2010-11-04 09:33:31 +00:00
Ming
ca066d0bac
fixed #191
2010-11-04 09:32:22 +00:00
yangws
c792daec63
update PowerVR OGLES lib to version 2.0.27.0484
2010-11-04 03:59:29 +00:00
yangws
d630996bd0
fixed #187 The reason is call preMailLoop too many times in short time in message loop, use sleep(0) to resolve this problem.
2010-11-04 03:51:57 +00:00
Walzer
f80ea71066
fix #188 , for win32 version, make glDeleteTextrues before eglDestroyContext
2010-11-03 08:00:39 +00:00
Walzer
200080aea0
fix #188 , make eglDestroyContext after glDeleteTexture
2010-11-03 06:47:23 +00:00
Ming
b06f84d332
2010-11-03 06:13:40 +00:00
Ming
b0e0d63217
2010-11-03 06:04:48 +00:00
Ming
b60fbd82a5
added for android
2010-11-03 03:01:17 +00:00
Ming
6853385c8d
resolve compile error for android
2010-11-03 02:59:07 +00:00
Walzer
4695fa05df
egl function errors will show a messagebox now
2010-10-29 08:36:34 +00:00
natural-law
6d98ae5b2c
support Chinese in cocos2dx-uphone
2010-10-27 03:56:51 +00:00
Walzer
2935faebfc
change default Makefile.ARM to build static libraries.
2010-10-26 09:51:37 +00:00
natural-law
419544ff45
debug
2010-10-22 07:51:32 +00:00
natural-law
1d8b5d02a3
debug
2010-10-22 07:10:18 +00:00
natural-law
1b81908ae4
add comment
2010-10-21 09:56:13 +00:00
natural-law
78a93db918
issue #182
2010-10-21 02:29:09 +00:00
natural-law
1f8442cc05
issue #182
2010-10-21 02:24:46 +00:00
natural-law
0dbda6c32d
issue #185
...
Let cocos2d-uphone support WVGA
2010-10-19 09:08:25 +00:00
yangws
72e31303a7
Don't need disable statusbar on uphone yet
2010-10-16 09:28:16 +00:00
Ming
992ad7e75d
fix the method of computing frame rate
2010-10-16 07:29:53 +00:00
yangws
2ba7ba409b
fixed #184 support deviceOrientation on win32 now.
2010-10-15 08:06:05 +00:00
Ming
0298500abe
add setContentScaleFactor()
2010-10-15 07:47:48 +00:00
yangws
fb0987ae6c
fixed #183 add zlib1.dll for win32
2010-10-14 07:05:44 +00:00
yangws
24ae7b36b7
2010-10-13 08:44:16 +00:00
natural-law
c8e2874c9f
debug
2010-10-13 08:21:59 +00:00
yangws
c1225b9396
fixed #183 run test ok.
2010-10-13 06:46:06 +00:00
yangws
83ac66091d
2010-10-13 06:18:39 +00:00
yangws
3317280984
2010-10-13 06:15:11 +00:00
yangws
ebb4ae2aa7
issue #183 add iconv libjpeg libpng libxml2 zlib to win32/third_party
2010-10-13 06:12:23 +00:00
yangws
23808af094
win32 window close button enable.
2010-10-13 05:16:17 +00:00
yangws
f9b550a7b0
add user files
2010-10-13 05:11:55 +00:00
yangws
c4e53c54e4
fixed #176 test_win32 OK.
2010-10-13 05:09:39 +00:00
yangws
040f68160a
issue #176 add test code in test_win32, which same with test_uphone .
2010-10-12 09:15:44 +00:00
Walzer
2a43160d39
fix a warning
2010-10-12 04:07:49 +00:00
natural-law
31c069777d
issue #182
2010-10-12 03:52:11 +00:00
Walzer
3224f8b9c5
issue 172 : fix the bug. In CCTextureCache::addImage and CCTextureCache::addUIImage, we will lock the texture cache array before we use it. So we must make sure that we unlock the texture cache array when we return in the function.
2010-10-12 03:23:47 +00:00
Ming
7a9b417248
2010-10-11 10:05:34 +00:00
yangws
c1e4bf366f
2010-10-11 08:48:44 +00:00
natural-law
09e9638b03
issue #182
2010-10-11 07:35:36 +00:00
natural-law
05bea6a707
issue #182
2010-10-11 07:28:58 +00:00
yangws
5184e4383e
change UIImage(TBitmap * ) to UIImage(CCXBitmapDC *) on uPhone platform.
2010-10-11 02:58:27 +00:00
yangws
82e6fabf96
Helloworld-win32 release OK.
2010-10-10 15:30:38 +00:00
yangws
e7502ad66f
Add PowerVR Lib to platform/win32/third_party.
2010-10-10 13:03:11 +00:00
yangws
8900e0644c
helloworld-win32 vertical screen ok.
2010-10-09 09:41:42 +00:00
Ming
9febafadec
2010-10-09 08:23:58 +00:00
Walzer
77564d0017
add LAYER_NODE_FUNC & SCENE_NODE_FUNC
2010-10-09 06:23:47 +00:00
Ming
a05f9d0dc5
2010-10-09 01:57:24 +00:00
Walzer
f94d1760e5
bug fix: release error in forceRemoveDelegate method
2010-10-08 13:17:03 +00:00
yangws
cf0a2c5665
add cocos2dx-win32 framework, can't work yet.
2010-10-08 09:53:04 +00:00
Ming
19b6f1a235
2010-10-08 01:57:07 +00:00
Walzer
371baf3efc
add NSSet::anyObject method
2010-10-01 15:05:05 +00:00
Walzer
ed4e288f27
modify the logic of "node" method
2010-10-01 15:04:12 +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
a6b03ce9ea
add type cast in "ccp" marco, to avoid warnings
2010-10-01 06:21:37 +00:00
Walzer
b86a666269
fix some warnings during compile phase
2010-09-30 23:51:06 +00:00
Ming
0247182dc3
fixed #173
2010-09-30 07:54:15 +00:00
Walzer
72aee0eace
issue #175 , add retain for CCCallFunc::m_pSelectorTarget
2010-09-30 03:57:31 +00:00
Ming
683596a023
issue #170
2010-09-29 09:39:45 +00:00
Walzer
8633fa5d9e
issue #171
2010-09-29 08:33:52 +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
Walzer
dad659641b
issue #171 , add @brief in class annotate
2010-09-29 01:44:57 +00:00
Ming
742baf4fdb
issue #170
2010-09-28 10:27:33 +00:00
Ming
a257cad0a4
issue #170
2010-09-28 10:00:38 +00:00
natural-law
c57957d910
issue #170
...
add comment of class CCFileUtils
2010-09-28 08:57:39 +00:00
natural-law
b7dd58e4e1
issue #170
...
add comment of class CCFileUtils
2010-09-28 08:48:26 +00:00
Ming
68d3edc0d3
issue #170
2010-09-28 08:18:05 +00:00
Walzer
01eb8da314
issue #171 , modify object-c code in annotate.
2010-09-28 04:14:12 +00:00
Walzer
a279e5dc9b
issue 169, we should retain the new variable first, and then release the old one. assignment at last.
2010-09-27 10:19:10 +00:00
Walzer
3f233e2651
issue #161,support *.jpg,add texture to texture cache
2010-09-27 09:26:35 +00:00
Walzer
dff457e4eb
issue 167, premutiply alpha when read png file
2010-09-27 08:05:49 +00:00
Ming
ced3d86507
issue #166
2010-09-26 06:55:28 +00:00
Ming
167aed310c
2010-09-26 06:26:19 +00:00
Ming
85e2bfdea0
fixed #163
2010-09-26 06:11:10 +00:00
Ming
29dba052bf
fixed #163
2010-09-26 04:01:19 +00:00
Walzer
5b82f4d468
issue #161,support *.jpg
2010-09-26 02:09:05 +00:00
natural-law
c4c81dba7e
issue #165
...
Update the tests code to 0.99.4 release version
2010-09-25 03:54:33 +00:00
Walzer
8de5442c0e
issue #161,update CCTMXLayer, CCTMXTiledMap, CCTextureCache
2010-09-25 02:28:27 +00:00
Ming
12d6df9717
issue #154
2010-09-24 10:10:32 +00:00
Walzer
5415e04d7c
issue #161,add CCSpriteBatchNode
2010-09-24 04:05:25 +00:00
Walzer
156d1ff69b
issue #161,add CCSpriteBatchNode
2010-09-24 04:04:13 +00:00
Ming
0d0b68a200
fixed #151
2010-09-24 02:54:06 +00:00
Ming
a50b1b97bb
issue #151 : because now the r, g, b is correct, so we should not
...
change it
2010-09-21 08:15:23 +00:00
yangws
30417e37f9
2010-09-21 07:06:01 +00:00
Ming
7852912fdd
issue #151
2010-09-18 09:49:02 +00:00
Ming
addfb8df94
issue #151
2010-09-18 09:22:21 +00:00
Ming
556b8ed455
issue #151 : change the function name
2010-09-18 07:44:56 +00:00
Ming
93135d1366
issue #151
2010-09-18 07:22:07 +00:00
Ming
b87fb419fb
issue #151
2010-09-18 06:14:51 +00:00
natural-law
5af16c3282
issue #144
...
Clear memory leaks of the test_uphone project
2010-09-17 06:51:34 +00:00
yangws
069d3507e8
unified CCXEGL code base on uPhoneEmuGlesPatch.zip
2010-09-17 04:02:23 +00:00
natural-law
d2b60c4402
issue #144
...
Clear memory leaks of the test_uphone project
2010-09-17 03:41:02 +00:00
Ming
0c842b7874
issue #142 : add depth test of opengl
2010-09-17 01:20:46 +00:00
natural-law
6bd7d28e06
issue #144
...
Clear memory leaks of the test_uphone project
2010-09-16 09:19:18 +00:00
Ming
300e1abbbb
issue #142
2010-09-16 07:53:58 +00:00
natural-law
4db7ac0e9b
issue #144
...
Clear memory leaks of the test_uphone project
2010-09-16 03:18:09 +00:00
Ming
14982bd715
issue #141
2010-09-15 06:52:11 +00:00
Ming
a92f74d318
fixed #141 : the transition vertex is error, so use CCDirector's instead
2010-09-15 03:47:55 +00:00
Ming
be2baff67f
fixed #146 : convert the pointer to NSObject* before HASH_FIND_INT, because we save it as NSObject*, and the saving operation will adjust the value of pointer.
2010-09-15 01:31:01 +00:00
Walzer
c83678f9b2
hide system state bar when cocos2d running
2010-09-14 08:47:29 +00:00
yangws
221f07610c
hide system state bar when cocos2d running
2010-09-14 08:34:14 +00:00
Ming
622170528c
issue #141
2010-09-14 07:23:38 +00:00
natural-law
16b360fd7d
fixed #148
...
Explant Box2D and add Box2dTest
2010-09-14 06:47:12 +00:00
natural-law
cd4bb0bfc8
issue #144
...
Clear memory leaks of the test_uphone project
2010-09-14 02:26:19 +00:00
natural-law
331f777713
issue #144
...
Clear memory leaks of the test_uphone project
2010-09-13 08:01:27 +00:00
natural-law
0c2849eea3
issue #139
...
Debug
2010-09-13 07:00:08 +00:00
natural-law
ae1439812a
issue #139
...
Debug
2010-09-13 06:12:50 +00:00
natural-law
40b6d8500a
issue #139
...
Debug
2010-09-13 03:09:15 +00:00
natural-law
ea125c8500
issue #143
...
Clear memory leaks
2010-09-11 10:15:34 +00:00
natural-law
8c1c49bff0
issue #143
...
Clear memory leaks
2010-09-11 08:35:06 +00:00
natural-law
44ce8d9c5a
issue #143
...
Clear memory leaks
2010-09-11 08:18:18 +00:00
natural-law
2c682380ed
issue #143
...
Clear memory leaks
2010-09-11 07:48:37 +00:00
natural-law
b25f35d2c0
issue #143
...
Clear memory leaks
2010-09-11 07:40:01 +00:00
natural-law
143d8a3271
debug
2010-09-11 06:51:13 +00:00
Ming
8ee9347d72
issue #138
2010-09-10 07:52:10 +00:00
Ming
1c0d6b1d31
issue #138
2010-09-10 07:47:10 +00:00
Walzer
b2d950743b
issue 136, use NSDictionary in CCSpriteFrameCache
2010-09-10 06:08:25 +00:00
Ming
1de4c1eb6e
issue #138
2010-09-10 01:21:49 +00:00
Ming
9cab8be0ff
issue #138
2010-09-09 09:24:55 +00:00
natural-law
2f438483e5
fixed #137
...
add SchedulerTest code
2010-09-09 08:15:21 +00:00
natural-law
2997a74699
issue #135
...
Add SpriteTest code
2010-09-09 02:17:38 +00:00
Walzer
cba41dc44b
issue #129 , add obj->release when obj is inserted into NSDictionary
2010-09-08 06:52:56 +00:00
Ming
6d8cad341d
issue #131
2010-09-08 06:11:24 +00:00
Ming
2abd0cbff7
issue #131
2010-09-08 02:04:06 +00:00
Walzer
a1f3f89517
fixed #134 , save plist file name
2010-09-08 01:52:30 +00:00
Ming
712da80ffb
2010-09-08 01:33:43 +00:00
Ming
03cdfe1e27
2010-09-08 01:32:04 +00:00
Walzer
64d0d7a7e1
fixed #134 , fullPathFromRelativeFile, modify CCTextureCache::addImage
2010-09-08 01:28:28 +00:00
Walzer
4b86b49b08
fixed #134 , fullPathFromRelativeFile, modify CCTextureCache::addImage
2010-09-07 10:04:57 +00:00
natural-law
bd796c7452
issue #130
...
Add function to set the resource path
2010-09-07 08:30:31 +00:00
natural-law
8eb885382e
issue #130
...
Add function to set the resource path
2010-09-07 08:05:18 +00:00
Walzer
3313d696f2
issue #18 , debug
2010-09-07 07:39:15 +00:00
Walzer
641adefe1c
fixed #133 , override copyWithZone in class CCCallFuncN
2010-09-07 07:13:25 +00:00
natural-law
f94441141f
fixed #132
...
add AtlasTest code
2010-09-07 03:47:54 +00:00
Walzer
43672e1770
issue #114 , CCTMXTiledMap debug
2010-09-07 03:26:28 +00:00
Ming
4023e2830b
issue #131
2010-09-07 02:22:07 +00:00
Walzer
1c1971255e
fixed #129 , use NSString to make dictionary
2010-09-06 12:26:19 +00:00
yangws
4a52e5aaf9
impliment CCXEGLView for uPhone device.
2010-09-06 10:35:24 +00:00
Ming
7b33c38e51
issue #61 :
2010-09-06 10:10:41 +00:00
Ming
d15fe1b211
issue #61 :
2010-09-06 10:02:17 +00:00
Ming
105c1d4ab6
issue #61 :
2010-09-06 10:01:50 +00:00
Walzer
37458680a7
fixed #127 , add NSString
2010-09-06 06:54:14 +00:00
Walzer
fce216a111
issue #126 , initialize the pointer
2010-09-06 06:15:06 +00:00
Ming
7131389535
issue #61 :
2010-09-06 05:52:57 +00:00
Walzer
4de7ff7a98
issue #114 , CCTMXTiledMap debug
2010-09-06 03:59:28 +00:00
Ming
031054abc6
issue #61 :
2010-09-06 03:58:14 +00:00
Ming
b842c135c3
issue #61 :
2010-09-06 03:55:56 +00:00
Ming
6e9ca000e5
issue #61 :
2010-09-06 03:53:41 +00:00
Ming
ee75a8c033
issue #61 :
2010-09-06 03:50:24 +00:00
Ming
69762e4b4c
issue #61 :
2010-09-06 03:48:04 +00:00
Ming
b035165e25
2010-09-06 03:45:02 +00:00
Ming
aaa6b127e9
issue #61 :
2010-09-06 03:31:23 +00:00
Ming
174befbbfe
2010-09-06 03:10:00 +00:00
Ming
515acaa4cf
issue #61 :
2010-09-06 03:06:57 +00:00
Ming
e975c403ba
issue #61 :
2010-09-06 02:57:21 +00:00
Walzer
907fb3f692
issue #126 , add retain when member variable is changed
2010-09-06 02:27:38 +00:00
Ming
b587476b97
issue #61 :
2010-09-06 02:21:05 +00:00
Ming
b12fac2958
issue #61 :
2010-09-06 02:04:28 +00:00
Walzer
fee1ce8f09
fixed #124 , chipmunk done!
2010-09-04 10:18:14 +00:00
Walzer
4226dcede9
issue #61 , add retain for member variable
2010-09-04 10:06:26 +00:00
Ming
41d9386ad3
issue #61 :
2010-09-04 09:13:34 +00:00
Ming
cee96f55a7
issue #61 :
2010-09-04 07:24:26 +00:00
Ming
41b014f6ab
issue #61 :
2010-09-04 07:16:52 +00:00
Ming
ae3f178c7b
issue #61 :
2010-09-04 07:10:41 +00:00
Walzer
88888f7f63
issue #114 , CCTMXTiledMap debug
2010-09-04 06:51:16 +00:00
Ming
21e0bfe46b
issue #61 :
2010-09-04 06:47:40 +00:00
Ming
0ee9e5fd0b
issue #61 :
2010-09-04 06:13:48 +00:00
Walzer
35fe435800
issue #121 , return bool in function init****
2010-09-04 05:39:37 +00:00
Walzer
5fd1bf85b6
issue #121 , return bool in function init****
2010-09-04 04:02:52 +00:00
Ming
004df276ee
issue #122
2010-09-04 04:00:39 +00:00
Ming
f4681c4b53
issue #122
2010-09-04 03:55:42 +00:00
Ming
0dda718b87
issue #122
2010-09-04 03:48:11 +00:00
Ming
d52678bca9
issue #61
2010-09-04 03:36:40 +00:00
Ming
ea6ecb2e93
issue #122
2010-09-04 03:35:06 +00:00
Ming
4088681630
issue #122
2010-09-04 03:34:37 +00:00
Ming
0468bbf3f3
issue #122
2010-09-04 03:30:39 +00:00
Ming
bcea1e97a4
issue #122
2010-09-04 03:26:26 +00:00
Ming
8b1e5f71c0
issue #122
2010-09-04 03:20:10 +00:00
Ming
543c3f5a96
issue #61 : free the memory in void to memory leak
2010-09-03 10:00:48 +00:00
Ming
d9e1134840
issue #61 : should retain in void to memory leak
2010-09-03 10:00:09 +00:00
Ming
642f2a297b
issue #61 : use delete[] instead of delete to avoid memory leak
2010-09-03 09:23:45 +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
178b48ddfc
issue #114 , CCTMXTiledMap debug
2010-09-03 05:47:34 +00:00
Ming
c549d497a6
issue #116 : remove the using of sprintf_s, because it is VC specific
2010-09-03 03:50:04 +00:00
Ming
37ea7dd914
issue #116 : remove the using of sprintf_s, because it is VC specific
2010-09-03 03:49:10 +00:00
Ming
03afc91007
issue #116 : remove the using of sprintf_s, because it is VC specific
2010-09-03 03:47:35 +00:00
Ming
ed3909c9e4
issue #116 : remove the using of sprintf_s, because it is VC specific
2010-09-03 03:15:46 +00:00
Ming
9258d171aa
issue #119
2010-09-03 03:09:47 +00:00
Walzer
e7ae3ff710
issue #114 , CCTMXTiledMap debug
2010-09-03 02:37:34 +00:00
Ming
9a12e848f5
fixed #118
2010-09-03 01:32:13 +00:00
Walzer
082b90ea06
issue #114 , CCTMXTiledMap debug
2010-09-02 10:16:02 +00:00
Ming
863fc8584a
issue #116
2010-09-02 08:58:04 +00:00
Ming
857595d644
issue #116
2010-09-02 08:46:25 +00:00
Ming
7a1c55dd5a
fixed #117
2010-09-02 08:45:51 +00:00
Walzer
fea395cc79
issue #116 , remove include "support/data_support/CCArray.h" in CCTMXLayer.h
2010-09-02 07:48:47 +00:00
Walzer
43a4664534
issue #114 , CCTMXTiledMap debug
2010-09-02 07:31:37 +00:00
Ming
59afd38192
issue #116 : remove __super
2010-09-02 06:54:42 +00:00
Ming
73d6ecb232
issue #116
2010-09-02 02:44:40 +00:00
Ming
6a4af3bcfd
issue #116
2010-09-02 02:33:39 +00:00
natural-law
b18e246eb9
fixed #115
...
add TileMapTest code
2010-09-01 09:30:51 +00:00
Walzer
ca6a97c4ac
issue #114 , CCTMXTiledMap debug
2010-09-01 09:26:16 +00:00
Walzer
8cb49d0a8f
issue #114 , CCTMXTiledMap debug
2010-09-01 08:23:30 +00:00
Ming
8da7979dc6
remove the include of CGPointExtension.h in .vcproj file
2010-09-01 07:46:08 +00:00
Ming
ed023fc129
fixed #112
2010-09-01 07:36:25 +00:00
Walzer
ca8672ff62
fixed #113
2010-09-01 07:26:47 +00:00
natural-law
4b529493fc
fixed #110
...
add ParallaxTest code
2010-09-01 06:57:55 +00:00
Ming
c6789ef16d
fixed issue#111
2010-09-01 06:57:12 +00:00
Walzer
7bcb58ef78
2010-09-01 05:56:36 +00:00
Walzer
820676ea28
issue #18 , complete the implementation left.
2010-09-01 04:02:36 +00:00
Ming
05259df015
issue #61 : the destruction of NSObject should be virtual
2010-09-01 04:01:48 +00:00
Walzer
ff3d907846
issue 67, modify constructor
2010-08-31 10:11:31 +00:00
Walzer
3d91d1e58d
update to uphone-sdk-2010.08.26, which adds opengl headers
2010-08-31 08:53:25 +00:00
Walzer
a0ec92f6c4
fixed #71 , complete CCTMXTiledMap
2010-08-31 08:48:42 +00:00
Walzer
92f2528ede
fixed #69 , complete CCTMXLayer
2010-08-31 07:11:13 +00:00
Ming
c293bd456f
issue #85 : remove the use of static_cast()
2010-08-31 03:23:54 +00:00
Ming
39c6ebf503
issue #85:remove the using of dynamic_cast()
2010-08-31 03:20:37 +00:00
Ming
b9587a7062
2010-08-30 07:45:39 +00:00
Walzer
4ac8acdf44
fixed #68 , complete CCTileMapAtlas
2010-08-30 07:23:07 +00:00
Ming
40158638ff
issue #85:remove the using of dynamic_cast()
2010-08-30 07:06:08 +00:00
natural-law
6e7fede2bb
fixed #103
...
add ActionManager Test code
2010-08-30 07:04:46 +00:00
Ming
b70950dd57
issue #85:remove the using of dynamic_cast()
2010-08-30 05:53:20 +00:00
Ming
af1afdb8fb
issue #85 : remove unneeded comments
2010-08-30 05:48:27 +00:00
Ming
821602a853
fixed #105
2010-08-30 05:42:17 +00:00
Walzer
1eeebfb6fb
fixed #70 , CCTMXObjectGroup
2010-08-30 03:45:46 +00:00
Ming
0cdfba141a
issue #85 : make CCRepeatForever to inherit from CCIntervalAction
2010-08-28 10:00:38 +00:00
Ming
1e7e3f6854
fixed #102 : CCRANDOM_0_1() has an error, it always return 0
2010-08-28 09:42:12 +00:00
Walzer
aec3660ec4
issue #18 , debug
2010-08-28 08:28:30 +00:00
Walzer
cac04e3bfc
issue #18 , debug
2010-08-28 08:23:03 +00:00
natural-law
3f1d4f4fcb
issue #101
...
add MenuTest code
2010-08-28 07:47:51 +00:00
Walzer
4a91a25226
issue #18 , debug
2010-08-28 07:43:13 +00:00
Walzer
35b33ba82b
issue #18 , debug
2010-08-28 07:24:33 +00:00
natural-law
b1c7636632
fixed #100
...
Modify the variable type of CCAction::m_pTarget form NSObject to CCNode
2010-08-28 04:02:10 +00:00
Ming
32c2e83b3f
issue #98
2010-08-28 02:56:18 +00:00
Walzer
aad6392555
issue #72,debug link error
2010-08-27 10:14:17 +00:00
Walzer
408a34603b
fixed #72 , complete CCTMXLayerInfo
2010-08-27 10:07:37 +00:00
Walzer
2367ceed67
issue #82 : debug CCParticleSystem::initWithDictionary ,break and return false if there is something wrong
2010-08-27 07:17:15 +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
natural-law
738ed042fa
fixed #97
...
add Touches Test code
2010-08-27 03:53:35 +00:00
Walzer
2aca691689
issue #96 , add CCTMXXMLParser files
2010-08-26 09:53:35 +00:00
Walzer
daa63cebda
issue #82 : implement initWithDictionary
2010-08-26 09:22:23 +00:00
natural-law
7fd86b7734
fixed #95
...
add CocosNode Test code
2010-08-26 07:09:02 +00:00
Walzer
2658199ead
issue #82 : debug
2010-08-26 06:06:41 +00:00
Ming
0f3717cc45
fixed #94
2010-08-26 05:47:47 +00:00
Ming
c81b45fe44
fixed #94
2010-08-26 04:04:22 +00:00
natural-law
82f316a247
issue #78
...
modify Particle Test code
2010-08-26 03:39:26 +00:00
Walzer
0e053e2703
issue #91 , debug CCParallaxNode
2010-08-26 03:34:22 +00:00
Walzer
2ad752d206
fixed #91 , implement CCParallaxNode
2010-08-26 03:30:52 +00:00
natural-law
b47d47b3b5
fixed #93
...
add DrawPrimitives Test code
2010-08-26 02:53:49 +00:00
Walzer
4f1e1996be
issue #91 , add CCParallaxNode files
2010-08-26 02:44:00 +00:00
Walzer
e7fc567b94
issue #82 : debug ,
2010-08-26 01:42:20 +00:00
Ming
fab3c76c10
fixed #89
2010-08-25 10:31:55 +00:00
Ming
b8416fdfec
fixed #86
2010-08-25 09:25:01 +00:00
Ming
8e3ab00f18
fixed #86
2010-08-25 09:23:32 +00:00
Ming
7291056154
fixed #86
2010-08-25 09:21:38 +00:00
Walzer
3c4eb5e8e0
issue #18 , debug xml parser
2010-08-25 08:50:31 +00:00
Ming
1cfee20d06
fixed #84 :
2010-08-25 08:08:10 +00:00
Ming
32fbef7d34
issue 82: remove the including of "platform/platform.h"
2010-08-25 06:37:40 +00:00
Ming
bfadb1371a
fixed #83 :
2010-08-25 06:14:31 +00:00
natural-law
4a42f2d334
issue #78
...
add code to show FPS and particle count
2010-08-25 05:45:28 +00:00
Ming
8c818ac0ff
issue #81 : remove including header of "platform/platform.h"
2010-08-25 03:46:57 +00:00
Ming
c36b833784
issue #81 : remove including header of "platform/platform.h"
2010-08-25 03:44:26 +00:00
Ming
82a39c917f
issue #81 : remove including header of "platform/platform.h"
2010-08-25 03:40:02 +00:00
Ming
ebab68a580
issue #81 : remove including header of "platform/platform.h"
2010-08-25 03:38:08 +00:00
Walzer
b34b5b379e
issue #82 : debug , undefine CCDictionary
2010-08-25 03:36:57 +00:00
Walzer
96a1e4f5ec
2010-08-25 03:18:59 +00:00
Ming
1cec3f5b60
issue #81 : remove including header of "platform/platform.h"
2010-08-25 03:17:03 +00:00
Ming
25f49cac40
issue #81 : remove including header of "platform/platform.h"
2010-08-25 03:14:34 +00:00
Ming
ecd8b2e9e4
fixed #80
2010-08-25 02:35:19 +00:00
Ming
710e29b086
issue #80
2010-08-25 02:19:20 +00:00
Ming
bd6c97dd2a
issue #80 : remove CCDirector.h to direction of include
2010-08-25 01:40:31 +00:00
Walzer
cbccd4b1f8
issue #62 , debug
2010-08-24 09:12:16 +00:00
Walzer
e838e5c8b9
issue #62 , debug
2010-08-24 06:40:30 +00:00
Walzer
8da4457904
issue #62 , debug
2010-08-24 06:32:01 +00:00
Walzer
2051869da5
issue #62 , debug
2010-08-24 06:30:03 +00:00
Ming
1cb377bca8
fixed #79
2010-08-24 01:56:09 +00:00
Walzer
8c88676d27
issue #18 , debug
2010-08-24 01:49:38 +00:00
Walzer
df7092b83b
issue #62 , debug
2010-08-23 09:53:43 +00:00
Ming
4b34b3a015
fixed #79
2010-08-23 09:29:52 +00:00
Ming
c085826f9a
fixed #77
2010-08-23 08:32:37 +00:00
Walzer
8f24fa052b
issue #62 , debug
2010-08-23 07:56:14 +00:00
Walzer
b43a3a2aac
issue #62 , debug
2010-08-23 07:53:10 +00:00
Walzer
de81590145
issue #62 , debug
2010-08-23 07:15:05 +00:00
Walzer
0fd94875fb
fixed #62 , complete particle system
2010-08-23 06:57:37 +00:00
Ming
0c98caf83f
fixed #75 : include uphone/ZipUtil.h
2010-08-23 06:09:10 +00:00
Ming
61028a5dab
fixed #75
2010-08-23 05:51:23 +00:00
natural-law
5f008f935a
issue #74
...
add ClickAndMove Test code
2010-08-23 03:53:37 +00:00
natural-law
90c8b7898f
issue #73
...
add effects test code
2010-08-23 02:17:29 +00:00
Ming
ceba1ff961
issue #65 : add some missed codes
2010-08-21 05:53:24 +00:00
Ming
64e729905a
issue #64 : fixed a bug of CCSpawn
2010-08-21 03:03:18 +00:00
natural-law
6193087b0c
issue #65
...
add ProgressActions Test
2010-08-21 02:26:26 +00:00
natural-law
40e7abcc5f
issue #64
...
add Transitions Test
2010-08-20 09:51:45 +00:00
Ming
cad3d3c230
fixed #52
2010-08-20 09:38:48 +00:00
Ming
19b75463ed
issue #64 : retain the object when it was added to the scheduler
2010-08-20 07:56:24 +00:00
natural-law
2a37efc84a
issue #64
...
add Transitions Test
2010-08-20 06:35:37 +00:00
Ming
0894732547
fixed #53
2010-08-20 02:41:36 +00:00
Ming
e09f21b4d8
fixed #51
2010-08-20 02:07:58 +00:00
Ming
17e866f5ac
issue #61
2010-08-20 01:31:35 +00:00
Walzer
1d7f567963
issue #18 , debug
2010-08-19 08:45:18 +00:00
Walzer
ccca95746e
issue #18 , debug
2010-08-19 07:29:38 +00:00
Walzer
1dc617174a
issue #18 , debug
2010-08-19 06:25:52 +00:00
Walzer
29d9a489b8
issue #18 , debug
2010-08-19 06:11:35 +00:00
Walzer
9703e75e57
issue #18 , debug
2010-08-19 06:09:40 +00:00
Walzer
b2585b1d4b
issue #18 , debug
2010-08-19 05:46:34 +00:00
Walzer
a08b17b4aa
fixed #59 , complete CCMotionStreak
2010-08-19 05:37:39 +00:00
Walzer
584f558075
fixed #59 , complete CCMotionStreak
2010-08-19 02:14:54 +00:00
Walzer
59324a4a65
fixed #58 , complete CCRibbon, CCRibbonSegment
2010-08-18 09:56:59 +00:00
Ming
3bca871999
issue #51
2010-08-18 08:56:27 +00:00
Walzer
2aa067875b
issue #18 , debug
2010-08-18 08:49:49 +00:00
Walzer
b2bbe00479
issue #18 , debug uiimage::save, uiimage::initWithBuffer
2010-08-18 08:48:39 +00:00
Ming
5076ff065c
issue #55
2010-08-18 08:37:54 +00:00
Ming
1a4a070dfe
2010-08-18 07:26:21 +00:00
yangws
876c0dabb8
add CCXEGLView::getFrame() function.
2010-08-18 07:24:19 +00:00
Walzer
1fd2128806
fixed #56 , CCRenderTexture
2010-08-18 07:15:02 +00:00
Ming
2f638dbe14
issue #55
2010-08-18 06:57:36 +00:00
Walzer
acef33a591
issue #18 , debug : FNTConfigRemoveCache
2010-08-18 04:03:31 +00:00
Walzer
05e2ce6a51
issue #7 , implement transition
2010-08-18 03:06:48 +00:00
Walzer
e7e0ff565b
fixed #48 , implement CCXBitmapDC
2010-08-17 08:12:46 +00:00
Ming
950c8cff82
fixed #54
2010-08-17 06:43:00 +00:00
Ming
c8ea0e7eb6
fixed #54
2010-08-17 06:25:41 +00:00
Walzer
55f01578ea
issue $48, implement CCXBitmapDC
2010-08-17 04:04:25 +00:00
Ming
7c3ccd5600
fixed #49 :
2010-08-17 03:43:10 +00:00
natural-law
bdae947e76
issue #50
...
use uPhone's new/delete replace the standard new/delete
2010-08-17 03:32:33 +00:00
Ming
0ef3574562
move include/CCGrid.h to effects/CCGrid.h
2010-08-16 08:53:14 +00:00
Ming
f45e14bc85
fixed #47 :
2010-08-16 08:46:45 +00:00
Walzer
deb7ec097d
issue $48, implement CCXBitmapDC
2010-08-16 07:15:36 +00:00
Walzer
bb04891ccb
issue $48, implement CCXBitmapDC
2010-08-16 07:02:17 +00:00
Ming
adbf5a659f
issue #46 : remove unneeded .h file
2010-08-16 06:11:19 +00:00
yangws
a1ae0f6ede
call loadExtension in CCXApplication's constructor.
2010-08-16 04:29:06 +00:00
Walzer
3fa4d2dcc4
issue $48, implement CCXBitmapDC and implement CCTexture2D.cpp
2010-08-16 03:59:53 +00:00
Ming
2c5cbd7e1a
fixed #46 : implement CCGrabber
2010-08-16 03:26:41 +00:00
Ming
a7b13558e3
fixed #42 : implement CCProgressTimerActions.cpp and CCProgressTimerActions.h
2010-08-16 02:02:06 +00:00
natural-law
56fb233224
issue #33
...
submit the actions tests code
2010-08-13 09:21:33 +00:00
Walzer
d466777b3c
issue #18 , debug
2010-08-13 09:15:50 +00:00
Walzer
81f09f91df
issue #18 , debug
2010-08-13 08:55:46 +00:00
Ming
1f2117fb19
fixed #45
2010-08-13 03:18:31 +00:00
Walzer
5448bdd392
issue #18 , debug
2010-08-13 03:16:04 +00:00
Ming
b4c8d88707
issue #45 : fix logic error of insertChild()
2010-08-13 02:54:30 +00:00
Ming
2b3e708c5b
issue #6 : fix bug of insertObjectAtIndex()
2010-08-13 02:14:47 +00:00
Ming
c8e031777c
issue #44 : fix some bugs
2010-08-13 02:05:35 +00:00
Walzer
23dc04ffaf
issue #18 , debug
2010-08-13 01:26:52 +00:00
Ming
c2ed3d22ef
issue #44 : fix some bugs
2010-08-12 10:14:21 +00:00
Ming
d4355b2d23
issue #44 : fix some bugs
2010-08-12 09:55:37 +00:00
Walzer
6e06b04bec
2010-08-12 09:51:23 +00:00
Walzer
9510be1d72
fixed #41 , complete label
2010-08-12 09:39:25 +00:00
Ming
3c658c27a5
issue #44 : fix some bugs
2010-08-12 09:01:51 +00:00
Walzer
0d7fc054b6
issue #18 , debug
2010-08-12 08:19:09 +00:00
natural-law
8dcfabcd44
issue #43
...
use libpng read image files.
2010-08-12 07:35:19 +00:00
yangws
16706df9d7
add NewDeleteOp.cpp on uphone
2010-08-12 07:29:18 +00:00
natural-law
ff72e4087d
issue #43
...
use libpng read image files.
2010-08-12 06:46:58 +00:00
Ming
fa71e45ac0
issue #42 : implement CCProgressTimer
2010-08-11 10:15:52 +00:00
Walzer
c06cae617f
issue #41 , implement CCLabel,CCLabelAtlas
2010-08-11 10:09:10 +00:00
natural-law
298768aeec
issue #33
...
fix little bugs of CCDirector and Actions
2010-08-11 07:24:15 +00:00
Ming
1873732182
issue #35 : fix bug of startWithTarget()
2010-08-11 07:04:34 +00:00
Ming
a934e49e31
issue #6 : fix bug with arrayWithArray()
2010-08-11 06:56:00 +00:00
Ming
2fc2bde67b
issue #35 : fix some bug
2010-08-11 06:03:46 +00:00
Ming
035299fcfe
fixed #40
2010-08-11 02:33:03 +00:00
Ming
907f5d5604
issue #6 : fixed logical bug
2010-08-10 10:23:43 +00:00
Ming
836ede4060
issue #6 : fixed logical bug
2010-08-10 10:18:09 +00:00
Ming
712fee20ed
issue #6 : fixed logical bug
2010-08-10 10:11:45 +00:00
Ming
c93cdeaa1e
fixed #38 : implemented
2010-08-10 09:21:01 +00:00
Ming
167366cfab
fixed #35 : fix some compile bugs
2010-08-10 09:20:28 +00:00
Ming
ef99448e13
fixed #39 : implement CCEaseAction
2010-08-10 06:02:13 +00:00
Walzer
2a2f5ccf38
issue #38 , implement CCMenu
2010-08-10 04:49:16 +00:00
yangws
7f136d932f
add statusBarFrame() function in CCXApplication.
2010-08-10 04:03:05 +00:00
Ming
49673e03a0
issue #6 : fix bug of gettimeofday()
2010-08-09 09:43:17 +00:00
Ming
358c712839
issue #35 : implement CCIntervalAction
2010-08-09 08:27:36 +00:00
Walzer
0e014dbfd0
2010-08-09 07:35:26 +00:00
Walzer
4f2a57d2a2
issue #18 , debug
2010-08-09 07:26:16 +00:00
yangws
2283765d42
On uPhone platform, UpdateWindow in draw loop.
2010-08-09 05:57:33 +00:00
Ming
3e2ee37a8a
issue #35 : fixed some bugs
2010-08-09 03:46:35 +00:00
Walzer
cba33c622d
issue #18 , debug
2010-08-09 03:03:06 +00:00
Walzer
728512c614
fixed #37 , complete CCCameraAction
2010-08-09 02:58:48 +00:00
natural-law
a32ed04e07
issue #33
...
fix a bug and submit the prototype test framework
2010-08-06 09:50:20 +00:00
Walzer
e08807083c
issue #18 , debug, change description
2010-08-06 08:05:19 +00:00
Ming
e3d34da47e
issue #35 : implement some actions
2010-08-06 07:48:53 +00:00
Ming
792a2d2ab5
issue #35 : implement some actions
2010-08-06 06:44:17 +00:00
Walzer
324a9fac83
issue #18 , debug
2010-08-06 06:32:32 +00:00
Ming
260125af50
issue #6 : fixed a compile error
2010-08-06 06:29:57 +00:00
Ming
410ca0f269
issue #6 : fixed a compile error
2010-08-06 06:04:49 +00:00
Walzer
ffce4ec6b3
issue #18 , debug
2010-08-06 05:48:02 +00:00
yangws
c0b98a1e6d
2010-08-06 04:02:54 +00:00
Walzer
4a239daf4a
2010-08-06 03:58:17 +00:00
Walzer
32c43d5797
fixed #31 , complete CCAction.cpp
2010-08-06 03:58:03 +00:00
yangws
24bebd37a3
2010-08-06 03:51:07 +00:00
yangws
7097321fd9
2010-08-06 03:49:17 +00:00
yangws
489b64ec27
2010-08-06 03:42:15 +00:00
yangws
e5816f0068
fixed #34 add eglview resize support.
2010-08-06 03:14:22 +00:00
natural-law
2aa5312c77
issue #33
...
fix little bugs
2010-08-06 03:08:55 +00:00
Ming
3b58ec4afe
issue #35 : add CCIntervalAction.cpp and CCIntervalAction.h but have not implemented them
2010-08-06 02:51:40 +00:00
yangws
22b4f3206d
fixed bug : one click two pen down message on uphone platform.
2010-08-06 02:15:54 +00:00
Walzer
2bf3a73c2d
fixed #3 , complete CCNode CCAtlasNode
2010-08-06 01:46:56 +00:00
natural-law
d661503528
issue #33
...
fix little bugs
2010-08-06 01:29:18 +00:00
yangws
d6597735fc
write "helloworld" code in one file
2010-08-05 10:58:38 +00:00
Walzer
b4543ef6f1
issue #5 , implement CCLayer::onEnter, CCLayer::onExit
2010-08-05 10:07:14 +00:00
Walzer
076cab9f49
issue #36 , implement CCInstantAction.cpp
2010-08-05 09:22:47 +00:00
yangws
833397163e
remove helloworld main form class code. create main window in application's EventHandler.
2010-08-05 09:20:24 +00:00
Ming
f4fc30f651
fixed #32 : changed because the implementation of CCActionManager
2010-08-05 06:38:42 +00:00
Ming
b422992b44
fixed #32 : implement CCActionManager
2010-08-05 06:37:36 +00:00
Walzer
aaf66ba58e
issue #31 , implement CCAction.cpp, CCIntervalAction left
2010-08-05 06:32:04 +00:00
yangws
d30d8be81b
fixed bug: show currect image must run app twice.
2010-08-05 04:02:55 +00:00
yangws
cde36d0de9
fixed #34 impliment setDeviceOrientation function.
2010-08-05 03:02:30 +00:00
Ming
52982764c8
issue #6 : implement setDeviceOrientation()
2010-08-05 02:38:21 +00:00
yangws
08e72de8b4
issue #34 add setDeviceOrientation in CCXApplication class.
2010-08-05 02:29:29 +00:00
natural-law
513babf08e
fixed #27
...
fix some bugs of node and director
2010-08-04 10:17:07 +00:00
Walzer
512f5d2121
issue #18 , debug
2010-08-04 10:03:15 +00:00
Walzer
5856419293
issue #18 , debug
2010-08-04 09:19:37 +00:00
Ming
ea619d1b01
fixed #30 : add some header files
2010-08-04 08:54:58 +00:00
Ming
5404fd879b
issue #6 : initialize m_pLastUpdate
2010-08-04 08:50:51 +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
Ming
8ab5072885
issue #6 : use struct timeval * instead of struct timeval
2010-08-04 08:18:09 +00:00
yangws
8596cbffe2
fix vertical revert bug
2010-08-04 08:08:43 +00:00
Walzer
14427a24d7
2010-08-04 07:46:12 +00:00
yangws
d4297744d5
change DrawPixelEx to DrawBitmap when swapBuffers in uphone/CCXEGLView_uphone.cpp
2010-08-04 06:48:14 +00:00
Ming
2acf23d133
issue #6 : add function isPremultipliedAlpha()
2010-08-04 06:38:11 +00:00
Ming
2262a122d3
issue #6 : use dynamic_cast<>
2010-08-04 03:13:03 +00:00
Ming
8c754ee5a9
issue #26 : because it use some macro that using malloc and free, so we can not change it to new
2010-08-04 03:10:55 +00:00
Ming
f236e4d542
issue #26 : change malloc/calloc to new
2010-08-04 03:02:33 +00:00
natural-law
b11c03cff3
fixed #27
...
fix some bugs of node and director
2010-08-04 02:36:37 +00:00
yangws
44ec769cf8
fixed #14 copy ogles color buffer data to TDC in CCXEGL::SwapBuffers, to emulate eglSwapBuffers on uphone emulator.
2010-08-03 10:11:37 +00:00
Walzer
9db3106303
issue #18 , debug
2010-08-03 08:49:25 +00:00
Walzer
3914006a99
issue #18 , debug _cmd
2010-08-03 07:25:47 +00:00
Walzer
4f357e5872
issue #18 , debug __super::init() in CCTransitionScene::initWithDuration
2010-08-03 07:13:50 +00:00
Walzer
03df28e28a
issue #18 , debug
2010-08-03 06:50:41 +00:00
Ming
ad74a42c6c
issue #13 : implement needed codes
2010-08-03 05:52:41 +00:00
natural-law
e9f36ce744
fixed #25
...
添加一个简单的CCSprite单元测试,同时修正几个小的bug
2010-08-03 04:07:32 +00:00
Ming
8607fdb025
issue #6 : fix logical error in getRGBA8888Data()
2010-08-03 03:35:55 +00:00
Walzer
db49ed49b9
issue #18 , debug
2010-08-03 03:28:34 +00:00
yangws
27eda1194a
fixed #22 use user defined message to call CCDirector::preMainLoop, Use PowerVR Win32 GLES Lib to emulate TOPS GLES.
2010-08-03 03:23:12 +00:00
Ming
80c347932e
issue #13 : allocate memory for member variable m_pszName
2010-08-03 02:25:38 +00:00
Ming
40abd44425
issue #10 : use dynamic_cast<> instead of member variable
2010-08-03 01:40:03 +00:00
Ming
670c8e06da
issue #13 : fix compile error
2010-08-02 10:18:43 +00:00
Ming
062ba12b20
issue #6 : make getRGBA8888Data() more readable
2010-08-02 10:18:00 +00:00
Ming
70bf71e01d
issue #13 : add initialization of m_bRecursiveDirty
2010-08-02 10:15:35 +00:00
natural-law
6571dbafee
修正几个小bug
2010-08-02 10:04:24 +00:00
Ming
3b2425d8bf
issue #6 : autorelease pool management
2010-08-02 09:48:01 +00:00
Walzer
8e496d09d9
issue #18 , debug
2010-08-02 09:38:42 +00:00
Walzer
3403f1c1fd
issue #18 , debug BGRA to RGBA
2010-08-02 09:21:57 +00:00
Ming
ca3918933b
issue #6 : initialize default value to m_pobOpenGLView
2010-08-02 09:10:04 +00:00
Walzer
6a40e3e1d2
issue #18 , debug
2010-08-02 08:00:01 +00:00
Walzer
a161e4ed3e
issue #18 , debug
2010-08-02 07:44:41 +00:00
Walzer
33394ce4f7
issue #18 , debug
2010-08-02 07:42:07 +00:00
Walzer
f38734b879
issue #18 , debug
2010-08-02 06:46:06 +00:00
Ming
929059d148
issue #6 : change preMainLoop() to public
2010-08-02 06:40:53 +00:00
Ming
a2083303e9
issue #6 : implement some function
2010-08-02 04:00:06 +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
Ming
167122d2cf
issue #6 : add ImageToolKit_d.lib to fix link error
2010-08-02 02:40:28 +00:00
Ming
db2a75e2df
issue #6 : fixed compile error
2010-08-02 02:29:00 +00:00
Walzer
b0f648bda7
issue #7 , debug
2010-08-02 02:16:35 +00:00
Walzer
3f8bbaec24
issue #7 , add assert for UIImage.initWithContentsOfFile()
2010-07-30 10:21:00 +00:00
Ming
9945867be7
issue #19 : fixed runtime error
2010-07-30 10:17:13 +00:00
Walzer
458ca18148
issue #5 , implement
2010-07-30 09:18:20 +00:00
Walzer
88ce1c8f83
issue #7 , implement
2010-07-30 08:35:07 +00:00
Ming
18ced8482d
issue #13 : implement CCSpriteFrameCache.cpp
2010-07-30 06:10:45 +00:00
Walzer
a35d71a4fe
issue #7 , add xml parser
2010-07-30 04:02:36 +00:00
Ming
8ab8a1bb57
issue #6 : initialize m_pLock
2010-07-29 10:18:23 +00:00
yangws
08e46a37a4
fixed #14 add egl code in class CCXEGLView
2010-07-29 08:05:14 +00:00
Ming
2f00ab6937
issue #13 : implement CCSpriteSheet.cpp
2010-07-29 07:46:54 +00:00
yangws
f12d51f7ae
fixed #14 impliment CCTouch and treate touch msg in CCXEGLView EventHandler.
2010-07-29 04:12:11 +00:00
yangws
28376fcd4d
issue #14 CCTouch is platform independent
2010-07-29 02:21:02 +00:00
yangws
de4cb4fcf7
issue #14 add CCXEGLView attach with EGLTouchDelegate
2010-07-28 10:18:27 +00:00
Ming
6115e7b6a1
issue #6 : set dispatcher to view
2010-07-28 10:02:36 +00:00
Ming
f2df99116e
issue #17 : fix link error
2010-07-28 07:35:51 +00:00
Walzer
ffdf5dda8a
issue #17 , fixed link error
2010-07-28 07:27:51 +00:00
Ming
9c984b8a34
issue #17 : fixed link error
2010-07-28 07:16:00 +00:00
Walzer
eefb4ce9e9
issue #7 , remove gridbase methods
2010-07-28 06:10:12 +00:00
Walzer
d2f792363c
issue #7 , debug
2010-07-28 05:48:13 +00:00
Ming
ce5e3f5567
issue #6 : update .vcproj file
2010-07-28 03:49:17 +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
294bb7b246
issue #7 , debug
2010-07-28 03:29:13 +00:00
yangws
a9d39bb731
issue #14 add CCXEGLView files
2010-07-28 02:26:06 +00:00
yangws
fc139bf12a
issue #14 change CCXApplication to CCXEGLView, CCDirector compile ok.
2010-07-28 02:15:02 +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
fdf12330d0
issue #7 , modify initPremultipliedATextureWithImage(), to be checked
2010-07-27 10:31:52 +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
e5af08ae93
issue #6 : change the implementation of CGImageGetColorSpace()
2010-07-27 08:41:18 +00:00
Ming
b6dd87fb64
issue #6 : fix some compile error
2010-07-27 07:49:39 +00:00
Ming
2243252289
issue #6 : rename to CCTouch_Platform.h
2010-07-27 07:30:31 +00:00
Ming
d1d14190d5
issue #6 : add some comments
2010-07-27 07:21:21 +00:00
Ming
2b477f5f0f
issue #6 : fix compile error
2010-07-27 05:54:41 +00:00
Ming
e51ba53346
issue #6 : add platform/CCTouchPlatform.h
2010-07-27 05:50:00 +00:00
Ming
5eede62659
fixed #16 : fixed compile errors
2010-07-27 05:47:29 +00:00
Ming
e946042ce2
issue #6 : remove UIImage.h
2010-07-27 01:35:25 +00:00
Walzer
5a119a03ee
issue #7 , add include "UIImage.h" to platform.h
2010-07-26 10:28:46 +00:00
Ming
2f052f299c
issue #6 : add function getRGBA8888Data()
2010-07-26 10:18:46 +00:00
yangws
245a8de096
issue #14 add CCApplication.h
2010-07-26 10:17:07 +00:00
Walzer
0783eddda4
issue #7 , implementations
2010-07-26 09:32:23 +00:00
yangws
2eb5637519
modify gles include path add commit test_uphone frame code.
2010-07-26 09:12:06 +00:00
Walzer
a789bd37a1
issue #7 , add UIImage.h in platform/
2010-07-26 07:15:50 +00:00
Ming
ce2dc0fa5e
issue #6 : update cocos2dx-uphone.vcproj
2010-07-26 07:15:39 +00:00
Ming
1bdc65322c
issue 6#; delete platform_uphone.cpp
2010-07-26 06:13:45 +00:00
Ming
47774f0c77
issue #6 : fixed some compile error
2010-07-26 05:53:08 +00:00
Ming
4160abc669
issue #6 : fixed compile error because some file is deleted
2010-07-26 02:35:45 +00:00
Ming
da11b924ab
issue #6 : update CCDirector.cpp, CCDirector.h
2010-07-26 02:00:08 +00:00
Ming
073f0720c6
issue #6 : add platform/CCTime.h, platform/Cocos2dTypes.h, platform/uphone/CCTime.h, platform/uphone/CCTime.cpp
2010-07-26 01:59:27 +00:00
Ming
233b19a717
issue #6 : delete platform.h and platform_uphone.h
2010-07-26 01:58:09 +00:00
Ming
5182bc1c0c
issue #6 : add CCFileUtils
2010-07-23 08:39:34 +00:00
Walzer
d2235ef1a3
issue 7#, add NSLock.h in platform/
2010-07-23 07:39:24 +00:00
Ming
636c60c2ed
issue #6 : update UIImage
2010-07-23 07:13:47 +00:00
Ming
d46ba27ea1
issue #6 : add UIImage.cpp, UIImage.h
2010-07-23 06:36:16 +00:00
Ming
10ec5e45db
issue #6 : fixed compile error
2010-07-23 06:25:21 +00:00
Ming
db23b9ec4e
issue #13 : fixed compile error
2010-07-23 06:24:54 +00:00
Ming
c14cff9855
issue 13: fixed compile error
2010-07-23 06:24:23 +00:00
Walzer
2fdf9c0ef3
issue #7 , add namespace to timeval in platform_uphone.h
2010-07-23 06:23:53 +00:00
Ming
c368f3a6cc
issue #13 : change char* to const char* in function declaration
2010-07-23 06:06:19 +00:00
Ming
a48f58732b
issue #6 : the file is already exist under support
2010-07-23 05:55:14 +00:00
Ming
9bcdca47ca
issue #6 : update NSMutableArray.h
2010-07-23 05:42:55 +00:00
Ming
941e465eaa
issue #13 : update CCSpriteFrameCache.h
2010-07-23 05:42:29 +00:00
Ming
a2ed05d205
issue #6 : delete NSArray.cpp, NSArray.h
2010-07-23 01:46:52 +00:00
Walzer
b34c778e79
issue #7 , remove unusable include in .h
2010-07-22 10:39:40 +00:00
Ming
a3687c7e37
issue #6 : update CCDirector.cpp
2010-07-22 07:56:02 +00:00
Ming
5be2e27424
issue #6 : update NSMutableArray.h
2010-07-22 07:55:28 +00:00
Ming
7f160f9e56
issue #6 : update CCSprite.cpp, add CCSpriteFrame.cpp
2010-07-22 07:54:43 +00:00
Ming
fef0ebc88d
issue #13 : update CCSpriteFrame.h
2010-07-22 07:54:02 +00:00
Ming
295eefef78
issue #13 : update CCSpriteFrame.h, CCSpriteFrameCache.h, CCSpriteSheet.h
2010-07-22 07:08:30 +00:00
Ming
07d54edaba
issue #13 : add CCSprite.cpp
2010-07-22 06:54:47 +00:00
Ming
05e48618b3
issue #13 : update CCSprite.h
2010-07-22 06:52:35 +00:00
Ming
bfb9133ca5
issue #6 : add function vertex3
2010-07-22 06:51:37 +00:00
Ming
63871077af
issue #3 : change tow function to virtual
2010-07-22 06:31:08 +00:00
Walzer
e631a65d9f
issue #7 , correct an error
2010-07-22 03:20:52 +00:00
Walzer
9934149257
issue #7 , change string to const char*
2010-07-22 03:15:25 +00:00
Ming
0cedc699ea
issue #13 : add const to char*
2010-07-22 02:29:45 +00:00
Ming
63fa1aedfd
issue #13 : add some static functions
2010-07-22 02:16:53 +00:00
Ming
7c05a4ff68
issue #6 : change the modify tho public
2010-07-22 02:10:51 +00:00
Ming
b0a480c40f
issue #13 : add CCSprite.h, CCSpriteFrame.h, CCSpriteFrameCache.h, CCSpriteSheet.h
2010-07-22 01:39:15 +00:00
Walzer
c40e185ebe
issue #3 , set methods virtual
2010-07-21 10:03:47 +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
Walzer
adbf70a033
issue #7 , implement .cpp
2010-07-21 03:13:32 +00:00
Ming
98915e1e9e
issue #6:update NSMutableArray.cpp
2010-07-21 02:07:46 +00:00
Ming
4ed833eb47
fixed issue #12 : add CCAction.h
2010-07-20 06:42:56 +00:00
Ming
07c9d7351f
issue #10 : update CCTouchDispacher.cpp, CCTouchDispatcher.h
2010-07-20 06:39:28 +00:00
Walzer
c8d3a1754f
issue #7 , remove ../
2010-07-20 06:34:25 +00:00
Walzer
9137931b38
issue #7 , remove ../
2010-07-20 06:33:31 +00:00
Walzer
2e5357dc30
issue #7 , change the include directory
2010-07-20 06:29:18 +00:00
Ming
1d860d2f54
issue 10: update CCTouchDispatcher.h
2010-07-20 06:21:59 +00:00
Ming
4963bc4223
issue #6 : update CCDirector.h, CCDirector.cpp
2010-07-20 06:07:27 +00:00
Walzer
5d60c2ca0a
issue #7 , change the use of NSMutableArray
2010-07-20 05:49:13 +00:00
Ming
c8477d4d16
issue #6 : update CCScheduler.cpp
2010-07-20 03:40:22 +00:00
Ming
f8f1e04e3b
issue #6 : update CCTouchDispacher.cpp
2010-07-20 03:39:49 +00:00
Ming
50739886fc
issue #6 : update CCTouchDispatcher.h
2010-07-20 03:32:30 +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
Walzer
405d445f36
issue #7 , change function name in CCProtocols.h, use set* and get*
2010-07-19 10:00:13 +00:00
Walzer
e0b4307d30
fixed #3 , CCAtlasNode complete, CCNode is short of Action
2010-07-19 08:45:53 +00:00
Ming
72b9b13599
issue #6 : update ccMacros.h
2010-07-19 06:59:13 +00:00
Ming
cff5590721
issue #11 : add TransformUtils.cpp and TransformUtils.h
2010-07-19 06:24:04 +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
e41b7626ee
issue #6 : add NSLock.cpp and NSLock.h
2010-07-19 03:27:38 +00:00
Ming
4bc6383f6b
issue #6 : remove NSLock.cpp and NSLock.h
2010-07-19 03:16:34 +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
Ming
4cd8860827
issue #6 : update CCConfiguration.cpp
2010-07-19 01:57:51 +00:00
Ming
c968d653c4
issue #6 : update ccMacro.h
2010-07-19 01:35:29 +00:00
Walzer
483ad553be
nothing, just modify the include path
2010-07-16 10:05:10 +00:00
Walzer
cc9c52d0c7
issue #5 , do some implementation
2010-07-16 09:53:59 +00:00
Walzer
669f59d721
add CGPointZero, CGSizeZero, CGRectZero
2010-07-16 09:51:35 +00:00
Walzer
c61ceb8020
issue #7 : complete CCTextureAtlas, done CCTextureCache partly
2010-07-16 08:28:11 +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
9f83ecb260
issue #6 : update CCTouchDispacher.cpp
2010-07-16 06:27:00 +00:00
Ming
56ba688df0
issue #6 : update CCDirector.cpp
2010-07-16 06:22:43 +00:00
Ming
d0558f3349
issue #6 : add CCTouch.h, update platform_uphone.cpp and platform_uphone.h
2010-07-16 06:20:55 +00:00
Ming
0983a84d6d
issue #6 : update CCProtocols.h
2010-07-16 06:19:55 +00:00
Ming
84534a1316
issue #6 : add replaceObjectAtIndex() to NSMutableArray
2010-07-16 06:19:21 +00:00
Walzer
aaf5b5859f
issue #7 : add CCTextureAtlas.h and implement CCTextureAtlas.cpp partly, add CCTextureCache.h
2010-07-16 06:15:06 +00:00
Ming
1d0f9bd582
issue #11 ; add CCTouchDispacher.cpp and CCTouchDispatcher.h
2010-07-16 06:10:18 +00:00
Ming
a82195717d
issue #6 : update CCDirector.h, add CCDirector.cpp
2010-07-16 06:09:31 +00:00
Ming
e8d1b0a0cf
issue #10 : add CCTouchHandler and CCTouchDelegateProtocol.h
2010-07-16 03:39:21 +00:00
Walzer
108e3b6d2b
issue #7 : add CCPVRTexture.h and implement CCPVRTexture.cpp partly
2010-07-16 02:34:42 +00:00
Ming
92bf801870
issue #6 : implement NSSet
2010-07-16 02:13:27 +00:00
Walzer
63b87af767
issue #7 : add CCTexture2D.h and implement CCTexture2D.cpp partly
2010-07-15 10:15:00 +00:00
Walzer
8eff6998dd
issue #5 : add description to CCNode
2010-07-15 03:39:05 +00:00
Walzer
df8150582c
issue #5 : implement a part of the methods in .cpp
2010-07-14 08:30:25 +00:00
Walzer
2394258ed1
issue #5 : implement selector methods in CCNode.cpp
2010-07-14 03:52:27 +00:00
Walzer
ee1a33867c
issue #5 : add include
2010-07-14 03:18:05 +00:00
Ming
3e89679570
issue #11 : add uthash.h and utlist.h
2010-07-14 03:06:09 +00:00
Ming
cb5dcf8862
issue #6 : add CCScheduler.cpp
2010-07-14 03:03:54 +00:00
Ming
577399d2cb
issue #6 : add getObjectAtIndex() to NSMutableArray
2010-07-14 03:02:06 +00:00
Walzer
c39a43c0cc
issue #5 , implementation in CCNode.cpp
2010-07-14 02:36:26 +00:00
Ming
9ab774cd8b
issue #6 : update CCScheduler.h and selector_protocol.h
2010-07-14 02:35:20 +00:00
Walzer
26479af70a
issue #5 , add NSAssert define
2010-07-13 06:21:06 +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
e4f3ecf842
issue #5 , add implementations in .cpp files
2010-07-13 01:48:39 +00:00
Ming
a1e1a5f484
issue #6 : add CCScheduler.h
2010-07-13 01:36:15 +00:00
Walzer
dadfb6bf55
issue #5 , change private method to protected
2010-07-12 10:20:04 +00:00
Walzer
1c2b95973d
issue #5 , add declares in .cpp files, but still no implementation. change some methods to virtual.
2010-07-12 09:56:06 +00:00
Ming
fb5762c463
issue #6 : update NSObject.cpp
2010-07-12 09:12:08 +00:00
Ming
d2522eb541
issue #6 : add CCDirector.h and update CCConfiguration
2010-07-12 09:03:27 +00:00
Ming
7c07335dab
issue #6 : update NSAutoreleasePool, NSObject.h and NSMutableArray
2010-07-12 09:01:26 +00:00
Walzer
8672eea9da
issue #5 , modify some bugs in all my .h files
2010-07-09 10:24:08 +00:00
Walzer
d70eb65227
issue #2 , modify marco name
2010-07-09 09:02:00 +00:00
Walzer
a9b4e37355
issue #5 , remove init()
2010-07-09 08:38:29 +00:00
Walzer
79d69daa27
issue #5 , add CCPageTurnTransition and CCRadialTransition, check CCNode, CCAtlasNode ,CCLayer, CCScene and CCTransition
2010-07-09 08:26:01 +00:00
Walzer
c5e4169ec8
issue #3 , remove "init" from CCNode
2010-07-09 08:22:02 +00:00
Walzer
b294364927
issue #5 , add some descriptions
2010-07-09 07:34:16 +00:00
Walzer
fdcbafda0f
issue #5 , add CCLayer.h, add @todo
2010-07-09 03:26:56 +00:00
Walzer
46da55d4a0
issue #5 , add CCScene, CCTransition
2010-07-08 10:11:08 +00:00
Walzer
8951d0133b
issue #5 , add CCScene
2010-07-08 08:23:06 +00:00
Walzer
5eed1eee76
fixed #3 , complete .h files
2010-07-08 07:31:35 +00:00
Walzer
0e8d3a5e9e
fixed #2 , fix comiple errors. but link error still exists
2010-07-08 07:13:07 +00:00
Walzer
297b508122
issue #3 , simple modify
2010-07-08 06:00:51 +00:00
Walzer
97233e991a
issue #3 , simple modify
2010-07-08 06:00:06 +00:00
Walzer
4c707cd100
issue #3 , update
2010-07-08 04:20:58 +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
e8be24e1bd
issue #2 : add needed header file to platform.h
2010-07-08 03:56:17 +00:00
Ming
c81e408606
issue #2 : move Cocos2dTypes.h to /platform/uphone/Cocos2dTypes.h
2010-07-08 03:49:13 +00:00
Ming
d174b51106
issue #9
2010-07-08 02:53:52 +00:00
Walzer
8a1220e32b
issue #9 , BOOL->bool, YES->yes, NO->no
2010-07-08 02:45:42 +00:00
Walzer
ffe2e31fec
issue #3 ,
2010-07-08 02:26:58 +00:00
Walzer
1d4e2006df
issue #2 , modified virtual,BOOL,TRUE,FALSE,property
2010-07-08 02:25:52 +00:00
Ming
e68143c71f
issue #8 : add platform.h and platform_uphone.h
2010-07-07 08:55:12 +00:00
Ming
83b7f00160
issue #6 : update CCConfiguration.h
2010-07-07 07:38:03 +00:00
Ming
30f04eae56
issue #8 : add CCGrid.h
2010-07-07 07:35:30 +00:00
Walzer
da9a1abf4d
2010-07-07 07:24:44 +00:00
Ming
3cb019b7fc
2010-07-07 07:18:48 +00:00
Walzer
9f825a19ac
2010-07-07 07:15:30 +00:00
Ming
d7e1a264ea
issue #6 : update NSMutableArray.h
2010-07-07 06:22:24 +00:00
Ming
aa9a02c632
issue #2:rename cocos2dx.vcproj to cocos2dx-uphone.vcproj
2010-07-07 03:40:29 +00:00
Walzer
d9b3967daa
2010-07-07 01:41:29 +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
d101f32672
issue #6:issue #6 : remove the .h files to cocos2dx
2010-07-06 12:22:01 +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
e3ed31701f
issue #6
2010-07-06 12:18:40 +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
95699af69d
issue #6
2010-07-06 09:55:33 +00:00
Ming
c04225ab4b
issue #6 : update CCConfiguration.cpp, CCDrawingPrimitives.cpp
2010-07-06 09:54:36 +00:00
Ming
69eefc5363
issue #2 : update cocos2dx.vcproj
2010-07-06 09:53:30 +00:00
Walzer
ea0e3a5b81
add copyright
2010-07-06 09:27:05 +00:00
Walzer
344c99e5e6
variable property define
2010-07-06 09:20:53 +00:00
Ming
dafe99ca70
issue #2 : move to folder cocos2dx
2010-07-06 08:28:41 +00:00