root
|
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 |
|
laschweinski
|
60e794fcc8
|
add files include test and cocosDenshion
|
2011-08-19 14:43:19 +08:00 |
|
laschweinski
|
871abb4a32
|
Merge branch 'master' into LinuxPort
|
2011-08-19 13:20:23 +08:00 |
|
laschweinski
|
ad305648c0
|
modified: cocos2dx/misc_nodes/CCRenderTexture.cpp
modified: cocos2dx/platform/CCGL.h
modified: cocos2dx/platform/CCImage.cpp
CocosDenshion/Linux/
CocosDenshion/third_party/
HelloWorld/Linux/
cocos2dx/.settings/
cocos2dx/platform/Linux/
tests/test.linux/
|
2011-08-19 13:07:50 +08:00 |
|
minggo
|
5087f6ddb2
|
[android] fixed #683: remove unneeded includes
|
2011-08-18 16:19:36 +08:00 |
|
minggo
|
b4ab3f6b75
|
[android] fixed #683: remove unneeded includes
|
2011-08-18 16:18:26 +08:00 |
|
minggo
|
1640e48d5a
|
[android] fixed #683: let getCurrentLanguageJNI() & getPackageNameJNI() return valid pointer
|
2011-08-18 16:09:49 +08:00 |
|
Phenix Yu
|
ed42bc388c
|
fixed lua memory leak
|
2011-08-18 12:26:33 +08:00 |
|
moadib
|
a8d87a9976
|
Non-trivial arguments passed by reference now.
Removed unnecessary cocos2d:: prefix inside namespace.
|
2011-08-17 17:26:26 +04:00 |
|
Walzer
|
4244fdb62b
|
fixed #643, swap accelerometer input x/y according to the orientation (on ios devices)
|
2011-08-17 20:11:33 +08:00 |
|
laschweinski
|
5d20ebe24b
|
modified: HelloWorld/AppDelegate.cpp
modified: HelloWorld/HelloWorldScene.cpp
modified: cocos2dx/cocoa/CCNS.cpp
modified: cocos2dx/include/CCActionInstant.h
modified: cocos2dx/misc_nodes/CCRenderTexture.cpp
modified: cocos2dx/particle_nodes/CCParticleSystemQuad.cpp
modified: cocos2dx/platform/CCAccelerometer_platform.h
modified: cocos2dx/platform/CCApplication_platform.h
modified: cocos2dx/platform/CCArchOptimalParticleSystem.h
modified: cocos2dx/platform/CCCommon.cpp
modified: cocos2dx/platform/CCEGLView_platform.h
modified: cocos2dx/platform/CCGL.cpp
modified: cocos2dx/platform/CCGL.h
modified: cocos2dx/platform/CCImage.cpp
modified: cocos2dx/platform/CCPlatformConfig.h
modified: cocos2dx/platform/CCPlatformMacros.h
modified: cocos2dx/platform/CCSAXParser.h
modified: cocos2dx/platform/CCStdC.h
modified: cocos2dx/support/CCUserDefault.cpp
modified: cocos2dx/support/data_support/ccCArray.h
modified: tests/AppDelegate.cpp
deleted: tests/Res/music.mid
modified: tests/tests/controller.cpp
modified: tests/tests/tests.h
HelloWorld/Linux/
cocos2dx/.settings/
cocos2dx/platform/Linux/
tests/test.linux/
|
2011-08-17 11:36:54 +08:00 |
|
Walzer
|
6d3941ebc1
|
Merge pull request #464 from leon-li/master
fix some warnings under xcode 4.0 llvm clang
|
2011-08-10 19:32:16 -07:00 |
|
Leon
|
771e2349c5
|
fix some warnings under xcode 4.0 llvm compiler
|
2011-08-10 22:39:02 +08:00 |
|
Walzer
|
6eba0b658f
|
fixed #651, add CCFileUtils to doxygen api document
|
2011-08-08 23:05:47 +08:00 |
|
minggo
|
7a0e8b4a0a
|
Merge pull request #457 from minggo/iss642
fixed #642: CCRenderTexture::saveBuffer() works ok on iOS
|
2011-08-07 20:08:16 -07:00 |
|
minggo
|
41ea2e98a1
|
fixed #642: CCRenderTexture::saveBuffer() works ok on iOS
|
2011-08-08 11:01:47 +08:00 |
|
liswei
|
70e19d7245
|
fixed #347 fixed 'AddFontResource' path error!
|
2011-08-08 10:32:21 +08:00 |
|
minggo
|
016c463659
|
Merge pull request #449 from flyingpacer/savecrash
fixed #657 Latest git version was broken
|
2011-08-04 02:39:33 -07:00 |
|
minggo
|
76da5f2e84
|
fixed #656: remove unneeded methods & android can let user set resource path
|
2011-08-04 17:19:58 +08:00 |
|
RongHong
|
4745b85af9
|
fixed #657 Latest git version was broken
|
2011-08-04 16:37:43 +08:00 |
|
liswei
|
bbc4bbeb6c
|
issue #347 lost [] in 'delete array'
|
2011-08-04 13:47:21 +08:00 |
|
liswei
|
897dd54b12
|
fixed #347 add ttf support in win32
|
2011-08-04 11:23:59 +08:00 |
|
minggo
|
78642a39ac
|
[android] fixed #652: refactor JniHelper::jstringtochar()
|
2011-08-03 10:44:39 +08:00 |
|
liswei
|
188b168d30
|
issue #347 add ttf support in wophone
|
2011-08-02 18:02:27 +08:00 |
|
minggo
|
895d4992e4
|
issue #347: FontTest runs ok on iOS
|
2011-08-01 18:22:47 +08:00 |
|
minggo
|
a3b4043755
|
issue #347: add tests for FontTest & it works ok on android
|
2011-07-29 15:57:27 +08:00 |
|
minggo
|
cfb3765035
|
issue #347: iOS support font defined by ttf file
|
2011-07-29 10:15:10 +08:00 |
|
minggo
|
648117ebb5
|
issue #347: android can use ttf file
|
2011-07-28 17:20:37 +08:00 |
|
RongHong
|
0f94423b9b
|
fixed #630 To realize the buffer-saving function in CCRenderTexture
|
2011-07-28 10:52:09 +08:00 |
|
RongHong
|
a253909030
|
fixed #630 To realize the buffer-saving function in CCRenderTexture
|
2011-07-27 16:55:04 +08:00 |
|
minggo
|
b308effdc5
|
[android] fixed #631: Send \n to engine when user input nothing
|
2011-07-26 11:41:28 +08:00 |
|
minggo
|
ab4ef0f180
|
Merge https://github.com/cocos2d/cocos2d-x into iss623
|
2011-07-25 14:13:20 +08:00 |
|
minggo
|
b105b6005e
|
[android] fixed #623: refactor Cocos2dJni.cpp
|
2011-07-25 14:12:30 +08:00 |
|
Walzer
|
b43d233c08
|
issue #629, pass eImgFmt param to initWithImageData. But still haven't add test case for this.
|
2011-07-24 09:04:08 +08:00 |
|
minggo
|
62ea6a2d46
|
issue #623: create JniHelper and use it somewhere
|
2011-07-22 18:14:29 +08:00 |
|
minggo
|
0c495628ea
|
Merge pull request #405 from minggo/iss618
invoke java code(System.exit()) to finish programe
|
2011-07-19 02:20:36 -07:00 |
|
Leon
|
d2d02e0c52
|
fix compile error with android-ndk-r6
|
2011-07-19 16:54:42 +08:00 |
|
minggo
|
640d811809
|
[android] fixed #618: invoke java code(System.exit()) to finish programe
|
2011-07-19 16:01:22 +08:00 |
|
Walzer
|
768bfa9a9b
|
issue #536, add CCTexturePVR, update from 0.99.5 to 1.0.0, remove _POWERVR_SUPPORT marco, use CC_SUPPORT_PVRTC instead, the plan is to support PVR format on all platforms. Compile successfully on ios & android, but haven't compile on other paltforms. Test case haven't written yet.
|
2011-07-19 15:22:13 +08:00 |
|
Walzer
|
bc44855091
|
issue #536, integrate the CCTexturePVR to project, update from 0.99.5 to 1.0.0, compile successfully on ios & android. Haven't test on other platforms yet.
|
2011-07-19 15:14:59 +08:00 |
|
minggo
|
9bbab7897a
|
fixed #615: CCLog may crash when invoke lua function
|
2011-07-14 17:52:56 +08:00 |
|
minggo
|
d48c3fdfb1
|
upgrade to 1.0.0-final 07-11
|
2011-07-12 11:20:41 +08:00 |
|
Max Aksenov
|
90564fac49
|
[airplay] fix : incorrect calculation of the bit depth
|
2011-07-07 08:40:29 -07:00 |
|
Walzer
|
94ac50bad0
|
fixed #582, use libpng instead of CIwImage in CCImage_airplay.cpp. Thanks to Max Akensov's contribution.
|
2011-07-07 14:45:59 +08:00 |
|
minggo
|
7603665165
|
fix merging confict of CCDirector.cpp
|
2011-07-05 14:54:41 +08:00 |
|
natural-law
|
7107c6612b
|
fixed #563, Upgrade folder support to rc3.
|
2011-07-05 12:05:19 +08:00 |
|
minggo
|
ad3bad964f
|
fixed #567
|
2011-07-05 11:36:46 +08:00 |
|
minggo
|
2a39fe0aa4
|
Merge pull request #335 from minggo/iss547
[Android] fixed #547: line wrap OK on Android
|
2011-06-29 19:46:25 -07:00 |
|
minggo
|
6c47f53b13
|
[Android] fixed #547: line wrap OK on Android
|
2011-06-29 15:45:30 +08:00 |
|
minggo
|
bb90fbfb1e
|
[iOS] fixed #546: CCLabelTTF:initWithString() will crash when the height is 0
|
2011-06-28 15:24:58 +08:00 |
|
yangws
|
59f37ddb5d
|
fixed #526 Wrap glScissor in CCEGLVIew::setScissorInPoints.
|
2011-06-27 10:55:45 +08:00 |
|
minggo
|
e8fda66ccc
|
Merge https://github.com/cocos2d/cocos2d-x
|
2011-06-24 13:55:52 +08:00 |
|
minggo
|
8440d6a267
|
[android] fixed #364: show string correct & line break ok
|
2011-06-24 13:55:00 +08:00 |
|
liswei
|
0c5f28fc11
|
fixed #539 call unzOpen, then may not call unzClose(WVGA)
|
2011-06-24 09:29:55 +08:00 |
|
liswei
|
4793713daa
|
fixed #539 call unzOpen, then may not call unzClose(WVGA)
|
2011-06-23 18:24:32 +08:00 |
|
Walzer
|
156dfa8859
|
Merge remote branch 'origin/master'
|
2011-06-23 16:31:52 +08:00 |
|
Walzer
|
9e74b1f50d
|
fixed #534, use #if (CC_TARGET_PLATFORM != CC_PLATFORM_IOS) - #endif to wrap the useless codes on ios.
|
2011-06-23 16:31:04 +08:00 |
|
minggo
|
53eafa77ff
|
Merge https://github.com/cocos2d/cocos2d-x into iss364
|
2011-06-23 14:45:25 +08:00 |
|
minggo
|
10cdd7f798
|
[android] fixed #364: line break ok on Android
|
2011-06-23 14:44:20 +08:00 |
|
yangws
|
2c22cf0621
|
fixed #537 update to version 2.8 r1 (2.08.28.0634)
|
2011-06-22 17:55:03 +08:00 |
|
minggo
|
1122a7c7d0
|
[android] use Android widget Bitmap other than skia to drawstring
|
2011-06-22 16:58:50 +08:00 |
|
Walzer
|
175e9394bc
|
Merge https://github.com/minggo/cocos2d-x into lua
|
2011-06-21 15:22:00 +08:00 |
|
minggo
|
d72d8a52f4
|
Merge https://github.com/cocos2d/cocos2d-x
|
2011-06-21 13:53:04 +08:00 |
|
natural-law
|
49a4481473
|
fixed #323, Remove the #include <map> in CCApplication_win32.cpp.
|
2011-06-21 12:01:59 +08:00 |
|
natural-law
|
960ef65f53
|
fixed #323, Modify the implement of getCurrentLanguage method on win32.
|
2011-06-21 11:58:10 +08:00 |
|
minggo
|
022e2b9998
|
issue #528: refactor ok on win32
|
2011-06-20 17:31:38 +08:00 |
|
natural-law
|
fae0498b3c
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2011-06-17 10:49:25 +08:00 |
|
natural-law
|
cfee246959
|
fixed #323, Add an interface to get the current language.
|
2011-06-17 10:49:02 +08:00 |
|
yangws
|
19eaefab72
|
CCImage_win32 hasn't release font resource in Destructor.
|
2011-06-16 10:55:57 +08:00 |
|
minggo
|
738f0b3426
|
Merge https://github.com/cocos2d/cocos2d-x into lua
|
2011-06-15 15:32:09 +08:00 |
|
natural-law
|
5d70774b4f
|
fixed #524, Parse the special format of plist files on ios & airplay.
|
2011-06-14 16:15:20 +08:00 |
|
natural-law
|
214e86a5b6
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Conflicts:
cocos2dx/platform/CCFileUtils.cpp
|
2011-06-14 15:05:52 +08:00 |
|
natural-law
|
489fb7824b
|
fixed #524, Parse the special format of plist files.
|
2011-06-14 14:53:00 +08:00 |
|
minggo
|
8003de7468
|
update to latest code and merge
|
2011-06-14 11:01:38 +08:00 |
|
liswei
|
1591c7edc8
|
fixed #512 fix warnings in /Wall flag
|
2011-06-10 17:51:37 +08:00 |
|
minggo
|
a8b6b850de
|
use precompile macro to cantrol if enable lua support
|
2011-06-01 17:51:08 +08:00 |
|
minggo
|
697368cf20
|
support lua
|
2011-05-31 14:04:14 +08:00 |
|
yangws
|
7e2d1d5c48
|
fixed #490 Text input on android use a different way, TextInputTest OK now.
|
2011-05-30 16:36:12 +08:00 |
|
yangws
|
ec23d7ed55
|
fixed #508 Dynamic switch retina display support.
|
2011-05-23 16:21:31 +08:00 |
|
unknown
|
97142d4a59
|
Use GetCurrentDirectory instead GetModuleName in CCFileUitls_win32.cpp and compile OK on vs2010
|
2011-05-19 21:11:29 +08:00 |
|
unknown
|
b940676cab
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 489
|
2011-05-19 20:55:39 +08:00 |
|
minggo
|
ff1017d86f
|
Merge pull request #276 from minggo/iss496
[android] fixed #496 fixed #497
|
2011-05-18 23:18:37 -07:00 |
|
minggo
|
073260e0a9
|
[android] fixed #496 fixed #497: tests and HelloWorld work ok on Android3.0
|
2011-05-19 11:26:57 +08:00 |
|
Walzer
|
2dd11490ad
|
Merge pull request #274 from yangws/master
Fixed some bugs on wophone and modify CClog output utf-8 string on win32 and wophone emulator.
|
2011-05-18 18:51:38 -07:00 |
|
minggo
|
822016e375
|
[android] fixed #495: fix a memory leak
|
2011-05-18 13:56:35 +08:00 |
|
yangws
|
8e07ab7dc9
|
Modify CCLog out utf-8 string on win32 and wophone emulator.
|
2011-05-18 11:25:54 +08:00 |
|
yangws
|
5173738f37
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2011-05-18 11:08:44 +08:00 |
|
yangws
|
7a6a891242
|
fixed bugs: the image stoped when switch app fore/background several times. The background music not stoped when app enter background some time.
|
2011-05-18 11:08:18 +08:00 |
|
natural-law
|
95a46bd5f8
|
[ios] fixed #493, The return value of CCFileUtils::getWriteablePath() should be end with '/'.
|
2011-05-17 10:44:56 +08:00 |
|
natural-law
|
0466166935
|
[win32] fixed #492, Consider the path separated by '\' in function CCFileUtils::fullPathFromRelativeFile().
|
2011-05-16 17:13:15 +08:00 |
|
yangws
|
aba77f4cae
|
issue #489 modified for vs2008.
|
2011-05-13 14:13:30 +08:00 |
|
Walzer
|
1340bbf842
|
[android] fix a compilation error in CCFileUtils_android.cpp, getWritablePath() method
|
2011-05-12 21:12:15 +08:00 |
|
minggo
|
91bc9a3f7a
|
[android] fixed #488: fix memory leak
|
2011-05-12 18:55:32 +08:00 |
|
minggo
|
d8f3b0c25b
|
[android] CCUserDefault works ok on android2.2
|
2011-05-12 18:32:13 +08:00 |
|
Walzer
|
249724f8d8
|
[ios] issue #371, fix the error when invoke CCImage::initWithString with null string ""
|
2011-05-12 08:24:29 +08:00 |
|
yangws
|
8fa1b97149
|
fixed a bug by bin: when reopen the keyboard can't delete the text which inputed before.
|
2011-05-10 18:08:07 +08:00 |
|
yangws
|
21c8628e68
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input2
Conflicts:
cocos2dx/platform/wophone/CCApplication_wophone.h
tests/tests/tests.h
|
2011-05-10 16:09:26 +08:00 |
|
yangws
|
167f4c206b
|
issue #478 KeyBoard can run on wophone. but too slow.
|
2011-05-10 15:48:26 +08:00 |
|
yangws
|
fc01bada97
|
input from sencond twindow named input view.
ps: TWindow doesn't support switch.
ps2: TWindow as memory window doesn't support rotate.
|
2011-05-09 16:59:26 +08:00 |
|
natural-law
|
dd309fe862
|
[wophone] fixed #487, Implement the function CCFiltUtils::getWriteablePath() on wophone.
|
2011-05-09 10:03:43 +08:00 |
|
minggo
|
e27452dd8a
|
Merge pull request #253 from minggo/iss455
Implement CCUserDefault
|
2011-05-08 18:37:33 -07:00 |
|
Walzer
|
3d17a650bf
|
Merge pull request #254 from natural-law/master
[wophone] Use Sys_SchedYield to control the FPS, instead of Sys_Sleep.
|
2011-05-06 03:04:45 -07:00 |
|
natural-law
|
42b3ad676e
|
[wophone] Use Sys_SchedYield to control the FPS, instead of Sys_Sleep.
|
2011-05-06 18:00:43 +08:00 |
|
minggo
|
e14040730b
|
fixed #455: release CCUserDefault at end & fix a bug when the user delete CCUserDefault carelessly
|
2011-05-06 17:46:19 +08:00 |
|
yangws
|
3f8293dffb
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input
Conflicts:
HelloWorld/wophone/HelloWorld.wophone.vcproj
tests/test.wophone/copy_res.bat
|
2011-05-06 17:45:39 +08:00 |
|
minggo
|
6c69107f33
|
fixed #455: CCUserDefault works ok on iOS
|
2011-05-06 17:01:41 +08:00 |
|
yangws
|
ced029257f
|
temp commit
|
2011-05-06 16:38:09 +08:00 |
|
minggo
|
7e40957e04
|
Merge https://github.com/cocos2d/cocos2d-x into iss455
|
2011-05-06 16:29:44 +08:00 |
|
minggo
|
80f739942d
|
issue #455 : compile CCUserDefault on iOS
|
2011-05-06 16:29:35 +08:00 |
|
minggo
|
33648a9e9b
|
issue #455: add compile CCUserDefault to WoPhone, but not test, because the path will change later
|
2011-05-06 16:14:07 +08:00 |
|
Walzer
|
857141eef3
|
[ios] issue #371, compatible with ios 4.1 4.2 4.3. switching different input methods will not cause crash
|
2011-05-06 15:43:36 +08:00 |
|
minggo
|
2c0bd49513
|
issue #455: CCUserDefault ok on win32 & Android
|
2011-05-06 15:31:51 +08:00 |
|
natural-law
|
846b529e49
|
[wophone] fixed #482, Modify the resource data path for the new WoPhone-SDK.
|
2011-05-06 10:13:12 +08:00 |
|
yangws
|
0fe61642f6
|
issue #478 text input ok.
|
2011-05-05 18:17:50 +08:00 |
|
Walzer
|
dcdad9a81a
|
Merge pull request #250 from yangws/481
fixed #481 DisableKeyLock and DisableBackLightAutoTurnOff when BackLightTurnOn.
|
2011-05-05 00:53:10 -07:00 |
|
yangws
|
6eb24cafee
|
fixed #481 remove KeyLock control code.
|
2011-05-05 14:00:36 +08:00 |
|
yangws
|
7c5a6d779c
|
fixed #481 DisableKeyLock and DisableBackLightAutoTurnOff when BackLightTurnOn.
|
2011-05-05 11:51:13 +08:00 |
|
Walzer
|
b61c019b2c
|
[android] fixed #475, CCImage::initWithString return true even if the bitmap hasn't been initialized. Thanks to Isaac Ashdown's fix on the forum.
|
2011-04-28 15:14:59 +08:00 |
|
yangws
|
d73699aabb
|
[ios] tests add RootViewController for rotate with ui object.
|
2011-04-28 14:19:12 +08:00 |
|
yangws
|
f8dc140840
|
change CCLabelTTF accept string from gb2312 to utf8.
|
2011-04-27 18:19:47 +08:00 |
|
yangws
|
e895d9d073
|
TextInputTest compile ok on android and merge last master code.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input
Conflicts:
HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java
HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxRenderer.java
HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj
cocos2dx/platform/android/Cocos2dJni.cpp
tests/test.android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java
tests/test.android/src/org/cocos2dx/lib/Cocos2dxRenderer.java
tests/test.ios/test.xcodeproj/project.pbxproj
tests/test.win32/test.win32.vcproj
|
2011-04-26 18:04:07 +08:00 |
|
yangws
|
9b08f4add6
|
keyboard notification message on ios and TextFieldTTF test code OK.
|
2011-04-26 16:33:20 +08:00 |
|
Walzer
|
b3f76a81a4
|
[win32] issue #471, CCFileUtils::fullPathFromRelativeFile mustn't calculate realtive path twice
|
2011-04-26 14:53:57 +08:00 |
|
minggo
|
99733c602d
|
[android] fixed #462: call applicationDidEnterBackground and applicationWillEnterBackground on android
|
2011-04-25 15:13:24 +08:00 |
|
Walzer
|
38ee881876
|
Merge branch 'master' of https://github.com/natural-law/cocos2d-x
|
2011-04-25 09:52:13 +08:00 |
|
natural-law
|
7337119501
|
issue #466, Modify the interface to fit the refactor of CCFileUtils.
|
2011-04-25 09:40:10 +08:00 |
|
moadib
|
85afa22195
|
[android] fixed typo in CCEGLView method name
|
2011-04-24 18:52:21 +04:00 |
|
Walzer
|
386005ef79
|
issue #466, Bin forget to modify CCFileUtils_ios.mm to fit the refactor, which cause compilation error.
|
2011-04-24 15:44:00 +08:00 |
|
yangws
|
252f3efe1a
|
CCIMEDispatcher works on android.
|
2011-04-22 16:33:41 +08:00 |
|
natural-law
|
e2ce006db2
|
fixed #466. [wophone] Refactor the CCFileUtils for the new packing approach.
|
2011-04-22 10:57:46 +08:00 |
|
minggo
|
8458058f26
|
Merge branch 'iss393' of https://github.com/minggo/cocos2d-x into minggo-iss393
|
2011-04-20 17:19:03 +08:00 |
|
minggo
|
fd45cbea77
|
[android] fixed #393: use new version of libxml2, it supports xpath and xslt
|
2011-04-20 17:08:50 +08:00 |
|
minggo
|
7b51fa8e9b
|
[android] fixed #393: use new version of libxml2, it supports xpath and xslt
|
2011-04-20 16:11:18 +08:00 |
|
minggo
|
e5441a4fc2
|
fixed #450: can set default pixel format other than RGBA8888
|
2011-04-20 15:34:33 +08:00 |
|
yangws
|
85027c40ca
|
CCIMEDispatcher works on ios.
|
2011-04-19 18:11:57 +08:00 |
|
minggo
|
0db048de73
|
Merge branch 'issue_456' of https://github.com/minggo/cocos2d-x into minggo-issue_456
|
2011-04-19 11:36:00 +08:00 |
|
minggo
|
c38af3c28d
|
fixed #456: integrate libcurl into cocos2dx
|
2011-04-19 10:57:44 +08:00 |
|
yangws
|
d11bd85d00
|
CCTextFieldTTF works on win32.
|
2011-04-19 09:32:33 +08:00 |
|
minggo
|
a4e9f1c18d
|
libcurl works ok on ios
|
2011-04-18 14:12:41 +08:00 |
|
walzer
|
eb4b31e4da
|
update config file from doxygen 1.7.2 to 1.7.4. add simple brief for CCMessageBox
|
2011-04-16 15:21:50 +08:00 |
|
minggo
|
37e7fad0d3
|
issue #456: add curl test & libcurl.so works ok on android
|
2011-04-15 17:15:05 +08:00 |
|
minggo
|
3d6fd051ab
|
issue #449: refactor CCTransition
|
2011-04-11 16:09:14 +08:00 |
|
minggo
|
37bb33d9e5
|
fixed #452: refactor CCDirector CCNode CCGrid
|
2011-04-11 15:10:09 +08:00 |
|
natural-law
|
d4dbedca4d
|
fixed #451,remove the code of support mac platform.
1. Remove the EventDispatcher.
2. Refactor CCLayer, CCMenu and CCParticleSystemPoint.
3. Modify the project file of win32, wophone and android.
|
2011-04-11 11:24:10 +08:00 |
|
yangws
|
b1ab937ec3
|
fix MouseEvent bug
|
2011-04-07 11:05:44 +08:00 |
|
Max Aksenov
|
b33aeac164
|
[airplay] renamed "CCEGLView::setFrameWitdAndHeight" to "CCEGLView::setFrameWidthAndHeight".
reformatted CCEGLView::setMotionTouch for unification with other functions of "setTouche".
|
2011-04-04 01:58:07 -07:00 |
|
Max Aksenov
|
6927dae38f
|
[airplay] renamed "CCEGLView::setFrameWitdAndHeight" to "CCEGLView::setFrameWidthAndHeight".
reformatted CCEGLView::setMotionTouch for unification with other functions of "setTouche".
|
2011-04-04 01:56:15 -07:00 |
|
walzer
|
de81120b6a
|
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
|
2011-04-03 09:51:01 +08:00 |
|
walzer
|
28fbfb04dc
|
Merge branch 'iss349' of https://github.com/natural-law/cocos2d-x into natural-law-iss349
|
2011-04-03 09:30:26 +08:00 |
|
minggo
|
0aa8eb2892
|
fixed #350: transitionfade flickers on both android and iphone
|
2011-04-02 16:16:19 +08:00 |
|
natural-law
|
72f11cb421
|
[ios]fixed #349,Modify the method of parse *.plist files in order to deal with *.plist files in binary format.
|
2011-04-02 11:32:15 +08:00 |
|
minggo
|
39b60291ed
|
Merge branch 'issue_441' of https://github.com/minggo/cocos2d-x into minggo-issue_441
|
2011-04-01 17:34:17 +08:00 |
|
minggo
|
8fbfc2773a
|
Merge branch 'issue_440' of https://github.com/minggo/cocos2d-x into minggo-issue_440
|
2011-04-01 17:19:30 +08:00 |
|
minggo
|
7d52161804
|
fixed #441: Initialize pointer in contruction & detect pointer value in destruction
|
2011-04-01 16:06:53 +08:00 |
|
Marat Yakupov
|
ac84278dae
|
[android] #443 implemented CCKeypadDelegate on android
|
2011-04-01 11:27:06 +04:00 |
|
minggo
|
2c539a1df5
|
[android] fixed #440: CCMessage works ok on android
|
2011-04-01 11:35:26 +08:00 |
|
yangws
|
63801db3f6
|
fixed #440 Commit missing file last commit.
|
2011-03-31 11:23:58 +08:00 |
|
yangws
|
20539d4b89
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 439
|
2011-03-31 10:51:00 +08:00 |
|
yangws
|
f8a5a4ecf3
|
CCMessageBox works on ios.
|
2011-03-31 10:36:53 +08:00 |
|
walzer
|
70eb85e6df
|
Merge branch 'yangws-439'
|
2011-03-30 11:47:10 +08:00 |
|
yangws
|
7e81c56231
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 439
Conflicts:
cocos2dx/platform/ios/CCFileUtils_ios.mm
|
2011-03-30 11:05:23 +08:00 |
|
walzer
|
35d94eb3a5
|
Merge branch 'iss411' of https://github.com/natural-law/cocos2d-x into natural-law-iss411
|
2011-03-30 10:44:34 +08:00 |
|
yangws
|
ba68a5b966
|
fixed #439 test OK.
|
2011-03-29 17:32:52 +08:00 |
|
natural-law
|
87ea85a986
|
fixed #411,support .plist format generated by zwoptex in the last version.
|
2011-03-29 16:59:50 +08:00 |
|
yangws
|
48d57b88e2
|
issue #439 ios and airplay midified.
|
2011-03-29 15:59:37 +08:00 |
|
yangws
|
1887417472
|
issue #439 ios and airplay midified.
|
2011-03-29 15:56:55 +08:00 |
|
walzer
|
5811fb7c76
|
Merge branch 'issue_422' of https://github.com/minggo/cocos2d-x into minggo-issue_422
|
2011-03-29 15:50:28 +08:00 |
|
yangws
|
6c5cf577b7
|
issue #439 wophone and android modified.
|
2011-03-29 15:05:53 +08:00 |
|
minggo
|
c686047f83
|
[android] fixed #422: multitouch for android
|
2011-03-29 14:20:05 +08:00 |
|
natural-law
|
334786c633
|
fixed #391,Add implement of CCNS on airplay.
|
2011-03-29 13:59:10 +08:00 |
|
natural-law
|
edc33952be
|
fixed #391,Add support on ios and airplay.
|
2011-03-29 12:50:25 +08:00 |
|
natural-law
|
5f7357bf09
|
fixed #391,CCSpriteFrameCache support *.plist files with format value is not 0.
|
2011-03-29 11:56:14 +08:00 |
|
yangws
|
041953151a
|
issue #439 CCFileData and imageWithImageFile modified on win32.
|
2011-03-29 11:41:44 +08:00 |
|
natural-law
|
1991a65b0b
|
Merge branch 'master' into iss391
Conflicts:
HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj
cocos2dx/proj.win32/cocos2d-win32.vcproj
cocos2dx/proj.wophone/Makefile.ARM
cocos2dx/proj.wophone/cocos2d-wophone.vcproj
template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj
template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj
template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
tests/test.ios/test.xcodeproj/project.pbxproj
|
2011-03-29 10:20:57 +08:00 |
|
walzer
|
6cc09aa4dc
|
Merge branch '396' of https://github.com/yangws/cocos2d-x into yangws-396
|
2011-03-28 21:08:56 +08:00 |
|
yangws
|
6b66affbab
|
fixed #396 wophone modified.
|
2011-03-28 17:20:39 +08:00 |
|
yangws
|
a9f85a2daa
|
issue #396 airplay modified.
|
2011-03-28 17:10:05 +08:00 |
|
natural-law
|
e38d3a2277
|
Merge branch 'master' into iss434
Conflicts:
cocos2dx/platform/airplay/CCFileUtils_airplay.h
template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj
template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj
template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
|
2011-03-28 17:06:32 +08:00 |
|
natural-law
|
ed2566e201
|
issue #434,Refactor class CCFileUtils on platform airplay.
|
2011-03-28 16:27:26 +08:00 |
|
yangws
|
a5040e0ccb
|
issue 396 ios modified.
|
2011-03-28 13:41:14 +08:00 |
|
yangws
|
814b66b089
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 396
|
2011-03-28 11:11:50 +08:00 |
|
yangws
|
dceff2d179
|
issue #396 android modified.
|
2011-03-28 11:09:49 +08:00 |
|
yangws
|
4b86cec4be
|
issue #396 win32 modifyed.
|
2011-03-28 10:44:14 +08:00 |
|
walzer
|
2f573a784e
|
fixed #435, CocosDenshion crashes at foreground/background switching
|
2011-03-27 22:17:18 +08:00 |
|
natural-law
|
cee82fe9fa
|
issue #434,refactor class CCFileUtils on android and ios.
|
2011-03-26 17:24:37 +08:00 |
|
walzer
|
f568ad8487
|
issue #379, fix a bug caused by airplay port integration, which makes android port unable to load resources by zlib.
|
2011-03-26 14:09:42 +08:00 |
|
natural-law
|
28a940ab57
|
issue #434,refactor class CCFileUtils on win32 and wophone.
|
2011-03-26 13:52:33 +08:00 |
|
yangws
|
2015e468ca
|
fixed #417 When mouse pressed， capture it in EGLView.
|
2011-03-26 11:34:18 +08:00 |
|
walzer
|
95d672a858
|
add copyright & author name for airplay port
|
2011-03-25 15:30:10 +08:00 |
|
walzer
|
9b8bc8373b
|
fixed #431, manually merge the WenSheng's work
|
2011-03-25 14:20:53 +08:00 |
|
walzer
|
fa5e71916b
|
issue #431, manually merge WenSheng's work
|
2011-03-25 14:16:58 +08:00 |
|
walzer
|
ff91c91ea9
|
issue #427 android HelloWorld ok
|
2011-03-25 12:01:56 +08:00 |
|
walzer
|
799fb0994f
|
issue #427, airplay port ok
|
2011-03-24 18:17:35 +08:00 |
|
walzer
|
db4fb7cc9c
|
issue #427, refactor ios port ok.
|
2011-03-24 17:51:29 +08:00 |
|
walzer
|
b9c56f1728
|
issue #427, try to add CCSAXParser.h
|
2011-03-24 16:16:49 +08:00 |
|
natural-law
|
55143e3b9e
|
issue #391,implement functions:CCRectFromString, CCPointFromString and CCSizeFromString.
|
2011-03-24 10:38:08 +08:00 |
|
walzer
|
ed492bbd1e
|
[airplay] first commit of airplay port. Thanks for Аксёнов Максим's contribution!
|
2011-03-23 22:16:20 +08:00 |
|
walzer
|
81fa070125
|
fixed #418, add copyright of original authors, merge Bin's commit
|
2011-03-19 14:45:51 +08:00 |
|
walzer
|
d8c28d3754
|
Merge branch 'issue_409' of https://github.com/minggo/cocos2d-x into minggo-issue_409
|
2011-03-18 15:59:01 +08:00 |
|
walzer
|
b56014c70f
|
issue #376, ios version compilation error when when COCOS2D_DEBUG = 1, fix CCLOG(@"...") to CCLOG("")
|
2011-03-18 15:17:15 +08:00 |