Commit Graph

440 Commits

Author SHA1 Message Date
minggo a2efab73a0 fixed #959: make touch id correct on android 2012-01-31 14:49:02 +08:00
minggo 6c2277757a fixed #958: delete SelectorProtocol and implement it in CCObject 2012-01-30 17:47:47 +08:00
gzito 9e180e9c01 Added true type fonts file for Marmalade version 2012-01-17 10:53:47 +01:00
dumganhar 3f7ab5a58f Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into modify_linux_port 2012-01-12 19:17:31 +08:00
dumganhar ef753afb6b modify eclipse project setting for linux port 2012-01-12 19:15:23 +08:00
minggo df668c9785 Merge pull request #675 from minggo/test
fixed #930: linux supports jpg format file
2012-01-12 01:51:16 -08:00
minggo 0e03c8ca21 fixed #930: linux supports jpg format file 2012-01-12 17:46:53 +08:00
minggo 3905e5a47b Merge pull request #670 from minggo/test
fixed #941: limit background music volume in [0, 1.0]
2012-01-11 01:57:27 -08:00
minggo 40b1798f41 fixed #941: limit background music volume in [0, 1.0] 2012-01-11 17:56:11 +08:00
dumganhar 5a411277fb modify helloworld project setting and use new icon for qnx project 2012-01-11 14:31:31 +08:00
minggo 86997d6709 fixed #940: replace icons and background pictures 2012-01-10 16:45:49 +08:00
dumganhar 317f23f498 fixed #939: Add create_qnx_project.vbs and add project references 2012-01-09 19:06:49 +08:00
dumganhar 2f1c313d12 Merge pull request #658 from gzito/master
Added options to compile libFreetype and libXml2 also under Marmalade Mac (x86 version)
2012-01-04 22:09:22 -08:00
minggo 1bd3601b11 fixed #937: use gnustl_static instead of stlport_static to resolve compiling error on android x86 platform 2012-01-04 18:02:32 +08:00
gzito 28562c3fb9 Merge branch 'master' of git://github.com/cocos2d/cocos2d-x 2011-12-27 16:14:19 +01:00
minggo afa8e48783 fixed #919: linux template supports global variable 2011-12-23 14:45:41 +08:00
minggo 61e87f661b issue #888: fix some typo error 2011-12-23 11:12:06 +08:00
minggo edbbe25a98 issue #888: remove the setting for android building 2011-12-23 10:40:02 +08:00
gzito 4550e2cba7 Lowered memory requirement for HelloWorld 2011-12-20 22:07:09 +01:00
minggo b7fbd4fc13 issue #919: supporting global variable 2011-12-20 16:50:39 +08:00
minggo 857ce1d505 fixed #921: fix a bug that accelerometer axes inverted in android tablet 2011-12-19 16:29:26 +08:00
Walzer fa3bbac3c7 Merge branch 'master' of http://github.com/cocos2d/cocos2d-x 2011-12-16 15:51:50 +08:00
Walzer ff883f1cdf Remove HelloWorld/iphone/HelloWorld.xcodeproj, it's merged from bada branch. The correct one is ios/HelloWorld.xcodeproj. 2011-12-16 15:50:58 +08:00
dumganhar af221f8710 fixed #918: modify filter of airplay to marmalade. 2011-12-16 11:08:37 +08:00
Walzer 7d01aa0c74 HelloWorld, Test and HelloLua can succefully compiled by xcodebuild commenline with -sdk iphonesimulator4.3 now. The key is GCC_VERSION="", you can not skip this null value, otherwise the commendline will use GCC4.2 as default, can generate tons of errors. 2011-12-13 22:25:51 +08:00
Walzer 6d17d711b5 fix a bug that xcodebuild -sdk iphone4.3simulator -configuration Debug cannot build successfully. The tiny error is that we use GCC4.2 in debug build. 2011-12-13 18:03:27 +08:00
dumganhar 625d299717 Merge branch 'master' of https://github.com/gzito/cocos2d-x into marmalade 2011-12-13 10:01:29 +08:00
gzito d4ea6d4ef5 Rollback changes about CCDirector::sharedInstance as pointer
Optimized a little bit CCImage::initWithString
Fixed CCApplication::run in order to handle closing Marmalade simulator
2011-12-12 14:50:35 +01:00
dumganhar e7a653b71d delete helloworld project on airplay platform 2011-12-12 19:05:57 +08:00
dumganhar 4b9cbb85ff #issue 908: Merge marmalade to latest cocos2d-x source
Merge branch 'master' of https://github.com/gzito/cocos2d-x into marmalade

