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