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

1013 Commits

Author SHA1 Message Date
James Chen d0f93d38f4 Merge pull request #769 from dumganhar/gles20-dev 
issue #1056: synchronise cocos2d-iphone gles2.0 branch, HelloWorld on win32 works ok.
 2012-03-14 00:00:57 -07:00
James Chen aefdb852a2 issue #1056: synchronise cocos2d-iphone gles2.0 branch, HelloWorld on win32 works ok. 2012-03-14 14:55:17 +08:00
Paolo Giangrandi 4f2f403827 Fixed a broken call to SetTouchInfo in CCEGLView_linux.cpp 2012-03-12 14:22:48 +01:00
Paolo Giangrandi 7820be7841 Fixed a typo: CCAplication_linux.{cpp,h} renamed in CCApplication_linux.{cpp,h} 2012-03-12 14:22:39 +01:00
James Chen bd59979495 add gles2.0 libraries for win32. 
add CCGLProgram, ccGLState, CCShaderCache.
add third library---kazmath
 2012-03-12 15:22:03 +08:00
minggo 7fc0ffbf26 fixed #737: remove view id 2012-03-12 11:00:12 +08:00
Wartortle 7321d33aaf Added support files for Accelerometer Simulation for iPhone Simulator and 
Unimotion
Ref: http://code.google.com/p/accelerometer-simulator/wiki/Home
Ref: https://github.com/gmarik/unimotion
 2012-03-08 11:23:47 +00:00
minggo 645d561276 fixed #737: remove view id 2012-03-08 12:40:27 +08:00
minggo a0f0971782 fixed #1017: improve win32 timing accuracy 2012-03-06 14:12:57 +08:00
James Chen 74b4b14ee3 Merge pull request #730 from moadib/qnx_eventhandler 
Added CCEGLView::EventHandler class for qnx-platform
Added window group id for qnx-version of CCEGLView
 2012-03-05 18:07:20 -08:00
James Chen cb1f94df47 revert CCFileUtils::getFileData method. 2012-03-05 09:55:50 +08:00
James Chen 347a8294ac fixed #1007: Allocate one more byte of '\0' to terminate string in CCFileUtils::getFileData. 2012-03-03 12:24:02 +08:00
minggo 796ba89e9d Merge pull request #742 from minggo/iss762_label_position 
compute correct text rect and display it on center
 2012-03-01 22:24:04 -08:00
minggo 2360a9a04e fixed #762: let zfont display on center 2012-03-02 14:22:01 +08:00
minggo 5485eb19d9 fixed #762: compute correct text rect and display it on center 2012-03-02 14:17:22 +08:00
minggo 79495fd743 Merge pull request #741 from minggo/master 
remove libiconv.a
 2012-03-01 19:28:35 -08:00
minggo c196f2dff2 issue #983: remove libiconv.a 2012-03-02 11:25:35 +08:00
minggo 528a769cf6 fixed #762: make label display on center on iOS 2012-03-02 11:15:44 +08:00
James Chen dfd5adb3bd fixed #994: add support for bbndk2.0 on blackberry platform. 2012-03-01 16:52:17 +08:00
James Chen 05bf647ec3 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss984_bada_qnx_static_lib 2012-02-28 15:00:18 +08:00
James Chen 2bc48219f8 remove libjpeg, libpng, libz project, use them as sources in cocos2dx project. 2012-02-27 18:18:40 +08:00
moadib de9f8dc441 Added window group id for qnx-version of CCEGLView 2012-02-24 08:40:35 +04:00
moadib 7fcdb3b114 Added CCEGLView::EventHandler class for qnx-platform 2012-02-22 12:27:13 +04:00
minggo b0b6b85a79 fixed #946: HD image for both retina and normal 2012-02-16 10:47:16 +08:00
James Chen a2a5af3348 update bada and qnx project settings 2012-02-15 13:52:41 +08:00
James Chen 2ef7b5d413 refactor folders for qnx 2012-02-15 11:26:28 +08:00
James Chen abbda72b2f modify bada 2.0 project setting 2012-02-14 23:31:37 +08:00
James Chen dac63dd2c2 rename include file name from uppercase to lowercase for linux platform 2012-02-14 22:41:33 +08:00
James Chen 3422696145 1.modify some project setting for bada 
2.rename some files
 2012-02-14 22:35:51 +08:00
