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

4310 Commits

Author SHA1 Message Date
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 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
Lucian Varlan a70569ff03 OnEnterTransitionDidFinish was called twice when a node is added in onEnter 
Fix ported from cocos2d-iphone:
99b7bef880
 2013-05-27 16:07:09 +03: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
James Gregory 6b8966e575 Disable debugging symbols for all Emscripten builds. -g is simply too slow to be a useful debugging tool. If someone needs it they should add it back in, but it is not sensible default behavior at this point. 2013-05-21 19:05:50 -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
carlo morgantini 4d3ed48905 initWithStringShadowStroke() renamed to initWithString() 2013-05-15 16:37:08 -07:00
carlo morgantini c9e875869e comment fixed 2013-05-15 16:37:08 -07:00
carlo morgantini 3c28048c14 fix alignent problem when rendering text with shadow 2013-05-15 16:37:08 -07:00
carlo morgantini 0ff33fd4f5 fix a problem with float stroke size 2013-05-15 16:37:08 -07:00
carlo morgantini 3b50ffe5ba Fix problem with CCLabelTTF + shadow and text alignment; also fontDefinition property names now are lowercase 2013-05-15 16:37:08 -07:00
carlo morgantini d77604b958 initWithStringAndTextDefinition() changed method's signature 2013-05-15 16:37:08 -07:00
carlo morgantini 04c890522d class renamed and moved to ccTypes.h 2013-05-15 16:35:25 -07:00
carlo morgantini ed981aee7e ccTextDefinition becomes CCTextDefinition 2013-05-15 16:29:33 -07:00
carlo morgantini bc9a74218c added a new utility for comparing 2 ccColor3b 2013-05-15 16:29:33 -07:00
carlo morgantini d9a53b3eb1 CCLabelTTF new interface for ccBuilder 2013-05-15 16:29:33 -07:00
carlo morgantini 9ba489bba4 new assert() added on unsupported platforms for CCLabelTTF and CCTexture2D 2013-05-15 16:29:33 -07:00
carlo morgantini 74441203cb stroke and shadow are implemented and supported only on iOS and Android for now 2013-05-15 16:29:33 -07:00
carlo morgantini fcea506fef fixed some text formatting issues 2013-05-15 16:29:33 -07:00
carlo morgantini 54347bf767 setFontTintColor renamed to setFontFillColor 2013-05-15 16:29:33 -07:00
carlo morgantini 7bc3ceb8c8 uses const ccColor & in the interface instead of ccColor& 2013-05-15 16:29:33 -07:00
carlo morgantini c727fa33c0 CCLabelTTF have now a tint, plus bug fixing and code clean up 2013-05-15 16:29:33 -07:00
carlo morgantini 221884f6d4 better CCTexture2D API for init texture with shadow and stroke 2013-05-15 16:29:32 -07:00
carlo morgantini fc846bb9ac label TTF stroke and shadow for Android 2013-05-15 16:29:32 -07:00
carlo morgantini 690d5968ca New stroke and shadows for Android 2013-05-15 16:12:43 -07:00
carlo morgantini dd9b4a8932 new shadow and stroke for CCLabelTTF 2013-05-15 16:12:43 -07:00
James Gregory ab2d94c040 First pass at using SDL to render fonts instead of FreeType. 2013-05-14 21:38:56 -07:00
James Gregory 0daa3adfd6 Emscripten changed ABI for .a files. Rebuild all deps, updating to current version. Switch Emscripten to incoming branch as it's not working on master right now. Added simple script for rebuilding deps in case it becomes necessary again. Switch builds to always use -g flag, per Emscripten's warnings. Undefine native client defines so that it builds (Emscripten switched to NaCl alignment, macro got defined as a side-effect). 2013-05-14 15:26:48 -07:00
James Gregory de1a6340da Add my hacky script to rebuild dependencies, in case this is needed again in the future. 2013-05-14 15:14:54 -07:00
James Chen 99664b5998 Merge pull request #2391 from sbc100/log_asserts 
fixed #2152: Logging assert messages to the console and renaming CCScriptSupport::executeAssert to CCScriptSupport::handleAssert.
 2013-05-13 19:56:28 -07:00
James Chen cdb3985f0d fixed #2151: Commenting a log in CCFileUtils::fullPathForFilename. 2013-05-13 21:48:25 +08:00
James Chen 8fa593a8fe fixed #2151: Custom font can't be loaded correctly if using full path of filename. 2013-05-13 19:12:37 +08:00
James Chen 4e3ff65707 Merge branch 'android_custom_font_fix' of git://github.com/DarraghCoy/cocos2d-x into iss2151-customttf 2013-05-13 18:40:14 +08:00
James Chen fa8daa2ebb Merge branch 'master' of https://github.com/metalgit92/cocos2d-x into metalgit92-master 2013-05-13 14:03:29 +08:00
minggo aa5e5661ce Merge pull request #2551 from silverscania/master 
Fix for corrupted texture issue: https://github.com/cocos2d/cocos2d-x/issues/2550
 2013-05-12 20:36:41 -07:00
minggo 3ebb61a09c Merge pull request #2543 from FlagellumDei/patch-1 
centerWindow() fix
 2013-05-12 19:44:15 -07:00
Xavier Arias 71df5706bd Added const to CCNode::getChildrenCount() 2013-05-12 20:45:41 +02:00
silverscania ddafa42850 Fix for wrong alignment using texture format sizes other than 4 bytes. 
For example RGBA4444 is 2 bytes per pixel. A texture with width of 1 passes the previous power of 2 test, but the alignment value needs to be 2, not 4.
 2013-05-12 18:08:33 +03:00
Xavier Arias Botargues 4d78d102dd Merge remote-tracking branch 'upstream/master' 2013-05-11 08:55:38 +02:00
James Chen e3e07b4c1e Fixing compilation errors for NaCl port. 2013-05-10 16:03:01 +08:00
James Chen 23f23be681 Bug fixes for Nacl port. 2013-05-10 16:02:12 +08:00
James Chen 8ebde4df7f Merge branch 'data-visitor' of https://github.com/dumganhar/cocos2d-x into iss2142-datavisitor 2013-05-10 15:54:47 +08:00
James Chen db464530fb fixed #2142: updating win32. 2013-05-10 15:46:24 +08:00
James Chen 42427634f2 fixed #2142: Adding datavisitor support for other platforms except win32. 2013-05-10 15:37:40 +08:00
James Chen cbafaf67a6 fixed #2142: Adding CCDataVisitor and Implementing CCPrettyPrinter, iOS port is ok. 2013-05-10 15:07:05 +08:00
Darragh Coy 032aed4499 Fix custom font loading on Android when using fonts that are in resource mapped directories/paths. 
1: Use the CCFileUtils::fullPathForFilename function to lookup the resolved path for the font in the Android specific function, CCImage::getBitmapFromJava.

2: Remove a warning previously added in pull request 2422 (https://github.com/cocos2d/cocos2d-x/pull/2422) in CCFileUtils::fullPathForFilename in order to support change (1) above. If we pass just a system font name to CCFileUtils::fullPathForFilename such as 'Arial' (instead of a path) then it should just return 'Arial' and not generate a warning. We can't assume that when a path (or handle) given to CCFileUtils::fullPathForFilename isn't found within Cocos2dx that it doesn't exist or isn't valid. Depending on the platform there might be files or folders or handles that could be accessible to the app which might exist outside of the knowledge of Cocos2dx. The correct place to warn about missing resource files would be at the point where the resource loading itself fails; e.g if a texture or sound fails to load for example.
 2013-05-09 14:29:42 +01:00
Attila Szilágyi 989b0a249c Fix centerWindow() when the taskbar is located along the top or left screen edge 
centerWindow() will not center the window correctly when the taskbar is located along the top or left screen edge.
 2013-05-09 14:13:24 +03:00
James Chen bc4bf29f51 Merge pull request #2526 from djh-/master 
fixed #2140: The displayed color of CCDrawNode is incorrect when VAO is disabled.
 2013-05-09 03:34:49 -07:00
minggo ee8ec25f6a Merge pull request #2541 from j4m3z0r/emscriptenate 
Compile for Emscripten in asm.js mode
 2013-05-08 18:53:35 -07:00
Xavier Arias 1c6c13b3e5 Added const to CCNode's getTag & getContentSize 2013-05-09 00:20:08 +02:00
James Gregory 7f03838639 Use asm.js by default. 2013-05-08 14:59:48 -07:00
Ed Bartley 8b55f1285f Fix ccCArray 2013-05-08 15:22:05 -04:00
minggo e5155eedca export ZipUtils 2013-05-08 11:45:27 +08:00
minggo 8e78f8a7eb Merge branch 'TexturePacker-SpriteSheetProtection' of https://github.com/FlowerpotGames/cocos2d-x into TexturePacker-SpriteSheetProtection 2013-05-08 10:32:26 +08:00
James Gregory 25bded7faf Now validates as asm.js: Disable HttpClient, pthread_cond_signal and eglReleaseThread in Emscripten. 2013-05-07 17:25:39 -07:00
James Gregory a33e2965af Add libwebp linkage (needed for asm.js validation) 2013-05-07 17:24:24 -07:00
Ed Bartley 3ff7e5871c Added function ccSetPvrEncryptionKey(…) to set the encryption key in a single function call. 
Updated the TextureAtlasEncryptionTest to show how to use the ccSetPvrEncryptionKey(…) function.
Updated the notes and header docs for improved clarity.
 2013-05-07 10:14:38 -04:00
danielhaaser 8acf2644b6 Fix incorrect colors in CCDrawNode. 2013-05-07 10:15:50 -03:00
James Chen 70472d558d Merge pull request #2430 from imbahom/master 
Fix a typo in CCNode.cpp.
 2013-05-07 01:48:31 -07:00
James Chen c45ebfa628 Merge pull request #2422 from brawsome/master 
fixed #2127: Adding CCLOG before original path is returned in CCFileUtils::fullPathForFileName to aid in debugging.
The PR has fix two issues:
1) Added additional CCLOG to CCFileUtils::fullPathForFilename:
There's currently no way to be sure, from a calling function, that
fullPathForFilename has returned an invalid file path, which makes it
difficult to quickly track down missing, or incorrect file paths. Added
a CCLOG before the original string is returned to make debugging
missing or incorrect file paths easier.

