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

1911 Commits

Author SHA1 Message Date
James Chen a678d12615 issue #2397: FileUtils::sharedFileUtils --> FileUtils::getInstance() for all platforms 2013-07-12 12:03:39 +08:00
James Chen 88a28b041e issue #2397: Director::sharedDirector --> Director::getInstance() for all files. 2013-07-12 11:50:36 +08:00
carlo morgantini ea72e046c6 Merge remote-tracking branch 'ricorigin/freetype' into developNewLabel 
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
 2013-07-11 17:38:07 -07:00
Ricardo Quesada 2d0aed4f0e libfreetype for iOS and Mac 
libfreetype for iOS and Mac
 2013-07-11 17:20:10 -07:00
carlo morgantini 1caa6dfbd7 start integrating FreeType for font rendering 2013-07-11 15:43:45 -07:00
Ricardo Quesada cf262c28e2 getInstance() / destroyInstance() are used... 
... instead of sharedXXX / purgeXXX.
They are more C++ friendly, and also easier to remember.

common files + Mac files + iOS files + tests/samples files were updated.

The old methods are deprecated now.
 2013-07-11 15:24:23 -07:00
Lee, Jae-Hong 9322e5594b Support Tizen 2.2 SDK. 
- Update project files.
- based on develop branch.
- HelloCpp, SimpleGame, HelloLua, TestLua available to build.
 2013-07-10 13:04:08 +09:00
Jaroslaw Lewandowski f1023232db Now opacity option for shadow in CCLabelTTF works. 2013-07-09 23:23:41 +01:00
Jaroslaw Lewandowski 626ba2686f Solving 'black screen' on android 2013-07-09 21:21:43 +01:00
minggo e5a80eed91 fixed conflict 2013-07-09 10:39:16 +08:00
James Chen db0a15b02f Merge branch 'iss2129-remove_prefix' of https://github.com/minggo/cocos2d-x into minggo-iss2129-remove_prefix 2013-07-06 15:19:09 +08:00
James Chen 43260a2bf1 [Windows] Fixing complication errors for WINDOWS. 2013-07-06 10:49:13 +08:00
minggo 04465622b7 issue #2129:remove prefix of types in ccTypes.h 2013-07-05 16:49:22 +08:00
James Chen a67ac821f7 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2371-add-lua-ios-mac 
Conflicts:
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
 2013-07-04 17:15:09 +08:00
James Chen 84ce80dcd2 issue #2371: [Mac] glClearDepth --> glClearDepthf, glDepthRange --> glDepthRangef, glReleaseShaderCompiler --> NULL . 2013-07-04 16:31:50 +08:00
James Chen 50a8067b74 issue #2371: std::vector<std::string>::iterator --> auto in CCFileUtils.cpp. 2013-07-04 16:30:35 +08:00
minggo ddf54a4f49 Merge pull request #3054 from simpliplant/windows_keyboard_support 
Hardware keyboard support (Windows support + Mac fix)
 2013-07-03 23:37:13 -07:00
minggo f019700b91 Merge pull request #3072 from minggo/const_love 
Fix compiling errors of #3070
 2013-07-03 23:19:14 -07:00
Ricardo Quesada adaa72fbb4 Adds const to getters 
Many getters in cocos2d are not declared as const.
This patch adds const to many cocos2d properties, specially in CCNode and
subclasses
 2013-07-03 17:22:15 -07:00
Ricardo Quesada 77dbe995d4 Merge branch 'develop' into ios_mac_one_project 2013-07-03 11:39:00 -07:00
Rene Klacan 294f9f34f7 KEYBOARD_SUPPORT renamed to CC_KEYBOARD_SUPPORT 2013-07-03 15:51:24 +02:00
Rene Klacan 92c382be04 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into windows_keyboard_support 2013-07-03 10:19:35 +02:00
Ricardo Quesada 2b73d0cb5f ios and mac projects unified in one simple xcode project 
Not finished yet:
 - iOS only includes Test Cpp (Simple Game not working yet on iOS)

It is easier to maintain and add more targets, files, etc.
 2013-07-02 18:20:38 -07:00
Jaroslaw Lewandowski d26fa847d8 - Fixing shadows for text with stroke in iOS 
- Improved text shadows in Android (they look the same as in iOS)
 2013-07-02 22:45:07 +01:00