minggo 5ce4968524 merge from cocos2d-x master 2012-02-10 10:46:58 +08:00
minggo 95906c34bf Merge branch 'luafix-master' of https://github.com/dualface/cocos2d-x into lua_support_refactor 2012-02-09 16:14:54 +08:00
minggo 153d2b8192 issue #971: build cocos2dx as static lib and remove some unneeded codes 2012-02-09 15:49:14 +08:00
minggo 29c18c67ca Merge pull request #712 from minggo/ndk_module 
Use modules in the Android NDK build
 2012-02-06 22:36:45 -08:00
minggo 9249328afb fixed #970: use modules in the Android NDK build 2012-02-07 14:34:30 +08:00
minggo 8770976884 Merge branch 'android_ndk_modules' of https://github.com/folecr/cocos2d-x into ndk_module 2012-02-07 10:48:07 +08:00
Wartortle aa06de2fb3 Second half of commit for adding Accelerometer simulation to Win32. 2012-02-06 11:38:53 +00:00
Wartortle ffc4457991 On Win32 platform, there's now support for simulating the Accelerometer 
using the up/down/left/right/comma/period keys.
 2012-02-06 11:29:28 +00:00
YuLei Liao 4fe0c10e10 merge upstream/master 2012-02-06 10:54:51 +08:00
moadib f5b8aa79c5 Fixed "out of bound" error in CCFileUtils::getWriteablePath() for BlackBerry 2012-02-05 16:49:47 +04:00
folecr cab83bb4a6 Fix header file location to match convention in include directives in the cocos source 2012-02-02 20:07:37 -08:00
YuLei Liao 47d88bfbba * add macro defines for Lua engine 2012-02-02 10:37:21 +08:00
martinezgerman c78bf39601 Member variable added to keep the current window active status 2012-01-31 22:55:44 -08:00
martinezgerman acdd00f03b Functionality to detect when the application goes to the background and return from it, notifying only ones per time to the application 2012-01-31 21:38:44 -08:00
martinezgerman e8f9c5f675 merging the original update 2012-01-31 20:06:39 -08:00
martinezgerman 38cd599bdc Functionality to detect when the application goes to the background and return from it 2012-01-31 00:25:09 -08:00
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
folecr b0b5790e06 Simplify inclusion of cocos2d in Android NDK projects: Cocos2DX is the only module that importing projects need to add. Requires Android NDK r7. 
* Uses NDK modules as the basis of the build system for Android NDK
 * Add a cocos2dx module to generate a shared library named cocos2dx_shared. Library name is still libcocos2d.so
 * The dependencies of this module are also Android NDK modules
 * ... which are prebuilt static libraries from the png, jpeg and xml2 modules.
 * Dependency library names set to libjpeg, libpng, etc. even though we are building variants with names like jpeg_shared.
 2012-01-29 09:52:38 -08:00
