27428dc5f4
Adding defines and enums for Tizen.
2013-05-16 19:49:16 +09:00
1412eeefd1
Merge pull request #1893 from martell/mingw
...
Added Mingw-crt Support without breaking VS SDK
2013-05-15 23:30:43 -07:00
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
82f1a8e8ff
Re-enable mouse-handling.
2013-05-15 20:21:02 -07:00
fb2a73048d
it now shares code between createTextBitmap and createTextBitmapShadowStroke (no more duplication)
2013-05-15 16:37:08 -07:00
3c28048c14
fix alignent problem when rendering text with shadow
2013-05-15 16:37:08 -07:00
0ff33fd4f5
fix a problem with float stroke size
2013-05-15 16:37:08 -07:00
3b50ffe5ba
Fix problem with CCLabelTTF + shadow and text alignment; also fontDefinition property names now are lowercase
2013-05-15 16:37:08 -07:00
74441203cb
stroke and shadow are implemented and supported only on iOS and Android for now
2013-05-15 16:29:33 -07:00
fcea506fef
fixed some text formatting issues
2013-05-15 16:29:33 -07:00
c727fa33c0
CCLabelTTF have now a tint, plus bug fixing and code clean up
2013-05-15 16:29:33 -07:00
221884f6d4
better CCTexture2D API for init texture with shadow and stroke
2013-05-15 16:29:32 -07:00
fc846bb9ac
label TTF stroke and shadow for Android
2013-05-15 16:29:32 -07:00
690d5968ca
New stroke and shadows for Android
2013-05-15 16:12:43 -07:00
dd9b4a8932
new shadow and stroke for CCLabelTTF
2013-05-15 16:12:43 -07:00
ab2d94c040
First pass at using SDL to render fonts instead of FreeType.
2013-05-14 21:38:56 -07:00
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
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
cdb3985f0d
fixed #2151 : Commenting a log in CCFileUtils::fullPathForFilename.
2013-05-13 21:48:25 +08:00
8fa593a8fe
fixed #2151 : Custom font can't be loaded correctly if using full path of filename.
2013-05-13 19:12:37 +08:00
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
3ebb61a09c
Merge pull request #2543 from FlagellumDei/patch-1
...
centerWindow() fix
2013-05-12 19:44:15 -07:00
23f23be681
Bug fixes for Nacl port.
2013-05-10 16:02:12 +08:00
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
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
ee8ec25f6a
Merge pull request #2541 from j4m3z0r/emscriptenate
...
Compile for Emscripten in asm.js mode
2013-05-08 18:53:35 -07:00
25bded7faf
Now validates as asm.js: Disable HttpClient, pthread_cond_signal and eglReleaseThread in Emscripten.
2013-05-07 17:25:39 -07:00
a33e2965af
Add libwebp linkage (needed for asm.js validation)
2013-05-07 17:24:24 -07:00
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
0630e15475
Merge remote-tracking branch 'origin/master' into emscriptenate
2013-05-06 23:56:16 -07:00
d58f21dc76
Merge pull request #2521 from minggo/emscriptenate
...
fix conflict of #2050
2013-05-06 23:51:38 -07:00
2418e72a0e
Fix compilation errors for linux port.
2013-05-07 14:36:01 +08:00
1166a02e13
resolve conflict for #2505
2013-05-07 14:31:00 +08:00
ea5d7bc5ad
Merge pull request #2361 from tiantian20007/dictStuff
...
Implement CCDictionary::writeToFile();
2013-05-06 23:17:11 -07:00
c7ac6b9d01
Add libjpeg linkage.
2013-05-06 22:28:13 -07:00
0c8f7dd608
Enable texture caching with emscripten.
2013-05-06 21:23:06 -07:00
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
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
82c6f68593
Set orientation to 0 for Emscripten, thus avoiding a segfault.
2013-05-06 21:00:38 -07:00
5b8494199e
Rebuild libfreetype without references to my home dir in it.
2013-05-06 20:59:50 -07:00
3077190e29
Add note on origin of libxml binary.
2013-05-06 20:59:49 -07:00
9d775d136b
Add libxml2 build for Emscripten.
2013-05-06 20:59:49 -07:00
5295202081
Add freetype2 headers that match the .a we're using.
2013-05-06 20:59:47 -07:00
5138fb66fd
Add pre-build dependencies for Emscripten libpng, libz.
2013-05-06 20:59:47 -07:00
7d563a818a
Hack: use 800x500 resolution for window for emscripten so that mouse roughly lines up.
2013-05-06 20:59:47 -07:00
19c6a50d50
Enable texture caching with emscripten.
2013-05-06 20:59:46 -07:00
edcd0f12e4
Add platform files for Emscripten.
2013-05-06 20:58:46 -07:00
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
4f56f93269
Add #defines for Emscripten platform
2013-05-06 20:58:43 -07:00
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
d395d26e1d
Merge pull request #2417 from sergey-shambir/disable_copy
...
Added CC_DISABLE_COPY macro
2013-05-06 03:02:48 -07:00
d2690d8942
Fix iOS 4.3 JPEG loading (darken picture, alpha issue)
2013-05-04 19:14:23 +02:00
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
d47759cc32
EAGLView.mm: fix indent
2013-05-03 19:46:58 +09:00
be2f20e213
Fix missing protocol method warning for iOS 6.0 addition
2013-05-01 00:35:17 +09:00
2ba5035e5a
Make sure XMLDocument is deleted; Code clean up; Add test;
2013-04-28 00:36:37 +08:00
d1afe6cfa6
Fixing a bug in CCFileUtilsIOS::isFileExist().
2013-04-25 22:02:20 +08:00
93a8b60111
If file path is an empty string, return false directly in CCFileUtils::isFileExist.
2013-04-25 21:51:13 +08:00
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
41f5538ff4
Added CC_DISABLE_COPY macro
2013-04-20 15:13:19 +04:00
3ae98978d4
Added CC_FORMAT_PRINTF to CCString
...
Added for CCString::initWithFormat() and CCString::createWithFormat().
Fixed warnings.
2013-04-19 14:00:16 +04:00
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
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
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
20e102bc46
Fixed setAccelerometerInterval signature in setAccelerometerIntervalJNI function.
2013-04-18 01:27:33 +01:00
81e4178a42
fix for spaces when wrapping
2013-04-17 13:09:48 +02:00
ddd6d9d155
fixed #2059 : cc.FileUtils.getInstance().getStringFromFile(filename) doesn't return a whole string.
2013-04-17 16:08:48 +08:00
78d3c7f048
fixed #1613:not reload resources on Android platform after return from background
2013-04-17 15:34:57 +08:00
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
af71b881df
fix wrong buffer name
2013-04-17 01:59:23 +04:00
9a04eee8d1
do it atomically;
2013-04-16 12:38:53 +08:00
91ddfe7382
Add support for CCDictionary contains CCArray;
2013-04-16 12:34:09 +08:00
b7f0b2a8e0
Use CCLOG instead of CCLog;
2013-04-13 18:20:17 +08:00
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
5952597c1a
Set writable path to XDG_CONFIG_HOME if it exists.
2013-04-11 09:20:25 +08:00
cda864b597
Read app name from /proc/self/exe
2013-04-11 08:58:48 +08:00
db5df829fb
Restore codes of init m_strDefaultResRootPath
2013-04-10 18:39:01 +08:00
85c932112f
Merge remote-tracking branch 'upstream/master'
2013-04-10 17:54:50 +08:00
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
e193dbc4cf
Linux: Set writable path to "<user's home>/.config/<app name>"
2013-04-10 11:45:55 +08:00
d03b95ca46
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
cocos2dx/platform/linux/CCFileUtilsLinux.cpp
2013-04-10 11:16:04 +08:00
ba591b0980
Linux: Set writable path to "<user's home>/.config/<app name>"
2013-04-10 10:55:50 +08:00
df888eef65
fixed #2042 : remove libxml2
2013-04-10 09:56:31 +08:00
5d2c67ee8a
fixed #1904:strip libcurl.a on x86 architecture
2013-04-10 09:40:44 +08:00
3c8b26813e
delete libxml2
2013-04-10 09:39:48 +08:00
0f6e2daf31
Correction of passed buffer size to readlink and verification of result return by readlink.
2013-04-09 00:25:31 +02:00
5e2f1e0bd6
Merge pull request #2272 from Weeds/saxparser-fix
...
fixed #2035 : fixed potential crash in CCSaxParser
2013-04-08 07:49:36 -07:00
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
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
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
831dfb6ade
Merge remote-tracking branch 'origin/iss1592-update-uthash' into iss1592-update-uthash
2013-04-08 11:56:10 +08:00
2c3427dcee
issue #1592 : Fixing complication errors for windows port.
2013-04-08 11:56:04 +08:00
ad68b3d5ed
Merge pull request #2288 from mchinen/master
...
Android: fix emulator for OpenGL ES 2.0
2013-04-07 19:08:00 -07:00
4d5dff6172
Reduce function call in nativeInitBitmapDC to improve performance.
2013-04-07 17:17:19 +08:00
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
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
fa9339916d
Improve font rendering performance
2013-04-02 10:16:51 +08:00
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
227d2cf60b
Add emulator detection hack to allow running OpenGL ES 2.0 projects in the emulator
2013-03-31 20:47:43 +09:00
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
Lee, Jae-Hong