2) Optmization to ccArrayGetIndexOfObject …
Optimized loop of ccArrayGetIndexOfObject to remove the overhead of 3
pointer dereferences per iteration, and pre-increment the int for
speed. If this function is called a lot, and with a large list, this
will result in a good performance win.
This can probably be done with just pointers, but I haven't taken the
time to validate all function calls to make sure it would be
appropriate. Though I can guarantee that if this worked fine before, it
will work fine with this change.
 2013-05-07 01:40:57 -07:00
James Chen 288838ec92 Fixing compilation errors. 2013-05-07 15:51:58 +08:00
minggo 26bdc459d3 Merge pull request #2143 from CodeSnooker/master 
Added Method to create a CCMenuItemToggle from a CCArray with a target selector
 2013-05-07 00:26:56 -07:00
James Gregory 0630e15475 Merge remote-tracking branch 'origin/master' into emscriptenate 2013-05-06 23:56:16 -07:00
minggo d58f21dc76 Merge pull request #2521 from minggo/emscriptenate 
fix conflict of #2050
 2013-05-06 23:51:38 -07:00
James Chen eb936b0feb Merge pull request #2522 from dumganhar/fix-building-error 
Fix compilation errors for linux port.
 2013-05-06 23:39:18 -07:00
James Chen 2418e72a0e Fix compilation errors for linux port. 2013-05-07 14:36:01 +08:00
minggo 1166a02e13 resolve conflict for #2505 2013-05-07 14:31:00 +08:00
minggo 90b8dfd383 Merge pull request #2504 from wagaf-d/ccpchanges 
Move ccpX functions to CCPoint methods and operators
 2013-05-06 23:22:21 -07:00
minggo ea5d7bc5ad Merge pull request #2361 from tiantian20007/dictStuff 
Implement CCDictionary::writeToFile();
 2013-05-06 23:17:11 -07:00
James Gregory c7ac6b9d01 Add libjpeg linkage. 2013-05-06 22:28:13 -07:00
Adrien Béraud 16d2b5a957 Assert that the user does not divide by 0 in CCPoint and CCSize 2013-05-07 14:58:43 +10:00
Adrien Béraud ca4c2edc29 Clarify CCPoint::rotate & unrotate documentation 2013-05-07 14:36:17 +10:00
James Gregory ce2d97c848 Simplify Emscripten makefile a little. 2013-05-06 21:30:03 -07:00
James Gregory a285117aca Disable unsafe GL opts, enable -O2 2013-05-06 21:29:45 -07:00
James Gregory 7b04e6b0e7 Implement primitive drawing methods for Emscripten 2013-05-06 21:29:44 -07:00
James Gregory 92e4c76f20 Move GL server-side buffer code into a separate class and use multiple inheritance to deploy only to classes that need it. 2013-05-06 21:29:44 -07:00
James Gregory fa77e6ede2 Switch to using GL_DYNAMIC_DRAW. 2013-05-06 21:29:44 -07:00
James Gregory 29cfe512a3 Remove debug print statement 2013-05-06 21:29:44 -07:00
James Gregory 41b5cfebb6 Add warning messages if any of the raw primitive drawing methods are used (they seem not to be, in pratice). 2013-05-06 21:29:43 -07:00
James Gregory 36fc2ecf99 Get CCGrid to work. 2013-05-06 21:29:43 -07:00
James Gregory f386272486 Add method to CCNode class to allow uploading data to GPU. Call it from CCSprite. 2013-05-06 21:29:43 -07:00
James Gregory 9ae67ff78a Move GL server-side buffer code into a separate class and use multiple inheritance to deploy only to classes that need it. 2013-05-06 21:25:47 -07:00
James Gregory ff1e0aefa0 Switch to using GL_DYNAMIC_DRAW. 2013-05-06 21:25:47 -07:00
James Gregory 0c8f7dd608 Enable texture caching with emscripten. 2013-05-06 21:23:06 -07:00
James Gregory 235b80e7f8 Get CCGrid to work. 2013-05-06 21:22:34 -07:00
James Gregory 7a3875b99d Point Emscripten root to be the external referenced by the tree. 2013-05-06 21:17:22 -07:00
James Gregory 2b8efda0f4 Use floats instead of doubles for Chipmunk. 2013-05-06 21:17:22 -07:00
James Gregory de9df010c3 Enable texture cache on Emscripten. Not sure yet if this is the best balance, since we're both short on memory *and* compute time. 2013-05-06 21:17:22 -07:00
James Gregory 062a5eefd8 Move GL server-side buffer code into a separate class and use multiple inheritance to deploy only to classes that need it. 2013-05-06 21:13:21 -07:00
James Gregory 6c828bbe4f Switch to using GL_DYNAMIC_DRAW. 2013-05-06 21:13:21 -07:00
James Gregory 809b77d632 Get CCGrid to work. 2013-05-06 21:08:28 -07:00
James Gregory 4fb6b406ce Add libtiff to Emscripten builds, plus some build flags. 2013-05-06 21:00:39 -07:00
James Gregory 735280572a Add libtiff build -- build with straight emconfigure, emmake, with a troublesome assert removed (assert(sizeof(uint64) == 8)). 2013-05-06 21:00:39 -07:00
James Gregory 82c6f68593 Set orientation to 0 for Emscripten, thus avoiding a segfault. 2013-05-06 21:00:38 -07:00
James Gregory 4d4b638531 Switch to O1 for now. 2013-05-06 21:00:38 -07:00
James Gregory d529287cfa Remove LOG prefixes from emscripten makefiles 2013-05-06 21:00:38 -07:00
James Gregory 3829a5741b Fix the ordering of vertex attributes for CCProgressTimer. 2013-05-06 21:00:38 -07:00
James Gregory 130647d97f Implement primitive drawing methods for Emscripten 2013-05-06 21:00:38 -07:00
James Gregory 16e9598a54 Enable -O2 optimization now that Emscripten seems to succeed. 2013-05-06 20:59:50 -07:00
James Gregory 5b8494199e Rebuild libfreetype without references to my home dir in it. 2013-05-06 20:59:50 -07:00
James Gregory 3077190e29 Add note on origin of libxml binary. 2013-05-06 20:59:49 -07:00
James Gregory 81ded66016 Don't set animation interval on emscripten builds since that is driven by the request frame API. 2013-05-06 20:59:49 -07:00
James Gregory 9d775d136b Add libxml2 build for Emscripten. 2013-05-06 20:59:49 -07:00
James Gregory e3dc808a7c Remove redundant -l flags from emscripten build -- it doesn't have fontconfig, and GL stuff is linked in automatically. 2013-05-06 20:59:48 -07:00
James Gregory 5bac7b52ac Move GL server-side buffer code into a separate class and use multiple inheritance to deploy only to classes that need it. 2013-05-06 20:59:48 -07:00
James Gregory a9c8d99a4c Switch to using GL_DYNAMIC_DRAW. 2013-05-06 20:59:48 -07:00
James Gregory 872df86f84 Remove debug print statement 2013-05-06 20:59:48 -07:00
James Gregory 3546534a66 Switch makefile over to using Emscripten headers for freetype. 2013-05-06 20:59:48 -07:00
James Gregory 8a9586fd9d More client side buffer fixes. 2013-05-06 20:59:48 -07:00
James Gregory 91ea64db09 More client side buffer fixes. 2013-05-06 20:59:48 -07:00
James Gregory 9352b8b359 More client side buffer fixes. 2013-05-06 20:59:48 -07:00
James Gregory f35e32d158 Add warning messages if any of the raw primitive drawing methods are used (they seem not to be, in pratice). 2013-05-06 20:59:48 -07:00
James Gregory 5295202081 Add freetype2 headers that match the .a we're using. 2013-05-06 20:59:47 -07:00
James Gregory d52aa420e8 Switch to slot-based GL buffer loading code for CCSprite. 2013-05-06 20:59:47 -07:00
James Gregory 87daf9d3eb Add missing Makefile reference to file utils for Emscripten. 2013-05-06 20:59:47 -07:00
James Gregory 764dffc822 Increase heap size for Emscripten binaries, add in missing linkages. 2013-05-06 20:59:47 -07:00
James Gregory 5138fb66fd Add pre-build dependencies for Emscripten libpng, libz. 2013-05-06 20:59:47 -07:00
James Gregory 7d563a818a Hack: use 800x500 resolution for window for emscripten so that mouse roughly lines up. 2013-05-06 20:59:47 -07:00
James Gregory 19c6a50d50 Enable texture caching with emscripten. 2013-05-06 20:59:46 -07:00
James Gregory a1c628f80a Fix Motion streak client side buffers 2013-05-06 20:58:46 -07:00
James Gregory edcd0f12e4 Add platform files for Emscripten. 2013-05-06 20:58:46 -07:00
James Gregory 9500448f87 Get CCGrid to work. 2013-05-06 20:58:46 -07:00
James Gregory 089a47d937 Add method to CCNode class to allow uploading data to GPU. Call it from CCSprite. 2013-05-06 20:58:45 -07:00
James Gregory aa2739a109 Update build process for HelloCpp to build .js and .data files separately, pulling both in from index.html 2013-05-06 20:58:45 -07:00
James Gregory 77e9f4902e Build fixes for emscripten, add linkage to libfreetype.a 2013-05-06 20:58:45 -07:00
James Gregory 1d307d676d Remove freetype source and add libfreetype.a as built by the Emscripten test-suite. 
Revert "Add freetype 2.4.11 to repo"

This reverts commit 418906d2612b59ead6826d8395b69168bdff0ca4.
 2013-05-06 20:58:45 -07:00