folecr e6fddbc047 Move libraries & include files for third party dependencies so that it is possible to create Android NDK Modules from prebuilt libs. 2012-01-29 09:33:17 -08:00
gzito f40d3d3db8 Changed use of animation interval in game loop 2012-01-24 23:27:03 +01:00
gzito b400570265 Workaround for issue #635. Prevents "ERROR: 5 in device 25" to be reported in X86 Marmalade Mac OSX simulator 2012-01-17 10:57:31 +01:00
gzito c87881ff94 Added Marmalade support to TextInputTest and HelloLua samples 2012-01-15 15:57:10 +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 0e03c8ca21 fixed #930: linux supports jpg format file 2012-01-12 17:46:53 +08:00
minggo 0ee582e887 fixed #917: add header files to resolve compiling errors 2012-01-09 17:36:57 +08:00
minggo b1aee8f9eb Merge https://github.com/cocos2d/cocos2d-x into iss917_CCFileUtils 2012-01-09 17:12:46 +08:00
dumganhar 4cc1658d45 fixed #938:Don't use eglGetProcAddress to get extension function on bada1.0 device, otherwise it will cause crash. 2012-01-09 14:15:49 +08:00
dumganhar 259aaf42a6 Fixed: get extension function from eglGetProcAddress on bada platform 2012-01-09 14:15:18 +08:00
dumganhar 30a02030b0 make the property function to virtual 2012-01-09 11:07:45 +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
gzito 65ddb88000 Added options to compile freetype and libXml under Marmalade MAC (x86 simulator version) 2012-01-04 23:34:48 +01:00
minggo c6da8d2fbd call correct java method 2012-01-04 10:14:46 +08:00
gzito 2acea5f7af libxml2.mkf for both Windows and Mac Marmalade versions 2012-01-03 00:39:31 +01:00
gzito 083d0015a3 Merge branch 'master' of git://github.com/cocos2d/cocos2d-x 2012-01-02 22:32:29 +01:00
minggo 37915cfed6 remove unneeded function, and make protocol an abstract class 2011-12-28 14:46:49 +08:00
gzito 28562c3fb9 Merge branch 'master' of git://github.com/cocos2d/cocos2d-x 2011-12-27 16:14:19 +01:00
dumganhar a09bebb32b fixed #903: 1.pass 'id' parameter to setTouchInfo function; 
2.when double press happens, deal with it as single press.
 2011-12-23 20:33:42 +08:00
minggo a96285b617 fixed #923: init iamge type and refactor a little codes 2011-12-22 15:38:31 +08:00
minggo 21f05c2d6f issue #903: fix a compiling error 2011-12-22 09:56:09 +08:00
minggo bb4b1d02bb Merge pull request #608 from GMTDev/patch-2 
issue #903: Update CCTouch to include the ID/PID of the touch
 2011-12-20 21:48:30 -08: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
minggo 28d0737bf3 fixed #917: implement CCFileUtils::getFileDataFromZip() on iOS 2011-12-20 14:18:53 +08:00
gzito 59bccb6bf8 Added last loaded font caching & minor fixes 2011-12-19 23:08:35 +01:00
gzito e3c5d6886e Added authors info 2011-12-19 22:57:04 +01:00
gzito e389ae5469 Optimized CCImage and fixed alpha value 2011-12-19 22:56:44 +01:00
dumganhar af221f8710 fixed #918: modify filter of airplay to marmalade. 2011-12-16 11:08:37 +08:00
dumganhar 8298e0b6ff Merge branch 'master' of https://github.com/styck/cocos2d-x into pullrequest#611 
Conflicts:
	tests/test.marmalade/test.mkb
 2011-12-15 13:03:07 +08:00
dumganhar f3b7b519fc Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into pullrequest#619 2011-12-15 11:38:15 +08:00
minggo 8813d94257 Merge pull request #617 from minggo/issue906 
remove unneeded code in CCImage_android.cpp
 2011-12-14 18:08:24 -08:00
Didiet Noor 8c69c70fc3 Fixed Path Issues on QNX, CocosDenshion Test back to original 2011-12-15 00:31:17 +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 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
minggo ba462e99a6 fixed #906: remove unneeded code in CCImage_android.cpp 2011-12-12 17:02: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
styck b1cdb6543d Updated ccLanguageType CCApplication::getCurrentLanguage() to return the current language 
Added tests for Marmalade and enabled language and font testing
 2011-12-11 17:18:01 -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