Conflicts:
	cocos2dx/platform/CCFileUtils.cpp
	cocos2dx/platform/CCPlatformConfig.h
	cocos2dx/support/zip_support/ioapi.cpp
2011-12-12 17:46:21 +08:00
dumganhar baf3755142 remove some '__QNX__' macros 2011-12-12 16:14:12 +08:00
dumganhar dea2713f51 fixed #907: add blackberry port
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into blackberry

Conflicts:
	cocos2dx/platform/CCSAXParser.h
2011-12-12 11:49:49 +08:00
minggo 95b43ac563 Merge pull request #614 from minggo/issue892_RTTI
Use RTTI to simplify codes
2011-12-11 19:40:34 -08:00
minggo 8c5c3300aa Merge pull request #612 from dumganhar/issue904
Issue904
2011-12-11 19:33:07 -08:00
Giovanni Zito aabe452f2e Updated for Marmalade 2011-12-09 22:15:52 +01:00
dumganhar 1c9ecabd89 modify all projects config 2011-12-09 17:03:11 +08:00
dumganhar 5dea9b8205 fix a crash bug in SimpleAudioEngine.cpp
update helloworld and tests main.cpp and AppDelegate.cpp files
2011-12-09 15:54:35 +08:00
dumganhar b11bcacea8 modify Device-Debug project setting, finished running on device! 2011-12-08 18:22:06 +08:00
Giovanni Zito 1eb8ba656e Added marmalade folder 2011-12-08 11:15:20 +01:00
dumganhar fa07d16f73 switch to WVGA 2011-12-08 11:07:17 +08:00
dumganhar de7754697f fixed #904: use relative path for bada 2.0 projects 2011-12-07 18:26:38 +08:00
minggo a3986a9e21 issue 892: add cpp flag to support rtti on android 2011-12-07 16:51:54 +08:00
dumganhar 2c94bcc075 add some files for qnx 2011-12-07 16:22:40 +08:00
styck 96d400d918 Replace expat with libxml2, added libxml2 libraries and header files. Library built from: https://github.com/marmalade/marmalade-libxml2
Refactored Accelerometer to match other platforms

Updated SimpleAudioEngine.cpp with new functions.  (NOT tested).

Updated app.icf for latest Marmalade

Update deprecated function calls.

Removed CCSAXParser_aiplay.cpp - not used, uses default in platform.
2011-12-06 18:32:36 -08:00
dumganhar bfdb908d01 add Cocos2dx project
add HelloWorld project and rename proj.blackberry fold to proj.qnx
2011-12-06 14:56:37 +08:00
dumganhar d71b467ca5 modify helloworld .cproject, use xcopy /y /s to copy resource 2011-12-01 17:02:11 +08:00
minggo cddaa3fea2 fixed #885: make SimpleAudioEngine::setEffectVolume() take effect immediately on android 2011-12-01 12:12:14 +08:00
dumganhar 3442d17dbe fixed #880: implement preLoadBackgroundMusic on bada, fix the bug that playEffect repeatly can't work. Modify CC_ASSERT macro define. 2011-11-28 18:05:38 +08:00
dumganhar cad4ff05f3 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base
Conflicts:
	cocos2dx/textures/CCTextureCache.cpp
2011-11-28 15:43:13 +08:00
dumganhar 31ea76c16a remove COCOS2D_DEBUG=1 in helloworld and cocos2dx project 2011-11-28 14:33:29 +08:00
dumganhar 20455bf164 fix a bug that when selecting "target-release" in building configurations, CCFileUtils::getFileData can't work correctly because CC_ASSERT is called uncorrectly. 2011-11-28 14:27:48 +08:00
minggo bd595516b8 issue #781: add new functions for sound 2011-11-25 09:56:06 +08:00
dumganhar e87b00db67 add pthread support for bada 1.0 2011-11-24 17:26:04 +08:00
dumganhar 07da67f253 Merge branch 'master' into master_base
Conflicts:
	cocos2dx/menu_nodes/CCMenu.cpp