James Gregory 955ba1bfd3 ifdef tango around some symbols that aren't defined in Emscripten (nor a bunch of other platforms, it seems). 2013-05-06 20:58:43 -07:00
James Gregory 4f56f93269 Add #defines for Emscripten platform 2013-05-06 20:58:43 -07:00
James Gregory c45e5797cf Add Makefiles for Emscripten + Emscripten external 2013-05-06 20:58:02 -07:00
minggo 80dfd4d493 Merge pull request #2407 from sergey-shambir/attribute_format 
Added __attribute__(__format__()) for CCLog and CCString
 2013-05-06 20:06:52 -07:00
Sam Clegg 4f6de1bcad Rename CCScriptSupport::executeAssert -> CCScriptSupport::handleAssert 
Also remove the first "cond" argument, since it is always false.
 2013-05-06 12:25:13 -07:00
Sam Clegg e699919bc6 Log assert messages 
Now, assert messages as visible in the trace output
as well as the line number of condition that failed.
 2013-05-06 12:25:13 -07:00
Adrien Béraud 6a5559da7f Check for 0 length in CCPoint::normalize() 2013-05-07 03:15:28 +10:00
Adrien Béraud f71798a35b Check for 0 length in CCPoint::normalize() 2013-05-07 02:59:38 +10:00
Adrien Béraud 49474f5194 documentation 2013-05-07 02:53:13 +10:00
Ed Bartley 040e6fc5b9 Promote global functions and variables for PVR decryption to ZipUtils class. 
Rename PVR decryption functions and variables to better fit in the Cocos2DX framework.
Improve log error notes.
Update TextureAtlasEncryptionTest to match revised function call in ZipUtils.
Update ccSetPvrEncryptionKeyPart documentation to clarify that encryption is never 100% secure.
 2013-05-06 10:04:45 -04:00
minggo d395d26e1d Merge pull request #2417 from sergey-shambir/disable_copy 
Added CC_DISABLE_COPY macro
 2013-05-06 03:02:48 -07:00
minggo bbf0f9d1bd Merge pull request #2513 from savdalion/const-methods 
Added const methods for classes - purer code!
 2013-05-05 23:55:37 -07:00
James Chen fead37eab3 fixed #2105: Adding Travis build support for linux and NaCl. 2013-05-06 10:55:39 +08:00
Adrien Béraud 3661e34695 Bug fix: width and height reversed in CCSize operators 2013-05-05 19:51:44 +10:00
Romain Tisserand d2690d8942 Fix iOS 4.3 JPEG loading (darken picture, alpha issue) 2013-05-04 19:14:23 +02:00
Adrien Béraud 637cc1a9ed CCPoint::getDistance() implemented, CCPoint::length() renamed to getLength(), bug fixes 2013-05-05 02:58:46 +10:00
minggo 1a0db3749e Merge pull request #2496 from mchinen/mchinensedit 
Fix missing protocol method warning for iOS 6.0 addition
 2013-05-04 08:55:07 -07:00
savdalion 5f549dd011 Added const modifier for classes CCArray, CCObject - fine code! 2013-05-04 15:05:06 +03:00
Adrien Béraud 6fb586028e Revert unrelated change commited by mistake 2013-05-04 17:20:59 +10:00
Adrien Béraud b9fe35901a Moved most CCPointExtension functions to CCPoint OO-equivalents 2013-05-04 17:18:22 +10:00
Ricardo Quesada ea30d21799 updates Xcode project to detect more warnings 2013-05-03 11:59:44 -07:00
Michael Chinen d47759cc32 EAGLView.mm: fix indent 2013-05-03 19:46:58 +09:00
Adrien Béraud b34dc25346 Cleaner constructors and overloads for CCSize; Cross-assignement and conversion constructors between CCPoint and CCSize. 2013-05-03 13:24:52 +10:00
Adrien Béraud b627cd4674 overloading operators +-*/ in CCPoint 2013-05-02 15:13:03 +10:00
Adrien Béraud 9fb0081add direct constructor for CCPoint 2013-05-02 14:59:50 +10:00
Darragh Coy 212feb8d8c Add CCDirector::popToSceneStackLevel(int level) 
This replicates a change made to cocos2d-iphone in the following commit:
59c5272bff

The cocos2d-iphone change was originally discussed in the following pull request:
http://github.com/cocos2d/cocos2d-x/pull/2210
 2013-04-30 23:33:22 +01:00
Michael Chinen be2f20e213 Fix missing protocol method warning for iOS 6.0 addition 2013-05-01 00:35:17 +09:00
minggo d1506326ba Merge pull request #2484 from sergey-shambir/bit_more_verbose 
Logging: More verbose output in removeChildByTag and getActionByTag
 2013-04-29 08:06:53 -07:00
minggo 1a598a8c68 update version 2013-04-28 13:48:18 +08:00
Sergey Shambir 44a6be80d2 More verbose logging in removeChildByTag and getActionByTag 
Tags are often hardcoded, so tag value will be useful to detect problem.
 2013-04-27 23:15:00 +04:00
tiantian 2ba5035e5a Make sure XMLDocument is deleted; Code clean up; Add test; 2013-04-28 00:36:37 +08:00
minggo cb8f069ae6 Merge pull request #2466 from Weeds/fix-loadAsyncImage 
don't use named semaphore for syncing image loading thread
 2013-04-27 08:47:48 -07:00
Andre Rudlaff 43615fe0a7 don't use named semaphore in HttpClient 
this patch removes using named semaphores for Http requests.
This also destroys the mutexes from CCTextureCache when the thread is
destroyed
 2013-04-27 17:44:33 +02:00
James Chen edc8444ca4 Updating blackberry project configurations. 2013-04-27 14:07:54 +08:00
Andre Rudlaff 5e12d9f8fe don't use named semaphore for syncing image loading thread 
Named semaphores are unique across process bounds, therefore a semaphore
left in an invalid state may cause locks on other processes.
The code has been exchanged by using pthread mutex and condition variables
 2013-04-26 18:55:36 +02:00
Ed Bartley f89d39953e Add PVR.CCZ encryption support to ZipUtils based upon http://www.codeandweb.com/texturepacker/contentprotection 
Add sample to TestCPP.
 2013-04-25 13:40:49 -04:00
James Chen d1afe6cfa6 Fixing a bug in CCFileUtilsIOS::isFileExist(). 2013-04-25 22:02:20 +08:00
James Chen 93a8b60111 If file path is an empty string, return false directly in CCFileUtils::isFileExist. 2013-04-25 21:51:13 +08:00
Ed Bartley b2b10ba5f7 CCLayerColor::_realOpacity is not set in ::initWithColor(…) causing unexpected behavior if a ::runAction(CCFadeTo::create(…)) applied to the LayerColor. 2013-04-25 10:32:03 +08:00
Andrew Goulding d2ca2a4d10 Optmization to ccArrayGetIndexOfObject 
Optimized loop of ccArrayGetIndexOfObject to remove the overhead of 3
pointer dereferences per iteration, and pre-increment the int for
speed. If this function is called a lot, and with a large list, this
will result in a good performance win.

This can probably be done with just pointers, but I haven't taken the
time to validate all function calls to make sure it would be
appropriate. Though I can guarantee that if this worked fine before, it
will work fine with this change.
 2013-04-25 12:18:40 +10:00
imbahom 72ad9fd701 Update CCNode.cpp 
注释错误
 2013-04-23 21:44:24 +08:00
Andrew Goulding 3c6bb725e7 Added additional CCLOG to CCFileUtils::fullPathForFilename 
There's currently no way to be sure, from a calling function, that
fullPathForFilename has returned an invalid file path, which makes it
difficult to quickly track down missing, or incorrect file paths. Added
a CCLOG before the original string is returned to make debugging
missing or incorrect file paths easier.
 2013-04-23 06:24:12 +10:00
minggo d89792fdc6 fixed #2073: fix memory leak in CCUserDefault 2013-04-22 16:43:05 +08:00
Sergey Shambir 41f5538ff4 Added CC_DISABLE_COPY macro 2013-04-20 15:13:19 +04:00
Sergey Shambir 3ae98978d4 Added CC_FORMAT_PRINTF to CCString 
Added for CCString::initWithFormat() and CCString::createWithFormat().
Fixed warnings.
 2013-04-19 14:00:16 +04:00
Sergey Shambir 5541816ef6 Fixed GCC warning on narrowing conversion 2013-04-19 12:09:26 +04:00
Sergey Shambir e5b2f300f9 Added CC_FORMAT_PRINTF(x,y) macro to warn on CCLog() format errors 
Uses printf format. Enabled for GCC and clang.
 2013-04-19 11:54:08 +04:00
James Chen d37a43e100 Merge pull request #2398 from lgb/float_comparison_issue 
fixed #1935: Float comparison must not use "==" in the equal function of CCPoint and CCSize, we should compare float number by using epsilon and absolute difference.
 2013-04-18 19:44:17 -07:00
James Chen ec50d34622 fixed #2068: Tab ~> 4 spaces. 2013-04-19 09:59:08 +08:00
James Chen 9ecaacf59b fixed #2068: Updating source format. 2013-04-19 09:55:29 +08:00
James Chen b91c5f099c fixed #2068: Fixing a compilation error on win32 since "•" couldn't be recognized by vs compiler. 2013-04-19 09:49:55 +08:00
James Chen 861e8e42f7 Merge branch 'master' of https://github.com/MarcelBloemendaal/cocos2d-x into MarcelBloemendaal-master 2013-04-18 16:21:17 +08:00
James Chen 612a8a309f Merge pull request #2193 from Weeds/feature-screen-dimensions 
fixed #2065: Adding kResolutionFixedHeight and kResolutionFixedWidth resolution policy.
 2013-04-18 00:31:13 -07:00
minggo 724402750b Merge pull request #2390 from scoyo/master 
Fix for spaces at the beginning of wrapped lines
 2013-04-17 19:10:19 -07:00
