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
|
79b711a758
|
move CCXBitmapDC from cocos2d/platform to platform_support.
|
2011-01-19 14:23:26 +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 |
yangws
|
caf518f97d
|
fixed: helloworld win32 release configure build error, CCTMXTiledMap.cpp Access NULL pointer error.
|
2010-12-17 17:20:39 +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 |