Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,100 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

3100 Commits

Author SHA1 Message Date
laschweinski a362d3131c update debug and release makefiles again 2011-08-28 16:58:10 +08:00
laschweinski c977f3e07c commit debug and release makefile 2011-08-28 16:44:20 +08:00
laschweinski e64bfd6c68 commit subdir.mk 
delete all obsolete *.d and *.o files
 2011-08-28 15:43:50 +08:00
laschweinski 1ac3fdebca deleted: Box2D/Box2DConfig.cmake 
deleted:    Box2D/CMakeLists.txt
	new file:   CocosDenshion/.cproject
	new file:   CocosDenshion/.project
	deleted:    HelloCocos2dx/AndroidDebug/Classes/AppDelegate.d
	deleted:    HelloCocos2dx/AndroidDebug/Classes/AppDelegate.o
	deleted:    HelloCocos2dx/AndroidDebug/Classes/HelloWorldScene.d
	deleted:    HelloCocos2dx/AndroidDebug/Classes/HelloWorldScene.o
	deleted:    HelloCocos2dx/AndroidDebug/Classes/subdir.mk
	deleted:    HelloCocos2dx/AndroidDebug/android/jni/helloworld/main.d
	deleted:    HelloCocos2dx/AndroidDebug/android/jni/helloworld/main.o
	deleted:    HelloCocos2dx/AndroidDebug/android/jni/helloworld/subdir.mk
	deleted:    HelloCocos2dx/AndroidDebug/libHelloCocos2dx.so
	deleted:    HelloCocos2dx/AndroidDebug/makefile
	deleted:    HelloCocos2dx/AndroidDebug/objects.mk
	deleted:    HelloCocos2dx/AndroidDebug/sources.mk
	deleted:    HelloCocos2dx/AndroidRelease/Classes/AppDelegate.d
	deleted:    HelloCocos2dx/AndroidRelease/Classes/AppDelegate.o
	deleted:    HelloCocos2dx/AndroidRelease/Classes/HelloWorldScene.d
	deleted:    HelloCocos2dx/AndroidRelease/Classes/HelloWorldScene.o
	deleted:    HelloCocos2dx/AndroidRelease/Classes/subdir.mk
	deleted:    HelloCocos2dx/AndroidRelease/android/jni/helloworld/main.d
	deleted:    HelloCocos2dx/AndroidRelease/android/jni/helloworld/main.o
	deleted:    HelloCocos2dx/AndroidRelease/android/jni/helloworld/subdir.mk
	deleted:    HelloCocos2dx/AndroidRelease/libHelloCocos2dx.so
	deleted:    HelloCocos2dx/AndroidRelease/makefile
	deleted:    HelloCocos2dx/AndroidRelease/objects.mk
	deleted:    HelloCocos2dx/AndroidRelease/sources.mk
	deleted:    HelloCocos2dx/Classes/AppDelegate.cpp
	deleted:    HelloCocos2dx/Classes/AppDelegate.h
	deleted:    HelloCocos2dx/Classes/HelloWorldScene.cpp
	deleted:    HelloCocos2dx/Classes/HelloWorldScene.h
	deleted:    HelloCocos2dx/Linux/main.cpp
	deleted:    HelloCocos2dx/Linux/main.h
	deleted:    HelloCocos2dx/Resource/CloseNormal.png
	deleted:    HelloCocos2dx/Resource/CloseSelected.png
	deleted:    HelloCocos2dx/Resource/HelloWorld.png
	deleted:    HelloCocos2dx/Resource/Icon.png
	deleted:    HelloCocos2dx/Resource/app.config.txt
	deleted:    HelloCocos2dx/android/AndroidManifest.xml
	deleted:    HelloCocos2dx/android/build.properties
	deleted:    HelloCocos2dx/android/build.xml
	deleted:    HelloCocos2dx/android/build_native.sh
	deleted:    HelloCocos2dx/android/default.properties
	deleted:    HelloCocos2dx/android/gen/org/cocos2dx/application/R.java
	deleted:    HelloCocos2dx/android/jni/helloworld/main.cpp
	deleted:    HelloCocos2dx/android/local.properties
	deleted:    HelloCocos2dx/android/proguard.cfg
	deleted:    HelloCocos2dx/android/res/drawable-hdpi/icon.png
	deleted:    HelloCocos2dx/android/res/drawable-ldpi/icon.png
	deleted:    HelloCocos2dx/android/res/drawable-mdpi/icon.png
	deleted:    HelloCocos2dx/android/res/layout/game_demo.xml
	deleted:    HelloCocos2dx/android/res/layout/helloworld_demo.xml
	deleted:    HelloCocos2dx/android/res/values/strings.xml
	deleted:    HelloCocos2dx/android/src/org/cocos2dx/application/ApplicationDemo.java
	deleted:    HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxAccelerometer.java
	deleted:    HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxActivity.java
	deleted:    HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxBitmap.java
	deleted:    HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java
	deleted:    HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxMusic.java
	deleted:    HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxRenderer.java
	deleted:    HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxSound.java
	modified:   HelloWorld/Classes/AppDelegate.cpp
	deleted:    HelloWorld/Linux/CloseNormal.png
	deleted:    HelloWorld/Linux/CloseSelected.png
	deleted:    HelloWorld/Linux/HelloWorld.png
	deleted:    HelloWorld/Linux/Icon.png
	deleted:    HelloWorld/Linux/Materhorn.ttf
	deleted:    HelloWorld/Linux/app.config.txt
	deleted:    HelloWorld/Linux/cocos2dx-hello
	deleted:    HelloWorld/Linux/libcocos2dx.so
	modified:   cocos2dx/.cproject
	modified:   lib/linux/Debug/libcocos2d.so
	modified:   lib/linux/Release/libcocos2d.so
	modified:   template/android/mycopy_files.sh
	new file:   tests/test.linux/.cproject
	new file:   tests/test.linux/.project
	modified:   tests/tests/ChipmunkTest/cocos2dChipmunkDemo.cpp
	modified:   tests/tests/controller.cpp
	modified:   tests/tests/tests.h
 2011-08-28 14:33:04 +08:00