Jaroslaw Lewandowski 20e102bc46 Fixed setAccelerometerInterval signature in setAccelerometerIntervalJNI function. 2013-04-18 01:27:33 +01:00
Oleg Baluk 271f90e744 compare using epsilon and absolute difference 2013-04-18 02:16:49 +04:00
Kristiaan De Jongh 81e4178a42 fix for spaces when wrapping 2013-04-17 13:09:48 +02:00
James Chen 63ce8adfad fixed #2059: Fix complication errors on Android. 2013-04-17 17:05:39 +08:00
James Chen ddd6d9d155 fixed #2059: cc.FileUtils.getInstance().getStringFromFile(filename) doesn't return a whole string. 2013-04-17 16:08:48 +08:00
minggo 72f1fadca2 Merge pull request #2380 from NatWeiss/patch-2 
Properly resets the tile's Y flipping
 2013-04-17 00:42:08 -07:00
minggo 78d3c7f048 fixed #1613:not reload resources on Android platform after return from background 2013-04-17 15:34:57 +08:00
James Chen e07d11d1e2 Merge pull request #2381 from lgb/blackberry-compile-fix 
fix compilation error in cocos2dx for BlackBerry PlayBook
 2013-04-16 22:00:08 -07:00
James Chen 694c47f5d6 Merge pull request #2382 from wedteam/keypad-support 
fixed #2057: [JSB] Adding response for back and menu keypad event for Android.
 2013-04-16 21:56:37 -07:00
James Chen 1eb79530c6 fixed #1847: -DCC_ENABLE_BOX2D_INTEGRATION ~> -DCC_ENABLE_BOX2D_INTEGRATION=1, 
-DCC_ENABLE_CHIPMUNK_INTEGRATION ~> -DCC_ENABLE_CHIPMUNK_INTEGRATION=1.
 2013-04-17 12:49:25 +08:00
akira_cn e1f9e1a300 update keypad support 2013-04-17 10:40:46 +08:00
NatWeiss f875366cc6 Properly resets the tile's Y flipping 
This bug caused many tiles to be Y flipped if only one tile was actually intended to be flipped.
 2013-04-16 15:01:22 -07:00
Oleg Baluk af71b881df fix wrong buffer name 2013-04-17 01:59:23 +04:00
tianTian 9a04eee8d1 do it atomically; 2013-04-16 12:38:53 +08:00
tianTian 91ddfe7382 Add support for CCDictionary contains CCArray; 2013-04-16 12:34:09 +08:00
Sam Clegg ffb7360e46 Enable easy swithing between Box2D and chipmunk in linux and nacl 
The ENABLE_BOX2D/ENABLE_CHIPMUNK defines were previously
hardcoded in the Makefiles.  Now you get chipmunk by default
on both platforms and can enble Box2D by setting USE_BOX2D in
your environment.

Also remove erroneous -D__CC_PLATFORM_FILEUTILS_CPP__ and
-D__CC_PLATFORM_IMAGE_CPP__ from linux Makefiles.  These should
never be defined globally like this.
 2013-04-15 07:35:50 -07:00
Sam Clegg 87f57d6ca6 Fix CCPhysicsSprite getPosition variants 
CCPhysicsSprite was overriding only some of the getPosition
methods on a node resulting in, for example, getPositionX
and getPositionY not working for physics nodes.

This change also makes this overloads shared between box2d
and chipmunk implementations.
 2013-04-15 07:35:49 -07:00
Marcel Bloemendaal 76b222978c Changed some property names to match conventions. 
Changed m_pSecureTextEntry to m_bSecureTextEntry and renamed
getSecureTextEntry to isSecureTextEntry
 2013-04-15 09:11:04 +02:00
James Chen bfa766f705 Merge pull request #2356 from MarkEHenderson/master 
Fix variable initialization in SpriteBatchNode and LabelBMFont to allow JS extension
 2013-04-14 22:37:46 -07:00
James Chen ca2f203947 Merge pull request #2343 from Yodesoft/master 
fixed #2053: [Linux] Setting writable path to "<user's home>/.config/<app name>".
 2013-04-14 20:10:23 -07:00
James Chen 84b4c5ac2b fixed #2051: Comment update, int ~> intptr_t. 2013-04-14 16:05:54 +08:00
James Chen ea78ee9bb7 fixed #2051: TestCpp/ExtensionsTest/CocosbuilderTest crashes under x86_64 target. 2013-04-14 16:00:50 +08:00
James Chen 2757962748 Merge branch 'master' of https://github.com/billy1380/cocos2d-x into billy1380-master 2013-04-14 14:49:02 +08:00
tianTian b7f0b2a8e0 Use CCLOG instead of CCLog; 2013-04-13 18:20:17 +08:00
tianTian 96359950cf Implement CCDictionary::writeToFile(); 
Use NSDictionay to do the job for iOS and Mac, and using tinyxml2 for other platform;
 2013-04-13 16:55:24 +08:00
tianTian edf1e53d2d fix syntax error; 2013-04-13 15:18:54 +08:00
Mark Henderson 9c82c39978 remove duplicate default variable definition 2013-04-12 10:11:26 -07:00
billy1380 493d1d90ed fixed a bug that was causing x86_64 tests to crash while loading 
ccbuilder files
 2013-04-12 14:37:28 +01:00
Mark Henderson 038a04c05b Fixing SpriteBatchNode and LabelBMFont to prevent error when release is called without calling init 2013-04-11 15:02:09 -07:00
yodesoft 5952597c1a Set writable path to XDG_CONFIG_HOME if it exists. 2013-04-11 09:20:25 +08:00
yodesoft cda864b597 Read app name from /proc/self/exe 2013-04-11 08:58:48 +08:00
yodesoft db5df829fb Restore codes of init m_strDefaultResRootPath 2013-04-10 18:39:01 +08:00
yodesoft 85c932112f Merge remote-tracking branch 'upstream/master' 2013-04-10 17:54:50 +08:00
James Chen 862d4d6316 Merge pull request #2195 from folecr/androidlinkerflags 
fixed #2047: Clean up linked libraries for Android.
 2013-04-10 00:53:00 -07:00
James Chen 32406efec2 Merge branch 'newlines_in_cclog' of https://github.com/sbc100/cocos2d-x into sbc100-newlines_in_cclog 
Conflicts:
	cocos2dx/proj.linux/cocos2dx.mk
 2013-04-10 14:17:23 +08:00
James Chen 68867b8798 Merge pull request #2212 from rogerzanoni/linux_link 
fixed #2044: Fix linux build, libpthread and libGL libraries need to be linked on linux.
 2013-04-09 21:50:54 -07:00
yodesoft e193dbc4cf Linux: Set writable path to "<user's home>/.config/<app name>" 2013-04-10 11:45:55 +08:00
minggo a0dc39ca38 fixed #2034:use previous path to get UserDefault.xml 2013-04-10 11:39:01 +08:00
yodesoft d03b95ca46 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	cocos2dx/platform/linux/CCFileUtilsLinux.cpp
 2013-04-10 11:16:04 +08:00
yodesoft ba591b0980 Linux: Set writable path to "<user's home>/.config/<app name>" 2013-04-10 10:55:50 +08:00
minggo df888eef65 fixed #2042: remove libxml2 2013-04-10 09:56:31 +08:00
minggo 5d2c67ee8a fixed #1904:strip libcurl.a on x86 architecture 2013-04-10 09:40:44 +08:00
minggo 3c8b26813e delete libxml2 2013-04-10 09:39:48 +08:00
James Chen b8ea3dfe99 Merge pull request #2332 from dumganhar/master 
cxx-generator ~> bindings-generator.
 2013-04-08 22:58:04 -07:00
James Chen 0d5d2e54fd cxx-generator ~> bindings-generator. 2013-04-09 13:47:12 +08:00
folecr e91ec3ede5 Clean up linked libraries 
* LOCAL_LD_LIBS and LOCAL_EXPORT_LDLIBS are the same
 * Remove unused -lEGL
 2013-04-08 22:46:25 -07:00
James Chen 55ec9de216 Merge pull request #2326 from harikrishnar/master 
fixed #2037: Major problem with initWithObjects method of CCArray.
 2013-04-08 21:50:33 -07:00
James Chen 8e4848b243 Merge pull request #2328 from elmiro/readlink 
fixed #2036: Correction of passed buffer size to readlink ...
 2013-04-08 20:46:08 -07:00
minggo ac43ff7584 Merge pull request #2325 from minggo/userdefault-hotfix 
fixed #2034:make CCUserDefault compatible with previous version on Android and iOS
 2013-04-08 18:34:20 -07:00
elMiro 0f6e2daf31 Correction of passed buffer size to readlink and verification of result return by readlink. 2013-04-09 00:25:31 +02:00
hkrishna 38cb350d39 Problem with initWithObjects of CCArray 
A new unused array was created instead of using the instance on which
the method was called
 2013-04-09 00:08:41 +05:30
James Chen 5e2f1e0bd6 Merge pull request #2272 from Weeds/saxparser-fix 
fixed #2035: fixed potential crash in CCSaxParser
 2013-04-08 07:49:36 -07:00
minggo d3aa718b22 fixed #2034:make CCUserDefault compatible with previous version on Android and iOS 2013-04-08 21:35:43 +08:00
James Chen 935b7af11c Merge branch 'openal' of https://github.com/azmeuk/cocos2d-x into azmeuk-openal 
Conflicts:
	AUTHORS
 2013-04-08 17:53:14 +08:00
James Chen 401b3dca4d Merge pull request #2282 from DarraghCoy/ccfileutils_create_with_contents_of_file_fix 
fixed #2031: Fix CCFileUtils 'createXXXXWithContentsOfFile' path lookup issue.
 2013-04-08 02:33:23 -07:00
James Chen c3a177e5e6 Merge pull request #2268 from Weeds/ccscheduler-fix 
fixed #2003: Fixed potential crash in CCScheduler::removeHashElement.
 2013-04-08 02:00:22 -07:00