Rene Klacan fc8b60a2cf fixed issues on win32 and mac keyboard 2013-07-02 11:39:18 +02:00
James Chen 0d040bae76 closed #2347: Macros like CC_KEYBOARD_SUPPORT should not be in header file. 2013-07-01 16:48:42 +08:00
Sergey Shambir 1c52517770 CocosDenshion: added effects customization for 7 platforms. 
1. Pitch/pan/gain support on iOS, Mac, Linux+FMOD, Android+SoundPool;
2. Unified OpenAL code with pitch/pan/gain on Linux, Tizen, Blackberry,
Native Client;
3. Bug fixed: rewindBackgroundMusic() no longer stops music on unified
OpenAL engine.
4. Optional mp3 support for Linux+OpenAL (OPENAL_MP3 make option);
5. Pan/gain (not pitch) support for Android+OpenES.
6. Reorganized CocosDenshion tests in TestCpp.

Known issues:
1. No support for windows, emscrippten, marmalade.
2. No pitch effect on Android+OpenES. It requires backend redesign:
http://code.google.com/p/android/issues/detail?id=24592
 2013-06-29 13:44:16 +04:00
James Chen e2b9863bf7 issue #2325: [Linux] KEYBOARD_SUPPORT --> CC_KEYBOARD_SUPPORT. 2013-06-29 11:44:14 +08:00
Rene Klacan 444a6e689e added windows keyboard support 2013-06-29 01:46:39 +02:00
minggo 8938268183 issue #2329: remove unneeded codes 2013-06-26 16:42:11 +08:00
James Chen 229e181625 issue #2305: [Win32] Removing the third party library pthreadVCE2. 2013-06-26 12:52:38 +08:00
folecr 295f9e0fec Do nothing in the case of forAsync 2013-06-24 16:42:56 -07:00
folecr 2e0804ae29 Remove references to zip file 2013-06-24 15:15:25 -07:00
folecr 21405531aa getFileData() 
* The async case is NYI
 * include stdlib for abort() when forAsync is true
 2013-06-24 15:14:15 -07:00
folecr 7090d8daad isFileExist() 2013-06-24 15:14:15 -07:00
folecr 0422953bbe Native Asset Manager 2013-06-24 15:14:14 -07:00
folecr e916cef32b #define LOGD 2013-06-24 15:14:14 -07:00
folecr 6708983de2 Update target to android-10 for NDK code 2013-06-24 15:14:14 -07:00
folecr 7d4ce91b6b Up the minSdkVersion to 9 2013-06-24 15:14:14 -07:00
James Chen 62902ad212 Fixing compilation errors for Emscripten port. 2013-06-24 10:21:36 +08:00
James Chen 80cb06d3f7 Merge branch 'minggo-iss2305-replace-pthread' of https://github.com/dumganhar/cocos2d-x into minggo-iss2305-replace-pthread 2013-06-24 10:01:57 +08:00
James Chen 195605c85d issue #2322: Macro CC_DLL take no effect now since we are using static library. 2013-06-23 17:21:13 +08:00
James Chen 4a8eabd97f Merge branch 'iss2305-replace-pthread' of https://github.com/minggo/cocos2d-x into minggo-iss2305-replace-pthread 2013-06-21 17:01:22 +08:00
minggo 68559dfa00 issue #2305: use c++11 thread instead of pthread in CCTextureCache 2013-06-21 15:29:21 +08:00
James Chen e7ee2f2151 [Win32] undef MessageBox since it will be conflicted with cocos2d::MessageBox. 2013-06-21 11:57:14 +08:00
James Chen 0879a12516 issue #2129: Re-adds 'CC' prefix to objective-c classes for all projects. 2013-06-21 11:14:03 +08:00
James Chen 2a715ec3cf Merge pull request #2956 from ricardoquesada/cc_namespace_obj 
issue #2129: Re-adds 'CC' prefix to objective-c classes.
 2013-06-20 19:10:01 -07:00
Ricardo Quesada 578bce4bc8 Re-adds 'CC' prefix to objective-c classes. 
And also makes it compile on Mac, which was broken
 2013-06-20 17:46:22 -07:00
Sam Clegg b5a509e65e [NaCl] Don't cache font size 
This avoids churn of the cached font when different
sizes of the same font are requested sequentially.

Review URL: https://codereview.chromium.org/14308007
 2013-06-20 12:56:13 -07:00