laschweinski 71c442b79c chipmunk/CMakeCache.txt 
chipmunk/CMakeFiles/
	chipmunk/CMakeLists.txt
	chipmunk/Makefile
	chipmunk/cmake_install.cmake
	chipmunk/src/CMakeFiles/
	chipmunk/src/Makefile
	chipmunk/src/cmake_install.cmake
	cocos2dx/platform/third_party/linux/curl/
	cocos2dx/platform/third_party/linux/libraries/libcurl.a
 2011-08-28 14:28:24 +08:00
Augusto Souza a157b775f8 First version of unloadBackgroundMusic for android - Feature #687 2011-08-28 01:02:12 -03:00
Augusto Souza 32f8060c49 Prevent null point exception in preloadBackgroundMusic 2011-08-28 00:59:51 -03:00
Augusto Souza 3a0c2cb4fb First version of a preloadBackgroundMusic for Android - Feature #687 2011-08-27 23:24:52 -03:00
laschweinski 08c81fda90 new file: installLinuxLib.sh 
HelloWorld/android/assets
 2011-08-25 19:11:35 +08:00
laschweinski 0958b2aaf6 new file: HelloWorld/Classes/AppDelegate.cpp 
new file:   HelloWorld/Classes/AppDelegate.h
	new file:   HelloWorld/Classes/HelloWorldScene.cpp
	new file:   HelloWorld/Classes/HelloWorldScene.h
	new file:   HelloWorld/postCompiled.sh
 2011-08-25 19:11:06 +08:00
