521155e9e2
issue #1177 : Added some common methods for CCPoint,CCSize,CCRect. Added MutiTouchTest demo.
2012-04-23 14:30:38 +08:00
160c94dd46
fixed #1179 : popup message box when invoking CCAssert on Android
2012-04-20 15:12:20 +08:00
f3d97bd9b6
fixed #1180 : synchronize CCConfiguration
2012-04-20 11:39:12 +08:00
230b8a386b
issue #1176 : Changed linebreak symbol to UNIX format ('\n'),replaced 'tab'
...
with four spaces. Also,
1. Used macro NS_CC_BEGIN instead of namespace cocos2d {, NS_CC_END instead
of }.
2. Removed some unused files.
3. Renamed the name of some folders, for example,
"test.android"-->"proj.android" .
2012-04-19 14:35:52 +08:00
7d7baf81a2
refactor updated...
2012-04-18 18:43:45 +08:00
3475108953
issue #1056 : Updated Android.mk, fixed a bug in CCImage.h.
2012-03-27 13:48:14 +08:00
aefdb852a2
issue #1056 : synchronise cocos2d-iphone gles2.0 branch, HelloWorld on win32 works ok.
2012-03-14 14:55:17 +08:00
db4d51496e
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into bada
...
Conflicts:
cocos2dx/platform/CCAccelerometer_platform.h
cocos2dx/platform/CCApplication_platform.h
cocos2dx/platform/CCArchOptimalParticleSystem.h
cocos2dx/platform/CCEGLView_platform.h
cocos2dx/platform/CCPlatformConfig.h
cocos2dx/platform/CCSAXParser.h
cocos2dx/platform/CCStdC.h
tests/AppDelegate.cpp
tests/tests/Box2DTestBed/Tests/EdgeShapes.h
2011-09-29 16:03:37 +08:00
3c795073e0
Merge branch 'master' into bada
...
Conflicts:
HelloWorld/iphone/HelloWorld.xcodeproj/project.pbxproj
cocos2dx/CCamera.cpp
cocos2dx/cocoa/NSData.cpp
cocos2dx/label_nodes/CCBitmapFontAtlas.cpp
cocos2dx/platform/CCFileUtils_platform.h
cocos2dx/platform/CCXApplication_platform.h
cocos2dx/platform/CCXCocos2dDefine_platform.h
cocos2dx/platform/CCXEGLView_platform.h
cocos2dx/platform/CCXMath.h
cocos2dx/platform/CCXUIAccelerometer_platform.h
cocos2dx/platform/CCXUIImage_platform.h
cocos2dx/platform/ccxCommon_platform.h
cocos2dx/platform/config_platform.h
cocos2dx/platform/platform.h
cocos2dx/support/base64.cpp
cocos2dx/tileMap_parallax_nodes/CCTMXXMLParser.cpp
tests/AppDelegate.cpp
tests/test.iphone/test.iphone.xcodeproj/project.pbxproj
2011-09-19 13:42:08 +08:00
d57d9ca6f6
modified: cocos2dx/.cproject
...
modified: cocos2dx/CCConfiguration.cpp
modified: cocos2dx/CCConfiguration.h
modified: cocos2dx/actions/CCActionGrid3D.cpp
modified: cocos2dx/platform/Linux/CCAplication_linux.cpp
modified: cocos2dx/platform/Linux/CCAplication_linux.h
modified: cocos2dx/platform/Linux/CCImage_Linux.cpp
modified: mycreate-android-project.sh
new file: post.sh
modified: template/android/mycopy_files.sh
modified: tests/AppDelegate.cpp
new file: tests/test.linux/Res
deleted: tests/test.linux/Res/Hello.png
deleted: tests/test.linux/Res/Images/BoilingFoam.plist
deleted: tests/test.linux/Res/Images/BurstPipe.plist
deleted: tests/test.linux/Res/Images/Comet.plist
deleted: tests/test.linux/Res/Images/Comet.png
deleted: tests/test.linux/Res/Images/ExplodingRing.plist
deleted: tests/test.linux/Res/Images/Flower.plist
deleted: tests/test.linux/Res/Images/Fog.png
deleted: tests/test.linux/Res/Images/Galaxy.plist
deleted: tests/test.linux/Res/Images/HelloWorld.png
deleted: tests/test.linux/Res/Images/Icon.png
deleted: tests/test.linux/Res/Images/LavaFlow.plist
deleted: tests/test.linux/Res/Images/Pea.png
deleted: tests/test.linux/Res/Images/Phoenix.plist
deleted: tests/test.linux/Res/Images/PlanetCute-1024x1024.png
deleted: tests/test.linux/Res/Images/SendScoreButton.png
deleted: tests/test.linux/Res/Images/SendScoreButtonPressed.png
deleted: tests/test.linux/Res/Images/SpinningPeas.plist
deleted: tests/test.linux/Res/Images/SpinningPeas.png
deleted: tests/test.linux/Res/Images/Spiral.plist
deleted: tests/test.linux/Res/Images/SpookyPeas.plist
deleted: tests/test.linux/Res/Images/SpookyPeas.png
deleted: tests/test.linux/Res/Images/Upsidedown.plist
deleted: tests/test.linux/Res/Images/atlastest.png
deleted: tests/test.linux/Res/Images/b1-hd.png
deleted: tests/test.linux/Res/Images/b1.png
deleted: tests/test.linux/Res/Images/b2-hd.png
deleted: tests/test.linux/Res/Images/b2.png
deleted: tests/test.linux/Res/Images/background.png
deleted: tests/test.linux/Res/Images/background1-hd.png
deleted: tests/test.linux/Res/Images/background1.png
deleted: tests/test.linux/Res/Images/background2-hd.png
deleted: tests/test.linux/Res/Images/background2.png
deleted: tests/test.linux/Res/Images/background3-hd.png
deleted: tests/test.linux/Res/Images/background3.png
deleted: tests/test.linux/Res/Images/ball-hd.png
deleted: tests/test.linux/Res/Images/ball.png
deleted: tests/test.linux/Res/Images/bitmapFontTest3.fnt
deleted: tests/test.linux/Res/Images/bitmapFontTest3.png
deleted: tests/test.linux/Res/Images/blocks-hd.png
deleted: tests/test.linux/Res/Images/blocks.png
deleted: tests/test.linux/Res/Images/btn-about-normal.png
deleted: tests/test.linux/Res/Images/btn-about-selected.png
deleted: tests/test.linux/Res/Images/btn-highscores-normal.png
deleted: tests/test.linux/Res/Images/btn-highscores-selected.png
deleted: tests/test.linux/Res/Images/btn-play-normal.png
deleted: tests/test.linux/Res/Images/btn-play-selected.png
deleted: tests/test.linux/Res/Images/bugs/RetinaDisplay.jpg
deleted: tests/test.linux/Res/Images/bugs/bug886.jpg
deleted: tests/test.linux/Res/Images/bugs/bug886.png
deleted: tests/test.linux/Res/Images/bugs/circle-hd.plist
deleted: tests/test.linux/Res/Images/bugs/circle-hd.png
deleted: tests/test.linux/Res/Images/bugs/circle.plist
deleted: tests/test.linux/Res/Images/bugs/circle.png
deleted: tests/test.linux/Res/Images/bugs/corner.png
deleted: tests/test.linux/Res/Images/bugs/edge.png
deleted: tests/test.linux/Res/Images/bugs/fill.png
deleted: tests/test.linux/Res/Images/bugs/picture-hd.png
deleted: tests/test.linux/Res/Images/bugs/picture.png
deleted: tests/test.linux/Res/Images/close-hd.png
deleted: tests/test.linux/Res/Images/close.png
deleted: tests/test.linux/Res/Images/debian.plist
deleted: tests/test.linux/Res/Images/f1-hd.png
deleted: tests/test.linux/Res/Images/f1.png
deleted: tests/test.linux/Res/Images/f2-hd.png
deleted: tests/test.linux/Res/Images/f2.png
deleted: tests/test.linux/Res/Images/fire-grayscale.png
deleted: tests/test.linux/Res/Images/fire.png
deleted: tests/test.linux/Res/Images/fps_images.png
deleted: tests/test.linux/Res/Images/grossini-hd.png
deleted: tests/test.linux/Res/Images/grossini.png
deleted: tests/test.linux/Res/Images/grossini_128x256_mipmap.pvr
deleted: tests/test.linux/Res/Images/grossini_dance_01.png
deleted: tests/test.linux/Res/Images/grossini_dance_02.png
deleted: tests/test.linux/Res/Images/grossini_dance_03.png
deleted: tests/test.linux/Res/Images/grossini_dance_04.png
deleted: tests/test.linux/Res/Images/grossini_dance_05.png
deleted: tests/test.linux/Res/Images/grossini_dance_06.png
deleted: tests/test.linux/Res/Images/grossini_dance_07.png
deleted: tests/test.linux/Res/Images/grossini_dance_08.png
deleted: tests/test.linux/Res/Images/grossini_dance_09.png
deleted: tests/test.linux/Res/Images/grossini_dance_10.png
deleted: tests/test.linux/Res/Images/grossini_dance_11.png
deleted: tests/test.linux/Res/Images/grossini_dance_12.png
deleted: tests/test.linux/Res/Images/grossini_dance_13.png
deleted: tests/test.linux/Res/Images/grossini_dance_14.png
deleted: tests/test.linux/Res/Images/grossini_dance_atlas-hd.png
deleted: tests/test.linux/Res/Images/grossini_dance_atlas-mono.png
deleted: tests/test.linux/Res/Images/grossini_dance_atlas.png
deleted: tests/test.linux/Res/Images/grossini_dance_atlas_nomipmap.png
deleted: tests/test.linux/Res/Images/grossini_pvr_rgba4444.pvr
deleted: tests/test.linux/Res/Images/grossini_pvr_rgba8888.pvr
deleted: tests/test.linux/Res/Images/grossinis_sister1-hd.png
deleted: tests/test.linux/Res/Images/grossinis_sister1-testalpha.png
deleted: tests/test.linux/Res/Images/grossinis_sister1-testalpha.ppng
deleted: tests/test.linux/Res/Images/grossinis_sister1.png
deleted: tests/test.linux/Res/Images/grossinis_sister2-hd.png
deleted: tests/test.linux/Res/Images/grossinis_sister2.png
deleted: tests/test.linux/Res/Images/landscape-1024x1024.png
deleted: tests/test.linux/Res/Images/logo-mipmap.pvr
deleted: tests/test.linux/Res/Images/logo-nomipmap.pvr
deleted: tests/test.linux/Res/Images/menuitemsprite.png
deleted: tests/test.linux/Res/Images/paddle-hd.png
deleted: tests/test.linux/Res/Images/paddle.png
deleted: tests/test.linux/Res/Images/particles-hd.png
deleted: tests/test.linux/Res/Images/particles.png
deleted: tests/test.linux/Res/Images/pattern1.png
deleted: tests/test.linux/Res/Images/piece.png
deleted: tests/test.linux/Res/Images/powered.png
deleted: tests/test.linux/Res/Images/r1-hd.png
deleted: tests/test.linux/Res/Images/r1.png
deleted: tests/test.linux/Res/Images/r2-hd.png
deleted: tests/test.linux/Res/Images/r2.png
deleted: tests/test.linux/Res/Images/snow.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-7.png
deleted: tests/test.linux/Res/Images/spritesheet1.png
deleted: tests/test.linux/Res/Images/stars-grayscale.png
deleted: tests/test.linux/Res/Images/stars.png
deleted: tests/test.linux/Res/Images/stars2-grayscale.png
deleted: tests/test.linux/Res/Images/stars2.png
deleted: tests/test.linux/Res/Images/streak.png
deleted: tests/test.linux/Res/Images/test-rgba1.png
deleted: tests/test.linux/Res/Images/test_blend.png
deleted: tests/test.linux/Res/Images/test_image-bad_encoding.pvr
deleted: tests/test.linux/Res/Images/test_image.jpeg
deleted: tests/test.linux/Res/Images/test_image.png
deleted: tests/test.linux/Res/Images/test_image.pvr
deleted: tests/test.linux/Res/Images/test_image.pvrraw
deleted: tests/test.linux/Res/Images/test_image_a8.pvr
deleted: tests/test.linux/Res/Images/test_image_ai88.pvr
deleted: tests/test.linux/Res/Images/test_image_bgra8888.pvr
deleted: tests/test.linux/Res/Images/test_image_i8.pvr
deleted: tests/test.linux/Res/Images/test_image_pvrtc2bpp.pvr
deleted: tests/test.linux/Res/Images/test_image_pvrtc4bpp.pvr
deleted: tests/test.linux/Res/Images/test_image_rgb565.pvr
deleted: tests/test.linux/Res/Images/test_image_rgba4444.pvr
deleted: tests/test.linux/Res/Images/test_image_rgba4444.pvr.ccz
deleted: tests/test.linux/Res/Images/test_image_rgba4444.pvr.gz
deleted: tests/test.linux/Res/Images/test_image_rgba4444_mipmap.pvr
deleted: tests/test.linux/Res/Images/test_image_rgba5551.pvr
deleted: tests/test.linux/Res/Images/test_image_rgba8888.pvr
deleted: tests/test.linux/Res/Images/texture1024x1024.png
deleted: tests/test.linux/Res/Images/texture2048x2048.png
deleted: tests/test.linux/Res/Images/texture512x512.png
deleted: tests/test.linux/Res/TileMaps/fixed-ortho-test2.png
deleted: tests/test.linux/Res/TileMaps/hexa-test.tmx
deleted: tests/test.linux/Res/TileMaps/hexa-tiles.png
deleted: tests/test.linux/Res/TileMaps/iso-test-bug787.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test-movelayer.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test-objectgroup.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test-vertexz.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test-zorder.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test.png
deleted: tests/test.linux/Res/TileMaps/iso-test.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test1.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test2-uncompressed.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test2.png
deleted: tests/test.linux/Res/TileMaps/iso-test2.tmx
deleted: tests/test.linux/Res/TileMaps/iso.png
deleted: tests/test.linux/Res/TileMaps/levelmap.tga
deleted: tests/test.linux/Res/TileMaps/ortho-objects.tmx
deleted: tests/test.linux/Res/TileMaps/ortho-test1.png
deleted: tests/test.linux/Res/TileMaps/ortho-test1_bw.png
deleted: tests/test.linux/Res/TileMaps/ortho-test2.png
deleted: tests/test.linux/Res/TileMaps/orthogonal-test-movelayer.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test-vertexz.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test-zorder.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test1.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test1.tsx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test2.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test3.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test4-hd.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test4.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test5.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test6-hd.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test6.tmx
deleted: tests/test.linux/Res/TileMaps/test-object-layer.tmx
deleted: tests/test.linux/Res/TileMaps/tiles-hd.png
deleted: tests/test.linux/Res/TileMaps/tiles.png
deleted: tests/test.linux/Res/TileMaps/tmw_desert_spacing-hd.png
deleted: tests/test.linux/Res/TileMaps/tmw_desert_spacing.png
deleted: tests/test.linux/Res/animations/dragon_animation-hd.png
deleted: tests/test.linux/Res/animations/dragon_animation.png
deleted: tests/test.linux/Res/animations/ghosts.plist
deleted: tests/test.linux/Res/animations/ghosts.png
deleted: tests/test.linux/Res/animations/grossini-aliases.plist
deleted: tests/test.linux/Res/animations/grossini-aliases.png
deleted: tests/test.linux/Res/animations/grossini.plist
deleted: tests/test.linux/Res/animations/grossini.plist.xml
deleted: tests/test.linux/Res/animations/grossini.png
deleted: tests/test.linux/Res/animations/grossini.ztp
deleted: tests/test.linux/Res/animations/grossini_blue.plist
deleted: tests/test.linux/Res/animations/grossini_blue.png
deleted: tests/test.linux/Res/animations/grossini_family.plist
deleted: tests/test.linux/Res/animations/grossini_family.png
deleted: tests/test.linux/Res/animations/grossini_gray.plist
deleted: tests/test.linux/Res/animations/grossini_gray.png
deleted: tests/test.linux/Res/app.config.txt
deleted: tests/test.linux/Res/background.mp3
deleted: tests/test.linux/Res/effect1.wav
deleted: tests/test.linux/Res/effect2.ogg
deleted: tests/test.linux/Res/fonts/A Damn Mess.ttf
deleted: tests/test.linux/Res/fonts/Abberancy.ttf
deleted: tests/test.linux/Res/fonts/Abduction.ttf
deleted: tests/test.linux/Res/fonts/Paint Boy.ttf
deleted: tests/test.linux/Res/fonts/Schwarzwald Regular.ttf
deleted: tests/test.linux/Res/fonts/Scissor Cuts.ttf
deleted: tests/test.linux/Res/fonts/arial16.fnt
deleted: tests/test.linux/Res/fonts/arial16.png
deleted: tests/test.linux/Res/fonts/bitmapFontTest.fnt
deleted: tests/test.linux/Res/fonts/bitmapFontTest.png
deleted: tests/test.linux/Res/fonts/bitmapFontTest2.fnt
deleted: tests/test.linux/Res/fonts/bitmapFontTest2.png
deleted: tests/test.linux/Res/fonts/bitmapFontTest3.fnt
deleted: tests/test.linux/Res/fonts/bitmapFontTest3.png
deleted: tests/test.linux/Res/fonts/bitmapFontTest4.fnt
deleted: tests/test.linux/Res/fonts/bitmapFontTest4.png
deleted: tests/test.linux/Res/fonts/bitmapFontTest5.fnt
deleted: tests/test.linux/Res/fonts/bitmapFontTest5.png
deleted: tests/test.linux/Res/fonts/fps_images-hd.png
deleted: tests/test.linux/Res/fonts/fps_images.png
deleted: tests/test.linux/Res/fonts/futura-48.fnt
deleted: tests/test.linux/Res/fonts/futura-48.png
deleted: tests/test.linux/Res/fonts/konqa32-hd.fnt
deleted: tests/test.linux/Res/fonts/konqa32-hd.png
deleted: tests/test.linux/Res/fonts/konqa32.fnt
deleted: tests/test.linux/Res/fonts/konqa32.png
deleted: tests/test.linux/Res/fonts/larabie-16-hd.png
deleted: tests/test.linux/Res/fonts/larabie-16.png
deleted: tests/test.linux/Res/fonts/tuffy_bold_italic-charmap-hd.png
deleted: tests/test.linux/Res/fonts/tuffy_bold_italic-charmap.png
deleted: tests/test.linux/Res/music.mid
deleted: tests/test.linux/Res/zwoptex/grossini-generic.plist
deleted: tests/test.linux/Res/zwoptex/grossini-generic.png
deleted: tests/test.linux/Res/zwoptex/grossini.plist
deleted: tests/test.linux/Res/zwoptex/grossini.png
CocosDenshion/AndroidDebug/
CocosDenshion/AndroidRelease/
HelloCocos2dx/AndroidDebug/2
HelloCocos2dx/android/assets
HelloCocos2dx/postCompiled.sh
installLinuxLib.sh
2011-08-23 11:28:04 +08:00
3e54282e04
fixed #502 modify CCConfiguration to singleton mode
2011-06-15 11:48:00 +08:00
1591c7edc8
fixed #512 fix warnings in /Wall flag
2011-06-10 17:51:37 +08:00
67eb87abfe
To fix the crash when the gles version is too low
2011-06-08 10:02:07 +08:00
7d52161804
fixed #441 : Initialize pointer in contruction & detect pointer value in destruction
2011-04-01 16:06:53 +08:00
81fa070125
fixed #418 , add copyright of original authors, merge Bin's commit
2011-03-19 14:45:51 +08:00
abd2725ed4
issue #148 , add copyright
2011-03-19 10:34:26 +08:00
59b65373e7
[bug fix] CCConfiguration::checkForGLExtension(const string&) sometimes crashes. Define it!
2011-03-16 20:53:08 +08:00
53753b65b5
merge bada platform
2010-12-15 18:05:02 +08:00
820c2f0714
issue #211 cocos2d-x back to cocos2dx
2010-11-18 15:01:42 +00:00
b4328354af
issue #211 cocos2dx -> cocos2d-x
2010-11-18 14:07:17 +00:00
040f68160a
issue #176 add test code in test_win32, which same with test_uphone .
2010-10-12 09:15:44 +00:00
5fd1bf85b6
issue #121 , return bool in function init****
2010-09-04 04:02:52 +00:00
260125af50
issue #6 : fixed a compile error
2010-08-06 06:29:57 +00:00
410ca0f269
issue #6 : fixed a compile error
2010-08-06 06:04:49 +00:00
14427a24d7
2010-08-04 07:46:12 +00:00
e9f36ce744
fixed #25
...
添加一个简单的CCSprite单元测试，同时修正几个小的bug
2010-08-03 04:07:32 +00:00
4cd8860827
issue #6 : update CCConfiguration.cpp
2010-07-19 01:57:51 +00:00
d2522eb541
issue #6 : add CCDirector.h and update CCConfiguration
2010-07-12 09:03:27 +00:00
89dcd544fb
fixed #9
2010-07-08 03:58:33 +00:00
97d6aaf296
issue #2 , add link to website at each file header
2010-07-06 12:55:05 +00:00
924017afdd
issue #6
2010-07-06 12:40:11 +00:00
c04225ab4b
issue #6 : update CCConfiguration.cpp, CCDrawingPrimitives.cpp
2010-07-06 09:54:36 +00:00
dafe99ca70
issue #2 : move to folder cocos2dx
2010-07-06 08:28:41 +00:00
James Chen