Sam Clegg 47878c1855 [NaCl] Remove legacy nacl_mounts usage. 
Also add nacl SDK version check to ensure the SDK contains
a recent version of nacl_io.
 2013-06-20 12:56:12 -07:00
Sam Clegg 40766006bd [NaCl] Fix NaCl build which had been disabled. 
Since switching to C++11 the NaCL build was disabled.
This re-enables the ARM configuration which uses a
more recent version of gcc.  This means that that NaCl
code paths will at least be test until we can find a way
to re-enable the X86 build.
 2013-06-20 12:56:12 -07:00
Lee, Jae-Hong 2f8b24d05c Fix compile error. 2013-06-20 19:20:27 +09:00
James Chen 93b6328303 issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
minggo 227e95d429 Merge pull request #2936 from minggo/iss2304-refator-cclayer 
issue #2304:accelerometer fix of mac
 2013-06-19 19:58:15 -07:00
minggo 924ba1bdca issue #2304:accelerometer fix of mac 2013-06-20 10:56:13 +08:00
minggo 8d4f715008 Merge pull request #2929 from minggo/iss2304-refator-cclayer 
issue #2304:use function to simplify acceremeter call back
 2013-06-19 01:43:18 -07:00
minggo ccbd0a831d issue #2304:use function to simplify acceremeter call back 2013-06-19 16:10:53 +08:00
James Chen 016d34d889 Compilation errors fix after merging https://github.com/cocos2d/cocos2d-x/pull/2919 2013-06-19 15:08:09 +08:00
James Chen 86f7fd4988 Merge pull request #2925 from dumganhar/musikov-develop 
fixed #2303: Missing precision when getting strokeColor and fontFillColor
 2013-06-18 23:27:57 -07:00
James Chen e6c14edf18 Merge pull request #2907 from waiter/master 
fixed #2306: update “solve android crash with CCLabelTTF setString function”
 2013-06-18 23:22:54 -07:00
James Chen f007819f74 Merge branch 'develop' of https://github.com/musikov/cocos2d-x into musikov-develop 
Conflicts:
	cocos2dx/textures/CCTexture2D.cpp
 2013-06-19 14:05:55 +08:00
James Chen 8f33bf7e05 issue #2301: _pTextures --> _textures. 2013-06-19 13:40:21 +08:00
James Chen fa6a0d4051 issue #2301: m_pTextures --> _pTextures. 2013-06-19 13:15:03 +08:00
James Chen 1eadcd8b38 fixed #2301: Merge branch 'emscriptenate' of https://github.com/j4m3z0r/cocos2d-x into j4m3z0r-emscriptenate 
Conflicts:
	cocos2dx/proj.emscripten/cocos2dx.mk
 2013-06-19 13:03:51 +08:00
Lee, Jae-Hong b546fc3214 Implement Accelerometer. 2013-06-19 09:31:34 +09:00
minggo e9d8595617 fixed #2124: make CCImage::initWithIamgeFileThreadSafe() thread safe 2013-06-18 17:10:54 +08:00
James Gregory ad90fe88a8 Merge remote-tracking branch 'origin/master' into emscriptenate 2013-06-17 20:30:36 -07:00
waiter ecebf31287 solve android crash with CCLabelTTF setString function 
solve android crash with CCLabelTTF setString function
 2013-06-18 10:08:34 +08:00
James Gregory 5095b03f9c Get async image loading building with -O2 and asm.js 2013-06-17 17:10:41 -07:00
minggo b9c85d87ae Merge pull request #2896 from dumganhar/iss2129-format-codes 
issue #2129: New naming of member varibles, renaming m_iVar to _var.
 2013-06-17 03:27:01 -07:00
James Chen 8fb40eaee2 android target 17 --> 8. 2013-06-17 15:55:09 +08:00
James Chen 4c6043c9d2 Merge pull request #2898 from pyrasis/tizen_2.1 
[Tizen] Add armv7l webp library.
 2013-06-15 20:03:37 -07:00
Lee, Jae-Hong 8c1953eed9 Add armv7l webp library. 2013-06-16 11:07:55 +09:00
James Chen c0d44cb2e4 fixed #2129: Rename m_iVar to _var, remove CC prefixes. 2013-06-15 14:03:30 +08:00
James Chen 82cd7bb01f Merge branch 'iss2284-merge-master' of https://github.com/minggo/cocos2d-x into minggo-iss2284-merge-master 2013-06-14 15:41:01 +08:00
minggo a221f06592 issue #2284: fix bugs after merging master 2013-06-14 14:34:50 +08:00
Ricardo Quesada 98190a21c0 Actions with clone() pattern 1/3 
This is the 1st patch of 3.