laschweinski e0fa5fdd78 new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/config/ftconfig.h 
new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/config/ftheader.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/config/ftmodule.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/config/ftoption.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/config/ftstdlib.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/freetype.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftadvanc.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftbbox.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftbdf.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftbitmap.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftbzip2.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftcache.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftchapters.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftcid.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/fterrdef.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/fterrors.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftgasp.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftglyph.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftgxval.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftgzip.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftimage.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftincrem.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftlcdfil.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftlist.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftlzw.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftmac.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftmm.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftmodapi.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftmoderr.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftotval.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftoutln.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftpfr.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftrender.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftsizes.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftsnames.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftstroke.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftsynth.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftsystem.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/fttrigon.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/fttypes.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftwinfnt.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftxf86.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/autohint.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftcalc.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftdebug.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftdriver.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftgloadr.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftmemory.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftobjs.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftpic.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftrfork.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftserv.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftstream.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/fttrace.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftvalid.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/internal.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/psaux.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/pshints.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svbdf.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svcid.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svgldict.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svgxval.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svkern.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svmm.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svotval.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svpfr.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svpostnm.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svpscmap.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svpsinfo.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svsfnt.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svttcmap.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svtteng.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svttglyf.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svwinfnt.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svxf86nm.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/sfnt.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/t1types.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/tttypes.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/t1tables.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/ttnameid.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/tttables.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/tttags.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/freetype/ttunpat.h
	new file:   cocos2dx/platform/third_party/linux/libfreetype2/ft2build.h
	new file:   cocos2dx/platform/third_party/linux/libjpeg/cderror.h
	new file:   cocos2dx/platform/third_party/linux/libjpeg/cdjpeg.h
	new file:   cocos2dx/platform/third_party/linux/libjpeg/jconfig.h
	new file:   cocos2dx/platform/third_party/linux/libjpeg/jdct.h
	new file:   cocos2dx/platform/third_party/linux/libjpeg/jerror.h
	new file:   cocos2dx/platform/third_party/linux/libjpeg/jinclude.h
	new file:   cocos2dx/platform/third_party/linux/libjpeg/jmemsys.h
	new file:   cocos2dx/platform/third_party/linux/libjpeg/jmorecfg.h
	new file:   cocos2dx/platform/third_party/linux/libjpeg/jpegint.h
	new file:   cocos2dx/platform/third_party/linux/libjpeg/jpeglib.h
	new file:   cocos2dx/platform/third_party/linux/libjpeg/jversion.h
	new file:   cocos2dx/platform/third_party/linux/libjpeg/transupp.h
	new file:   cocos2dx/platform/third_party/linux/libpng/PngFile.h
	new file:   cocos2dx/platform/third_party/linux/libpng/cexcept.h
	new file:   cocos2dx/platform/third_party/linux/libpng/config.h
	new file:   cocos2dx/platform/third_party/linux/libpng/png.h
	new file:   cocos2dx/platform/third_party/linux/libpng/pngconf.h
	new file:   cocos2dx/platform/third_party/linux/libpng/pngpriv.h
	new file:   cocos2dx/platform/third_party/linux/libpng/readpng.h
	new file:   cocos2dx/platform/third_party/linux/libpng/readpng2.h
	new file:   cocos2dx/platform/third_party/linux/libpng/resource.h
	new file:   cocos2dx/platform/third_party/linux/libpng/writepng.h
	new file:   cocos2dx/platform/third_party/linux/libraries/libfreetype.a
	new file:   cocos2dx/platform/third_party/linux/libraries/libjpeg.a
	new file:   cocos2dx/platform/third_party/linux/libraries/libpng.a
	new file:   cocos2dx/platform/third_party/linux/libraries/libpng15.a
	new file:   cocos2dx/platform/third_party/linux/libraries/libxml2.a
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/DOCBparser.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/HTMLparser.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/HTMLtree.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/Makefile
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/Makefile.am
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/Makefile.in
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/SAX.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/SAX2.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/c14n.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/catalog.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/chvalid.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/debugXML.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/dict.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/encoding.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/entities.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/globals.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/hash.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/list.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/nanoftp.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/nanohttp.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/parser.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/parserInternals.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/pattern.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/relaxng.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/schemasInternals.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/schematron.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/threads.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/tree.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/uri.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/valid.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/xinclude.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/xlink.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/xmlIO.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/xmlautomata.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/xmlerror.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/xmlexports.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/xmlmemory.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/xmlmodule.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/xmlreader.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/xmlregexp.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/xmlsave.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/xmlschemas.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/xmlschemastypes.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/xmlstring.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/xmlunicode.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/xmlversion.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/xmlversion.h.in
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/xmlwriter.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/xpath.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/xpathInternals.h
	new file:   cocos2dx/platform/third_party/linux/libxml2/libxml/xpointer.h
	HelloWorld/Classes/
	HelloWorld/android/assets
	HelloWorld/postCompiled.sh
	installLinuxLib.sh
 2011-08-25 19:08:55 +08:00
laschweinski a8f6f18705 new file: HelloWorld/.cproject 
new file:   HelloWorld/.project
	HelloWorld/Classes/
	HelloWorld/android/assets
	HelloWorld/postCompiled.sh
	cocos2dx/platform/third_party/linux/
	installLinuxLib.sh
 2011-08-25 19:06:42 +08:00
laschweinski 606c8803bc modified: CocosDenshion/Linux/FmodAudioPlayer.cpp 
modified:   CocosDenshion/Linux/FmodAudioPlayer.h
	deleted:    HelloWorld/AppDelegate.cpp
	deleted:    HelloWorld/AppDelegate.h
	deleted:    HelloWorld/HelloWorldScene.cpp
	deleted:    HelloWorld/HelloWorldScene.h
	modified:   cocos2dx/.cproject
	modified:   cocos2dx/actions/CCActionInstant.cpp
	modified:   cocos2dx/include/CCActionInstant.h
	modified:   lib/android/Debug/libcocos2d.so
	modified:   lib/android/Release/libcocos2d.so
	modified:   lib/linux/Debug/libcocos2d.so
	modified:   lib/linux/Debug/libcocosdenshion.so
	modified:   lib/linux/Release/libcocos2d.so
	modified:   lib/linux/Release/libcocosdenshion.so
	HelloWorld/AndroidDebug/
	HelloWorld/AndroidRelease/
	HelloWorld/Classes/
	HelloWorld/android/assets
	HelloWorld/postCompiled.sh
	cocos2dx/platform/third_party/linux/
	installLinuxLib.sh
	tests/Res/gui_close.WAV
 2011-08-25 19:04:29 +08:00
