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
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