James Chen d3eed7fd1f Merge pull request #2279 from sjchao/master 
fixed #2030: Fixing a display bug when a scrollView nested in another scrollView. The parent's scissor rect need to be considered, when setting the scissor rect in the subScrollView.
 2013-04-07 23:55:55 -07:00
James Chen 7a45e1ddd1 Merge pull request #2322 from dumganhar/iss1592-update-uthash 
fixed #1592: Updating uthash to v1.9.8.
 2013-04-07 23:31:31 -07:00
James Chen 4e2819e86d Fixing a warning. 2013-04-08 13:51:24 +08:00
James Chen 831dfb6ade Merge remote-tracking branch 'origin/iss1592-update-uthash' into iss1592-update-uthash 2013-04-08 11:56:10 +08:00
James Chen 2c3427dcee issue #1592: Fixing complication errors for windows port. 2013-04-08 11:56:04 +08:00
James Chen 7c6cb8c8cd commit latest uthash.h utlist.h 2013-04-08 10:59:41 +08:00
minggo ad68b3d5ed Merge pull request #2288 from mchinen/master 
Android: fix emulator for OpenGL ES 2.0
 2013-04-07 19:08:00 -07:00
yodesoft 4d5dff6172 Reduce function call in nativeInitBitmapDC to improve performance. 2013-04-07 17:17:19 +08:00
minggo 2436d87cb3 Merge pull request #2256 from waiter/master 
Add CCRemoveSelf Action
 2013-04-06 19:09:17 -07:00
James Chen 038720a1b2 Merge pull request #2290 from Yodesoft/master 
fixed #2000: Improve font rendering performance for linux platform.
 2013-04-03 18:59:37 -07:00
Romain Tisserand 15d4e75cdb JNI fixes, added missing JNIEXPORT / JNICALL declarations 
This is needed if compiling with custom visibility settings (example :
-fvisibility=hidden)
 2013-04-02 22:15:12 +02:00
minggo 3d0a5e52c6 Merge pull request #2267 from nickveri/master 
Added some missing function for setting integer shader uniforms in CCGLProgram
 2013-04-01 19:52:11 -07:00
yodesoft fa9339916d Improve font rendering performance 2013-04-02 10:16:51 +08:00
Michael Chinen 6f5173f448 android:Add emulator detection and config change to allow running OpenGL ES 2.0 projects in the emulator 
Code taken from forum post by Romain TISSERAND
http://www.cocos2d-x.org/boards/6/topics/12563?r=25446#message-25446
 2013-04-01 20:41:33 +09:00
Darragh Coy 7f565bb2fa Fix CCUserDefault.cpp compiling on Android. 
CCUserDefault.cpp shouldn't compile on Android.
 2013-03-31 22:24:10 -07:00
Michael Chinen 227d2cf60b Add emulator detection hack to allow running OpenGL ES 2.0 projects in the emulator 2013-03-31 20:47:43 +09:00
Darragh Coy d0f8aaad9e Fix CCFileUtils 'createXXXXWithContentsOfFile' path lookup issue 
When calling 'CCFileUtils::createCCDictionaryWithContentsOfFile' and 'CCFileUtils::createCCArrayWithContentsOfFile' on iOS/OSX these functions call upon 'CCFileUtils::fullPathForFilename' to resolve the path given into a full path which can be used with system file IO functions. This matches the convention found throughout the cocos2dx library and is expected behaviour. However, on Android and other platforms it appears calling 'CCFileUtils::createCCDictionaryWithContentsOfFile' or 'CCFileUtils:: createCCArrayWithContentsOfFile' does not do the same resolution using 'CCFileUtils::fullPathForFilename' - resulting in file paths which are correctly specified (and which worked on iOS/OSX) to fail to load on these platforms.

Fix this issue by performing a lookup/resolve of the file path using 'CCFileUtils::fullPathForFilename' before doing the low level loading work itself. This brings the behaviour of other platforms in line with iOS and OSX.
 2013-03-29 22:51:25 -07:00
sjchao cd3a2be720 change comment type 2013-03-29 17:21:29 +08:00
sjchao 4690a45f3e change a method name 
change method name from isScissorEnable() to isScissorEnabled() in
class CCEGLViewProtocal
 2013-03-29 17:19:47 +08:00
sjchao 18c43e29b2 change method name from getIsScissorEnable() to isScissorEnable() 2013-03-29 15:32:30 +08:00
chao 253ebe49e4 add getIsScissorEnable() and getScissorRect() for CCEGLViewProtocal 2013-03-29 01:28:26 +08:00
Marcel Bloemendaal 6d6a0f23eb Added support for secureTextEntry (passwords) 
Added a secureTextEntry property. Enabling this property causes the
TextField to display the entered text as bullets.
 2013-03-28 15:08:33 +01:00
Éloi Rivard 8c013fe619 * Basic Linux OpenAL support. 2013-03-28 12:07:09 +01:00
Andre Rudlaff 5372363365 fixed potential crash in CCSaxParser 
The character array which given to CCSAXParser::parse() may not be NULL
terminated.
Therefore we must also add the size of the data array to the parameter list
of the tinyxml2::XMLDocument::parse() call
 2013-03-28 01:07:54 +01:00
Andre Rudlaff 89f08bb441 [Linux] fixed font rendering crash for certain fonts 
face->size->metrics->ascender seems to be unreliable for some fonts,
additionally the freetype documentation says that it may be used
differently for different fonts.
Therefore it may happen that the ascender of a font face is less then
the glyphs bounding box resulting in accessing invalid memory.

The fix is to use the bbox attribute instead of the ascender
 2013-03-28 00:54:11 +01:00
Andre Rudlaff 8ab1f3c6d2 fixed potential crash in CCScheduler::removeHashElement 
If the scheduler is the last object to have retained the pElements target and
the targets desctructor calls CCScheduler::unschedule() invalid memory is
accessed as pElement->timers is already freed, but the pElement is not removed
yet.
Therefore the call to target->release() should be made after pElement has been
removed from the hash table
 2013-03-26 22:55:26 +01:00
nickveri fd35ebd4d4 Added support for setting integer uniforms 2013-03-26 18:20:38 +00:00
waiter af9e3442c6 Add CCRemoveSelf Action 2013-03-25 18:18:38 +08:00
James Chen f7b2ca2125 Fixing compilation errors when enable CC_ENABLE_PROFILERS. 2013-03-25 11:47:27 +08:00
James Chen 92f278657e Merge branch 'fix_profiler_compile_error_android' of https://github.com/gelldur/cocos2d-x 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2013-03-25 11:46:02 +08:00
waiter f6742c3bcd Add RemoveSelf Action 2013-03-25 11:14:19 +08:00
waiter 80c9e2f714 Add RemoveSelf Action 
Add RemoveSelf Action, so we can simple call CCRemoveSelf to remove the
node from parent.
 2013-03-25 11:10:51 +08:00
billy1380 cdfe693583 - changed cocos2d mac project to support universal build and x86 
- fixed issues associated with that
 2013-03-23 16:04:51 +00:00
James Chen 636f07a43f Merge pull request #2243 from sbc100/fix_linux_build 
Fix linux compilation of CCTexturePVR.cpp
 2013-03-22 19:07:24 -07:00
Sam Clegg fe86b9d6df Fix linux compilation of CCTexturePVR.cpp 
On linux (and possibly other platforms)
GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG is simply not defined since we don't
include GLES/gl2ext.h.
 2013-03-22 10:40:35 -07:00
minggo 71659f4aa9 Merge pull request #2247 from hailongiPhone/master 
release && set nil
 2013-03-22 04:09:47 -07:00
minggo 1538c72581 Merge pull request #2197 from dumganhar/ios-default-font 
[iOS] Using system font by `[UIFont systemFontOfSize]` when font name wasn't found.
 2013-03-22 00:10:09 -07:00
hailong 2ea447dbfd Update CCDirectorCaller.mm 
First destroy CCDirector instance with  cocos2d::CCDirector::sharedDirector()->end() 

Then create new CCDirector instance with
cocos2d::CCApplication::sharedApplication()->run();

APP will crash at 
CCApplication::setAnimationInterval

[[CCDirectorCaller sharedDirectorCaller] setAnimationInterval: interval ];
 2013-03-22 15:02:46 +08:00
Dawid Drozd 21cab34029 Fixing profiling compile error 2013-03-22 07:58:57 +01:00
minggo 949700ca1a issue #1848:use CCConfiguration::supportsPVRTC() to determine if the device support powertc format 2013-03-21 15:50:41 +08:00
James Chen e2e9bc8ce0 Fixing memoryleaks. 2013-03-21 09:00:55 +08:00
minggo 406ea3f69d Merge https://github.com/cocos2d/cocos2d-x into test-before-release 2013-03-20 15:19:19 +08:00
James Chen 9336ab710f fix a logic error and a memory leak in CCLabelBMFont. 2013-03-20 13:55:43 +08:00
minggo 9afc6729dc fix build error caused by libcurl on android x86 2013-03-20 11:53:19 +08:00
Roger Zanoni fdb1d69efe Fix linux build 
The cocos library uses libpthread and libGL on linux, so we need to link
with them.
 2013-03-19 18:44:11 -04:00
James Chen ac509f70db [iOS] Using system font by `[UIFont systemFontOfSize]` when font name wasn't found. 2013-03-19 13:11:33 +08:00
Andre Rudlaff 865a730ef5 added kResolutionFixedHeight and kResolutionFixedWidth resolution policy 
These new resolution policies will either ignore the width or height of the
specified design resolution size, but scale the ignored dimension, so it
matches the aspect ratio of the device.

Example:
A device with 854x480 pixels and a design resolution size set to 480x320
and the kResolutionFixedHeight policy, will create an internal canvas of
the size of 570x320px
If the device original size is 800x480 its internal size will be
534x320px
The height for both examples stays the same, the width is adjusted to match
the aspect ratio

