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