1)
Removes the copyWithZone() patterns.
Adds the clone() pattern instead (which is more C++ friendly)
Adds also "const" to getters.
 2013-06-13 17:25:14 -07:00
Mykyta Usikov 28e8899089 fixed strokeColor and fontFillColor of CCLabelTTF 2013-06-13 14:16:33 +03:00
minggo cd5bcb87af issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
James Chen b372fc8534 Merge pull request #2872 from maciekczwa/develop 
fixed #2283: Adding Polish language support.
 2013-06-13 00:00:36 -07:00
James Chen 0de1a4ebd8 Merge pull request #2877 from pyrasis/tizen_2.1 
Support Tizen device
 2013-06-12 22:56:23 -07:00
Ricardo Quesada c1d519aac2 LabelTTF vertical alignment fixed on OS X 
vertical alignment was broken on OS X.
top and bottom were switched.
 2013-06-13 10:46:28 +08:00
minggo 92ce25371a Merge pull request #2874 from ricardoquesada/labelttf_mac_fix 
LabelTTF vertical alignment fixed on OS X
 2013-06-12 19:45:31 -07:00
Ricardo Quesada 1780643c63 merge pull reqeust fixing for iOS7 and Xcode5 into master 2013-06-13 10:43:41 +08:00
James Gregory 872be8e964 Initial commit of browser accelerated async image-loading code for Emscripten. 2013-06-12 14:46:32 -07:00
Lee, Jae-Hong 1bd3f10601 Support Tizen device. 2013-06-12 10:20:18 +09:00
Ricardo Quesada 75b9913c92 LabelTTF vertical alignment fixed on OS X 
vertical alignment was broken on OS X.
top and bottom were switched.
 2013-06-11 14:59:40 -07:00
Ricardo Quesada af49023741 Fixes for iOS7 and Xcode5 2013-06-11 12:11:05 -07:00
Maciej Czerniak 1e71ea85f3 add Polish language support 2013-06-11 16:46:38 +02:00
Maciej Czerniak dddb487639 fix formatting 2013-06-11 16:43:35 +02:00
Maciej Czerniak c9b88e1c0c add missing Norwegian language for marmelade platform 2013-06-11 16:41:54 +02:00
Maciej Czerniak eb79c01003 add missing Norwegian language for linux platform 2013-06-11 16:39:33 +02:00
Rene Klacan f31a258c01 Merge pull request from cocos2d/develop 2013-06-11 01:06:12 +02:00
minggo 6eaa1f97ec Merge pull request #2828 from minggo/develop 
fixed #2161: fixed crash of loading ETC file
 2013-06-08 02:02:52 -07:00
minggo d5bfe10379 fixed #2161: fixed crash of loading ETC file 2013-06-08 17:01:45 +08:00
minggo 2b3f3b6744 fixed #2161: fixed crash of loading ETC file 2013-06-08 16:58:18 +08:00
minggo 52f55802b7 Merge pull request #2826 from minggo/develop 
make CCFileUtil::getFileData() get data correctly
 2013-06-07 22:44:01 -07:00
minggo f56c20657b fixed #2266:make CCFileUtil::getFileData() get data correctly 2013-06-08 13:42:52 +08:00
minggo 6d3615157a fixed #2266:make CCFileUtil::getFileData() get data correctly 2013-06-08 13:40:03 +08:00
minggo f2be4c62ee Merge pull request #2820 from minggo/develop 
fixed #2161: don't close AssetManager
 2013-06-07 20:24:27 -07:00
minggo b023158c85 fixed #2161: don't close AssetManager 2013-06-08 11:23:13 +08:00
minggo 206502dccb fixed #2161: don't close AssetManager 2013-06-08 10:57:19 +08:00
Michael Chinen 9471c51201 set up keyboard handling for mac 2013-06-07 20:29:02 +09:00
Lee, Jae-Hong b9f5691706 [Tizen] Add libwebsockets.h, .a and support C++11 2013-06-07 20:14:43 +09:00
James Chen ec8ab8bd8b Updating multi-platform-xxx template for win32. 2013-06-07 12:57:28 +08:00
James Chen d72e9d10b5 Updating multi-platform-xxx template for win32. 2013-06-07 12:50:02 +08:00
Ricardo Quesada 428711482e Adds missing config files for CCConfiguration 
...and add functionality on the Director to override the default values
from the config file.