Benefits:
- no distortions
- full canvas is usable, the visibility origin is 0/0
- I can use getWinSize() to place objects which is more intuitive
- for objects that should be placed at 0/0 I can use CGPointZero or 0/0 instead
  of the VisibilityRect methods, which is more readable
- using this method projects from the 1.x branch are probably much easier to
  port

Disadvantages:
- it is the developers responsibility to create the game code so that it
  supports multiple aspect ratios
 2013-03-18 20:06:01 +01:00
James Chen f52e56be20 Merge pull request #2184 from dumganhar/iss1837-jsb-schedule 
fixed #1837: Refactoring schedule binding codes.
1) We need bind cc.Node.scheduleUpdate and cc.Scheduler.scheduleUpdate manually since schedules need to be associated with _schedFunc_target_ht and _schedObj_target_ht.
2) Bind cc.Scheduler.unscheduleCallbackForTarget.
 2013-03-18 00:35:33 -07:00
James Chen f57a751a48 fixed #1837: Refactoring schedule binding codes. 
* 1) We need bind cc.Node.scheduleUpdate and cc.Scheduler.scheduleUpdate manually since `schedules` need to be associated with _schedFunc_target_ht and _schedObj_target_ht
* 2) Bind cc.Scheduler.unscheduleCallbackForTarget.
 2013-03-18 15:29:53 +08:00
minggo ac2a52e71b modify version 2013-03-18 11:25:27 +08:00
Sam Clegg 8b6d23538d Fix linux library path. 
linux libraries were being built to "cocos2dx/lib/linux" rather
than just lib/linux.

Always used absolute path for -rpath linker argument.
 2013-03-16 09:01:21 -07:00
Sam Clegg 04c1a863a0 Remove tailing newlines from CCLog messaages. 
Some CCLog message contained trailing newlines which
made the logs hard to read on many platforms.  The solution
here is to stip trailing newlines on those platforms, and also
to remove the newlines from the existing log messages.
 2013-03-16 09:01:21 -07:00
Andre Rudlaff a1602a992b fontcache map is now static, as we do not need external linkage for it. 2013-03-15 17:54:24 +01:00
Andre Rudlaff d3ecb09c9b Merge branch 'master' into feature-linux-fontcache 2013-03-15 08:54:15 +01:00
James Chen 9a5116e406 Merge pull request #2167 from Weeds/feature-linux-fontdimensions 
fixed #1834: [Linux] fixed font rendering artifacts, added simple line break.
This patch fixed the size calculations for true type fonts (especially for
italic fonts)
Additinally a very simple greedy line break algorithm has been added for
true type labels.
 2013-03-14 19:35:20 -07:00
James Chen 7326df875e Merge pull request #2154 from jedy/fix_ccnode_doc 
fix: can't generate CCNode.h's document with doxygen 1.8.3
 2013-03-14 19:06:58 -07:00
Andre Rudlaff e8ee3a9b83 [Linux] fixed font rendering artifacts, added simple line break 
This patch fixed the size calculations for true type fonts (especially for
italic fonts)
Additinally a very simple greedy line break algorithm has been added for
true type labels.
 2013-03-15 00:24:25 +01:00
minggo 3bef9cc749 Merge pull request #2159 from DarraghCoy/add_ccset_create 
Add CCSet::create() function
 2013-03-14 03:21:17 -07:00
James Chen a57cc21d7a Merge pull request #2156 from dumganhar/iss1830-jsb-utf8 
fixed #1830: Using JS::CompileOptions::setUTF8(true) to compile script.
 2013-03-13 19:59:25 -07:00
Darragh Coy 55dd6a6129 Add CCSet::create() to create, autorelease and return a new empty set. 2013-03-13 10:58:24 -07:00
James Chen 29aa62d923 fixed #1830: Using JS::CompileOptions::setUTF8(true) to compile script. 2013-03-13 18:10:54 +08:00
wu.hao 521fac290d fix: can't generate CCNode.h's document with doxygen 1.8.3 2013-03-13 14:56:17 +08:00
minggo 2bc703c3f0 Merge pull request #2069 from jxhgzs/cocos2dx_getDeltaTime 
add m_fDeltaTime getter function
 2013-03-12 19:38:57 -07:00
Sam Clegg 863286b0b9 Fix warning in linux build. 
Also, define _DEBUG rather then DEBUG in linux and nacl makefiles
by default, and limit the command line definions that are used
when building Box2D.
 2013-03-12 16:59:22 -07:00
Andre Rudlaff 67ad11dbee [Linux] add cache for font family -> font path mapping 
As FcFontMach is quite an expensive call the results of getFontFile() are
now cached in an std::map if either a ttf file is packed with the app or
if a font file has been found by using fontconfig
 2013-03-13 00:11:35 +01:00
James Chen ae1c64573e Merge pull request #2046 from rohankuruvilla/eclipse 
fixed #1827: Eclipse Project import - Documentation Added and Tested.
 2013-03-12 01:36:17 -07:00
Paras Mendiratta 94a5cdad29 Added Method to create a CCMenuItemToggle from a CCArray with a target selector. 2013-03-12 12:41:41 +05:30
minggo 1d51f9a3d7 issue #1529:CCUserDefault work ok on Android 2013-03-11 16:45:20 +08:00
minggo ac888fee01 issue #1529:CCUserDefault supports default value on iOS 2013-03-11 14:45:07 +08:00
James Chen 3f709c3edb Merge pull request #2134 from AsadR/remove-all-notifications-for-target 
fixed #1822: Added CCNotificationCenter::removeAllObservers(CCObject *target).
 2013-03-10 22:41:59 -07:00
James Chen 30e304961f Merge pull request #2126 from sbc100/make_run_for_linux 
fixed #1820: Adding 'make run' target for linux projects.
 2013-03-10 20:04:40 -07:00
Asad ur Rehman c1a8059998 Added CCNotificationCenter::removeAllObservers 
This is a helper method that removes all observers with a particular
target. It can be used in destuctors to ensure no observers trigger
callbacks on objects that no longer exist.
 2013-03-10 19:34:01 +05:00
James Chen a889322a47 Fixed compilation error for MAC port. 2013-03-10 16:34:41 +08:00
Sam Clegg 9eb9524659 Add 'make run' target for linux projects. 
Also, a few other linux build system improvements:
- Add linux build of SimpleGame
- Update multi-platform templates to use new common
  build system.
- Remove redundant main.h files.
 2013-03-08 10:01:03 -08:00
James Chen 2c7b178d7f fixed #1812: Minor fix. 2013-03-08 16:00:14 +08:00
James Chen aa53211f86 fixed #1812: A warning of getStringWithEllipsisJni function when compiling it with clang. 2013-03-08 15:56:17 +08:00
minggo e8d4b17a23 issue #1529:modify CCUserDefault.cpp path in linux makefile 2013-03-08 11:18:34 +08:00
Rohan Kuruvilla 7149f0598d Adding missing eclipse project files 2013-03-07 12:13:50 -08:00
minggo dd8681b18b Merge pull request #2113 from minggo/refactor-ccuserdefault 
Refactor ccuserdefault
 2013-03-06 23:05:50 -08:00
minggo a691df2251 Merge pull request #2100 from fins/master 
getStartLocationInView() and getStartLocation() methods in CCTouch
 2013-03-06 22:40:12 -08:00
minggo 2842719e35 issue #1529:add user_default into vs2010 project 2013-03-07 10:31:01 +08:00
minggo e85989f76e issue #1529:modify marmalade and native client project configuration 2013-03-07 09:51:26 +08:00
Sam Clegg ce247a6304 [NaCl] Fix warnings in ARM build 2013-03-06 13:02:55 -08:00
Sam Clegg 7ad171d8ee Use same top level Makefile for nacl and linux builds. 
Also, re-use some of the concepts from the linux build
system (such as quite by default) in the nacl build.

Fix remaining warnings in NaCl builds.
 2013-03-06 13:02:55 -08:00
Sam Clegg 8677dad3c6 Improved build system from linux. 
This change makes several fundamental improvements to the linux
build system:

- Remove duplication: a lot of the common make logic is now in
  a central shared makefile: cocos2dx/proj.linux/cocos2dx.mk

- Quiet by default: unless you specify V=1 on the commandline
  the output is now very clean and quiet.

- Dependencies: gcc's automatic dependancy generation is now
  used (-MMD).  This means that if you change a header file
  then all the object that depend on it now get rebuilt.

- Don't store objects in the source tree: previously object
  files were stored alongside the sources, which meant that
  debug and release object clobbered each other which leads
  to confusion and lots of unnecessary rebuilding.Q

- Library dependencies: each binary now depends on the libraries
  it links aginst.  This means that if the cocos2dx library
  changes then all examples will get re-linked.

- Top level Makefile: there is now a top level Makefile that
  can be shared/used by any platform the uses make as the
  build system (for example NaCl).  Everything can be built
  by simply running 'make' at the top level. e.g:

    make DEBUG=1
    make DEBUG=1 clean
 2013-03-06 13:02:55 -08:00
minggo 648e9a7bf1 issue #1529:use NSUserDefaults on iOS and SharedPreferences on Android to implement CCUserDefault 2013-03-06 16:36:44 +08:00
minggo 7969224bf3 Merge pull request #2106 from waiter/master 
Update unload effect function (android normal)
 2013-03-05 22:45:10 -08:00
minggo 43dff78f4b Merge pull request #2102 from DarraghCoy/ios_custom_font_loading_fix 
Fix for loading custom fonts on iOS when referenced from a CCB file
 2013-03-05 22:42:13 -08:00
waiter e2119e1323 Merge pull request #1 from cocos2d/master 
update cocos2d/cocos2d-x
 2013-03-05 18:43:21 -08:00
minggo 3ce5a99c8d Merge pull request #2092 from sbc100/fix_all_warnings 
Fix all compiler warnings produced by gcc.
 2013-03-05 17:59:35 -08:00
