5db8a24389
fixed one issue in cocosdenshion
2011-10-26 18:38:27 +08:00
dd73456576
Merge branch 'bada' into f
2011-10-25 17:40:20 +08:00
3aef823bd5
rename sdk1.2 to sdk1.0
2011-10-24 11:00:11 +08:00
5589335d3a
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into linux_port1
2011-10-22 19:27:35 +08:00
04633242ba
fix a bug in audio player
2011-10-22 19:10:50 +08:00
eb901be664
project config change
2011-10-21 09:49:57 +08:00
da794c1613
Merge branch 'master' into bada
2011-10-21 09:28:29 +08:00
5c4a3c3fda
Merge remote branch 'upstream/master'
2011-10-20 18:34:10 +08:00
fdbb989ce5
make sdk1.2 to sdk1.0
2011-10-20 18:31:10 +08:00
67bbbb2800
1. relative to bug #754 , FontTest should use "fonts/abc.ttf" as external ttf name
...
2. fixed a tiny bug, FontTest can show font name on the top correctly
2011-10-20 14:56:39 +08:00
6451d8b6bf
use ceil to compute viewport
2011-10-20 13:44:21 +08:00
70a4942ea6
fix some warning
2011-10-19 15:24:19 +08:00
3c4c4e515a
modify project settings
2011-10-18 11:11:09 +08:00
064014aeae
make some special configure
2011-10-16 22:44:29 +08:00
ee53c29e5c
switch to 2.0 WVGA
2011-10-16 13:23:48 +08:00
1ffd3a4350
add language support
2011-10-14 15:54:18 +08:00
47c9020b85
fixed #738 : caculate label height if not set
2011-10-14 14:33:08 +08:00
3f89f3088b
remove mouse test log
2011-10-14 09:21:03 +08:00
fd3f496b76
use system orientation
2011-10-13 11:55:48 +08:00
5feee662e7
More simple and correct way to detect language for win32 application, also added detection of all languages contained in ccLanguageType enumeration .
...
Added support for detect russian language.
2011-10-12 09:32:59 +04:00
0283a4b254
Added dll-export macro to CCSaxParser declaration
2011-10-11 22:44:18 +04:00
64388023f6
Merge branch 'master' into bada
2011-10-10 13:47:16 +08:00
f162a5fcaa
add m_pAccelDelegate != NULL to avoid crash
2011-10-10 10:24:52 +08:00
eb9cb31ca4
use shared lib for cocos2dx project
2011-10-09 18:15:31 +08:00
9695b6df86
fixed #745 : export CCTime to dll
2011-10-09 10:19:12 +08:00
2f00b8ff1c
update to sdk2.0.2
2011-10-09 01:11:33 +08:00
fdea17b4f9
don't use DeviceOrientation, save orientation before running DirectorTest
2011-10-08 18:17:01 +08:00
beaa489406
add scale support
2011-09-30 17:19:16 +08:00
1830b4e2e9
add default file path = /Res
2011-09-30 10:02:37 +08:00
1b5365282a
add accelerometer support
2011-09-29 18:12:08 +08:00
9ff00c7c83
use utf-8 for displaying chinese
...
remove Gbk_Unicode.c Gbk_Unicode.h
2011-09-29 17:29:38 +08:00
db4d51496e
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into bada
...
Conflicts:
cocos2dx/platform/CCAccelerometer_platform.h
cocos2dx/platform/CCApplication_platform.h
cocos2dx/platform/CCArchOptimalParticleSystem.h
cocos2dx/platform/CCEGLView_platform.h
cocos2dx/platform/CCPlatformConfig.h
cocos2dx/platform/CCSAXParser.h
cocos2dx/platform/CCStdC.h
tests/AppDelegate.cpp
tests/tests/Box2DTestBed/Tests/EdgeShapes.h
2011-09-29 16:03:37 +08:00
bd2266fe4c
use timer as gameloop, can change FPS by using setAnimationInterval
...
modify some project setting
2011-09-29 15:52:16 +08:00
cda492593c
modify gameloop method
...
modify some project setting
2011-09-29 02:32:01 +08:00
de545096de
modify bada project setting
2011-09-28 18:21:17 +08:00
800940dd82
fixed some bug in bada port
2011-09-28 09:49:18 +08:00
a54ab3c293
add bada 2.0 project
...
move 1.2 project to sdk1.2 folder
2011-09-27 17:09:14 +08:00
cd18394b09
add bada 2.0 project
...
move 1.2 project to sdk1.2 folder
2011-09-27 17:06:11 +08:00
d4283b1f11
Merge branch 'linux_port'
2011-09-27 17:01:51 +08:00
294c796e55
add bada 2.0 project
...
move 1.2 project to sdk1.2 folder
2011-09-27 17:00:13 +08:00
6cf5592499
modify Gbk_Unicode.c
2011-09-26 17:50:31 +08:00
c78a4cb485
modify cocos2dx project setting for bada
2011-09-26 17:50:05 +08:00
13b091fb15
modify CCImage, make text being showed correctly
2011-09-26 15:40:56 +08:00
267cce29a9
Added testing ability for case when application enters background and returns in foreground on windows platform.
...
When application minimized applicationDidEnterBackground() called, when restored applicationWillEnterForeground().
Also break; forgotten in WM_KEYDOWN.
2011-09-22 13:11:51 +04:00
0ad5ec3557
fixed typo for win32 keypad testing ability
2011-09-22 10:27:10 +04:00
5537ba7e9e
Added keypad testing ability for windows platform. Shift+F1 emulated Back key pressing, and Shift+F2 emulated Menu key pressing
2011-09-21 16:21:11 +04:00
762e342b4d
fixed #727 : invoke DeleteLocalRef() to resolve memory leak
2011-09-20 14:25:16 +08:00
c93be8b828
modify <cstdio> to <stdio.h>
...
delete old project files
2011-09-20 12:39:44 +08:00
eb32cf9fe2
modify some files of bada project
2011-09-20 02:19:26 +08:00
81243eecdf
modify libpng version to 1.4.5
...
modify libjpeg txt mode to windows \r\n style
2011-09-20 02:17:44 +08:00
8ad2125139
add source code of libjpeg ,libpng ,zlib for bada
2011-09-20 02:16:20 +08:00
ca2027fbad
modify bada project
2011-09-19 23:35:46 +08:00
edb2cbbad6
modify bada project files
2011-09-19 18:17:19 +08:00
0e7fc78e4e
commit some files of bada project
2011-09-19 18:05:40 +08:00
c94adc58b9
changed bada projects directory, add bada macro
2011-09-19 17:53:45 +08:00
3c795073e0
Merge branch 'master' into bada
...
Conflicts:
HelloWorld/iphone/HelloWorld.xcodeproj/project.pbxproj
cocos2dx/CCamera.cpp
cocos2dx/cocoa/NSData.cpp
cocos2dx/label_nodes/CCBitmapFontAtlas.cpp
cocos2dx/platform/CCFileUtils_platform.h
cocos2dx/platform/CCXApplication_platform.h
cocos2dx/platform/CCXCocos2dDefine_platform.h
cocos2dx/platform/CCXEGLView_platform.h
cocos2dx/platform/CCXMath.h
cocos2dx/platform/CCXUIAccelerometer_platform.h
cocos2dx/platform/CCXUIImage_platform.h
cocos2dx/platform/ccxCommon_platform.h
cocos2dx/platform/config_platform.h
cocos2dx/platform/platform.h
cocos2dx/support/base64.cpp
cocos2dx/tileMap_parallax_nodes/CCTMXXMLParser.cpp
tests/AppDelegate.cpp
tests/test.iphone/test.iphone.xcodeproj/project.pbxproj
2011-09-19 13:42:08 +08:00
717698bf65
fix some compiling mistake
2011-09-05 10:12:14 +08:00
1fc09448a4
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into LinuxPort
...
Conflicts:
cocos2dx/actions/CCActionInstant.cpp
cocos2dx/include/CCActionInstant.h
2011-09-04 14:38:53 +08:00
018036eb28
Merge pull request #498 from minggo/iss703
...
fixed #703 : refactor Accelerometer
2011-08-31 18:30:22 -07:00
f61fde764b
fixed #703 : refactor Accelerometer
2011-08-31 17:14:29 +08:00
1402350870
fixed #676 , add more languages into CCApplication::getCurrentLanguage(). Android & iPhone port is done, other platforms no yet.
2011-08-31 14:20:33 +08:00
dd90e8ce86
issue #702 add invalid point judgement
2011-08-30 16:40:57 +08:00
ab2a6cb2bb
fixed #702 tests crashs at the start on wophone device
2011-08-30 15:59:06 +08:00
0cfbf4344a
fix a compiling error on wophone
2011-08-30 10:54:32 +08:00
414791a684
issue #675 : initialize acceleration_
2011-08-30 10:34:29 +08:00
92f741aa73
issue #675 : remove unneeded header file
2011-08-30 09:49:55 +08:00
c7fd375539
issue #675 : make wophone support only one accelerometer delegate
2011-08-30 09:45:11 +08:00
b38105a70b
issue 675: dispatch accelerometer data to one delegate
2011-08-29 18:18:39 +08:00
c977f3e07c
commit debug and release makefile
2011-08-28 16:44:20 +08:00
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
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
e26eaae5e1
[android] fixed #688 : support reading file other than apk
2011-08-25 11:24:31 +08:00
66b453edc9
[iOS] fixed #693 : CCLabelTTF support line break with \n
2011-08-23 16:19:31 +08:00
d57d9ca6f6
modified: cocos2dx/.cproject
...
modified: cocos2dx/CCConfiguration.cpp
modified: cocos2dx/CCConfiguration.h
modified: cocos2dx/actions/CCActionGrid3D.cpp
modified: cocos2dx/platform/Linux/CCAplication_linux.cpp
modified: cocos2dx/platform/Linux/CCAplication_linux.h
modified: cocos2dx/platform/Linux/CCImage_Linux.cpp
modified: mycreate-android-project.sh
new file: post.sh
modified: template/android/mycopy_files.sh
modified: tests/AppDelegate.cpp
new file: tests/test.linux/Res
deleted: tests/test.linux/Res/Hello.png
deleted: tests/test.linux/Res/Images/BoilingFoam.plist
deleted: tests/test.linux/Res/Images/BurstPipe.plist
deleted: tests/test.linux/Res/Images/Comet.plist
deleted: tests/test.linux/Res/Images/Comet.png
deleted: tests/test.linux/Res/Images/ExplodingRing.plist
deleted: tests/test.linux/Res/Images/Flower.plist
deleted: tests/test.linux/Res/Images/Fog.png
deleted: tests/test.linux/Res/Images/Galaxy.plist
deleted: tests/test.linux/Res/Images/HelloWorld.png
deleted: tests/test.linux/Res/Images/Icon.png
deleted: tests/test.linux/Res/Images/LavaFlow.plist
deleted: tests/test.linux/Res/Images/Pea.png
deleted: tests/test.linux/Res/Images/Phoenix.plist
deleted: tests/test.linux/Res/Images/PlanetCute-1024x1024.png
deleted: tests/test.linux/Res/Images/SendScoreButton.png
deleted: tests/test.linux/Res/Images/SendScoreButtonPressed.png
deleted: tests/test.linux/Res/Images/SpinningPeas.plist
deleted: tests/test.linux/Res/Images/SpinningPeas.png
deleted: tests/test.linux/Res/Images/Spiral.plist
deleted: tests/test.linux/Res/Images/SpookyPeas.plist
deleted: tests/test.linux/Res/Images/SpookyPeas.png
deleted: tests/test.linux/Res/Images/Upsidedown.plist
deleted: tests/test.linux/Res/Images/atlastest.png
deleted: tests/test.linux/Res/Images/b1-hd.png
deleted: tests/test.linux/Res/Images/b1.png
deleted: tests/test.linux/Res/Images/b2-hd.png
deleted: tests/test.linux/Res/Images/b2.png
deleted: tests/test.linux/Res/Images/background.png
deleted: tests/test.linux/Res/Images/background1-hd.png
deleted: tests/test.linux/Res/Images/background1.png
deleted: tests/test.linux/Res/Images/background2-hd.png
deleted: tests/test.linux/Res/Images/background2.png
deleted: tests/test.linux/Res/Images/background3-hd.png
deleted: tests/test.linux/Res/Images/background3.png
deleted: tests/test.linux/Res/Images/ball-hd.png
deleted: tests/test.linux/Res/Images/ball.png
deleted: tests/test.linux/Res/Images/bitmapFontTest3.fnt
deleted: tests/test.linux/Res/Images/bitmapFontTest3.png
deleted: tests/test.linux/Res/Images/blocks-hd.png
deleted: tests/test.linux/Res/Images/blocks.png
deleted: tests/test.linux/Res/Images/btn-about-normal.png
deleted: tests/test.linux/Res/Images/btn-about-selected.png
deleted: tests/test.linux/Res/Images/btn-highscores-normal.png
deleted: tests/test.linux/Res/Images/btn-highscores-selected.png
deleted: tests/test.linux/Res/Images/btn-play-normal.png
deleted: tests/test.linux/Res/Images/btn-play-selected.png
deleted: tests/test.linux/Res/Images/bugs/RetinaDisplay.jpg
deleted: tests/test.linux/Res/Images/bugs/bug886.jpg
deleted: tests/test.linux/Res/Images/bugs/bug886.png
deleted: tests/test.linux/Res/Images/bugs/circle-hd.plist
deleted: tests/test.linux/Res/Images/bugs/circle-hd.png
deleted: tests/test.linux/Res/Images/bugs/circle.plist
deleted: tests/test.linux/Res/Images/bugs/circle.png
deleted: tests/test.linux/Res/Images/bugs/corner.png
deleted: tests/test.linux/Res/Images/bugs/edge.png
deleted: tests/test.linux/Res/Images/bugs/fill.png
deleted: tests/test.linux/Res/Images/bugs/picture-hd.png
deleted: tests/test.linux/Res/Images/bugs/picture.png
deleted: tests/test.linux/Res/Images/close-hd.png
deleted: tests/test.linux/Res/Images/close.png
deleted: tests/test.linux/Res/Images/debian.plist
deleted: tests/test.linux/Res/Images/f1-hd.png
deleted: tests/test.linux/Res/Images/f1.png
deleted: tests/test.linux/Res/Images/f2-hd.png
deleted: tests/test.linux/Res/Images/f2.png
deleted: tests/test.linux/Res/Images/fire-grayscale.png
deleted: tests/test.linux/Res/Images/fire.png
deleted: tests/test.linux/Res/Images/fps_images.png
deleted: tests/test.linux/Res/Images/grossini-hd.png
deleted: tests/test.linux/Res/Images/grossini.png
deleted: tests/test.linux/Res/Images/grossini_128x256_mipmap.pvr
deleted: tests/test.linux/Res/Images/grossini_dance_01.png
deleted: tests/test.linux/Res/Images/grossini_dance_02.png
deleted: tests/test.linux/Res/Images/grossini_dance_03.png
deleted: tests/test.linux/Res/Images/grossini_dance_04.png
deleted: tests/test.linux/Res/Images/grossini_dance_05.png
deleted: tests/test.linux/Res/Images/grossini_dance_06.png
deleted: tests/test.linux/Res/Images/grossini_dance_07.png
deleted: tests/test.linux/Res/Images/grossini_dance_08.png
deleted: tests/test.linux/Res/Images/grossini_dance_09.png
deleted: tests/test.linux/Res/Images/grossini_dance_10.png
deleted: tests/test.linux/Res/Images/grossini_dance_11.png
deleted: tests/test.linux/Res/Images/grossini_dance_12.png
deleted: tests/test.linux/Res/Images/grossini_dance_13.png
deleted: tests/test.linux/Res/Images/grossini_dance_14.png
deleted: tests/test.linux/Res/Images/grossini_dance_atlas-hd.png
deleted: tests/test.linux/Res/Images/grossini_dance_atlas-mono.png
deleted: tests/test.linux/Res/Images/grossini_dance_atlas.png
deleted: tests/test.linux/Res/Images/grossini_dance_atlas_nomipmap.png
deleted: tests/test.linux/Res/Images/grossini_pvr_rgba4444.pvr
deleted: tests/test.linux/Res/Images/grossini_pvr_rgba8888.pvr
deleted: tests/test.linux/Res/Images/grossinis_sister1-hd.png
deleted: tests/test.linux/Res/Images/grossinis_sister1-testalpha.png
deleted: tests/test.linux/Res/Images/grossinis_sister1-testalpha.ppng
deleted: tests/test.linux/Res/Images/grossinis_sister1.png
deleted: tests/test.linux/Res/Images/grossinis_sister2-hd.png
deleted: tests/test.linux/Res/Images/grossinis_sister2.png
deleted: tests/test.linux/Res/Images/landscape-1024x1024.png
deleted: tests/test.linux/Res/Images/logo-mipmap.pvr
deleted: tests/test.linux/Res/Images/logo-nomipmap.pvr
deleted: tests/test.linux/Res/Images/menuitemsprite.png
deleted: tests/test.linux/Res/Images/paddle-hd.png
deleted: tests/test.linux/Res/Images/paddle.png
deleted: tests/test.linux/Res/Images/particles-hd.png
deleted: tests/test.linux/Res/Images/particles.png
deleted: tests/test.linux/Res/Images/pattern1.png
deleted: tests/test.linux/Res/Images/piece.png
deleted: tests/test.linux/Res/Images/powered.png
deleted: tests/test.linux/Res/Images/r1-hd.png
deleted: tests/test.linux/Res/Images/r1.png
deleted: tests/test.linux/Res/Images/r2-hd.png
deleted: tests/test.linux/Res/Images/r2.png
deleted: tests/test.linux/Res/Images/snow.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-7.png
deleted: tests/test.linux/Res/Images/spritesheet1.png
deleted: tests/test.linux/Res/Images/stars-grayscale.png
deleted: tests/test.linux/Res/Images/stars.png
deleted: tests/test.linux/Res/Images/stars2-grayscale.png
deleted: tests/test.linux/Res/Images/stars2.png
deleted: tests/test.linux/Res/Images/streak.png
deleted: tests/test.linux/Res/Images/test-rgba1.png
deleted: tests/test.linux/Res/Images/test_blend.png
deleted: tests/test.linux/Res/Images/test_image-bad_encoding.pvr
deleted: tests/test.linux/Res/Images/test_image.jpeg
deleted: tests/test.linux/Res/Images/test_image.png
deleted: tests/test.linux/Res/Images/test_image.pvr
deleted: tests/test.linux/Res/Images/test_image.pvrraw
deleted: tests/test.linux/Res/Images/test_image_a8.pvr
deleted: tests/test.linux/Res/Images/test_image_ai88.pvr
deleted: tests/test.linux/Res/Images/test_image_bgra8888.pvr
deleted: tests/test.linux/Res/Images/test_image_i8.pvr
deleted: tests/test.linux/Res/Images/test_image_pvrtc2bpp.pvr
deleted: tests/test.linux/Res/Images/test_image_pvrtc4bpp.pvr
deleted: tests/test.linux/Res/Images/test_image_rgb565.pvr
deleted: tests/test.linux/Res/Images/test_image_rgba4444.pvr
deleted: tests/test.linux/Res/Images/test_image_rgba4444.pvr.ccz
deleted: tests/test.linux/Res/Images/test_image_rgba4444.pvr.gz
deleted: tests/test.linux/Res/Images/test_image_rgba4444_mipmap.pvr
deleted: tests/test.linux/Res/Images/test_image_rgba5551.pvr
deleted: tests/test.linux/Res/Images/test_image_rgba8888.pvr
deleted: tests/test.linux/Res/Images/texture1024x1024.png
deleted: tests/test.linux/Res/Images/texture2048x2048.png
deleted: tests/test.linux/Res/Images/texture512x512.png
deleted: tests/test.linux/Res/TileMaps/fixed-ortho-test2.png
deleted: tests/test.linux/Res/TileMaps/hexa-test.tmx
deleted: tests/test.linux/Res/TileMaps/hexa-tiles.png
deleted: tests/test.linux/Res/TileMaps/iso-test-bug787.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test-movelayer.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test-objectgroup.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test-vertexz.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test-zorder.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test.png
deleted: tests/test.linux/Res/TileMaps/iso-test.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test1.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test2-uncompressed.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test2.png
deleted: tests/test.linux/Res/TileMaps/iso-test2.tmx
deleted: tests/test.linux/Res/TileMaps/iso.png
deleted: tests/test.linux/Res/TileMaps/levelmap.tga
deleted: tests/test.linux/Res/TileMaps/ortho-objects.tmx
deleted: tests/test.linux/Res/TileMaps/ortho-test1.png
deleted: tests/test.linux/Res/TileMaps/ortho-test1_bw.png
deleted: tests/test.linux/Res/TileMaps/ortho-test2.png
deleted: tests/test.linux/Res/TileMaps/orthogonal-test-movelayer.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test-vertexz.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test-zorder.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test1.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test1.tsx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test2.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test3.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test4-hd.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test4.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test5.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test6-hd.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test6.tmx
deleted: tests/test.linux/Res/TileMaps/test-object-layer.tmx
deleted: tests/test.linux/Res/TileMaps/tiles-hd.png
deleted: tests/test.linux/Res/TileMaps/tiles.png
deleted: tests/test.linux/Res/TileMaps/tmw_desert_spacing-hd.png
deleted: tests/test.linux/Res/TileMaps/tmw_desert_spacing.png
deleted: tests/test.linux/Res/animations/dragon_animation-hd.png
deleted: tests/test.linux/Res/animations/dragon_animation.png
deleted: tests/test.linux/Res/animations/ghosts.plist
deleted: tests/test.linux/Res/animations/ghosts.png
deleted: tests/test.linux/Res/animations/grossini-aliases.plist
deleted: tests/test.linux/Res/animations/grossini-aliases.png
deleted: tests/test.linux/Res/animations/grossini.plist
deleted: tests/test.linux/Res/animations/grossini.plist.xml
deleted: tests/test.linux/Res/animations/grossini.png
deleted: tests/test.linux/Res/animations/grossini.ztp
deleted: tests/test.linux/Res/animations/grossini_blue.plist
deleted: tests/test.linux/Res/animations/grossini_blue.png
deleted: tests/test.linux/Res/animations/grossini_family.plist
deleted: tests/test.linux/Res/animations/grossini_family.png
deleted: tests/test.linux/Res/animations/grossini_gray.plist
deleted: tests/test.linux/Res/animations/grossini_gray.png
deleted: tests/test.linux/Res/app.config.txt
deleted: tests/test.linux/Res/background.mp3
deleted: tests/test.linux/Res/effect1.wav
deleted: tests/test.linux/Res/effect2.ogg
deleted: tests/test.linux/Res/fonts/A Damn Mess.ttf
deleted: tests/test.linux/Res/fonts/Abberancy.ttf
deleted: tests/test.linux/Res/fonts/Abduction.ttf
deleted: tests/test.linux/Res/fonts/Paint Boy.ttf
deleted: tests/test.linux/Res/fonts/Schwarzwald Regular.ttf
deleted: tests/test.linux/Res/fonts/Scissor Cuts.ttf
deleted: tests/test.linux/Res/fonts/arial16.fnt
deleted: tests/test.linux/Res/fonts/arial16.png
deleted: tests/test.linux/Res/fonts/bitmapFontTest.fnt
deleted: tests/test.linux/Res/fonts/bitmapFontTest.png
deleted: tests/test.linux/Res/fonts/bitmapFontTest2.fnt
deleted: tests/test.linux/Res/fonts/bitmapFontTest2.png
deleted: tests/test.linux/Res/fonts/bitmapFontTest3.fnt
deleted: tests/test.linux/Res/fonts/bitmapFontTest3.png
deleted: tests/test.linux/Res/fonts/bitmapFontTest4.fnt
deleted: tests/test.linux/Res/fonts/bitmapFontTest4.png
deleted: tests/test.linux/Res/fonts/bitmapFontTest5.fnt
deleted: tests/test.linux/Res/fonts/bitmapFontTest5.png
deleted: tests/test.linux/Res/fonts/fps_images-hd.png
deleted: tests/test.linux/Res/fonts/fps_images.png
deleted: tests/test.linux/Res/fonts/futura-48.fnt
deleted: tests/test.linux/Res/fonts/futura-48.png
deleted: tests/test.linux/Res/fonts/konqa32-hd.fnt
deleted: tests/test.linux/Res/fonts/konqa32-hd.png
deleted: tests/test.linux/Res/fonts/konqa32.fnt
deleted: tests/test.linux/Res/fonts/konqa32.png
deleted: tests/test.linux/Res/fonts/larabie-16-hd.png
deleted: tests/test.linux/Res/fonts/larabie-16.png
deleted: tests/test.linux/Res/fonts/tuffy_bold_italic-charmap-hd.png
deleted: tests/test.linux/Res/fonts/tuffy_bold_italic-charmap.png
deleted: tests/test.linux/Res/music.mid
deleted: tests/test.linux/Res/zwoptex/grossini-generic.plist
deleted: tests/test.linux/Res/zwoptex/grossini-generic.png
deleted: tests/test.linux/Res/zwoptex/grossini.plist
deleted: tests/test.linux/Res/zwoptex/grossini.png
CocosDenshion/AndroidDebug/
CocosDenshion/AndroidRelease/
HelloCocos2dx/AndroidDebug/2
HelloCocos2dx/android/assets
HelloCocos2dx/postCompiled.sh
installLinuxLib.sh
2011-08-23 11:28:04 +08:00
60e794fcc8
add files include test and cocosDenshion
2011-08-19 14:43:19 +08:00
871abb4a32
Merge branch 'master' into LinuxPort
2011-08-19 13:20:23 +08:00
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
5087f6ddb2
[android] fixed #683 : remove unneeded includes
2011-08-18 16:19:36 +08:00
b4ab3f6b75
[android] fixed #683 : remove unneeded includes
2011-08-18 16:18:26 +08:00
1640e48d5a
[android] fixed #683 : let getCurrentLanguageJNI() & getPackageNameJNI() return valid pointer
2011-08-18 16:09:49 +08:00
ed42bc388c
fixed lua memory leak
2011-08-18 12:26:33 +08:00
a8d87a9976
Non-trivial arguments passed by reference now.
...
Removed unnecessary cocos2d:: prefix inside namespace.
2011-08-17 17:26:26 +04:00
4244fdb62b
fixed #643 , swap accelerometer input x/y according to the orientation (on ios devices)
2011-08-17 20:11:33 +08:00
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
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
771e2349c5
fix some warnings under xcode 4.0 llvm compiler
2011-08-10 22:39:02 +08:00
6eba0b658f
fixed #651 , add CCFileUtils to doxygen api document
2011-08-08 23:05:47 +08:00
7a0e8b4a0a
Merge pull request #457 from minggo/iss642
...
fixed #642 : CCRenderTexture::saveBuffer() works ok on iOS
2011-08-07 20:08:16 -07:00
41ea2e98a1
fixed #642 : CCRenderTexture::saveBuffer() works ok on iOS
2011-08-08 11:01:47 +08:00
70e19d7245
fixed #347 fixed 'AddFontResource' path error!
2011-08-08 10:32:21 +08:00
016c463659
Merge pull request #449 from flyingpacer/savecrash
...
fixed #657 Latest git version was broken
2011-08-04 02:39:33 -07:00
76da5f2e84
fixed #656 : remove unneeded methods & android can let user set resource path
2011-08-04 17:19:58 +08:00
4745b85af9
fixed #657 Latest git version was broken
2011-08-04 16:37:43 +08:00
bbc4bbeb6c
issue #347 lost [] in 'delete array'
2011-08-04 13:47:21 +08:00
897dd54b12
fixed #347 add ttf support in win32
2011-08-04 11:23:59 +08:00
78642a39ac
[android] fixed #652 : refactor JniHelper::jstringtochar()
2011-08-03 10:44:39 +08:00
188b168d30
issue #347 add ttf support in wophone
2011-08-02 18:02:27 +08:00
895d4992e4
issue #347 : FontTest runs ok on iOS
2011-08-01 18:22:47 +08:00
a3b4043755
issue #347 : add tests for FontTest & it works ok on android
2011-07-29 15:57:27 +08:00
cfb3765035
issue #347 : iOS support font defined by ttf file
2011-07-29 10:15:10 +08:00
648117ebb5
issue #347 : android can use ttf file
2011-07-28 17:20:37 +08:00
0f94423b9b
fixed #630 To realize the buffer-saving function in CCRenderTexture
2011-07-28 10:52:09 +08:00
a253909030
fixed #630 To realize the buffer-saving function in CCRenderTexture
2011-07-27 16:55:04 +08:00
b308effdc5
[android] fixed #631 : Send \n to engine when user input nothing
2011-07-26 11:41:28 +08:00
ab4ef0f180
Merge https://github.com/cocos2d/cocos2d-x into iss623
2011-07-25 14:13:20 +08:00
b105b6005e
[android] fixed #623 : refactor Cocos2dJni.cpp
2011-07-25 14:12:30 +08:00
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
62ea6a2d46
issue #623 : create JniHelper and use it somewhere
2011-07-22 18:14:29 +08:00
0c495628ea
Merge pull request #405 from minggo/iss618
...
invoke java code(System.exit()) to finish programe
2011-07-19 02:20:36 -07:00
d2d02e0c52
fix compile error with android-ndk-r6
2011-07-19 16:54:42 +08:00
640d811809
[android] fixed #618 : invoke java code(System.exit()) to finish programe
2011-07-19 16:01:22 +08:00
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
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
9bbab7897a
fixed #615 : CCLog may crash when invoke lua function
2011-07-14 17:52:56 +08:00
d48c3fdfb1
upgrade to 1.0.0-final 07-11
2011-07-12 11:20:41 +08:00
90564fac49
[airplay] fix : incorrect calculation of the bit depth
2011-07-07 08:40:29 -07:00
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
7603665165
fix merging confict of CCDirector.cpp
2011-07-05 14:54:41 +08:00
7107c6612b
fixed #563 , Upgrade folder support to rc3.
2011-07-05 12:05:19 +08:00
ad3bad964f
fixed #567
2011-07-05 11:36:46 +08:00
2a39fe0aa4
Merge pull request #335 from minggo/iss547
...
[Android] fixed #547 : line wrap OK on Android
2011-06-29 19:46:25 -07:00
6c47f53b13
[Android] fixed #547 : line wrap OK on Android
2011-06-29 15:45:30 +08:00
bb90fbfb1e
[iOS] fixed #546 : CCLabelTTF:initWithString() will crash when the height is 0
2011-06-28 15:24:58 +08:00
59f37ddb5d
fixed #526 Wrap glScissor in CCEGLVIew::setScissorInPoints.
2011-06-27 10:55:45 +08:00
e8fda66ccc
Merge https://github.com/cocos2d/cocos2d-x
2011-06-24 13:55:52 +08:00
8440d6a267
[android] fixed #364 : show string correct & line break ok
2011-06-24 13:55:00 +08:00
0c5f28fc11
fixed #539 call unzOpen, then may not call unzClose(WVGA)
2011-06-24 09:29:55 +08:00
4793713daa
fixed #539 call unzOpen, then may not call unzClose(WVGA)
2011-06-23 18:24:32 +08:00
156dfa8859
Merge remote branch 'origin/master'
2011-06-23 16:31:52 +08:00
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
53eafa77ff
Merge https://github.com/cocos2d/cocos2d-x into iss364
2011-06-23 14:45:25 +08:00
10cdd7f798
[android] fixed #364 : line break ok on Android
2011-06-23 14:44:20 +08:00
2c22cf0621
fixed #537 update to version 2.8 r1 (2.08.28.0634)
2011-06-22 17:55:03 +08:00
1122a7c7d0
[android] use Android widget Bitmap other than skia to drawstring
2011-06-22 16:58:50 +08:00
175e9394bc
Merge https://github.com/minggo/cocos2d-x into lua
2011-06-21 15:22:00 +08:00
d72d8a52f4
Merge https://github.com/cocos2d/cocos2d-x
2011-06-21 13:53:04 +08:00
49a4481473
fixed #323 , Remove the #include <map> in CCApplication_win32.cpp.
2011-06-21 12:01:59 +08:00
960ef65f53
fixed #323 , Modify the implement of getCurrentLanguage method on win32.
2011-06-21 11:58:10 +08:00
022e2b9998
issue #528 : refactor ok on win32
2011-06-20 17:31:38 +08:00
fae0498b3c
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-06-17 10:49:25 +08:00
cfee246959
fixed #323 , Add an interface to get the current language.
2011-06-17 10:49:02 +08:00
19eaefab72
CCImage_win32 hasn't release font resource in Destructor.
2011-06-16 10:55:57 +08:00
738f0b3426
Merge https://github.com/cocos2d/cocos2d-x into lua
2011-06-15 15:32:09 +08:00
5d70774b4f
fixed #524 , Parse the special format of plist files on ios & airplay.
2011-06-14 16:15:20 +08:00
214e86a5b6
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
...
Conflicts:
cocos2dx/platform/CCFileUtils.cpp
2011-06-14 15:05:52 +08:00
489fb7824b
fixed #524 , Parse the special format of plist files.
2011-06-14 14:53:00 +08:00
8003de7468
update to latest code and merge
2011-06-14 11:01:38 +08:00
1591c7edc8
fixed #512 fix warnings in /Wall flag
2011-06-10 17:51:37 +08:00
a8b6b850de
use precompile macro to cantrol if enable lua support
2011-06-01 17:51:08 +08:00
697368cf20
support lua
2011-05-31 14:04:14 +08:00
7e2d1d5c48
fixed #490 Text input on android use a different way, TextInputTest OK now.
2011-05-30 16:36:12 +08:00
ec23d7ed55
fixed #508 Dynamic switch retina display support.
2011-05-23 16:21:31 +08:00
97142d4a59
Use GetCurrentDirectory instead GetModuleName in CCFileUitls_win32.cpp and compile OK on vs2010
2011-05-19 21:11:29 +08:00
b940676cab
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 489
2011-05-19 20:55:39 +08:00
ff1017d86f
Merge pull request #276 from minggo/iss496
...
[android] fixed #496 fixed #497
2011-05-18 23:18:37 -07:00
073260e0a9
[android] fixed #496 fixed #497 : tests and HelloWorld work ok on Android3.0
2011-05-19 11:26:57 +08:00
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
822016e375
[android] fixed #495 : fix a memory leak
2011-05-18 13:56:35 +08:00
8e07ab7dc9
Modify CCLog out utf-8 string on win32 and wophone emulator.
2011-05-18 11:25:54 +08:00
5173738f37
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-05-18 11:08:44 +08:00
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
95a46bd5f8
[ios] fixed #493 , The return value of CCFileUtils::getWriteablePath() should be end with '/'.
2011-05-17 10:44:56 +08:00
0466166935
[win32] fixed #492 , Consider the path separated by '\' in function CCFileUtils::fullPathFromRelativeFile().
2011-05-16 17:13:15 +08:00
aba77f4cae
issue #489 modified for vs2008.
2011-05-13 14:13:30 +08:00
1340bbf842
[android] fix a compilation error in CCFileUtils_android.cpp, getWritablePath() method
2011-05-12 21:12:15 +08:00
91bc9a3f7a
[android] fixed #488 : fix memory leak
2011-05-12 18:55:32 +08:00
d8f3b0c25b
[android] CCUserDefault works ok on android2.2
2011-05-12 18:32:13 +08:00
249724f8d8
[ios] issue #371 , fix the error when invoke CCImage::initWithString with null string ""
2011-05-12 08:24:29 +08:00
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
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
167f4c206b
issue #478 KeyBoard can run on wophone. but too slow.
2011-05-10 15:48:26 +08:00
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
dd309fe862
[wophone] fixed #487 , Implement the function CCFiltUtils::getWriteablePath() on wophone.
2011-05-09 10:03:43 +08:00
e27452dd8a
Merge pull request #253 from minggo/iss455
...
Implement CCUserDefault
2011-05-08 18:37:33 -07:00
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
42b3ad676e
[wophone] Use Sys_SchedYield to control the FPS, instead of Sys_Sleep.
2011-05-06 18:00:43 +08:00
e14040730b
fixed #455 : release CCUserDefault at end & fix a bug when the user delete CCUserDefault carelessly
2011-05-06 17:46:19 +08:00
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
6c69107f33
fixed #455 : CCUserDefault works ok on iOS
2011-05-06 17:01:41 +08:00
ced029257f
temp commit
2011-05-06 16:38:09 +08:00
7e40957e04
Merge https://github.com/cocos2d/cocos2d-x into iss455
2011-05-06 16:29:44 +08:00
80f739942d
issue #455 : compile CCUserDefault on iOS
2011-05-06 16:29:35 +08:00
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
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
2c0bd49513
issue #455 : CCUserDefault ok on win32 & Android
2011-05-06 15:31:51 +08:00
846b529e49
[wophone] fixed #482 , Modify the resource data path for the new WoPhone-SDK.
2011-05-06 10:13:12 +08:00
0fe61642f6
issue #478 text input ok.
2011-05-05 18:17:50 +08:00
dcdad9a81a
Merge pull request #250 from yangws/481
...
fixed #481 DisableKeyLock and DisableBackLightAutoTurnOff when BackLightTurnOn.
2011-05-05 00:53:10 -07:00
6eb24cafee
fixed #481 remove KeyLock control code.
2011-05-05 14:00:36 +08:00
7c5a6d779c
fixed #481 DisableKeyLock and DisableBackLightAutoTurnOff when BackLightTurnOn.
2011-05-05 11:51:13 +08:00
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
d73699aabb
[ios] tests add RootViewController for rotate with ui object.
2011-04-28 14:19:12 +08:00
f8dc140840
change CCLabelTTF accept string from gb2312 to utf8.
2011-04-27 18:19:47 +08:00
e895d9d073
TextInputTest compile ok on android and merge last master code.
...
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input
Conflicts:
HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java
HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxRenderer.java
HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj
cocos2dx/platform/android/Cocos2dJni.cpp
tests/test.android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java
tests/test.android/src/org/cocos2dx/lib/Cocos2dxRenderer.java
tests/test.ios/test.xcodeproj/project.pbxproj
tests/test.win32/test.win32.vcproj
2011-04-26 18:04:07 +08:00
9b08f4add6
keyboard notification message on ios and TextFieldTTF test code OK.
2011-04-26 16:33:20 +08:00
b3f76a81a4
[win32] issue #471 , CCFileUtils::fullPathFromRelativeFile mustn't calculate realtive path twice
2011-04-26 14:53:57 +08:00
99733c602d
[android] fixed #462 : call applicationDidEnterBackground and applicationWillEnterBackground on android
2011-04-25 15:13:24 +08:00
38ee881876
Merge branch 'master' of https://github.com/natural-law/cocos2d-x
2011-04-25 09:52:13 +08:00
7337119501
issue #466 , Modify the interface to fit the refactor of CCFileUtils.
2011-04-25 09:40:10 +08:00
85afa22195
[android] fixed typo in CCEGLView method name
2011-04-24 18:52:21 +04:00
386005ef79
issue #466 , Bin forget to modify CCFileUtils_ios.mm to fit the refactor, which cause compilation error.
2011-04-24 15:44:00 +08:00
252f3efe1a
CCIMEDispatcher works on android.
2011-04-22 16:33:41 +08:00
e2ce006db2
fixed #466 . [wophone] Refactor the CCFileUtils for the new packing approach.
2011-04-22 10:57:46 +08:00
8458058f26
Merge branch 'iss393' of https://github.com/minggo/cocos2d-x into minggo-iss393
2011-04-20 17:19:03 +08:00
fd45cbea77
[android] fixed #393 : use new version of libxml2, it supports xpath and xslt
2011-04-20 17:08:50 +08:00
7b51fa8e9b
[android] fixed #393 : use new version of libxml2, it supports xpath and xslt
2011-04-20 16:11:18 +08:00
e5441a4fc2
fixed #450 : can set default pixel format other than RGBA8888
2011-04-20 15:34:33 +08:00
85027c40ca
CCIMEDispatcher works on ios.
2011-04-19 18:11:57 +08:00
0db048de73
Merge branch 'issue_456' of https://github.com/minggo/cocos2d-x into minggo-issue_456
2011-04-19 11:36:00 +08:00
c38af3c28d
fixed #456 : integrate libcurl into cocos2dx
2011-04-19 10:57:44 +08:00
d11bd85d00
CCTextFieldTTF works on win32.
2011-04-19 09:32:33 +08:00
a4e9f1c18d
libcurl works ok on ios
2011-04-18 14:12:41 +08:00
eb4b31e4da
update config file from doxygen 1.7.2 to 1.7.4. add simple brief for CCMessageBox
2011-04-16 15:21:50 +08:00
37e7fad0d3
issue #456 : add curl test & libcurl.so works ok on android
2011-04-15 17:15:05 +08:00
3d6fd051ab
issue #449 : refactor CCTransition
2011-04-11 16:09:14 +08:00
37bb33d9e5
fixed #452 : refactor CCDirector CCNode CCGrid
2011-04-11 15:10:09 +08:00
d4dbedca4d
fixed #451,remove the code of support mac platform.
...
1. Remove the EventDispatcher.
2. Refactor CCLayer, CCMenu and CCParticleSystemPoint.
3. Modify the project file of win32, wophone and android.
2011-04-11 11:24:10 +08:00
b1ab937ec3
fix MouseEvent bug
2011-04-07 11:05:44 +08:00
b33aeac164
[airplay] renamed "CCEGLView::setFrameWitdAndHeight" to "CCEGLView::setFrameWidthAndHeight".
...
reformatted CCEGLView::setMotionTouch for unification with other functions of "setTouche".
2011-04-04 01:58:07 -07:00
6927dae38f
[airplay] renamed "CCEGLView::setFrameWitdAndHeight" to "CCEGLView::setFrameWidthAndHeight".
...
reformatted CCEGLView::setMotionTouch for unification with other functions of "setTouche".
2011-04-04 01:56:15 -07:00
de81120b6a
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
2011-04-03 09:51:01 +08:00
28fbfb04dc
Merge branch 'iss349' of https://github.com/natural-law/cocos2d-x into natural-law-iss349
2011-04-03 09:30:26 +08:00
0aa8eb2892
fixed #350 : transitionfade flickers on both android and iphone
2011-04-02 16:16:19 +08:00
72f11cb421
[ios]fixed #349,Modify the method of parse *.plist files in order to deal with *.plist files in binary format.
2011-04-02 11:32:15 +08:00
39b60291ed
Merge branch 'issue_441' of https://github.com/minggo/cocos2d-x into minggo-issue_441
2011-04-01 17:34:17 +08:00
8fbfc2773a
Merge branch 'issue_440' of https://github.com/minggo/cocos2d-x into minggo-issue_440
2011-04-01 17:19:30 +08:00
7d52161804
fixed #441 : Initialize pointer in contruction & detect pointer value in destruction
2011-04-01 16:06:53 +08:00
ac84278dae
[android] #443 implemented CCKeypadDelegate on android
2011-04-01 11:27:06 +04:00
2c539a1df5
[android] fixed #440 : CCMessage works ok on android
2011-04-01 11:35:26 +08:00
63801db3f6
fixed #440 Commit missing file last commit.
2011-03-31 11:23:58 +08:00
20539d4b89
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 439
2011-03-31 10:51:00 +08:00
f8a5a4ecf3
CCMessageBox works on ios.
2011-03-31 10:36:53 +08:00
70eb85e6df
Merge branch 'yangws-439'
2011-03-30 11:47:10 +08:00
7e81c56231
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 439
...
Conflicts:
cocos2dx/platform/ios/CCFileUtils_ios.mm
2011-03-30 11:05:23 +08:00
35d94eb3a5
Merge branch 'iss411' of https://github.com/natural-law/cocos2d-x into natural-law-iss411
2011-03-30 10:44:34 +08:00
ba68a5b966
fixed #439 test OK.
2011-03-29 17:32:52 +08:00
87ea85a986
fixed #411,support .plist format generated by zwoptex in the last version.
2011-03-29 16:59:50 +08:00
48d57b88e2
issue #439 ios and airplay midified.
2011-03-29 15:59:37 +08:00
1887417472
issue #439 ios and airplay midified.
2011-03-29 15:56:55 +08:00
5811fb7c76
Merge branch 'issue_422' of https://github.com/minggo/cocos2d-x into minggo-issue_422
2011-03-29 15:50:28 +08:00
6c5cf577b7
issue #439 wophone and android modified.
2011-03-29 15:05:53 +08:00
c686047f83
[android] fixed #422 : multitouch for android
2011-03-29 14:20:05 +08:00
334786c633
fixed #391,Add implement of CCNS on airplay.
2011-03-29 13:59:10 +08:00
edc33952be
fixed #391,Add support on ios and airplay.
2011-03-29 12:50:25 +08:00
5f7357bf09
fixed #391,CCSpriteFrameCache support *.plist files with format value is not 0.
2011-03-29 11:56:14 +08:00
041953151a
issue #439 CCFileData and imageWithImageFile modified on win32.
2011-03-29 11:41:44 +08:00
1991a65b0b
Merge branch 'master' into iss391
...
Conflicts:
HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj
cocos2dx/proj.win32/cocos2d-win32.vcproj
cocos2dx/proj.wophone/Makefile.ARM
cocos2dx/proj.wophone/cocos2d-wophone.vcproj
template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj
template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj
template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
tests/test.ios/test.xcodeproj/project.pbxproj
2011-03-29 10:20:57 +08:00
6cc09aa4dc
Merge branch '396' of https://github.com/yangws/cocos2d-x into yangws-396
2011-03-28 21:08:56 +08:00
6b66affbab
fixed #396 wophone modified.
2011-03-28 17:20:39 +08:00
a9f85a2daa
issue #396 airplay modified.
2011-03-28 17:10:05 +08:00
e38d3a2277
Merge branch 'master' into iss434
...
Conflicts:
cocos2dx/platform/airplay/CCFileUtils_airplay.h
template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj
template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj
template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
2011-03-28 17:06:32 +08:00
ed2566e201
issue #434,Refactor class CCFileUtils on platform airplay.
2011-03-28 16:27:26 +08:00
a5040e0ccb
issue 396 ios modified.
2011-03-28 13:41:14 +08:00
814b66b089
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 396
2011-03-28 11:11:50 +08:00
dceff2d179
issue #396 android modified.
2011-03-28 11:09:49 +08:00
4b86cec4be
issue #396 win32 modifyed.
2011-03-28 10:44:14 +08:00
2f573a784e
fixed #435 , CocosDenshion crashes at foreground/background switching
2011-03-27 22:17:18 +08:00
cee82fe9fa
issue #434,refactor class CCFileUtils on android and ios.
2011-03-26 17:24:37 +08:00
f568ad8487
issue #379 , fix a bug caused by airplay port integration, which makes android port unable to load resources by zlib.
2011-03-26 14:09:42 +08:00
28a940ab57
issue #434,refactor class CCFileUtils on win32 and wophone.
2011-03-26 13:52:33 +08:00
2015e468ca
fixed #417 When mouse pressed， capture it in EGLView.
2011-03-26 11:34:18 +08:00
95d672a858
add copyright & author name for airplay port
2011-03-25 15:30:10 +08:00
9b8bc8373b
fixed #431 , manually merge the WenSheng's work
2011-03-25 14:20:53 +08:00
fa5e71916b
issue #431 , manually merge WenSheng's work
2011-03-25 14:16:58 +08:00
ff91c91ea9
issue #427 android HelloWorld ok
2011-03-25 12:01:56 +08:00
799fb0994f
issue #427 , airplay port ok
2011-03-24 18:17:35 +08:00
db4fb7cc9c
issue #427 , refactor ios port ok.
2011-03-24 17:51:29 +08:00
b9c56f1728
issue #427 , try to add CCSAXParser.h
2011-03-24 16:16:49 +08:00
55143e3b9e
issue #391,implement functions:CCRectFromString, CCPointFromString and CCSizeFromString.
2011-03-24 10:38:08 +08:00
ed492bbd1e
[airplay] first commit of airplay port. Thanks for Аксёнов Максим's contribution!
2011-03-23 22:16:20 +08:00
81fa070125
fixed #418 , add copyright of original authors, merge Bin's commit
2011-03-19 14:45:51 +08:00
d8c28d3754
Merge branch 'issue_409' of https://github.com/minggo/cocos2d-x into minggo-issue_409
2011-03-18 15:59:01 +08:00
b56014c70f
issue #376 , ios version compilation error when when COCOS2D_DEBUG = 1, fix CCLOG(@"...") to CCLOG("")
2011-03-18 15:17:15 +08:00
47173778cc
fixed #409 : rename NSArray UIAlignment
2011-03-18 14:31:29 +08:00
724ac1d0a9
Merge branch 'issue_403' of https://github.com/minggo/cocos2d-x into minggo-issue_403
2011-03-18 10:08:43 +08:00
7c52a521fa
fixed #403 : change UIEvent to CCEvent
2011-03-18 09:39:34 +08:00
b4d757ce9e
fixed #408 @5m , fix memory leak in CCImage::_initWithPngData
2011-03-17 14:26:36 +08:00
fc2818cf21
fixed #404 enableRitinaDisplay return false on iphone3
2011-03-17 11:10:50 +08:00
61e2f56439
Add Retina display resource for tests.
...
Modify CCDrawingPrimitives.cpp for retina display support.
2011-03-15 15:12:50 +08:00
89db0334a3
revert the modification of CCNode_mobile.cpp and CCSprite.cpp
2011-03-15 10:27:16 +08:00
4b61e713e5
Merge branch 'dev' of https://github.com/yangws/cocos2d-x into yangws-dev
2011-03-15 10:20:56 +08:00
0c75af0f97
[android]fixed #356,CCLabelTTF::initWithString not crashed anymore.
2011-03-14 18:29:15 +08:00
1e67709e34
fixed #392 CC_SPRITE_DEBUG_DRAW OK.
2011-03-12 15:20:26 +08:00
dd675f8cf1
[wophone]Resolve the memory leak of CCAccelerometer.
2011-03-11 17:41:19 +08:00
f0661a2679
fix 4 bugs:
...
1 call CCTextureCache::purgeSharedTextureCache() to release cached texture when enableRetinaDisplay is called.
2 enableRetinaDisplay performence correctly.
3 Modify libcocos2d project pre-link event performence corretly when the source in the path which contain white blacks.
4 Modify HiResTest, that can switch resouce dynamicly now.
2011-03-11 11:04:22 +08:00
a45125dafe
Merge branch 'issue385' of https://github.com/yangws/cocos2d-x into yangws-issue385
2011-03-10 17:20:32 +08:00
8335e30aef
fixed #385 Impliment CCLog on ios.
2011-03-10 17:08:38 +08:00
93aebbc469
[wophone]fixed #386,Resolve the compile conflict on wophone sdk.Modify the makefiles for wophone.
2011-03-10 14:24:13 +08:00
cb24e03466
Merge branch 'iss377' of https://github.com/natural-law/cocos2d-x into natural-law-iss377
2011-03-10 09:37:26 +08:00
7c6147421b
[wophone]fixed #377,Replace the word "uphone" with "wophone".
2011-03-09 17:28:35 +08:00
12981fac89
fixed #375
2011-03-09 16:19:20 +08:00
19470fda34
Merge branch 'iss383' of https://github.com/natural-law/cocos2d-x into natural-law-iss383
2011-03-09 14:55:45 +08:00
15368e6169
Merge branch 'issue373' of https://github.com/yangws/cocos2d-x into yangws-issue373
2011-03-09 14:53:51 +08:00
75e2ecc16d
issue #387 : move platform_support into cocos2dx/platform
2011-03-09 14:40:05 +08:00
63d283d3e8
delete ccxString.h
2011-03-09 12:00:04 +08:00
7aaf4be85f
move platform_support into cocos2dx/platform
2011-03-09 11:38:36 +08:00
4c0ace849a
[wophone]fixed #383
...
1. Modify the approach of handle left soft-key clicked.
2. Fix some compile error.
2011-03-09 11:26:13 +08:00
151a0096fa
fixed #373 Hide PVRFrame window on win32.
...
Modify the PVR registry "hide_gui" false in CCApplication_win32.cpp.
2011-03-09 10:39:08 +08:00
1aafd4fc56
issue #375 : fix some compile error
2011-03-09 10:21:29 +08:00
f1d13ca2e1
issue #375 : android compiled ok
2011-03-08 13:49:58 +08:00
837b8c04bf
issue #375 : rename some macros
2011-03-08 09:29:41 +08:00
7a331e1e14
issue #375 : wophone compiled ok
2011-03-07 18:20:48 +08:00
b5a99f90df
issue #375 : rename file names and object names
2011-03-07 17:11:57 +08:00
632cf39a8a
fix a bug when merging master into dev
2011-03-07 10:34:42 +08:00
aaf898cb72
merge master into dev
2011-03-07 09:52:45 +08:00
661bae2797
merge natural-law-iss370
2011-03-04 16:32:54 +08:00
aef83b2660
[uphone]Move Application from Application code to Cocos2dx/platform/ccxApplication.
2011-03-02 17:45:04 +08:00
4379a1c96f
Move ccxApplication to cocos2dx/platform on ios.
2011-03-02 17:05:22 +08:00
f7b401163b
Merge branch 'multitouchController' of https://github.com/Macarse/cocos2d-x into Macarse-multitouchController
2011-03-02 09:38:23 +08:00
89b4d07ed8
[android] fixed #368 : move Application code to cocos2dx/platform/ccxApplication
2011-03-01 19:53:39 +08:00
fc75306402
[android] fix a bug when run in HVGA
2011-03-01 18:34:06 +08:00
b65d84551b
resolve confict when merging branch yangws-issue366
2011-03-01 14:08:18 +08:00
7bc7d32001
fixed #366 [win32] Move Application from Application code to Cocos2dx/platform/ccxApplication
2011-03-01 12:41:57 +08:00
1b6602f582
Merge branch 'WVGA_scale_android' of https://github.com/minggo/cocos2d-x into minggo-WVGA_scale_android
2011-02-28 10:00:55 +08:00
f504211e56
merge natural-law-iss332 to dev
2011-02-28 09:48:14 +08:00
498e0072e1
[android] fixed #358 : autoscale HVGA resource to WVGA
2011-02-26 15:52:57 +08:00
0453eb0266
[android] issue #338:refactor platform_support
2011-02-24 19:42:45 +08:00
03e946a34f
Delete unused files.
2011-02-23 18:24:29 +08:00
63cedd1317
Merge code of Platform_support for IOS.
2011-02-23 18:22:05 +08:00
949c1000a8
update tests to 0.99.5.
2011-02-23 16:47:25 +08:00
36cb90aaa0
Merge branch 'jpgsupport' of https://github.com/minggo/cocos2d-x into minggo-jpgsupport
2011-02-23 14:13:48 +08:00
3dde0ebcf5
[android] fixed #353 : support jpg on android
2011-02-23 13:43:45 +08:00
4362a5f381
[uphone]issue #316,Resolution auto adjustment.
2011-02-19 17:44:43 +08:00
60e9ae873c
Merge branch 'dev-retina' of https://github.com/yangws/cocos2d-x into iss316
...
Conflicts:
HelloWorld/AppDelegate.cpp
tests/AppDelegate.cpp
2011-02-19 10:19:14 +08:00
85b9c9ae21
Retina display support and scale with keep w/h rate ok on win32.
2011-02-18 18:30:22 +08:00
4267593bf9
Used an array approach
2011-02-17 23:23:36 -03:00
8035fc366c
[uphone]Support read image file from zip file.
2011-02-17 16:16:50 +08:00
e4063fd190
[uphone]issue #340.Refactor platform_support on uphone,and run HelloWorld successful on both simulator and device.
2011-02-17 14:31:52 +08:00
0f52839efb
[uphone]support wrap when the dimensions is specified in CCLabelTTF.
2011-02-16 11:03:32 +08:00
693a8f049b
[iphone] test alignment in labels, ref to the post http://www.cocos2d-x.org/boards/6/topics/588?r=589#message-589 Thanks to Slaz
2011-02-14 11:51:56 +08:00
626a3f8b74
[uphone] fixed #348 , text drawing blur if color=white and fontSize<24
2011-02-12 22:42:42 +08:00
8458476597
Merge branch 'dev' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
...
Conflicts:
.gitignore
2011-02-12 16:42:47 +08:00
81848f19e6
Merge branch 'bug345' of https://github.com/minggo/cocos2d-x into minggo-bug345
2011-02-12 11:29:27 +08:00
eef0bd4578
[iphone] fixed bug #345 : remove init invoking
2011-02-11 16:06:09 +08:00
8d5995d5a6
First approach
2011-02-06 17:05:56 -03:00
66038230eb
Added logic to disable sensors from the c++ code
2011-02-05 20:17:24 -03:00
284c330569
Added code from walzer's comment
2011-02-01 00:11:42 -03:00
fce540989d
First approach
2011-01-30 20:05:30 -03:00
34a6ca5208
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
...
Conflicts:
cocos2dx/platform/win32/CCXUIImage_win32.cpp
cocos2dx/platform/win32/CCXUIImage_win32.h
tests/test.win32/test.win32.vcproj
2011-01-28 14:33:47 +08:00
76ea63da7f
Change prefix CCX to ccx.
2011-01-27 17:07:36 +08:00
3260eddd75
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-01-26 17:11:39 +08:00
ead71525e2
[uphone] don't block when zip resources loading failed
2011-01-26 17:08:19 +08:00
a0ecaed1ef
[android] define s_bPopupNotify
2011-01-26 16:45:27 +08:00
54dc660f6b
[android] change the declaration of s_bPopupNotify from public to private
2011-01-26 16:44:58 +08:00
39165142b8
[iphone] change the declaration of s_bPopupNotify from public to private and define it
2011-01-26 16:44:12 +08:00
31d287a77d
[uphone]change the declaration of s_bPopupNotify from public to private
2011-01-26 16:42:48 +08:00
072ed1651e
[win32] change the declaration of s_bPopupNotify from public to private
2011-01-26 16:41:59 +08:00
a732665b85
Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master
2011-01-26 15:48:02 +08:00
3746af1d63
fixed #328.Modify the function and parameter name.
2011-01-26 15:43:12 +08:00
7015e85918
fixed #328.By default,pop up a err dialog when loading textures failed.
2011-01-26 11:50:13 +08:00
950a284b94
[iphone] fixed #289 , clear a warning.
2011-01-26 11:31:01 +08:00
9e2587c26c
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
2011-01-25 17:09:11 +08:00
6a1b8d64aa
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-01-25 15:09:34 +08:00
d56575dd5a
[uphone]change the parameter order of function setResource.And add default value of the parameter pszResPath.
2011-01-25 14:26:26 +08:00
462ac4823f
bug fix, CCDirect_mobile.cpp crash m_bPurgeDirecotorInNextLoop, according to this post http://www.cocos2d-x.org/boards/6/topics/422
2011-01-25 11:33:03 +08:00
9eff0da20a
fix warning when building on android
2011-01-24 10:51:30 +08:00
1a17f3ea55
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
...
Conflicts:
cocos2dx/platform/win32/CCXApplication_win32.cpp
tests/test.win32/test.win32.vcproj
2011-01-22 17:52:06 +08:00
e23c1eb2f6
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
2011-01-22 16:45:26 +08:00
bc9bfdc30c
Move win32/CCXApplication to platform_support
2011-01-22 16:24:54 +08:00
4a4c0d3485
[android] fixed #321 : Frame control of android. It is not so accuracy.
2011-01-22 15:10:18 +08:00
9d8f0f4b17
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
2011-01-21 18:18:13 +08:00
882b473291
[iphone]: font support
2011-01-21 18:15:12 +08:00
cb7a0e553a
[iphone]: frame control
2011-01-21 17:33:15 +08:00
6bde512cbe
[android]issue #268,support more fonts on cocos2d-android.
2011-01-21 17:32:11 +08:00
31fc6c0039
[uphone]fixed #308,Modify the code,remove the function CCXApplication::setIsInBackground().
2011-01-20 13:55:45 +08:00
f7107fb015
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge
...
Conflicts:
cocos2dx/platform/uphone/CCXApplication_uphone.h
2011-01-20 13:47:01 +08:00
3d225465c0
[uphone]fixed #308,BGM is paused when press power key to make uphone sleep.
2011-01-20 13:41:58 +08:00
333f0b5574
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
...
Conflicts:
HelloWorld/AppDelegate.cpp
cocos2dx/particle_nodes/CCParticleSystem.cpp
cocos2dx/proj.win32/cocos2d-win32.vcproj
tests/AppDelegate.cpp
2011-01-20 11:18:35 +08:00
ee50078b3e
implement FPS limitation on UPhone.
2011-01-20 10:49:30 +08:00
b7e109f6e6
fixed iphone/android/uphone compilation errors brought by the prevous commit of #322
2011-01-19 22:29:57 +08:00
9347fadc71
[win32] fixed #322 , FPS control on win32
2011-01-19 18:23:42 +08:00
e404a6aeb9
Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master
2011-01-19 18:11:21 +08:00
d627608ff4
win32 platform fps limitation support.
2011-01-19 17:59:20 +08:00
816deced9e
Merge branch 'upto-0.99.5' of https://github.com/natural-law/cocos2d-x into natural-law-upto-0.99.5
2011-01-19 16:41:47 +08:00
a0c50d3edb
[iphone] support UTF8 Chinese chars
2011-01-19 16:26:55 +08:00
804dc4ef7c
Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
...
Conflicts:
cocos2dx/platform/CCArchOptimalParticleSystem.h
cocos2dx/platform/win32/CCXBitmapDC.cpp
cocos2dx/proj.win32/cocos2d-win32.vcproj
2011-01-19 15:29:08 +08:00
79b711a758
move CCXBitmapDC from cocos2d/platform to platform_support.
2011-01-19 14:23:26 +08:00
f992838f96
[uphone]fixed #293,Modify the absolute path method in CCFileUtils.
2011-01-18 18:21:06 +08:00
c682dd7084
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge
2011-01-18 10:16:35 +08:00
acb4a6a369
[uphone]fixed #293,modify the absolute path method in CCFileUtils.
2011-01-18 10:14:44 +08:00
e399a77369
fixed #306 , invoke CCDirector::end() method in next msgloop, otherwise the flow will crashes when end() is called in an ActionInterval.
2011-01-17 22:01:15 +08:00
ad5ee3c9f6
Merge remote branch 'remotes/origin/upto-0.99.5' Fix some conflicts manually.
2011-01-17 16:21:11 +08:00
67c0ad6332
add platform support project on win32.
...
Move macros, CCXUIImage, ccxCommon, CCXCocos2dDefine, 3rd party libraries, glu, NSLock, ccxConfig from platform/win32 to platform_support.
2011-01-15 18:05:35 +08:00
acff950860
[uphone]fixed #315,remove the way which use resource in ResourceMap.
2011-01-14 17:42:37 +08:00
6043008a11
Merge branch 'track' of https://github.com/leon-li/cocos2d-x into leon-li-track
2011-01-13 13:52:20 +08:00
5fe891408c
[win32]fixed #314,when function CCDirector::setDeviceOrientation() be called calculate the Projection and window size again.
2011-01-13 10:14:32 +08:00
d1c6c466d3
fixed #312,fix the bug of CCXBitmapDC in cocos2d-win32.
2011-01-12 15:48:36 +08:00
00a9615e0f
Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into merge
2011-01-10 18:08:57 +08:00
237042f7dd
fixed #309,App will not crash any more when surface re-created.
2011-01-10 17:54:44 +08:00
d405d3a1ba
fixed #310 :
2011-01-10 16:03:53 +08:00
7e30615d02
issue #304 Remove codes for controlling frame rate.
2011-01-10 15:13:30 +08:00
653cb2d76d
[uphone] fixed #308 , BGM can be paused after power key pressed to make uphone sleep.
2011-01-10 11:03:58 +08:00
78a7329054
Merge branch 'upto-0.99.5' of https://github.com/natural-law/cocos2d-x into natural-law-upto-0.99.5
2011-01-08 09:27:58 +08:00
c02a9a4dd5
Setting apk file path at runtime in cocos2d-android.
2011-01-07 16:29:06 +08:00
ec7fbd0e69
Fix bugs.
...
1. Run tests and HelloWorld in cocos2d-android.
2. Modify the makefile of cocos2d-uphone.
2011-01-07 11:30:19 +08:00
1f08213563
HelloWorld runs ok on iphone
2011-01-07 11:27:42 +08:00
a391c8ef99
fixed some errors for iphone platform
2011-01-07 10:25:32 +08:00
99dd33f94a
Merge branch 'upto-0.99.5' of https://github.com/minggo/cocos2d-x into upto-0.99.5
2011-01-07 09:33:09 +08:00
9a959c299f
fixed some errors of iphone platform
2011-01-07 09:35:27 +08:00
e0570d43ad
Fix bugs.Run HelloWorld and tests in cocos2d-win32 successful.
2011-01-06 14:04:03 +08:00
dumganhar