minggo 90e2ffc041 Merge pull request #490 from minggo/iss688 
[android] fixed #688: support reading file other than apk
 2011-08-24 21:48:33 -07:00
minggo e26eaae5e1 [android] fixed #688: support reading file other than apk 2011-08-25 11:24:31 +08:00
minggo 55dd2545d7 Merge pull request #488 from minggo/iss672 
fixed #672: implement copywithzone for CCShow & CCHide
 2011-08-24 01:51:30 -07:00
minggo dc17fdc342 Merge pull request #489 from minggo/master 
assign correct value to CCSkewY::m_fStartSkewY
 2011-08-24 01:51:12 -07:00
minggo ff34ada115 assign correct value to CCSkewY::m_fStartSkewY 2011-08-24 15:02:40 +08:00
minggo 952a01f43e fixed #672: implement copywithzone for CCShow & CCHide 2011-08-24 14:21:23 +08:00
minggo 8104377f3a Merge pull request #487 from minggo/master 
[android] copy files from Resources
 2011-08-23 02:22:15 -07:00
minggo 0879cd7466 [android] copy files from Resources 2011-08-23 17:17:09 +08:00
minggo 75339b7630 Merge pull request #486 from minggo/master 
invoke this->drawNumberOfQuads(n, 0) in CCTextureAtlas::drawNumberOfQuads(unsigned int n)
 2011-08-23 02:10:22 -07:00
minggo a7e8c36eee invoke this->drawNumberOfQuads(n, 0) in CCTextureAtlas::drawNumberOfQuads(unsigned int n) 2011-08-23 17:04:38 +08:00
minggo 8010db7255 Merge pull request #485 from minggo/iss693 
[iOS] fixed #693: CCLabelTTF support line break with \n
 2011-08-23 01:33:36 -07:00
minggo 66b453edc9 [iOS] fixed #693: CCLabelTTF support line break with \n 2011-08-23 16:19:31 +08:00
root 11679d9723 Merge branch 'master' into LinuxPort 2011-08-23 11:49:46 +08:00
root 005a2b4cf4 new file: lib/android/Debug/libcocos2d.so 
new file:   lib/android/Debug/libcocosdenshion.so
	new file:   lib/android/Release/libcocos2d.so
	new file:   lib/android/Release/libcocosdenshion.so
	new file:   lib/linux/Debug/libcocos2d.so
	new file:   lib/linux/Debug/libcocosdenshion.so
	new file:   lib/linux/Release/libcocos2d.so
	new file:   lib/linux/Release/libcocosdenshion.so
	HelloCocos2dx/postCompiled.sh
	installLinuxLib.sh
 2011-08-23 11:37:41 +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 3487b074ea Merge pull request #484 from minggo/master 
fixed #689: the width & height of CCRect should big or equal to 0
 2011-08-22 19:50:23 -07: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 c91f9b15dd Merge pull request #483 from minggo/iss670 
[android] fixed #670
 2011-08-22 02:49:15 -07:00
minggo ae21fcaf48 [android] fixed #670: pause & resume effect when app enter background & foreground 2011-08-22 16:58:54 +08:00
minggo 9609885437 Merge pull request #481 from minggo/iss689 
assert the width and height of rect is positive
 2011-08-22 00:36:46 -07: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
minggo a0be83d043 Merge pull request #480 from moadib/mutable_array_optimization 
CCMutableArray optimization
 2011-08-21 19:59:29 -07:00
Walzer 65576acb5b Create a license folder, add license file of CocosDenshion, FontLabel, iconv, libjpeg, libxml2, and zlib. I apologize to authors of these libraries for my laziness. 2011-08-21 21:05:25 +08:00
laschweinski 8f4d47900b new file: cocos2dx/.cproject 
new file:   cocos2dx/.project
 2011-08-21 19:03:46 +08:00
laschweinski ff5222fff8 some files missiong(eclipse with git is too hard to play) 2011-08-21 19:00:26 +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 abc856ac6d add box2d test 2011-08-19 15:37:57 +08:00
laschweinski 60e794fcc8 add files include test and cocosDenshion 2011-08-19 14:43:19 +08:00
minggo 0a9f6c1f09 Merge pull request #478 from minggo/iss684 
add test for displaying current language
 2011-08-18 23:19:00 -07:00
laschweinski e7ec40d1cc music.mid 2011-08-19 13:33:15 +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 11e9acb7c8 fixed #684: add test for displaying current language 2011-08-19 11:32:30 +08:00
minggo 733e582d12 fixed #684: add test for displaying current language 2011-08-19 11:26:14 +08:00
minggo cfd605311c Merge pull request #476 from minggo/iss685 
fixed #685: add label test for displaying Chinese characters
 2011-08-18 18:32:17 -07:00