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
minggo
d58f21dc76
Merge pull request #2521 from minggo/emscriptenate
...
fix conflict of #2050
2013-05-06 23:51:38 -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
ea5d7bc5ad
Merge pull request #2361 from tiantian20007/dictStuff
...
Implement CCDictionary::writeToFile();
2013-05-06 23:17:11 -07:00
James Gregory
0c8f7dd608
Enable texture caching with emscripten.
2013-05-06 21:23:06 -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
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
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
9d775d136b
Add libxml2 build for Emscripten.
2013-05-06 20:59:49 -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
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
edcd0f12e4
Add platform files for Emscripten.
2013-05-06 20:58:46 -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
4f56f93269
Add #defines for Emscripten platform
2013-05-06 20:58:43 -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
minggo
d395d26e1d
Merge pull request #2417 from sergey-shambir/disable_copy
...
Added CC_DISABLE_COPY macro
2013-05-06 03:02:48 -07:00
Romain Tisserand
d2690d8942
Fix iOS 4.3 JPEG loading (darken picture, alpha issue)
2013-05-04 19:14:23 +02: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
Michael Chinen
d47759cc32
EAGLView.mm: fix indent
2013-05-03 19:46:58 +09:00
Michael Chinen
be2f20e213
Fix missing protocol method warning for iOS 6.0 addition
2013-05-01 00:35:17 +09:00
tiantian
2ba5035e5a
Make sure XMLDocument is deleted; Code clean up; Add test;
2013-04-28 00:36:37 +08: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
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
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
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
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
Kristiaan De Jongh
81e4178a42
fix for spaces when wrapping
2013-04-17 13:09:48 +02: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
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
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
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
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
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
yodesoft
e193dbc4cf
Linux: Set writable path to "<user's home>/.config/<app name>"
2013-04-10 11:45:55 +08:00