gzito 2be5240a5d Fixed CCFileUtils::getWriteblePath on Marmalade 2011-12-10 16:34:54 +01:00
gzito f27f9180ff Merge remote-tracking branch 'remotes/styck/master' 2011-12-10 11:10:59 +01:00
Giovanni Zito 287f480c97 Added initWithString (TTF) and jpeg support 2011-12-09 22:05:12 +01:00
Giovanni Zito af29be2d26 Shared instance is now a pointer instead of a static instance. Also the CCEGLView::release notifies application about quit 2011-12-09 22:04:35 +01:00
Giovanni Zito 362a82f41c mainloop modified to handle correctly quit requests 2011-12-09 22:03:38 +01:00
Giovanni Zito 5584039f47 libFreeType and libJpeg for Marmalade 2011-12-09 21:58:32 +01:00
dumganhar 6d2a298035 Merge branch 'bbf' into blackberry 2011-12-09 15:58:16 +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
styck 7350fa9bb5 Updated based on G.Zito feedback 2011-12-08 19:51:19 -08:00
dumganhar 190fbb60a7 Merge branch 'Forf_2' into bbf 2011-12-09 10:39:27 +08:00
dumganhar b398d75e21 modify tests 'Res' link to 'Resource', remove the coupling between CocosDenshion and Cocos2dx 2011-12-09 10:32:00 +08:00
Giovanni Zito 0c1b058629 Changed symbols from "airplay" to "marmalade", added files and folders for marmalade 2011-12-08 12:16:32 +01:00
Giovanni Zito 7b0cb1bc8b Accelerometer stuff 2011-12-08 10:48:03 +01:00
Giovanni Zito e077107575 Used CONSTANT definitions for touch 2011-12-08 09:30:18 +01:00
Giovanni Zito 8b4b802839 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	cocos2dx/platform/CCSAXParser.h
 2011-12-08 08:41:16 +01:00
GavT 3d86583818 Update cocos2dx/platform/android/jni/TouchesJni.cpp 2011-12-07 20:25:51 -08:00
dumganhar fa07d16f73 switch to WVGA 2011-12-08 11:07:17 +08:00
Giovanni Zito b60eac2505 integrating libXml2 2011-12-07 23:49:52 +01: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
GavT 190891bab7 Pass on index/ID/PID of the touch from UITouch to CCTouch and the users touch handlers. Needed for multi touch apps that need to tell which touch/finger was let go. As discussed here by GavT: http://www.cocos2d-x.org/boards/6/topics/4043?r=5751#message-5751 
Files Modified: Eagleview.mm, CCTouch.h
 2011-12-06 20:06:38 -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
Giovanni Zito 97967ffcb3 Specific classes for Marmalade platform 2011-12-07 00:08:04 +01:00
dumganhar 6d7baa9684 add platform files for qnx 2011-12-06 17:19: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
Walzer 70d5a088f1 fixed #887, define GL_GLEXT_PROTOTYPES = 1 automatically when compile on ndk-r7 2011-12-04 20:18:17 +08:00
dumganhar 3f97e7db44 fix a bug when COCOS2D_DEBUG >= 1 in CCScheduler.cpp 2011-11-30 09:26:45 +08:00
dumganhar 0fff92236f add f project 2011-11-29 12:38:20 +08:00
minggo 266f0ee7ab Merge pull request #586 from leon-li/master 
Fix some minor bugs.
 2011-11-28 18:27:38 -08:00
Leon f108952595 Merge remote branch 'upstream/master' 
Conflicts:
	cocos2dx/support/CCPointExtension.cpp
 2011-11-29 10:15:15 +08:00
dumganhar d108f4f456 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base 2011-11-28 23:13:02 +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
minggo f0d22ae504 issue #879: replase assert with CCAssert 2011-11-28 17:28:43 +08:00
dumganhar 112ec42670 fixed #854: support bada pthread and semaphore 2011-11-28 16:07:17 +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 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
Leon 6f99f7efde 1. fix multi touch index. 
2. swap.
3. create gl view.
 2011-11-26 22:37:36 +08:00
