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

3865 Commits

Author SHA1 Message Date
Yongqin Liu d0f75ba92a Fix the bug for the bound check 
Signed-off-by: Yongqin Liu  <liuyq0307@thundersoft.com>
 2013-05-30 09:54:09 +08:00
Ricardo Quesada 827fa638ca Adds support for "CCString" types for boolean and integers 2013-05-29 15:49:34 -07:00
Ben Ward d166de4684 Fixed tabbing. 2013-05-29 15:40:19 +01: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
Yongqin Liu aea9e04fbf Add out of bound check for the index before do the update 
Signed-off-by: Yongqin Liu  <liuyq0307@thundersoft.com>
 2013-05-29 19:18:46 +08:00
Yongqin Liu f6b5208be5 CCLabelAtlas.cpp: add check for n when call setDirty 
in CCLabelAtlas::updateAtlasValues, there is the case that n equal to 0,
so we need to check it before when call m_pTextureAtlas->setDirty(true) and do
other process.

Signed-off-by: Yongqin Liu <liuyq0307@thundersoft.com>
 2013-05-29 10:45:47 +08:00
Lee, Jae-Hong e48553bc27 Delete ByteBuffer pointer and NULL check. 2013-05-29 10:52:45 +09:00
Ricardo Quesada ebb392ca8e CCConfiguration has format 
CCconfiguration has a file format.
It has a data and metadata
 2013-05-28 18:15:16 -07: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
minggo 98b1d95a74 modify ORGANIZATIONNAME 2013-05-28 18:04:42 +08:00
minggo 5f37e854c4 issue #2161: resolve conflict 2013-05-28 11:50:14 +08:00
minggo 6f624351b3 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ETC1-support 2013-05-28 11:36:05 +08:00
Yongqin Liu 56037a4939 CCTextureAtlas::updateQuad modify for the memcpy hot spot 
change the place that call CCTextureAtlas::updateQuad method to
update the quads with pointer reference directly.

Signed-off-by: Yongqin Liu<liuyq0307@thundersoft.com>
 2013-05-28 10:23:47 +08:00
minggo d6e547cd02 issue #2161:add CCTextureETC.cpp/.h into vs2010 project 2013-05-28 10:04:19 +08:00
minggo b038741d78 issue #2161: make linux,marmalade,native client,mac and emscripten project to include CCTextureETC.cpp 2013-05-27 15:06:43 +08:00
minggo beef61fc90 issue #2161: android supports ETC format now 2013-05-27 14:42:22 +08:00
James Chen 9f45c23222 Merge pull request #2641 from sergey-shambir/fix_linux_linkage 
Linux port: added libX11 to linked libraries.
 2013-05-26 18:41:43 -07:00
Lee, Jae-Hong 47fac0ed98 Implement CCEditBox for Tizen. (develop branch) 2013-05-26 20:40:13 +09:00
Sergey Shambir 06e6048537 Linux port: added libX11 to linked libraries. 
Otherwise build fails on linux.
 2013-05-24 23:36:21 +04:00
samuele3hu 0a1c12a2d3 issue #2103 add some overlapping file and delete some comment line 2013-05-24 13:45:06 +08:00
samuele3hu 338c7c8d67 issue #2103 add more test lua 2013-05-24 11:42:27 +08:00
Ben Ward dbcb4357e7 Fixed linebreaks on Mac OSX 2013-05-23 18:30:56 +01:00
James Chen 91a355cdb0 Updating cocos2dx/Android.mk. 2013-05-23 17:10:30 +08:00
James Chen 131d97a3d6 fixed #2217: Updating the comment for FPS display by using CCLabelAtlas. 2013-05-23 16:55:53 +08:00
James Chen 8448280ed3 issue 2217: Updating Make file and project configuration to add ccFPSImage.c. 2013-05-23 16:50:48 +08:00
James Chen d6a0af86eb fixed #2217: Updating logic when m_bIgnoreContentScaleFactor is enabled. 2013-05-23 16:12:04 +08:00
James Chen 42102bcf0a issue 2217: Removing unused fps_image png data. 2013-05-23 16:04:40 +08:00
James Chen 733b551bf6 issue #2217: Revert changes in CCPlatformMacro.h. 2013-05-23 15:59:45 +08:00
James Chen 22e259360e fixed #2217: Format codes in CCDirector::createStatsLabel. 2013-05-23 15:11:48 +08:00
James Chen bb11182279 fixed #2217: Using CCLabelAtlas instead of CCLabelTTF to show FPS. 2013-05-23 15:06:57 +08:00
Ricardo Quesada 8a34153a83 fixes compilation issues on Linux and Android 2013-05-22 18:11:37 -07:00
Ricardo Quesada ecf04e337c Fixes memory bug and adds support for loadConfigFile 2013-05-22 17:03:00 -07:00
Ricardo Quesada 836a61cd3e CCConfiguration extension (rewritten) 
rewritten to prevent conflicts while rebasing
 2013-05-22 13:00:34 -07:00