waiter 7699c83bd8 update Cocos2dxSound.java for unload effect 
when unload effect, sounID maybe null so the app will creash because of NPE.
 2013-03-06 09:21:49 +08:00
Sam Clegg 4d0aa01c4b Fix all gcc warnings in NaCl build. 2013-03-05 17:01:40 -08:00
Sam Clegg 38878b084b Fix all compiler warnings produced by gcc. 
This allows the linux and NaCl builds (and perhaps others)
to be compiles with -Wall and -Werror, and it makes the build
output much less noisy.
 2013-03-05 17:01:00 -08:00
minggo a9fa61af34 issue #1529:CCUserDefault -> user_default 2013-03-05 14:55:26 +08:00
minggo f37b1525b4 issue #1529:use NSUserDefault to implement CCUserDefault on iOS 2013-03-05 14:53:37 +08:00
Darragh Coy f84a4e2e08 Code review changes for pull request #2102 
We should only load the 'MarkerFelt-Wide' fallback font in 'CCImage.mm, _initWithString()' if the user is attempting to load a custom font, not when the user is attempting to load a system font. If the user is trying to load a system font then give back the default system font instead.
 2013-03-04 22:24:28 -08:00
minggo ae3c104fba issue #1686:disable depth test by default 2013-03-05 10:36:32 +08:00
Darragh Coy df3c449b4f Fix for loading custom fonts on iOS when referenced from a CocosBuilder CCB file 
Fix up how fonts are loaded in Cocos2dx for iOS to work transparently with custom font filenames/paths such as 'MyCustomFont.ttf' or 'fonts/MyCustomFont.ttf'. Referring to fonts by these paths would be OK on Android but can't be used on iOS since fonts must be referred to by family name on iOS; we must use 'MyCustomFont' when referring to that particular font in both examples on iOS. Hence add the code to strip out the folder path and extension on iOS so that the font path 'MyCustomFont.ttf' and 'fonts/MyCustomFont.ttf' can be used transparently across all platforms. This is required especially in the case where we have custom fonts being referenced from CCB files, since CCB files store the font names with the .ttf extension included.
 2013-03-04 15:32:24 -08:00
fins e8e229cc93 add getStartLocation() and getStartLocationInView() to CCTouch to access the start point of a touch 2013-03-04 13:08:19 +01:00
minggo 96c5be91e3 Merge pull request #2076 from sbc100/cocos_nacl 
Native Client port
 2013-03-03 18:24:04 -08:00
James Chen 71589e68ee fixed #1760: Redefinition of cpufeatures module. 2013-03-04 10:08:02 +08:00
Sam Clegg 33c422d1d5 Add new port: Native Client 2013-03-02 12:15:24 -08:00
Bite 85fd30aacf fix compile error when run xcode on case-sensive file system. 2013-03-02 18:15:05 +08:00
jiang xiaohua a959986e5e add cpp function 2013-03-02 16:31:19 +08:00
minggo 370fe7d937 issue #1686:fixed a logical error in CCLabelBMFont 2013-03-01 18:15:20 +08:00
minggo 0dfab6744a issue #1686:use correct values to initialize CCNodeRGBA member variables 2013-03-01 16:14:10 +08:00
minggo df56a2e3ec issue #1686: invoke sceneOrder() in CCTransitionScene::initWithDuration() 2013-03-01 15:30:40 +08:00
minggo 3e7e9ead5d issue #1686:add getInnerAction to CCEaseAction 2013-03-01 14:08:23 +08:00
jiang xiaohua 5feeaf024e add m_fDeltaTime getter function 2013-03-01 13:40:38 +08:00
James Chen 65f19f5c53 Removing some deprecated functions. 2013-03-01 10:57:52 +08:00
James Chen 7093807f3f CCNodeRGA isn't a pure abstract class anymore. Updated tools/tojs/cocos2d.ini. 2013-03-01 10:41:06 +08:00
minggo 7d0eafa42c Merge pull request #2065 from minggo/iss1686-synchronize 
issue #1686:fix some compiling error
 2013-02-28 17:52:45 -08:00
minggo 7c8bb82c67 issue #1686:fix some compiling error 2013-03-01 09:51:42 +08:00
minggo 514799db73 Merge pull request #2063 from minggo/iss1686-synchronize 
Synchronize to cocos2d-iphone v2.1rc0a
 2013-02-28 17:28:28 -08:00
Jozef Prídavok b7ca4656b6 Flush log messages. 2013-02-28 16:17:49 +01:00
minggo 70a70d38fc Merge pull request #9 from dumganhar/iss1686-synchronize 
issue #1686: Synchronizing LayerTest, LabelTest.
 2013-02-28 00:48:32 -08:00
James Chen 3b3adc3eea issue #1686: Synchronizing LayerTest. 2013-02-28 16:45:59 +08:00
minggo c75e440e22 issue #1686:synchronized RenderTexture 2013-02-28 16:35:42 +08:00
James Chen 8ba46c574a fix for conflict of project.pbxproj. 2013-02-28 13:37:45 +08:00
James Chen 56340f9555 Merge branch 'iss1686-synchronize' of https://github.com/minggo/cocos2d-x into iss1686-synchronize 
Conflicts:
	cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj
 2013-02-28 13:01:45 +08:00
minggo 63e4091bfa fixed #1686:finish updating 2013-02-28 11:55:36 +08:00
minggo 0070371045 issue #1686:synchronize CCLabelBMFont.cpp 2013-02-28 10:37:47 +08:00
minggo 14a35cff11 issue #1686:synchronize CCMenu.cpp 2013-02-28 10:15:09 +08:00
James Chen 3f74cd8190 fixed #1753: Adding ccUTF8.h/.cpp for MAC, LINUX and MARMALADE port. 2013-02-28 09:44:37 +08:00
minggo cd4f18c48f issue #1686:synchronize CCLayer.cpp 2013-02-27 18:21:35 +08:00
minggo 8dc431425c issue #1686:synchronize CCMenuItem.cpp 2013-02-27 17:23:39 +08:00
James Chen 537abaec42 fixed #1753: Android works ok now. 2013-02-27 16:57:36 +08:00
minggo 7eb93128c2 issue #1686:synchronize CCMotionStreak.cpp 2013-02-27 16:52:19 +08:00
minggo 00e978bbe9 issue #1686:synchronize CCParticleExample.cpp 2013-02-27 16:46:05 +08:00
minggo 2b0ff4ec62 issue #1686:synchronize CCParticleSystem.cpp 2013-02-27 16:26:42 +08:00
minggo 24e8664700 issue #1686:synchronize CCParticleSystemQuad.cpp 2013-02-27 16:24:33 +08:00
minggo 4b8708b762 issue #1686:synchronize CCProgressTimer.cpp 2013-02-27 15:52:14 +08:00
James Chen 0d70e6f92f issue #1753: Win32 works ok. 2013-02-27 15:45:23 +08:00
minggo 088bc959f6 issue #1686:synchronize CCRenderTexture.cpp 2013-02-27 15:44:36 +08:00
minggo 94076a5b9c issue #1686:synchronize CCSprite.cpp 2013-02-27 15:30:49 +08:00
James Chen 473e8e6139 issue #1753: Upgrading SpiderMonkey to Firefox19.0, iOS works ok. 2013-02-27 15:16:49 +08:00
minggo f571d66ed7 issue #1686:synchronize CCNode.cpp 2013-02-27 14:48:19 +08:00
minggo 8ed8def97f Merge branch 'iss1686-sync-rc0a' of https://github.com/dumganhar/cocos2d-x into iss1686-synchronize 2013-02-27 14:25:24 +08:00
minggo 8288e2124e issue #1686:synchronize CCTextureCache.cpp 2013-02-27 11:35:38 +08:00
minggo 28388deee3 Merge https://github.com/cocos2d/cocos2d-x into iss1686-synchronize 2013-02-27 11:23:29 +08:00
minggo 81b349d9ce fixed #1637:fix mac retina display and labelttf 2013-02-27 11:10:42 +08:00
minggo d983dd505c fixed #1752:use unstripped version to resolve link error 2013-02-27 10:44:34 +08:00
James Chen 7dc64fc9a6 issue #1686: sync to CCLayer 2013-02-27 09:38:30 +08:00
minggo 0ffb506607 issue #1686:synchronize CCTexturePVR.cpp 2013-02-26 18:08:51 +08:00
minggo 9d07778bb0 issue #1686:synchronize CCTMXXMLParser.cpp 2013-02-26 17:42:18 +08:00
minggo 98249b4754 issue #1686:synchronize CCTransition.cpp 2013-02-26 17:12:57 +08:00
minggo 25fd256dbd issue #1686:format codes 2013-02-26 17:03:29 +08:00
minggo 4fc6e1070b issue #1686:synchronize cocos2d.cpp 2013-02-26 16:55:23 +08:00
minggo 7941d70a04 fix a bug of CCUserDefault 2013-02-26 12:44:20 +08:00
James Chen 5f645cefba issue #1489: ZEXPORT -> CC_DLL for unzip.h. 2013-02-25 18:35:18 +08:00
James Chen 2eab8f75d4 Merge branch 'iss1489-AssetsManager' of https://github.com/dumganhar/cocos2d-x into minggo-iss1489-AssetsManager 2013-02-25 18:09:05 +08:00
James Chen a6b24cd40b Merge pull request #9 from minggo/iss1489-AssetsManager 
issue #1489: Updates with upstream.
 2013-02-25 02:08:03 -08:00