Supported values:

 - cocos2d.x.fps
 - cocos2d.x.display_fps
 - cocos2d.x.gl.projection
 - cocos2d.x.texture.pixel_format_for_png
 - cocos2d.x.texture.pvrv2_has_alpha_premultiplied

If the "config.plist" file is not present, or some keys are not present,
the default values are going to be used

IMPORTANT:
 The folder "samples/Cpp/TestCpp/Resources/configs" needs to be added
 in the Android, Linux, Win32 projects.
 Already added in OS X and iOS Xcode projects.
 2013-06-06 12:23:44 -07:00
James Chen 5832934e41 Reverting target to android-8. 2013-06-06 16:20:22 +08:00
Rene Klacan 8b16178f9f Merge pull request from cocos2d/develop 2013-06-06 09:42:18 +02:00
James Chen 5c592943db [Mamarlade] Fixing a compilation error in cocos2dx/platform/marmalade/CCImage.cpp. 2013-06-06 15:02:57 +08:00
James Chen ab3f42bb5f Merge pull request #2784 from dumganhar/some-fixes-marmalade-master 
[master] Some fixes:
Adding libwebsockets license in WebSocket.h/.cpp.
Log error instead of triggering an assert for shadow and stroke.
[Mamarlade] Fixing a compilation error in cocos2dx/platform/marmalade
Fixing a bug that display is wrong when setting setTexture(NULL) for CCSprite
[Spine] Using getContentSize to make spine-runtime supports the strategy of loading resources in cocos2d-x.
Removing unreadable print in CCBReaderLoad.lua.
Removing CODE_SIGN_IDETITY section in prom.pbxproj.
Marmalade projects fix.
 2013-06-05 23:47:01 -07:00
James Chen 0248c23b20 [Mamarlade] Fixing a compilation error in cocos2dx/platform/marmalade/CCImage.cpp. 2013-06-06 14:19:59 +08:00
minggo a8fe210c7e fixed #2260: make CCDictionary::createWithContentsOfFile() return NULL when the file is missing 2013-06-06 12:50:42 +08:00
Ricardo Quesada 479062fdb7 on dealloc, log "this" with %p, not %x. 
Also adds %p where it was missing.
And make a few fixes on the iOS project
 2013-06-05 18:21:05 -07:00
Ricardo Quesada 609801e900 compiles on linux and other machines without C99 support 2013-06-05 09:29:27 +08:00
Ricardo Quesada 9b305a60d1 cc_timeval works on 64bit machines, like OS X 2013-06-05 09:29:12 +08:00
René Klačan f66e12f414 Merge pull request #4 from cocos2d/develop 
pull request from main repo
 2013-06-04 02:05:36 -07:00
minggo c21812b270 Merge pull request #2729 from ricardoquesada/timeval_64bit_fix 
cc_timeval works on 64bit machines, like OS X
 2013-06-03 22:47:45 -07:00
Ricardo Quesada 7e7e943699 compiles on linux and other machines without C99 support 2013-06-03 20:45:06 -07:00
Ben Ward 0f8fa2e5a4 Fixed tabbing. 2013-06-04 10:45:20 +08:00
Ben Ward 73b8050fa1 Fixed linebreaks on Mac OSX 2013-06-04 10:45:07 +08:00
minggo 74b86021e6 Merge pull request #2624 from benjamesward/master 
Fixed linebreaks on Mac OSX
 2013-06-03 19:40:34 -07:00
Ricardo Quesada c6d00a3ccb cc_timeval works on 64bit machines, like OS X 2013-06-03 17:31:59 -07:00
René Klačan 9e4c5bbca3 Merge pull request #3 from cocos2d/develop 
pull request from main repo
 2013-06-03 04:07:43 -07:00
James Chen cedb427a6e fixed #1647: Adding WebSocket support for Cpp and JSB. 
Conflicts:
	extensions/proj.win32/libExtensions.vcxproj
	extensions/proj.win32/libExtensions.vcxproj.filters
 2013-06-02 18:55:57 +08:00
