root
|
11679d9723
|
Merge branch 'master' into LinuxPort
|
2011-08-23 11:49:46 +08:00 |
|
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 |
|
minggo
|
d5457526d4
|
fixed #689: the width & height of CCRect should big or equal to 0
|
2011-08-23 10:46:00 +08:00 |
|
minggo
|
19244406d6
|
fixed #689: assert the width and height of rect is big than 0
|
2011-08-22 14:55:51 +08:00 |
|
minggo
|
cd4a08aa6a
|
Merge pull request #479 from minggo/iss678
fixed #679: add constructor for CCArray
|
2011-08-21 20:14:06 -07:00 |
|
laschweinski
|
8f4d47900b
|
new file: cocos2dx/.cproject
new file: cocos2dx/.project
|
2011-08-21 19:03:46 +08:00 |
|
moadib
|
807ae36d6a
|
CCMutableArray optimization
|
2011-08-20 01:30:33 +04:00 |
|
minggo
|
1f9f1f59d4
|
fixed #679: add constructor for CCArray
|
2011-08-19 16:15:06 +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 |
|
minggo
|
e39d551294
|
fixed #680: fix the bug that CCTouchDispatcher::rearrangeHandlers() crashed
|
2011-08-17 15:00:32 +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
|
3afe6ebfb2
|
fixed #638, add support for pvr ccz format. I've tested it on both ios & android, also with instrument memleak detection. But haven't tested on win32 & marmalde, in thoery it will work.
|
2011-08-16 11:56:17 +08:00 |
|
Walzer
|
0881668cc2
|
fixed #661. Thanks to GMTDev's previous resolvtion. And I fix the compilation error in the his patch: add float m_fContentScaleFactor declaration into CCTMXLayer.h, fix tile->setPositionIn to tile->setPosition. I just run TiledMapTest in retina mode, it works well
|
2011-08-15 12:10:11 +08:00 |
|
Phenix Yu
|
2eafb827cf
|
avoid memory leaking from lua script module
|
2011-08-14 17:26:51 +08:00 |
|
GavT
|
f47df23363
|
Fixed problems with iPhone Retina mode TMX Tiled map support. Uses "ContentScaleFactor" to divide down some Rect coordinates and changed some "setPositionInPixels" to "setPosition" too. See bug #661 http://www.cocos2d-x.org/issues/661
Also added "float m_fContentScaleFactor" in the class CCTMXLayer.h
|
2011-08-11 20:47:54 -07:00 |
|
Walzer
|
4aa33b0942
|
Merge pull request #463 from minggo/master
fixed #668
|
2011-08-10 19:32:44 -07: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 |
|
minggo
|
9a884ffda6
|
[iOS] fixed #668: CCLabelBMFont looks ok in retina mode
|
2011-08-10 15:07:34 +08:00 |
|
Walzer
|
6eba0b658f
|
fixed #651, add CCFileUtils to doxygen api document
|
2011-08-08 23:05:47 +08:00 |
|
minggo
|
2b5635898a
|
fixed #665: add test of RenderTextureSave
|
2011-08-08 14:06:03 +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 |
|
Walzer
|
976d886263
|
Merge pull request #455 from giom/master
Lua AddSearchPath issue #647
|
2011-08-05 18:43:44 -07:00 |
|
minggo
|
2d5a04b9ca
|
Merge pull request #454 from flyingpacer/608
fixed #608 rendertexture disappears after going to background
|
2011-08-04 23:55:26 -07:00 |
|
minggo
|
dd43f16c8e
|
fixed #622: add comment of CCUserDefault
|
2011-08-05 11:02:42 +08:00 |
|
RongHong
|
5f08bb24fe
|
Merge branch 'master' into 608
|
2011-08-05 10:59:40 +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
|
78ffea3049
|
Merge pull request #443 from natural-law/master
fixed #513
|
2011-08-02 23:35:35 -07:00 |
|
minggo
|
6892787afa
|
fixed #653: add CCScheduler::unscheduleScriptFunc()
|
2011-08-03 14:15:35 +08:00 |
|
natural-law
|
3a80e51d25
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2011-08-03 11:39:03 +08:00 |
|
natural-law
|
94f2d8a5e2
|
fixed #513, CCProgressTimer support sprite generated from CCSpriteFrame.
|
2011-08-03 11:38:38 +08:00 |
|
minggo
|
78642a39ac
|
[android] fixed #652: refactor JniHelper::jstringtochar()
|
2011-08-03 10:44:39 +08:00 |
|
minggo
|
b9374663cd
|
Merge pull request #440 from flyingpacer/savecrash
fixed #649 the user could save any domain of the render texture
|
2011-08-02 03:16:20 -07:00 |
|
minggo
|
90f403d8a2
|
Merge pull request #441 from liswei/issue347
issue #347 add ttf support in wophone
|
2011-08-02 03:16:06 -07:00 |
|
liswei
|
188b168d30
|
issue #347 add ttf support in wophone
|
2011-08-02 18:02:27 +08:00 |
|
RongHong
|
4a8e3f468e
|
fixed #649 the user could save any domain of the render texture
|
2011-08-02 17:22:57 +08:00 |
|
minggo
|
09dc164fff
|
issue #645: update to v1.0.1
|
2011-08-02 15:45:27 +08:00 |
|
RongHong
|
3a3a52c59a
|
fixed #649 the user could save any domain of the render texture
|
2011-08-02 14:25:58 +08:00 |
|
minggo
|
730ff63c9f
|
rename scene to node
|
2011-08-02 14:09:23 +08:00 |
|
minggo
|
c4d1dedba8
|
Merge https://github.com/reflog/cocos2d-x into reflog
|
2011-08-02 14:03:34 +08:00 |
|
minggo
|
9fe868b881
|
Merge pull request #438 from natural-law/master
Use the setter to set the value of m_tAnchorPoint.
|
2011-08-01 21:39:43 -07:00 |
|
natural-law
|
9a86582cd2
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2011-08-02 11:06:47 +08:00 |
|
natural-law
|
d6221cfa36
|
Use the setter to set the value of m_tAnchorPoint.
|
2011-08-02 11:02:02 +08:00 |
|
RongHong
|
d575d40ab3
|
fixed #648 savebuffer may crash on some machines like Motorola Defy
|
2011-08-02 10:27:52 +08:00 |
|
RongHong
|
335d2d30b4
|
fixed #648 savebuffer may crash on some machines like Motorola Defy
|
2011-08-02 10:05:15 +08:00 |
|
Guillaume Maury
|
f86da27a38
|
Merge branch '0.9.0'
|
2011-08-02 03:49:36 +08:00 |
|
Guillaume Maury
|
b789927ca3
|
added possibility to add a path to the lua search path (package.path/LUA_PATH)
|
2011-08-02 03:47:39 +08:00 |
|
minggo
|
63839de12a
|
Merge https://github.com/cocos2d/cocos2d-x into iss347
|
2011-08-01 18:23:14 +08:00 |
|
minggo
|
895d4992e4
|
issue #347: FontTest runs ok on iOS
|
2011-08-01 18:22:47 +08:00 |
|
natural-law
|
5b0f25466a
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2011-08-01 10:45:40 +08:00 |
|
natural-law
|
bf44d13bc9
|
fixed #644, m_bUseBatchNode of all sprite drawn by CCSpriteBatchNode should be false after CCSpriteBatchNode::removeAllChildrenWithCleanup() invoked.
|
2011-08-01 10:44:18 +08:00 |
|
minggo
|
52df611822
|
Merge pull request #434 from flyingpacer/641
fixed #641 the user could save buffer to any path
|
2011-07-31 18:20:28 -07:00 |
|
Eli Yukelzon
|
41bdb281dc
|
corrected bug and leak in getBool
|
2011-07-31 15:31:39 +03:00 |
|
Eli Yukelzon
|
af61a7c650
|
added support for optional default values in CCUserDefault getters
|
2011-07-31 15:08:25 +03:00 |
|
Eli Yukelzon
|
9c5fa51e6b
|
usuful macros for defining scene() and node() methods with params
|
2011-07-30 11:55:38 +03:00 |
|
Eli Yukelzon
|
b2dce6ab80
|
Merge remote-tracking branch 'upstream/master'
|
2011-07-30 09:32:44 +03:00 |
|
minggo
|
a3b4043755
|
issue #347: add tests for FontTest & it works ok on android
|
2011-07-29 15:57:27 +08:00 |
|
RongHong
|
a54fda812b
|
fixed #641 the user could save buffer to any path
|
2011-07-29 11:36:04 +08:00 |
|
minggo
|
cfb3765035
|
issue #347: iOS support font defined by ttf file
|
2011-07-29 10:15:10 +08:00 |
|
natural-law
|
d37a694529
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Conflicts:
cocos2dx/platform/CCImage.cpp
|
2011-07-29 09:51:43 +08:00 |
|
natural-law
|
5ad318fa71
|
Resolve the cocos2d compile error on wophone.
|
2011-07-29 09:50:06 +08:00 |
|
minggo
|
87f0b6c63f
|
Merge pull request #431 from flyingpacer/640
fixed #640 the image read from render texture is upseted
|
2011-07-28 18:42:14 -07:00 |
|
Eli Yukelzon
|
41ec0ba945
|
modification to support radio menu
|
2011-07-28 22:18:45 +03:00 |
|
reflog
|
ae945f4880
|
changes to support CCScrollLayer
|
2011-07-28 17:09:06 +03:00 |
|
minggo
|
50038b7cc2
|
Merge https://github.com/cocos2d/cocos2d-x into iss347
|
2011-07-28 18:06:20 +08:00 |
|
RongHong
|
c7aa948817
|
fixed #640 the image read from render texture is upseted
|
2011-07-28 18:02:25 +08:00 |
|
RongHong
|
c1fdf9afb5
|
issue #608 rendertexture disappears after going to background
|
2011-07-28 17:32:09 +08:00 |
|
minggo
|
648117ebb5
|
issue #347: android can use ttf file
|
2011-07-28 17:20:37 +08:00 |
|
natural-law
|
a7404dc2bf
|
fixed #639, Initialize the m_tPosition of CCParticleSystem with the setter.
|
2011-07-28 16:16:51 +08:00 |
|
natural-law
|
d4db9eb566
|
fixed #636, Modify the implementation of method CCTextureCache::textureForKey().
|
2011-07-28 15:08:07 +08:00 |
|
Leon
|
a8e4d5ea89
|
rename CCMenu::menu() -> CCMenu::node()
|
2011-07-28 14:24:24 +08:00 |
|
Leon
|
4c06cb853b
|
Merge remote branch 'upstream/master'
|
2011-07-28 12:27:07 +08:00 |
|
RongHong
|
0f94423b9b
|
fixed #630 To realize the buffer-saving function in CCRenderTexture
|
2011-07-28 10:52:09 +08:00 |
|
Leon
|
4510101e96
|
add CCMenu::init() and CCMenu::menu() to create empty menus
|
2011-07-28 10:45:32 +08:00 |
|
RongHong
|
aec1ddc4b4
|
Merge branch 'master' into 630
|
2011-07-28 10:10:47 +08:00 |
|
RongHong
|
eda6228374
|
fixed #630 To realize the buffer-saving function in CCRenderTexture
|
2011-07-28 10:09:56 +08:00 |
|
RongHong
|
a253909030
|
fixed #630 To realize the buffer-saving function in CCRenderTexture
|
2011-07-27 16:55:04 +08:00 |
|
RongHong
|
8afa3a9be1
|
fixed #619 CCFadeTo may crashed on android
|
2011-07-27 16:21:00 +08:00 |
|
minggo
|
33e85bdc53
|
Merge pull request #421 from leon-li/master
add CCMenuItem::setTarget
|
2011-07-26 18:48:24 -07:00 |
|
Leon
|
c5f7036f7b
|
add CCMenuItem::setTarget
|
2011-07-26 18:41:58 +08:00 |
|
liswei
|
1e8e036da7
|
issue #633 add playeffect loop in wophone
|
2011-07-26 17:04:39 +08:00 |
|
minggo
|
b308effdc5
|
[android] fixed #631: Send \n to engine when user input nothing
|
2011-07-26 11:41:28 +08:00 |
|
Walzer
|
20bba80c73
|
Merge remote branch 'origin/master'
|
2011-07-25 15:02:41 +08:00 |
|
Walzer
|
059e5ebc0b
|
add "virtual" keyword to the destructor of CCMutableArray, to prevent someone delete it as a CCObject and cause memory leak
|
2011-07-25 15:00:00 +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 |
|
Leon
|
9ce402655d
|
Merge remote branch 'upstream/master'
|
2011-07-24 12:24:16 +08:00 |
|
Leon
|
864878d15a
|
fix warning on android
|
2011-07-24 12:16:40 +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 |
|
Walzer
|
45e8915963
|
fixed #628, CCMutableArray::arrayWithObjects & arrayWithArray should set the return object to autorelease. And add CCAnimation::m_pobFrames->retain() after it get value from arrayWithArray. (it's property with retain in -iphone version but we miss the retain)
|
2011-07-24 08:30:49 +08:00 |
|
minggo
|
62ea6a2d46
|
issue #623: create JniHelper and use it somewhere
|
2011-07-22 18:14:29 +08:00 |
|
minggo
|
0dac01b3d8
|
Merge pull request #409 from natural-law/master
fixed #621
|
2011-07-20 00:43:02 -07:00 |
|
minggo
|
36a1f574b3
|
Merge pull request #408 from minggo/iss620
[win32] fixed #620: change the output of lua to a lib
|
2011-07-20 00:40:53 -07:00 |
|
natural-law
|
32e7ee6e2f
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2011-07-20 15:35:52 +08:00 |
|
natural-law
|
6a8b563feb
|
fixed #621, Add Texture2dTest in tests project.
|
2011-07-20 15:35:20 +08:00 |
|
minggo
|
3e080476f3
|
[win32] fixed #620: change the output of lua to a lib
|
2011-07-20 15:21:51 +08:00 |
|
minggo
|
6996ccee95
|
Merge pull request #407 from leon-li/master
fix: passing std::string object to CCLOG
|
2011-07-19 20:42:29 -07:00 |
|
Leon
|
6426e96f82
|
Merge remote branch 'upstream/master'
|
2011-07-20 11:42:00 +08:00 |
|
Leon
|
5f1f63dabf
|
fix: passing std::string object to CCLOG
|
2011-07-20 08:52: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 |
|
Walzer
|
d2b44a203f
|
issue #536, build success on win32
|
2011-07-19 16:03: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
|
7a12bb9cdc
|
fixed #613: Call executeCallFuncN instead of executeCallFunc in CCMenuItem::activate()
|
2011-07-18 10:31:41 +08:00 |
|
minggo
|
a3e9679578
|
fixed #611: add some functions for lua
|
2011-07-18 10:18:36 +08:00 |
|
minggo
|
29efe9bd39
|
Merge pull request #402 from minggo/iss615
fixed #615: CCLog may crash when invoke lua function
|
2011-07-17 18:40:23 -07:00 |
|
minggo
|
9bbab7897a
|
fixed #615: CCLog may crash when invoke lua function
|
2011-07-14 17:52:56 +08:00 |
|
minggo
|
0817d59edf
|
Merge pull request #401 from minggo/master
[android] fixed #609: retain & release obj in CCSet
|
2011-07-14 02:27:56 -07:00 |
|
minggo
|
4694926edb
|
[android] fixed #609: retain & release obj in CCSet
|
2011-07-14 15:32:11 +08:00 |
|
minggo
|
dd42936bb3
|
[android] fixed #610: remove the support of ndk-r4
|
2011-07-14 10:37:40 +08:00 |
|
minggo
|
fe3aadf800
|
update to 1.0.0 07-12
|
2011-07-13 10:20:24 +08:00 |
|
minggo
|
faa1c8ee16
|
Merge pull request #393 from minggo/master
[win32] modify for vs2010
|
2011-07-12 03:09:44 -07:00 |
|
minggo
|
760ec3201e
|
[win32] modify for vs2010
|
2011-07-12 18:05:44 +08:00 |
|
Walzer
|
48420dca0c
|
fixed #605, add CC_DLL to pure C methods in CCNS.h
|
2011-07-12 17:10:10 +08:00 |
|
RongHong
|
935051a363
|
set gl perspctive project
|
2011-07-12 16:04:13 +08:00 |
|
natural-law
|
8b5282a0cf
|
fixed #603, The test case TMXGIDObjectsTest in TileMapTest not crash any more.
|
2011-07-12 14:21:29 +08:00 |
|
natural-law
|
51b751aade
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2011-07-12 11:26:28 +08:00 |
|
minggo
|
d48c3fdfb1
|
upgrade to 1.0.0-final 07-11
|
2011-07-12 11:20:41 +08:00 |
|
natural-law
|
d3960a13df
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2011-07-12 10:36:30 +08:00 |
|
natural-law
|
3d24fc5be4
|
fixed #606, Resolve the wrong effect of the test case PageTransitionForward in TransitionsTest.
|
2011-07-12 10:36:07 +08:00 |
|
minggo
|
eb675073ee
|
remove inline to comiple ok on android
|
2011-07-11 16:36:19 +08:00 |
|
RongHong
|
ae3dd1f497
|
Merge branch 'master' of http://github.com/cocos2d/cocos2d-x
|
2011-07-11 15:33:53 +08:00 |
|
RongHong
|
c8f5f703a5
|
to commit LuaCocos2d.cpp
|
2011-07-11 15:33:27 +08:00 |
|
minggo
|
76d15b8767
|
Merge pull request #379 from minggo/master
implements CCSequence::actionWithArray() & CCSpawn::actionWithArray()
|
2011-07-11 00:30:54 -07:00 |
|
minggo
|
60bf07b859
|
implements CCSequence::actionWithArray() & CCSpawn::actionWithArray()
|
2011-07-11 15:25:02 +08:00 |
|
natural-law
|
fcbe0443be
|
Resolve a bug in ZipUtils.cpp. And modify the Makefile of tests on wophone.
|
2011-07-11 15:16:29 +08:00 |
|
minggo
|
a64783d4d2
|
fix the usage of sort()
|
2011-07-11 10:12:29 +08:00 |
|
natural-law
|
1bdce00740
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Conflicts:
cocos2dx/include/ccConfig.h
|
2011-07-08 17:08:57 +08:00 |
|
minggo
|
a1531cd478
|
Merge pull request #369 from flyingpacer/master
fix #592
|
2011-07-08 01:59:36 -07:00 |
|
minggo
|
6c37f42414
|
Merge pull request #368 from minggo/master
fixed #586
|
2011-07-08 01:46:54 -07:00 |
|
natural-law
|
cba538d5d0
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2011-07-08 15:58:14 +08:00 |
|
RongHong
|
de7150214c
|
Merge branch 'master' of http://github.com/cocos2d/cocos2d-x
|
2011-07-08 15:40:27 +08:00 |
|
RongHong
|
7b74372cac
|
fix #592
|
2011-07-08 15:38:32 +08:00 |
|
minggo
|
39a3b715cd
|
fixed #589
|
2011-07-08 15:28:13 +08:00 |
|
natural-law
|
810cf3f8c3
|
fixed #591
|
2011-07-08 15:02:46 +08:00 |
|
minggo
|
f0ea58651b
|
fixed #586
|
2011-07-08 15:01:51 +08:00 |
|
Walzer
|
5c8b04bc25
|
fixed #585
|
2011-07-08 14:48:25 +08:00 |
|
natural-law
|
134a3a0fcf
|
fixed #590
|
2011-07-08 14:32:09 +08:00 |
|
natural-law
|
db6a5fce23
|
fixed #588.
|
2011-07-08 14:16:10 +08:00 |
|
natural-law
|
5db1719302
|
fixed #587
|
2011-07-08 14:15:51 +08:00 |
|
Max Aksenov
|
90564fac49
|
[airplay] fix : incorrect calculation of the bit depth
|
2011-07-07 08:40:29 -07:00 |
|
minggo
|
b0416adaf2
|
Merge pull request #364 from minggo/master
upgrade to rc3
|
2011-07-07 01:06:27 -07:00 |
|
minggo
|
96289b20c4
|
upgrade to rc3
|
2011-07-07 16:03:03 +08:00 |
|
minggo
|
ae466898b0
|
Merge pull request #363 from minggo/master
change the return value of CCSkewBy::reverse() & CCScaleBy::reverse() to CCActionInterval*
|
2011-07-07 00:49:31 -07:00 |
|
minggo
|
b08788d810
|
change the return value of CCSkewBy::reverse() & CCScaleBy::reverse() to CCActionInterval*
|
2011-07-07 15:41:42 +08: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
|
8e370eeb10
|
fix some compiling warnings
|
2011-07-07 11:27:45 +08:00 |
|
natural-law
|
2bc8427b3c
|
Resolve the bug of some particle test cases can't be shown.
|
2011-07-07 11:02:47 +08:00 |
|
Walzer
|
348a05a329
|
fix a typo, CCObject::m_uRefrence -> CCObject::m_uReference
|
2011-07-07 08:23:31 +08:00 |
|
Walzer
|
72dfb3f919
|
fixed #576, replace std::string to _KeyT in CCMutableDictionary class template
|
2011-07-07 08:19:29 +08:00 |
|
minggo
|
3dc1967f6c
|
fixed #579: change zorder to int
|
2011-07-06 20:48:56 +08:00 |
|
minggo
|
e56547b9f5
|
fixed #580: use int or it will loop for ever
|
2011-07-06 19:54:25 +08:00 |
|
minggo
|
6cb945a8ca
|
fix bug of particle_node when upgrade to rc3
|
2011-07-06 18:16:19 +08:00 |
|
minggo
|
f894e00f27
|
fix a bug of CCProgressTimer when upgrade to rc3
|
2011-07-06 16:29:56 +08:00 |
|
minggo
|
980ce79ead
|
[android] fixed #577: init member variable to default value
|
2011-07-06 15:22:25 +08:00 |
|
minggo
|
59ed71df03
|
Merge pull request #353 from minggo/master
upgrade to 1.0.0-rc3
|
2011-07-06 00:02:45 -07:00 |
|
minggo
|
ff50997eb0
|
issue #574
|
2011-07-06 14:56:05 +08:00 |
|
Walzer
|
ac700583cc
|
fixed #573, init m_tColor & m_tBlendFunc in CCLayerColor constructor
|
2011-07-05 15:39:50 +08:00 |
|
minggo
|
7603665165
|
fix merging confict of CCDirector.cpp
|
2011-07-05 14:54:41 +08:00 |
|
minggo
|
7adb140439
|
fixed #568
|
2011-07-05 14:51:17 +08:00 |
|
minggo
|
2b963060ab
|
Merge pull request #352 from natural-law/master
fixed #563
|
2011-07-04 22:56:40 -07:00 |
|
Walzer
|
12aa33e0ee
|
fix an unsafe call in CCDirector::isOpenGLAttached(). Thanks to Ben Smith http://www.cocos2d-x.org/boards/6/topics/2092
|
2011-07-05 12:13:07 +08:00 |
|
natural-law
|
6c95a3190f
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2011-07-05 12:05:43 +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
|
0d80326392
|
fixed #564: upgrade textures to 1.0.0-rc3
|
2011-07-05 10:47:25 +08:00 |
|
minggo
|
0e6bf40e7c
|
fixed #561: upgrade particle_nodes to 1.0.0-rc3
|
2011-07-04 19:20:16 +08:00 |
|
minggo
|
6b97a381e9
|
fixed #560: upgrade misc_nodes to 1.0.0-rc3
|
2011-07-04 16:01:57 +08:00 |
|
minggo
|
8478288e88
|
fixed #iss559
|
2011-07-04 14:47:32 +08:00 |
|
minggo
|
210840a22a
|
fixed #555: upgrade effects to 1.0.0-rc3
|
2011-07-04 14:21:03 +08:00 |
|
minggo
|
70ce4f877f
|
fixed #565: upgrade tileMap_parallax_nodes to 1.0.0-rc3
|
2011-07-04 14:11:43 +08:00 |
|
minggo
|
6482f5662b
|
fixed #557: upgrade label_nodes to 1.0.1-rc3
|
2011-07-04 10:59:35 +08:00 |
|
natural-law
|
0378a6a36d
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Conflicts:
cocos2dx/include/CCNode.h
|
2011-07-01 16:24:23 +08:00 |
|
natural-law
|
7d7f3a9241
|
fixed #562, Upgrade folder sprite_nodes to rc3.
|
2011-07-01 16:11:31 +08:00 |
|
minggo
|
16f79cb0be
|
fixed #554: upgrade base_nodes to 1.0.0-rc3
|
2011-07-01 15:48:05 +08:00 |
|
minggo
|
de705986f8
|
Merge pull request #341 from minggo/iss553
fixed #533: upgrade actions to 1.0.0-r3
|
2011-07-01 00:18:32 -07:00 |
|
minggo
|
7bdf2cb84e
|
fixed #533: upgrade actions to 1.0.0-r3
|
2011-07-01 15:08:23 +08:00 |
|
natural-law
|
4d5dab4a40
|
fixed #558, Upgrade folder layers_scenes_transitions_nodes to rc3.
|
2011-07-01 11:26:26 +08:00 |
|
natural-law
|
dab077d2a1
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2011-07-01 10:27:39 +08:00 |
|
natural-law
|
d892872d2f
|
fixed #552, Treat the parameter of method CCTextureCache::removeTextureForKey() as relative path.
|
2011-07-01 09:32:15 +08:00 |
|
minggo
|
989c8027d0
|
Merge pull request #338 from natural-law/master
fixed #522
|
2011-06-30 18:24:09 -07:00 |
|
natural-law
|
b684cbdc6c
|
fixed #522, CCSpriteFrameCache::addSpriteFramesWithFile(const char *pszPlist) will not crash any more if the parameter don't have '/'.
|
2011-06-30 17:50:28 +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
|
9d4c4b5cb6
|
delete some unused codes.
|
2011-06-28 14:37:06 +08:00 |
|
yangws
|
0dec97a303
|
fixed #544 The bug reaised by CCGrid render texture in another FBO.
|
2011-06-28 14:32:59 +08:00 |
|
yangws
|
3b6265aa58
|
Compile ok on vs2010
|
2011-06-27 17:02:58 +08:00 |
|
yangws
|
59f37ddb5d
|
fixed #526 Wrap glScissor in CCEGLVIew::setScissorInPoints.
|
2011-06-27 10:55:45 +08:00 |
|
Walzer
|
00568c229a
|
[android] back to shared library link
|
2011-06-25 11:21:16 +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 |
|
Walzer
|
481010a417
|
Merge pull request #316 from minggo/iss364
[Android] line break ok on Android
|
2011-06-23 01:04:22 -07:00 |
|
Walzer
|
39d62d69a7
|
add script_support into cocos2dx/proj.wophone/Makefile.ARM, but untest.
|
2011-06-23 16:02:16 +08:00 |
|
Walzer
|
fea9f3b943
|
add script_support to cocos2d-wophone.vcproj
|
2011-06-23 15:59:28 +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 |
|
minggo
|
d4bd6e63d2
|
synchrolize java code to HelloLua
|
2011-06-23 12:47:02 +08:00 |
|
Walzer
|
d4e9e5a9d9
|
Merge pull request #314 from yangws/master
PVRFrame lib update to version 2.8 r1 (2.08.28.0634)
|
2011-06-22 20:10:09 -07:00 |
|
Walzer
|
a98a3b9ca7
|
[airplay] add script_support
|
2011-06-23 09:31:18 +08:00 |
|
yangws
|
2c22cf0621
|
fixed #537 update to version 2.8 r1 (2.08.28.0634)
|
2011-06-22 17:55:03 +08:00 |
|
Walzer
|
45933b177f
|
Merge pull request #313 from minggo/iss535
[Android] Use Android widget Bitmap to drawing string
|
2011-06-22 02:17:07 -07:00 |
|
Walzer
|
67ac46647f
|
issue #531, Merge liswei/issue531 manually.
|
2011-06-22 17:13:01 +08:00 |
|
minggo
|
1122a7c7d0
|
[android] use Android widget Bitmap other than skia to drawstring
|
2011-06-22 16:58:50 +08:00 |
|
minggo
|
fd86f1ef8c
|
Merge pull request #309 from minggo/master
fix a compile bug
|
2011-06-21 02:39:45 -07:00 |
|
minggo
|
53a5ec412e
|
fixed #528: fix a compile bug
|
2011-06-21 17:36:38 +08:00 |
|
minggo
|
6cb6359168
|
Merge pull request #308 from minggo/master
fixed #528
|
2011-06-21 02:06:11 -07:00 |
|
Walzer
|
f3375f0dbb
|
issue #528, improve CCScriptEngineManager. AppDelegate should hold the whole lifecycle of LuaEngine object.
|
2011-06-21 17:02:08 +08:00 |
|
minggo
|
00cc1d277d
|
fixed #528: safe call of CCScriptEngineManager::sharedScriptEngineManager()->getScriptEngine()->xxx()
|
2011-06-21 16:59:17 +08:00 |
|
Walzer
|
ddbdf67f97
|
Merge http://github.com/minggo/cocos2d-x into lua
|
2011-06-21 16:03:34 +08:00 |
|
minggo
|
968779912a
|
fixed #528: add copyright & modify pop menu position
|
2011-06-21 15:50:47 +08:00 |
|
Walzer
|
175e9394bc
|
Merge https://github.com/minggo/cocos2d-x into lua
|
2011-06-21 15:22:00 +08:00 |
|
Walzer
|
f80948d2eb
|
Merge pull request #303 from natural-law/master
fixed #323
|
2011-06-20 23:03:08 -07:00 |
|
minggo
|
d72d8a52f4
|
Merge https://github.com/cocos2d/cocos2d-x
|
2011-06-21 13:53:04 +08:00 |
|
minggo
|
8066312098
|
fixed #528: refactor lua ok
|
2011-06-21 13:51:36 +08:00 |
|
Marat Yakupov
|
14c43f4246
|
changed postfix increment of iterators to prefix increment
|
2011-06-21 09:30:03 +04:00 |
|
natural-law
|
49a4481473
|
fixed #323, Remove the #include <map> in CCApplication_win32.cpp.
|
2011-06-21 12:01:59 +08:00 |
|
natural-law
|
ba4c3b8928
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2011-06-21 11:58:52 +08:00 |
|
natural-law
|
960ef65f53
|
fixed #323, Modify the implement of getCurrentLanguage method on win32.
|
2011-06-21 11:58:10 +08:00 |
|
minggo
|
80e618f6ed
|
issue #528: fix some bug & complete hello.lua
|
2011-06-21 11:47:57 +08:00 |
|
Walzer
|
3559258d94
|
Merge pull request #305 from moadib/cclabelbmfont_ref_instead_copy
Removed unnecessary copy of ccBMFontDef structure in CCLabelBMFont::createFontChars()
|
2011-06-20 20:38:05 -07:00 |
|
Walzer
|
4d161e7948
|
fix #529, add static node() method to CCLayerColor, CCLayerGradient, CCMultiplexLayer
|
2011-06-21 10:53:20 +08:00 |
|
minggo
|
2f97a43439
|
issue #528: refactor lua ok on Android
|
2011-06-21 10:18:43 +08:00 |
|
minggo
|
022e2b9998
|
issue #528: refactor ok on win32
|
2011-06-20 17:31:38 +08:00 |
|
Marat Yakupov
|
0b3586126b
|
Removed unnecessary copy of ccBMFontDef structure in CCLabelBMFont::createFontChars()
|
2011-06-20 10:40:27 +04: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 |
|
Marat Yakupov
|
7be492d1b5
|
Parameters should be passed by const reference instead copy
|
2011-06-16 09:27:51 +04:00 |
|
yangws
|
19eaefab72
|
CCImage_win32 hasn't release font resource in Destructor.
|
2011-06-16 10:55:57 +08:00 |
|
minggo
|
33008fc8de
|
Merge pull request #300 from minggo/lua
Lua support
|
2011-06-15 02:24:17 -07:00 |
|
minggo
|
738f0b3426
|
Merge https://github.com/cocos2d/cocos2d-x into lua
|
2011-06-15 15:32:09 +08:00 |
|
liswei
|
3e54282e04
|
fixed #502 modify CCConfiguration to singleton mode
|
2011-06-15 11:48:00 +08:00 |
|
liswei
|
c6cd929dac
|
fixed #516 ccactionmanager.cpp L289: 'if (UINT_MAX == i)' modify to 'if (UINT_MAX != i)'
|
2011-06-15 09:56:33 +08:00 |
|
liswei
|
585792f3da
|
Merge branch 'work1'
|
2011-06-14 16:29:41 +08:00 |
|
liswei
|
7c669cfcb4
|
fixed #523 [all] CCParticleSystemQuad::particleWithFile can't work correctly
|
2011-06-14 16:27:47 +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 |
|
minggo
|
49f1518893
|
fix a bug when compile in android
|
2011-06-14 15:43:45 +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
|
a7a22e528b
|
remove the usage of NDController
|
2011-06-14 14:46:39 +08:00 |
|
minggo
|
9c49e27bf1
|
add extensions & tools directory
|
2011-06-14 14:31:25 +08:00 |
|
minggo
|
0f19c30921
|
remove redifine functions
|
2011-06-14 11:32:01 +08:00 |
|
minggo
|
4d8b2c284c
|
support lua
|
2011-06-14 11:08:39 +08:00 |
|
minggo
|
8003de7468
|
update to latest code and merge
|
2011-06-14 11:01:38 +08:00 |
|
liswei
|
91326028ec
|
fixed #516 Undefined Behaviour in ccCArray.h (signed / unsigned conversion)
|
2011-06-13 16:58:55 +08:00 |
|
liswei
|
1591c7edc8
|
fixed #512 fix warnings in /Wall flag
|
2011-06-10 17:51:37 +08:00 |
|
Walzer
|
f600846d4b
|
Merge http://github.com/flyingpacer/cocos2d-x, resolve conflicts in cocos2dx/CCScheduler.cpp
|
2011-06-08 11:08:29 +08:00 |
|
RongHong
|
67eb87abfe
|
To fix the crash when the gles version is too low
|
2011-06-08 10:02:07 +08:00 |
|
RongHong
|
a13e8ae859
|
1.修正gles版本过低时会崩溃的问题
2.修正unscheduleAllSelectors（）中遍历哈希表导致崩溃的问题
|
2011-06-03 15:22:50 +08:00 |
|
Walzer
|
97afafd856
|
Merge remote branch 'origin/master'
|
2011-06-02 22:26:53 +08:00 |
|
Walzer
|
3cba64679c
|
add std::string CCString::toStdString() method
|
2011-06-02 22:26:38 +08:00 |
|
minggo
|
4f20deff30
|
fixed #518: fix a bug that use tHashSelectorEntry in wrong way
|
2011-06-02 10:07:17 +08:00 |
|
minggo
|
83e1e0ebd1
|
tests run ok when it don't enable lua
|
2011-06-01 20:29:05 +08:00 |
|
minggo
|
a8b6b850de
|
use precompile macro to cantrol if enable lua support
|
2011-06-01 17:51:08 +08:00 |
|
minggo
|
dedbd638d3
|
lua runs ok on Android
|
2011-06-01 14:35:28 +08:00 |
|
minggo
|
fe8fcb0b00
|
invode lua registerred tick
|
2011-05-31 14:49:47 +08:00 |
|
minggo
|
697368cf20
|
support lua
|
2011-05-31 14:04:14 +08:00 |
|
yangws
|
de977bc6c2
|
use 0 replace NULL
|
2011-05-30 16:49:08 +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 |
|
Walzer
|
c790fba340
|
avoid a bug in clang, see this post http://www.cocos2d-x.org/boards/7/topics/1638 Thanks to Cem Aslan's contribution!
|
2011-05-27 16:26:59 +08:00 |
|
Walzer
|
03b1bb6c52
|
fix a typo in CCTextFieldTTF. add comment for in helloworld/AppDelegate.cpp
|
2011-05-26 10:08:05 +08:00 |
|
yangws
|
ec23d7ed55
|
fixed #508 Dynamic switch retina display support.
|
2011-05-23 16:21:31 +08:00 |
|
yangws
|
4c0008cd73
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 489
|
2011-05-20 10:02:16 +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 |
|
yangws
|
02774dd963
|
fixed #499 Move CCRGBAProtocol implement from CCMenuItemImage to CCMenuItemSprite.
|
2011-05-19 17:00:13 +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
|
c7fb183dcb
|
[airplay] After exclude CurlTest & CCUserDefault, UserDefaultTest, HelloWorld & Tests can be compiled successfully now.
|
2011-05-12 21:58:11 +08:00 |
|
Walzer
|
1340bbf842
|
[android] fix a compilation error in CCFileUtils_android.cpp, getWritablePath() method
|
2011-05-12 21:12:15 +08:00 |
|
Walzer
|
f17a8f6226
|
Merge pull request #271 from minggo/iss488
[Android] CCUserDefault works ok on android2.2
|
2011-05-12 05:40:15 -07: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 |
|
yangws
|
c73c1a9ab6
|
compile ok in vs2010
|
2011-05-12 16:15:10 +08:00 |
|
Walzer
|
78d49e9806
|
[win32] dllexport 2 pure C functions from CCLabelBMFont.h
|
2011-05-12 08:40:19 +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 |
|
Walzer
|
d0ff1f274e
|
Merge pull request #264 from yangws/master
fixed a bug: TextInputTextWithAction can't stop CCTextFieldTTF's action when click enter button.
|
2011-05-11 03:28:16 -07:00 |
|
yangws
|
b8a9db98dc
|
fixed a bug: TextInputTextWithAction can't stop CCTextFieldTTF's action when click enter button.
|
2011-05-11 18:22:55 +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
|
02f30a86b3
|
[wophone] Modify the wophone Makefile.ARM for the CCUserDefault.
|
2011-05-09 11:09:54 +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
|
7fa669bad1
|
Merge pull request #255 from minggo/iss484
fixed #484: solve a potential memory leak
|
2011-05-08 02:21:31 -07:00 |
|
minggo
|
113f1ab2ef
|
fixed #484: solve a potential issue
|
2011-05-06 18:09:31 +08: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 |
|
Walzer
|
c7e25d305a
|
Merge pull request #248 from yangws/input
Split TextInputTest to Default test and Action test. Compile ok on vs2010
|
2011-05-05 00:50:48 -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 |
|
yangws
|
a5da2bd226
|
Split TextInputTest to Default test and Action test. Compile ok on vs2010.
|
2011-05-04 14:13:15 +08:00 |
|
minggo
|
0db248e1f1
|
Merge pull request #245 from yangws/input.
TextInputTest on on ios.
|
2011-05-02 18:48:48 -07:00 |
|
yangws
|
2b94d7d9ce
|
TextInputTest on on ios.
|
2011-04-29 18:09:54 +08:00 |
|
yangws
|
170933b4c5
|
CCTextFieldTTF test code ok on win32.
|
2011-04-29 16:46:29 +08:00 |
|
minggo
|
b00c54dc64
|
Merged pull request #243 from minggo/iss477.
[android] fixed #477: set default ndk version to ndk-r5
|
2011-04-28 19:29:15 -07:00 |
|
Walzer
|
bdd0b44b99
|
fixed a warning in CCProfiling.cpp
|
2011-04-29 10:08:35 +08:00 |
|
minggo
|
bb4fc1c446
|
[android] fixed #477: set default ndk version to ndk-r5
|
2011-04-29 09:59:05 +08:00 |
|
yangws
|
2bb4775051
|
add CCTextFieldDelegate.
|
2011-04-28 18:01:29 +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 |
|
minggo
|
8b14b1bab8
|
Merged pull request #242 from yangws/input.
[ios] tests add RootViewController for rotate with ui object.
|
2011-04-27 23:46:47 -07:00 |
|
yangws
|
d73699aabb
|
[ios] tests add RootViewController for rotate with ui object.
|
2011-04-28 14:19:12 +08:00 |
|
minggo
|
86b856c7f1
|
Merged pull request #241 from yangws/input.
make tests can compile on wophone and airplay.
|
2011-04-27 20:50:08 -07:00 |
|
minggo
|
963c271120
|
Merged pull request #240 from natural-law/master.
issue #428
|
2011-04-27 19:38:09 -07:00 |
|
yangws
|
323c065934
|
make test can compile on wophone and airplay.
|
2011-04-28 10:31:51 +08:00 |
|
natural-law
|
15ef0b9105
|
issue #428, fix the bug created by issue 428. Have some loop in wrong arrays.
|
2011-04-28 10:16:58 +08:00 |
|
Walzer
|
2cceeb5c39
|
Merge remote branch 'origin/master'
|
2011-04-27 22:46:38 +08:00 |
|
Walzer
|
fa43292250
|
ccTouchDeletateAllBit -> ccTouchDelegateAllBit. I met this typo 3 days ago, then miss it. Thanks to Isaac Ashdown.
|
2011-04-27 22:45:54 +08:00 |
|
yangws
|
f8dc140840
|
change CCLabelTTF accept string from gb2312 to utf8.
|
2011-04-27 18:19:47 +08:00 |