minggo f5bbad5833 issue #854: implement CCImage::initWithImageFileThreadSafe for iOS 2011-11-25 10:09:29 +08:00
dumganhar 79e204abad add semaphore support on bada 2011-11-25 10:06:26 +08:00
dumganhar c138d7e258 update CCAccelerometer on bada platform 2011-11-24 18:04:25 +08:00
dumganhar e87b00db67 add pthread support for bada 1.0 2011-11-24 17:26:04 +08:00
dumganhar aeb56495a6 add user truetype font support, fix a bug in CCTextureCache.cpp 2011-11-24 15:15:23 +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 4612e6e1d6 update pthread.cpp 2011-11-24 11:37:59 +08:00
dumganhar 42775d4ec5 update pthread implement 2011-11-24 10:58:09 +08:00
dumganhar 2bd49545fa add bada1.0 pthread support 2011-11-24 00:07:50 +08:00
dumganhar cfa42fa8a1 Merge branch 'newest' into master_base 2011-11-23 21:47:21 +08:00
dumganhar 035d7326db Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-11-23 21:43:40 +08:00
dumganhar 15e3a6b1cf update CCFileUtils_bada.cpp and CCImage_bada.cpp 2011-11-23 18:40:36 +08:00
minggo 8b20639d75 issue #838: HelloWorld support x86 2011-11-23 11:02:18 +08:00
minggo bc60ed7856 issue #854: optimize CCTextureCache::addImageAsync() 2011-11-22 16:47:24 +08:00
minggo 51eb56075b Merge https://github.com/cocos2d/cocos2d-x into iss854_pthread 2011-11-21 09:36:55 +08:00
minggo 4226fcf355 issue #854: add CCThread_ios.mm 2011-11-21 09:34:49 +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 50a2e2d5e9 Merge pull request #574 from minggo/iss854_pthread 
remove unneeded files
 2011-11-17 18:59:03 -08:00
minggo 5d8043ce7e issue854: remove unneeded files 2011-11-18 10:54:36 +08:00
minggo a7d6c90adb Merge pull request #571 from jbyu/master 
fix memory-leak for lua engine
 2011-11-17 18:53:14 -08:00
minggo 522386a6b7 issue #854: pthread work ok on iOS 2011-11-18 09:55:47 +08:00
minggo cc79e533a3 issue #854: add pthread for win32 and implement CCTextureCache::addImageAsync() 2011-11-16 11:04:29 +08:00
Phenix Yu 786feb6a8d Merge remote-tracking branch 'remotes/upstream/master' 
Conflicts:
	HelloLua/Classes/AppDelegate.cpp
	HelloLua/Resource/hello.lua
	HelloLua/ios/HelloLua.xcodeproj/project.pbxproj
	HelloLua/win32/HelloLua.win32.vcproj
	HelloLua/win32/HelloLua.win32.vcxproj.filters
	cocos2dx/include/ccMacros.h
	cocos2dx/platform/ios/AccelerometerDelegateWrapper.mm
	lua/cocos2dx_support/LuaCocos2d.cpp
	lua/cocos2dx_support/LuaEngineImpl.cpp
	template/xcode3/cocos2d-x_lua_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	template/xcode4/cocos2dx_lua.xctemplate/Resources/hello.lua
	template/xcode4/cocos2dx_lua.xctemplate/TemplateInfo.plist
	tests/test.win32/test.win32.vcxproj.filters
 2011-11-15 14:43:55 +08:00
Phenix Yu 441f8e6da9 Merge branch 'master' of https://github.com/jbyu/cocos2d-x 
Conflicts:
	cocos2dx/CCScheduler.cpp
	lua/cocos2dx_support/LuaEngine.cpp
	lua/cocos2dx_support/LuaEngine.h
 2011-11-15 14:00:52 +08:00
