Commit Graph

61 Commits

Author SHA1 Message Date
Dale Ducharme 32e4cc1af2 Updating the following:
CocosDenshion - now using OpenAL exclusively for audio, added ogg/vorbis support there
Accelerometer - fixing the accelerometer for different initial orientations of the device
Application - paying attention to the locale of the device and setting the current language accordingly
CCEGLView - paying attention to navigator events (menu, application go to background, application enters foreground), fixed up orientation code, fixed up screen event pointer code
2012-01-30 20:27:58 -05:00
minggo 0e03c8ca21 fixed #930: linux supports jpg format file 2012-01-12 17:46:53 +08:00
gzito 65ddb88000 Added options to compile freetype and libXml under Marmalade MAC (x86 simulator version) 2012-01-04 23:34:48 +01:00
gzito 2acea5f7af libxml2.mkf for both Windows and Mac Marmalade versions 2012-01-03 00:39:31 +01:00
gzito a39be9506f Defines documentation to avoid warning in Marmalade 2011-12-20 22:34:23 +01:00
gzito d37417f7da Re-added libXml2 2011-12-20 22:10:01 +01:00
gzito 298f12e7a3 Removed libxml2 (precompiled version) 2011-12-20 22:05:01 +01:00
dumganhar af221f8710 fixed #918: modify filter of airplay to marmalade. 2011-12-16 11:08:37 +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 8c5c3300aa Merge pull request #612 from dumganhar/issue904
Issue904
2011-12-11 19:33:07 -08:00
gzito 47e108a8c5 Added marmalade support, removed airplay 2011-12-11 10:19:41 +01:00
styck f3b662a5a8 marmalade updates 2011-12-10 22:29:39 -08:00
styck dc6476ebe0 marmalade updates 2011-12-10 21:54:07 -08:00
styck 9fc2061c6b mamarlade updates 2011-12-10 21:20:15 -08:00
styck bcf63d0e96 Merged from gitbub.gom/gzito, marmalade support, remove airplay 2011-12-10 20:59:48 -08:00
Giovanni Zito 5584039f47 libFreeType and libJpeg for Marmalade 2011-12-09 21:58:32 +01:00
Giovanni Zito 0c1b058629 Changed symbols from "airplay" to "marmalade", added files and folders for marmalade 2011-12-08 12:16:32 +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
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 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 cc79e533a3 issue #854: add pthread for win32 and implement CCTextureCache::addImageAsync() 2011-11-16 11:04:29 +08:00
Leon b7f0385a2b bundle 64 bit linux static libs 2011-10-28 12:19:26 +08:00
dumganhar d061e8323d modify project configure 2011-10-27 19:22:14 +08:00
dumganhar 3aef823bd5 rename sdk1.2 to sdk1.0 2011-10-24 11:00:11 +08:00
dumganhar eb901be664 project config change 2011-10-21 09:49:57 +08:00
dumganhar fdbb989ce5 make sdk1.2 to sdk1.0 2011-10-20 18:31:10 +08:00
dumganhar 3c4c4e515a modify project settings 2011-10-18 11:11:09 +08:00
dumganhar ee53c29e5c switch to 2.0 WVGA 2011-10-16 13:23:48 +08:00
dumganhar 2f00b8ff1c update to sdk2.0.2 2011-10-09 01:11:33 +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
dumganhar cda492593c modify gameloop method
modify some project setting
2011-09-29 02:32:01 +08:00
dumganhar de545096de modify bada project setting 2011-09-28 18:21:17 +08:00
dumganhar a54ab3c293 add bada 2.0 project
move 1.2 project to sdk1.2 folder
2011-09-27 17:09:14 +08:00
dumganhar cd18394b09 add bada 2.0 project
move 1.2 project to sdk1.2 folder
2011-09-27 17:06:11 +08:00
dumganhar 294c796e55 add bada 2.0 project
move 1.2 project to sdk1.2 folder
2011-09-27 17:00:13 +08:00
dumganhar c78a4cb485 modify cocos2dx project setting for bada 2011-09-26 17:50:05 +08:00
dumganhar c93be8b828 modify <cstdio> to <stdio.h>
delete old project files
2011-09-20 12:39:44 +08:00
dumganhar 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
dumganhar 8ad2125139 add source code of libjpeg ,libpng ,zlib for bada 2011-09-20 02:16:20 +08:00
dumganhar 0e7fc78e4e commit some files of bada project 2011-09-19 18:05:40 +08:00
laschweinski c977f3e07c commit debug and release makefile 2011-08-28 16:44:20 +08:00