Rene Klacan c8b4291731 keyboard support throught compiler directive 2013-06-02 04:11:43 +02:00
James Chen 0ff1ef6f84 Merge branch 'tizen_2.1' of https://github.com/pyrasis/cocos2d-x 2013-06-01 23:20:11 +08:00
James Chen 05a88c89dc fixed #1647: Adding WebSocket support for Cpp and JSB. 2013-05-31 23:13:03 +08:00
Rene Klacan 50ad3e1c80 KeyboardDispatcher + tests for it on linux 2013-05-31 14:29:32 +02:00
minggo 08b80bfbc9 Merge pull request #2675 from j4m3z0r/emscriptenate 
Emscripten: Fix calculation of offsets in font rendering so that we don't scribble a...
 2013-05-29 23:05:05 -07:00
James Gregory 8b4f5b5853 Fix calculation of offsets in font rendering so that we don't scribble all over memory! 2013-05-29 21:25:32 -07:00
Ben Ward d166de4684 Fixed tabbing. 2013-05-29 15:40:19 +01:00
James Chen 8456072aa0 Merge pull request #2671 from pyrasis/tizen_2.1 
Implement setIMEKeyboardState function for Tizen
 2013-05-29 07:23:47 -07:00
Lee, Jae-Hong ae78bb9b47 Modify space character check. 2013-05-29 23:14:52 +09:00
Lee, Jae-Hong ccd20af8f9 Implement setIMEKeyboardState function for Tizen. 2013-05-29 22:46:52 +09:00
James Chen 50c9515741 Merge pull request #2663 from pyrasis/tizen_2.1 
Fix Tizen CCEditBox bug.
 2013-05-29 06:39:01 -07:00
minggo 53365b9e46 Merge pull request #2669 from frranck/master 
adding norwegian language
 2013-05-29 02:10:37 -07:00
franck 3fab093f5b adding Norwegian language support 2013-05-29 10:16:22 +02:00
Lee, Jae-Hong e48553bc27 Delete ByteBuffer pointer and NULL check. 2013-05-29 10:52:45 +09:00
Jaroslaw Lewandowski 2999abed2b Explicitly initialising CCAcceleration structure to report zeros when run in device simulator 2013-05-29 00:02:36 +01:00
Lee, Jae-Hong c20e4f3700 Keep a previous text on Tizen CCEditBox. 2013-05-28 20:43:47 +09:00
Lee, Jae-Hong 5031aa1fd3 Encoding UTF-8 on Tizen CCEditBox and check empty string. 2013-05-28 20:04:37 +09:00
Michael Contento 026026e3af use onWindowFocusChanged(bool) instead of onResume()/onPause() 
we should use onWindowFocusChanged(bool) to detect if the app is currently
visitible to the user or not. because onPause()/onResume() leads to false
positives on some android versions (e.g. Kindle Fire). if you lock those
devices, while the app running, everything is fine (onPause() is handled
properly). but as soon as you wake up the device, and the lock screen gets
visible, the app is resumed and the music is played (onResume() is
called to early).

this is a) not the best behaviour and b) such games will be rejected on the
samsung app store. onWindowFocusChanged(bool) is, like onPause()/onResume(),
available since API level 1 and it should be safe to simply switch.
 2013-05-28 12:05:46 +02:00
minggo 6f624351b3 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ETC1-support 2013-05-28 11:36:05 +08:00
minggo beef61fc90 issue #2161: android supports ETC format now 2013-05-27 14:42:22 +08:00
Lee, Jae-Hong 47fac0ed98 Implement CCEditBox for Tizen. (develop branch) 2013-05-26 20:40:13 +09:00
Ben Ward dbcb4357e7 Fixed linebreaks on Mac OSX 2013-05-23 18:30:56 +01:00
James Chen 5c506e2edc Merge pull request #2607 from pyrasis/background_foreground_tizen 
Implementing foreground and background status for Tizen port.
 2013-05-21 21:43:51 -07:00
Lee, Jae-Hong 4152850592 Remove EVENT_COME_TO_BACKGROUND notification. 2013-05-22 13:17:54 +09:00
minggo e07761688e Merge pull request #2591 from nicolasgramlich/patch-1 
Updated .classpath of Android project to latest ADT 22 build tool compatibility.
 2013-05-21 19:43:25 -07:00