minggo 5273819e83 offer a thread safe function to read contents of xml file, and the engine use it internal 2011-11-15 10:41:18 +08:00
dumganhar 0fa48e2cfb Update cocos2dx/platform/CCPlatformMacros.h 2011-11-14 11:35:04 +08:00
dumganhar 7cb27a76ae modify accelerometer and Platform Functions 2011-11-13 22:45:41 +08:00
dumganhar d8de253542 add messagebox support 2011-11-13 01:13:25 +08:00
dumganhar 5704fdc146 Merge branch 'testMP_static_lib' into newest 2011-11-13 01:05:22 +08:00
dumganhar ea3b57ea2c modify multi touch support 2011-11-13 00:54:44 +08:00
dumganhar 8fd2917888 fixed a bug that Accelerometer value error if use HVGA resource in WVGA device 2011-11-13 00:54:05 +08:00
dumganhar 2abe0c0d32 CCAssert will show system messagebox, this easy for debuging code. 2011-11-10 16:49:05 +08:00
dumganhar ca3b91855a debug issue #852 2011-11-10 16:44:58 +08:00
dumganhar 920b41271d add TextInput support 2011-11-08 15:59:04 +08:00
dumganhar 0d6ea61b76 fixed some bug:1.setDeviceOrientation, chipmunkDemo glOrthof 2011-11-07 18:18:10 +08:00
dumganhar 7d2a26ec10 comment some applog 2011-11-07 00:28:09 +08:00
dumganhar 16fba505b6 add multitouch support 2011-11-05 11:36:27 +08:00
dumganhar 2998726364 revert language 2011-11-02 01:23:07 +08:00
dumganhar 240aa4c077 add russian language support 2011-11-01 23:32:26 +08:00
dumganhar cf3cecc108 revert to normal version 2011-11-01 23:02:26 +08:00
dumganhar cff6437b76 revert to normal ccLanguageType 2011-11-01 17:12:39 +08:00
dumganhar f43530c010 Merge branch 'test' of https://github.com/dumganhar/cocos2d-x into bada 
Conflicts:
	CocosDenshion/proj.bada/sdk1.0/.cproject
	CocosDenshion/proj.bada/sdk2.0/.cproject
	cocos2dx/platform/bada/CCApplication_bada.cpp
 2011-10-31 09:34:40 +08:00
dumganhar 853126036d add ogg source for cocosDenshion project 2011-10-29 15:38:15 +08:00
dumganhar fd90641c49 merge testf branch 2011-10-29 14:47:13 +08:00
Leon b7f0385a2b bundle 64 bit linux static libs 2011-10-28 12:19:26 +08:00
Leon 1b42b1d801 Merge remote branch 'upstream/master' 2011-10-28 11:37:02 +08:00
dumganhar d061e8323d modify project configure 2011-10-27 19:22:14 +08:00
dumganhar 5db8a24389 fixed one issue in cocosdenshion 2011-10-26 18:38:27 +08:00
dumganhar dd73456576 Merge branch 'bada' into f 2011-10-25 17:40:20 +08:00
dumganhar 3aef823bd5 rename sdk1.2 to sdk1.0 2011-10-24 11:00:11 +08:00
laschweinski 5589335d3a Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into linux_port1 2011-10-22 19:27:35 +08:00
laschweinski 04633242ba fix a bug in audio player 2011-10-22 19:10:50 +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
Leon 5c4a3c3fda Merge remote branch 'upstream/master' 2011-10-20 18:34:10 +08:00
dumganhar fdbb989ce5 make sdk1.2 to sdk1.0 2011-10-20 18:31:10 +08:00
Walzer 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
dumganhar 6451d8b6bf use ceil to compute viewport 2011-10-20 13:44:21 +08:00
Leon 70a4942ea6 fix some warning 2011-10-19 15:24:19 +08:00
dumganhar 3c4c4e515a modify project settings 2011-10-18 11:11:09 +08:00
dumganhar 064014aeae make some special configure 2011-10-16 22:44:29 +08:00
dumganhar ee53c29e5c switch to 2.0 WVGA 2011-10-16 13:23:48 +08:00
dumganhar 1ffd3a4350 add language support 2011-10-14 15:54:18 +08:00
Walzer 47c9020b85 fixed #738: caculate label height if not set 2011-10-14 14:33:08 +08:00
dumganhar 3f89f3088b remove mouse test log 2011-10-14 09:21:03 +08:00
dumganhar fd3f496b76 use system orientation 2011-10-13 11:55:48 +08:00
moadib 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