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 |