2011-11-24 11:52:16 +08:00
dumganhar 2bd49545fa add bada1.0 pthread support 2011-11-24 00:07:50 +08:00
dumganhar 035d7326db Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-11-23 21:43:40 +08:00
minggo 8b20639d75 issue #838: HelloWorld support x86 2011-11-23 11:02:18 +08:00
minggo d48da20b0f synchrolize to master 2011-11-18 18:53:53 +08:00
U-zhangxm-PC\zhangxm d84b6c25be issue #223: merge bada branch and fix some error 2011-11-18 18:45:05 +08:00
minggo 775c7ff847 Merge pull request #573 from minggo/iss854_pthread
support pthread
2011-11-17 18:40:30 -08:00
minggo 522386a6b7 issue #854: pthread work ok on iOS 2011-11-18 09:55:47 +08:00
minggo dd8a2deeaf fixed #758: fix the bug that TTF fonts cause low memory on android 2011-11-16 11:40:24 +08:00
dumganhar 0d6ea61b76 fixed some bug:1.setDeviceOrientation, chipmunkDemo glOrthof 2011-11-07 18:18:10 +08:00
dumganhar 3b48a69d01 remove setResourcePath method 2011-11-07 14:19:46 +08:00
dumganhar e9a2818d0d use wvga setting, add SYSTEM_SERVICE 2011-11-02 01:11:06 +08:00
dumganhar d061e8323d modify project configure 2011-10-27 19:22:14 +08:00
dumganhar 4b653c89d1 modify project configure 2011-10-25 14:12:42 +08:00
dumganhar 146d3e1536 modify project config 2011-10-24 14:22:09 +08:00
dumganhar 3aef823bd5 rename sdk1.2 to sdk1.0 2011-10-24 11:00:11 +08:00
dumganhar 59a14973ef change splash and icon to cocos2d 2011-10-24 10:54:08 +08:00
dumganhar eb901be664 project config change 2011-10-21 09:49:57 +08:00
dumganhar da794c1613 Merge branch 'master' into bada 2011-10-21 09:28:29 +08:00
dumganhar fdbb989ce5 make sdk1.2 to sdk1.0 2011-10-20 18:31:10 +08:00
Walzer e3c39fe835 fixed #753, visual orientation is wrong on ios5 simulator 2011-10-19 21:43:25 +08:00
minggo 2490388f28 remove unneeded packages 2011-10-19 20:03:18 +08:00
minggo 68d03de677 fixed #743: let nativeInit() get correct screensize when running on device with software android buttons 2011-10-19 19:55:23 +08:00
minggo 2d3bfd4a1a fixed #755: get x y coordinate from existing array to avoid crashing on sunsumg devices 2011-10-19 17:01:35 +08:00
minggo 3a17163897 make script more strongable 2011-10-18 23:21:39 -07:00
dumganhar 3c4c4e515a modify project settings 2011-10-18 11:11:09 +08:00
minggo 9a834585bb modify the path to relative path in project setting 2011-10-16 20:53:48 -07:00
minggo 80cd3266df make HelloWorld and tests work ok on linux with eclipse 2011-10-16 02:21:17 -07:00
dumganhar ee53c29e5c switch to 2.0 WVGA 2011-10-16 13:23:48 +08:00
minggo a56145d613 change include path of HelloWorld vs2010 configuration, add CurrentLanguageTest into tests of vs2010 configuration 2011-10-16 12:00:44 +08:00
Walzer 47c9020b85 fixed #738: caculate label height if not set 2011-10-14 14:33:08 +08:00
minggo 9b72d36671 fixed a compiling error because .cpp & .h of HelloWorld are moved into folder Classes 2011-10-11 12:03:19 +08:00
dumganhar eb9cb31ca4 use shared lib for cocos2dx project 2011-10-09 18:15:31 +08:00
dumganhar 2f00b8ff1c update to sdk2.0.2 2011-10-09 01:11:33 +08:00
dumganhar beaa489406 add scale support 2011-09-30 17:19:16 +08:00
dumganhar 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
minggo 333e08330b make create-linux-android-project.sh works ok 2011-09-29 00:49:49 -07:00
dumganhar c4fc9eed2f add HelloWorld Icons folder 2011-09-29 10:21:20 +08:00
dumganhar cda492593c modify gameloop method
modify some project setting
2011-09-29 02:32:01 +08:00
dumganhar 41e279585e ADD application.xml and manifest.xml 2011-09-28 23:07:19 +08:00
dumganhar de545096de modify bada project setting 2011-09-28 18:21:17 +08:00
minggo fe5eeb70d5 add files from HelloWorld/Classes 2011-09-28 17:31:50 +08:00
minggo dcf803f032 modify proj setting because all cpp files of HelloWorld are moved into Classes 2011-09-28 16:46:53 +08:00
minggo 8c63344c16 merge cocos2d-x master 2011-09-28 15:32:30 +08:00
minggo 3912be7f9d not get value of ok button from xml file 2011-09-28 15:27:31 +08:00
minggo 446bd86fce make HelloWorld and tests runs ok on linux 2011-09-27 22:56:06 -07:00
dumganhar 2c274cb061 delete old 1.2 project 2011-09-28 09:46:40 +08:00