walzer
|
9041d03d3b
|
[uphone] issue #307, config test.vcproj uphone for TestAudioEngine merger.
|
2011-01-19 18:02:35 +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
|
acb4a6a369
|
[uphone]fixed #293,modify the absolute path method in CCFileUtils.
|
2011-01-18 10:14:44 +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
|
c02a9a4dd5
|
Setting apk file path at runtime in cocos2d-android.
|
2011-01-07 16:29:06 +08:00 |
minggo
|
30f4c94bfb
|
make a little change to upto-0.99.5
|
2010-12-23 10:35:09 +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 |
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
|
687fb199fc
|
issue #233 stop main loop when application enter background. test ok on emulator
|
2010-12-02 18:44:13 +08:00 |
minggo
|
d88b26c4d2
|
commit AppDelegate.cpp after merging
|
2010-11-29 15:57:53 +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
|
4d98faabc5
|
fixed #226 add support read resource file from zip file in cocos2d-uphone
|
2010-11-29 10:49:43 +08:00 |
Walzer
|
b4152fa700
|
fixed #222 merge different HelloWorld to one directory just like "tests", except HelloWorld.android
|
2010-11-27 18:25:31 +08:00 |
yangws
|
9346275604
|
show fps
|
2010-11-19 03:14:19 +00:00 |
Ming
|
31809a3774
|
issue #208
|
2010-11-18 06:50:28 +00:00 |
Walzer
|
ed7d1ca159
|
issue #198 now test_uphone & test_win32 directories are remove. "test" stands for them
|
2010-11-12 09:24:12 +00:00 |