James Chen c1d85aaab2 Merge pull request #2611 from pyrasis/tizen_2.1 
Update projects to Tizen 2.1 SDK.
 2013-05-22 02:07:06 -07:00
Lee, Jae-Hong 220ac4982a Update projects to Tizen 2.1 SDK. 2013-05-22 16:55:18 +09: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
James Chen b037a38821 Merge pull request #2610 from dumganhar/iss1644-dict2jsval-crash 
fixed #1644: Passing NULL parameter to ccdictionary_to_jsval will cause crash, and improving performance for ccarray_to_jsval.
 2013-05-21 20:59:14 -07:00
James Chen e21926edb8 fixed #1644: Passing NULL parameter to ccdictionary_to_jsval will cause crash. 2013-05-22 11:56:47 +08: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
minggo 2ac874dca1 Merge pull request #2608 from FlowerpotGames/CCLabelTTF-Const-Update 
CCLabelTTF::enableShadow(…) const update
 2013-05-21 18:39:32 -07:00
minggo d1a8f54113 Merge pull request #2609 from j4m3z0r/emscriptenate 
Add Audio Support for Emscripten
 2013-05-21 18:32:12 -07:00
Ed Bartley 719eb15326 Make shadowOffset parameter of CCLabelTTF::enableShadow(…) a const reference. 2013-05-21 15:42:26 -04:00
Lee, Jae-Hong d83ed86739 Implementing foreground and background status and modify CocosDenshion comment. 2013-05-21 22:48:51 +09:00
Lee, Jae-Hong 4b248d5f8c Delete Tizen 2.0 headers and libraries. 2013-05-21 21:52:10 +09:00
Lee, Jae-Hong 6f34c7cb46 Support Tizen 2.1 SDK. 2013-05-21 21:22:31 +09:00
minggo 0857fdd599 issue #2188:fix compiling error of iOS 2013-05-21 18:18:44 +08:00
minggo cc2b00e9fe Merge pull request #2573 from j4m3z0r/emscriptenate 
Use browser font rendering instead of FreeType
 2013-05-20 22:50:28 -07:00
James Gregory da7113a04f Implement audio for Emscripten using SDL. Still needs methods to release samples when we're done with them. 2013-05-20 20:09:56 -07:00
James Chen acef98a350 Merge pull request #2572 from pyrasis/tizen 
fixed #2185: Cocos2d-x Tizen support.
 2013-05-20 20:08:28 -07:00
minggo e7d9e09a44 Merge pull request #2586 from silverscania/master 
Bug in previous modifications made to GL_UNPACK_ALIGNMENT
 2013-05-20 18:59:03 -07:00
Lee, Jae-Hong 5faa5e92af Modify getWritablePath function. 2013-05-21 10:56:18 +09:00
Lee, Jae-Hong 6bb8d58d3a Update cocos2d project and use float.h 2013-05-21 10:32:34 +09:00
Lee, Jae-Hong 73590e57f6 Set relative include path. 2013-05-21 09:55:33 +09:00
Nicolas Gramlich cef2575180 Updated .classpath of Android project to latest ADT 22 build tool compatibility. 
Changes correspond to: https://groups.google.com/forum/?fromgroups#!msg/adt-dev/epOfZbKPFdk/RbR2VYNQ5_8J
 2013-05-20 14:39:25 -06:00
silverscania 1d23f1a2b4 The real cause of the problem for the texture corruption was when using textures with no alpha. 
The function bitsPerPixelForFormat returns the wrong number for RGB_888.
 2013-05-19 18:53:59 +03:00
silverscania 5adb4bc895 For some non power of two textures, even if the row alignment was 8, 4 or 2, setting this resulted in corruption. 
See ddafa42850 (commitcomment-3243089) for texture example.
Fix by setting alignment to 1 for ALL non-PO2 textures.
 2013-05-19 15:17:48 +03:00
silverscania 1973a52fbe Revert "Try to fix bugs that came up but just keeping the old parameters for row alignment: 4 or 1" 
This was not the correct fix.
This reverts commit 110ea5a501.
 2013-05-19 15:12:39 +03:00
silverscania 110ea5a501 Try to fix bugs that came up but just keeping the old parameters for row alignment: 4 or 1 2013-05-19 13:55:20 +03:00
James Gregory 391fb636fa Add a flag to indicate whether raw image data is pre-multiplied or not, and switch to using Emscripten's SDL implementation when loading images from file (much faster) 2013-05-17 17:11:52 -07:00
James Gregory 7cca63130c Pre-multiply text when rendered by Emscripten's SDL implementation (since HTML5 canvas is non-pre-multiplied). 2013-05-17 17:10:51 -07:00
James Gregory ae5454cffc Remove SDL code from texture cache, and move all image loading code to CCImage. 2013-05-17 17:09:28 -07:00
James Gregory 2bcbf5c2b8 Coordinates are already in terms of pixels -- no need to do content scaling 2013-05-17 17:08:46 -07:00
Ricardo Quesada ba12022134 Grid setProjection2D fix 
It doesn't multiply it by the CC_CONTENT_SCALE_FACTOR().
Not needed since it is CCDirector::getWinSizeInPixels() already has it
calculated
 2013-05-17 15:30:19 -07:00