James Chen 17d9837b45 Adds AssetsManager support for win32. 2013-02-25 18:03:38 +08:00
minggo 442e8ea0cc issue #1489:android works ok 2013-02-25 16:58:10 +08:00
James Chen e3daa6c9af Merge branch 'iss1489-AssetsManager' of https://github.com/minggo/cocos2d-x into minggo-iss1489-AssetsManager 2013-02-25 16:23:02 +08:00
James Chen 8e819ac32c Updates libcurl with ssl support for win32. 2013-02-25 16:16:57 +08:00
minggo c8baa94753 issue #1489: update ios libcurl and add android project 2013-02-25 14:33:04 +08:00
minggo 1ae332ac0b Merge https://github.com/cocos2d/cocos2d-x into iss1489-AssetsManager 2013-02-25 10:25:24 +08:00
martell 1de4c579de Added Mingw-crt Support without breaking VS SDK 2013-02-22 22:00:54 +00:00
James Chen fdf8595353 tab -> 4 space. 2013-02-22 16:16:16 +08:00
James Chen 476e3801eb tab -> 4 space. 2013-02-22 16:15:17 +08:00
James Chen b54b924923 fixed #1743: Adding an additional transform for CCNode. 2013-02-22 16:01:49 +08:00
James Chen 46ee771e1c Merge branch 'master' of https://github.com/jxhgzs/cocos2d-x into jianghua-patch 2013-02-22 13:46:00 +08:00
James Chen 8921d92143 Removed some unused codes. 2013-02-22 11:58:52 +08:00
minggo ed1cbb94c2 Merge https://github.com/cocos2d/cocos2d-x into iss1489-AssetsManager 2013-02-22 11:04:40 +08:00
James Chen b50515c5bc Merge pull request #1873 from ThePickleMan/master 
fixed #1742: Added 'rotationIsDir' property to ParticleSystem.
 2013-02-21 19:02:39 -08:00
minggo 1df0095993 fix a bug of CCUserDefault 2013-02-22 11:01:57 +08:00
minggo 33b857c3f7 Merge pull request #1984 from billy1380/master 
CCLens3d can be concave
 2013-02-21 18:08:47 -08:00
folecr f26f254daa Use CCLOG instead of CCMessageBox to report file system errors 2013-02-21 17:05:17 -08:00
folecr 8408fc6d1b Remove unused access to Android application's external asset path. 2013-02-21 17:05:17 -08:00
folecr 82ae5f62fd Remove unused access to Android application's cache directory 2013-02-21 17:05:17 -08:00
jiang xiaohua d875edbd74 Additional a transformation matrix, Used in is not parent-child relationship but we still need to maintain transformation parent-child Example: GameObject_Parent(CCNode; create from CCNode) GameObject_sub1(CCNode; Create from the same CCSpriteBatchNode,the node's parent is CCLayer ) RenderComponents1( Create form the same CCSpriteBatchNode) Components2 .... GameObject_sub2 (CCNode; Create from the CCNode,the node's parent is GameObject_Parent ) RenderComponents1( not used batchNode) Now, GameObject_sub1 not GameObject_Parent node, but I want it to simulate the change of the son is GameObject_Parent; I Need additional the father's matrix in child Node ; 2013-02-20 22:33:28 +08:00
James Chen fa90ae320b issue #1733: Updated cocos2dx/proj.linux/Makefile. 2013-02-19 18:08:58 +08:00
James Chen 1415c90bd4 webp lib depends on the module of cpufeatures when compiling with "APP_ABI := armeabi-v7a". 2013-02-18 17:52:13 +08:00
James Chen 3452d44329 issue #1712: Removed importing some unused packages in Cocos2dxActivity. 2013-02-18 14:00:57 +08:00
James Chen 6b5a5c5317 issue #1712: Moving getDPI from Cocos2dxActivity to Cocos2dxHelper. 2013-02-18 13:51:16 +08:00
James Chen 505577239c jfloat --> jint. 2013-02-17 17:21:11 +08:00
James Chen f219f480cc issue #1712: DPI return integer on android. 2013-02-17 17:18:38 +08:00
James Chen cda7da3d43 fixed #1712: Adding default dpi for marmalade and mac since i don't know how to get DPI for these platforms. 2013-02-17 17:13:06 +08:00
James Chen 541dd357fa issue #1712: Getting DPI support for Linux. 2013-02-17 16:54:45 +08:00
James Chen edfe4c2a0c issue #1712: Adding empty CCDevice.cpp for linux, mac and marmalade. 2013-02-17 16:26:59 +08:00
James Chen 2626005d20 issue #1712: Updating project setting for blackberry. 2013-02-17 16:26:08 +08:00
James Chen 2b8ea8145a issue #1712: Getting DPI support for Blackberry. 2013-02-17 16:25:15 +08:00
James Chen 3dd792475f issue #1712: Moved CCDevice.cpp to platform/win32. 2013-02-17 11:52:30 +08:00
James Chen 9f6df60be0 issue #1712: Adding win32 support. 2013-02-17 11:34:55 +08:00
James Chen ac17f67686 issue #1712: Adding getting dpi support for iOS and Android. 2013-02-16 19:36:21 +08:00
James Chen 373706d3b3 Merge pull request #1977 from moadib/master 
Added window_group creation to CCEGLView for blackberry.
 2013-02-15 19:59:09 -08:00
billy1380 a1753113b5 CCLens3d can be concave 
added boolean operator to enable the lens to be concave as well as
convex
 2013-02-16 03:12:12 +00:00
James Chen ad61fa3e9b fixed #1703: fixed compilation errors for BlackBerry. 2013-02-16 11:05:30 +08:00
moadib fa1fee307a Added window_group creation to CCEGLView for blackberry 2013-02-12 19:00:02 +04:00
Ben Ward 5f6ce9db92 Adding Portuguese and Arabic language support 2013-02-11 15:29:56 +00:00
minggo ba8f26fed9 Merge pull request #1969 from minggo/iss1702-writablePath 
modify writable path for iOS and Android
 2013-02-06 22:16:46 -08:00
minggo 59c1f33ad5 fixed #1702:modify writable path to the return value of Context.getFilesDirectory() 2013-02-07 14:11:23 +08:00
James Chen ca9cc14d5d Merge pull request #1965 from fape/marmalade_tinyxml2 
Marmalade tinyxml2 fixes
 2013-02-06 19:24:33 -08:00
James Chen 3f0a5ab945 Merge pull request #1964 from fape/marmalade_webp 
Marmalade webp fixes
 2013-02-06 19:21:12 -08:00
ivzave 165faf49df prevent unintentional tinyxml2.cpp deletion during make clean on linux 2013-02-07 05:17:46 +04:00
fape 1ed9d643c5 prevent WEBP_USE_SSE2 2013-02-06 17:44:06 +01:00
fape 7e19a5464a Include missing header files to libwebp's marmalade project file. 2013-02-06 16:17:47 +01:00
fape 19c266ef47 include missing CCPlatformMacros.h 2013-02-06 16:16:40 +01:00
fape 05eb3a59f5 include missing CCPlatformMacros.h 2013-02-06 15:50:09 +01:00
fape 948732d617 marmalade tinyxml2 fixes 2013-02-06 14:49:04 +01:00
fape b51102d234 marmalade webp fixes 2013-02-06 14:40:48 +01:00
minggo 404cdf1122 issue #1702:return documents for iOS 2013-02-06 18:11:27 +08:00
minggo 0c5bcb3f7b issue #1702:fix a typo error 2013-02-06 18:04:40 +08:00
James Chen fb9ac31d08 fixed bugs in CCUserDefault.cpp after using tinyXML2, fixed warnings in SpriteTest.cpp. 2013-02-06 17:20:54 +08:00
James Chen 564939ee16 Merge pull request #1962 from dumganhar/iss1770-webp 
fixed #1770: Adding the library of webp for linux 32bit.
 2013-02-06 00:49:03 -08:00
minggo ed332770c3 fixed #1703:remove depence of libxml2 for vs project 2013-02-06 16:37:20 +08:00
James Chen e547735730 fixed #1770: Adding the library of webp for linux 32bit. 2013-02-06 16:33:54 +08:00
minggo 60d36ed3aa issue #1703:fix conflicts when synchronized to latest codes 2013-02-06 16:18:37 +08:00
James Chen 561f6ca435 issue #1770: Adding webp image format support for linux 64bit. 2013-02-06 15:47:23 +08:00
minggo 396230bb77 issue #1703:remove dependence of libxml2 for marmalade and linux 2013-02-06 14:16:06 +08:00
minggo 9a7cca5ed4 issue #1703:remove dependence of libxml2 2013-02-06 14:12:52 +08:00
minggo fcc6ed89ae add tinyxml2 to mac and marmalade project 2013-02-06 13:57:16 +08:00
minggo 3d9a0dc99d issue #1703:add tinyxml2 codes into vs project 2013-02-06 13:49:35 +08:00
James Chen c7fdb1e637 Merge branch 'iss1770-webp' of https://github.com/dumganhar/cocos2d-x into iss1770-webp 2013-02-06 13:07:22 +08:00
James Chen cc690c5a86 issue #1770: Adding webp support for mac port. 2013-02-06 13:06:48 +08:00
minggo e136476fb3 issue #1703:add tinyxml2 in makefile 2013-02-06 11:55:36 +08:00
minggo 682910b5f8 Merge https://github.com/cocos2d/cocos2d-x into tinyxml 2013-02-06 11:53:58 +08:00
James Chen 95dc349b77 issue #1770: Adding webp support for win32. 2013-02-06 11:23:10 +08:00
minggo 7d02925d7e issue #1703:include tinyxml2 files in android/iOS project 2013-02-06 11:15:54 +08:00
James Chen 1e5431bcc5 issue #1770: Adding webp support for blackberry and marmalade. 2013-02-06 10:52:13 +08:00
minggo 6e3409a30c issue #1703:move tinyxml2 to cocos2dx/support 2013-02-06 10:18:31 +08:00
James Chen a94e1b2a9d issue #1770: Webp works ok on Android and iOS. 2013-02-05 18:18:53 +08:00
James Chen 64248386a2 issue #1770: Updating iOS project configuration and adding WEBP test demo. 2013-02-05 11:37:13 +08:00
James Chen da91e97e17 Merge branch 'add_webp_support' of https://github.com/dualface/cocos2d-x into iss1770-webp 
Conflicts:
	scripting/javascript/bindings/generated
 2013-02-05 11:22:53 +08:00