James Gregory a1ff189854 Query the GL canvas for its width and height and use that rather than hardcoding it. Default the frame size to the whole canvas, and update the samples to use iPad resolution (1024x768). 2013-05-17 12:39:18 -07:00
Lee, Jae-Hong 900190e468 Replace tab to spaces. 2013-05-17 22:04:39 +09:00
James Gregory 95b5ce2e56 Remove freetype since it now works using Emscripten's SDL. 2013-05-16 17:34:33 -07:00
Lee, Jae-Hong 0ae6da81bd Include CCGL.h 2013-05-16 20:40:49 +09:00
Lee, Jae-Hong 43b11a73d6 Remove unused headers and defines. 2013-05-16 20:24:00 +09:00
Lee, Jae-Hong fb00de3e97 Implementing screen orientation function. 2013-05-16 20:17:11 +09:00
Lee, Jae-Hong e1cf030372 Change the default font path. 2013-05-16 20:16:57 +09:00
Lee, Jae-Hong 6072c9291f Adding libcocos2d.a project for Tizen. 2013-05-16 20:11:48 +09:00
Lee, Jae-Hong f47958356c Adding dependencies for libcurl.so 2013-05-16 20:09:23 +09:00
Lee, Jae-Hong 659e884009 Use CCImage.cpp from Linux implementation. 2013-05-16 20:07:31 +09:00
Lee, Jae-Hong e459129fac Move to rootstraps directory. 2013-05-16 20:06:25 +09:00
Lee, Jae-Hong 8915e90a36 Adding CCDevice.cpp for Tizen. 2013-05-16 20:05:04 +09:00
Lee, Jae-Hong 0ba2a82d35 Set return value. 2013-05-16 20:04:51 +09:00
Lee, Jae-Hong 434878c736 Delete libcurl.a because link error. Adding libcurl.so. 2013-05-16 20:04:06 +09:00
Lee, Jae-Hong 109e2feec8 Adding libcurl headers and x86 libraries for tizen. 2013-05-16 20:03:11 +09:00
Lee, Jae-Hong ce4663f851 Implementing file utils use with Osp. 2013-05-16 20:01:36 +09:00
Lee, Jae-Hong 704b8013fc Fix Assert bug. 2013-05-16 20:01:01 +09:00
Lee, Jae-Hong e51fe4f75e Define CC_ASSERT. 2013-05-16 19:59:38 +09:00
Lee, Jae-Hong d887b3cd84 Implementing getCurrentLanguage function. 2013-05-16 19:59:16 +09:00
Lee, Jae-Hong 0bd49de547 Implementing Animation Interval setting. 2013-05-16 19:58:46 +09:00
Lee, Jae-Hong b011bd2904 Implementing touch. 2013-05-16 19:58:14 +09:00
Lee, Jae-Hong d66abaa12c Implementing Termination. 2013-05-16 19:57:47 +09:00
Lee, Jae-Hong 3856c94416 Modify header define. 2013-05-16 19:57:17 +09:00
Lee, Jae-Hong ab8ede5ff8 Adding Osp Application, Osp Form Layer and implementing CCEGLView. 2013-05-16 19:55:26 +09:00
Lee, Jae-Hong 86bf779812 Adding third party headers and x86 libraries for Tizen. 2013-05-16 19:54:01 +09:00
Lee, Jae-Hong 58b181736d Adding platform code for Tizen. 2013-05-16 19:53:37 +09:00
Lee, Jae-Hong 27428dc5f4 Adding defines and enums for Tizen. 2013-05-16 19:49:16 +09:00
flamingo 3686107313 Update CCTexture2D.cpp 
Fixed compilation error on MSVC compiler
 2013-05-16 12:58:35 +04:00
minggo 1412eeefd1 Merge pull request #1893 from martell/mingw 
Added Mingw-crt Support without breaking VS SDK
 2013-05-15 23:30:43 -07:00
James Gregory d1922b6086 Add experimental (and currently disabled) code for using SDL to load texture data. If I can iron out the kinks, it should be a lot faster. 2013-05-15 20:22:43 -07:00
James Gregory bdbab7f5cf TTF rendering via SDL now seems to basically work. Not perfect yet, but seems to be about 3X faster on Chrome. 2013-05-15 20:21:30 -07:00
James Gregory 82f1a8e8ff Re-enable mouse-handling. 2013-05-15 20:21:02 -07:00
carlo morgantini a3f5238407 fix a warning caused by member variables initialization order in constructor 2013-05-15 16:37:08 -07:00
carlo morgantini fb2a73048d it now shares code between createTextBitmap and createTextBitmapShadowStroke (no more duplication) 2013-05-15 16:37:08 -07:00