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
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
4f56f93269
Add #defines for Emscripten platform
2013-05-06 20:58:43 -07:00
c45e5797cf
Add Makefiles for Emscripten + Emscripten external
2013-05-06 20:58:02 -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
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
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
6a5559da7f
Check for 0 length in CCPoint::normalize()
2013-05-07 03:15:28 +10:00
f71798a35b
Check for 0 length in CCPoint::normalize()
2013-05-07 02:59:38 +10:00
49474f5194
documentation
2013-05-07 02:53:13 +10:00
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
d395d26e1d
Merge pull request #2417 from sergey-shambir/disable_copy
...
Added CC_DISABLE_COPY macro
2013-05-06 03:02:48 -07:00
bbf0f9d1bd
Merge pull request #2513 from savdalion/const-methods
...
Added const methods for classes - purer code!
2013-05-05 23:55:37 -07:00
fead37eab3
fixed #2105 : Adding Travis build support for linux and NaCl.
2013-05-06 10:55:39 +08:00
3661e34695
Bug fix: width and height reversed in CCSize operators
2013-05-05 19:51:44 +10:00
d2690d8942
Fix iOS 4.3 JPEG loading (darken picture, alpha issue)
2013-05-04 19:14:23 +02:00
637cc1a9ed
CCPoint::getDistance() implemented, CCPoint::length() renamed to getLength(), bug fixes
2013-05-05 02:58:46 +10: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
5f549dd011
Added const modifier for classes CCArray, CCObject - fine code!
2013-05-04 15:05:06 +03:00
6fb586028e
Revert unrelated change commited by mistake
2013-05-04 17:20:59 +10:00
b9fe35901a
Moved most CCPointExtension functions to CCPoint OO-equivalents
2013-05-04 17:18:22 +10:00
ea30d21799
updates Xcode project to detect more warnings
2013-05-03 11:59:44 -07:00
d47759cc32
EAGLView.mm: fix indent
2013-05-03 19:46:58 +09:00
b34dc25346
Cleaner constructors and overloads for CCSize; Cross-assignement and conversion constructors between CCPoint and CCSize.
2013-05-03 13:24:52 +10:00
b627cd4674
overloading operators +-*/ in CCPoint
2013-05-02 15:13:03 +10:00
9fb0081add
direct constructor for CCPoint
2013-05-02 14:59:50 +10:00
212feb8d8c
Add CCDirector::popToSceneStackLevel(int level)
...
This replicates a change made to cocos2d-iphone in the following commit:
59c5272bffhttp://github.com/cocos2d/cocos2d-x/pull/2210
2013-04-30 23:33:22 +01:00
be2f20e213
Fix missing protocol method warning for iOS 6.0 addition
2013-05-01 00:35:17 +09:00
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
1a598a8c68
update version
2013-04-28 13:48:18 +08:00
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
2ba5035e5a
Make sure XMLDocument is deleted; Code clean up; Add test;
2013-04-28 00:36:37 +08:00
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
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
edc8444ca4
Updating blackberry project configurations.
2013-04-27 14:07:54 +08:00
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
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
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
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
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
72ad9fd701
Update CCNode.cpp
...
注释错误
2013-04-23 21:44:24 +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
d89792fdc6
fixed #2073 : fix memory leak in CCUserDefault
2013-04-22 16:43:05 +08: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
5541816ef6
Fixed GCC warning on narrowing conversion
2013-04-19 12:09:26 +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
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
ec50d34622
fixed #2068 : Tab ~> 4 spaces.
2013-04-19 09:59:08 +08:00
9ecaacf59b
fixed #2068 : Updating source format.
2013-04-19 09:55:29 +08:00
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
861e8e42f7
Merge branch 'master' of https://github.com/MarcelBloemendaal/cocos2d-x into MarcelBloemendaal-master
2013-04-18 16:21:17 +08: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
271f90e744
compare using epsilon and absolute difference
2013-04-18 02:16:49 +04:00
81e4178a42
fix for spaces when wrapping
2013-04-17 13:09:48 +02:00
63ce8adfad
fixed #2059 : Fix complication errors on Android.
2013-04-17 17:05:39 +08:00
ddd6d9d155
fixed #2059 : cc.FileUtils.getInstance().getStringFromFile(filename) doesn't return a whole string.
2013-04-17 16:08:48 +08:00
72f1fadca2
Merge pull request #2380 from NatWeiss/patch-2
...
Properly resets the tile's Y flipping
2013-04-17 00:42:08 -07: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
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
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
e1f9e1a300
update keypad support
2013-04-17 10:40:46 +08:00
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
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
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
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
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
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
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
84b4c5ac2b
fixed #2051 : Comment update, int ~> intptr_t.
2013-04-14 16:05:54 +08:00
ea78ee9bb7
fixed #2051 : TestCpp/ExtensionsTest/CocosbuilderTest crashes under x86_64 target.
2013-04-14 16:00:50 +08:00
2757962748
Merge branch 'master' of https://github.com/billy1380/cocos2d-x into billy1380-master
2013-04-14 14:49:02 +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
edf1e53d2d
fix syntax error;
2013-04-13 15:18:54 +08:00
9c82c39978
remove duplicate default variable definition
2013-04-12 10:11:26 -07:00
493d1d90ed
fixed a bug that was causing x86_64 tests to crash while loading
...
ccbuilder files
2013-04-12 14:37:28 +01:00
038a04c05b
Fixing SpriteBatchNode and LabelBMFont to prevent error when release is called without calling init
2013-04-11 15:02:09 -07: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
862d4d6316
Merge pull request #2195 from folecr/androidlinkerflags
...
fixed #2047 : Clean up linked libraries for Android.
2013-04-10 00:53:00 -07: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
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
e193dbc4cf
Linux: Set writable path to "<user's home>/.config/<app name>"
2013-04-10 11:45:55 +08:00
a0dc39ca38
fixed #2034:use previous path to get UserDefault.xml
2013-04-10 11:39:01 +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
b8ea3dfe99
Merge pull request #2332 from dumganhar/master
...
cxx-generator ~> bindings-generator.
2013-04-08 22:58:04 -07:00
0d5d2e54fd
cxx-generator ~> bindings-generator.
2013-04-09 13:47:12 +08:00
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
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
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
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
0f6e2daf31
Correction of passed buffer size to readlink and verification of result return by readlink.
2013-04-09 00:25:31 +02:00
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
5e2f1e0bd6
Merge pull request #2272 from Weeds/saxparser-fix
...
fixed #2035 : fixed potential crash in CCSaxParser
2013-04-08 07:49:36 -07:00
d3aa718b22
fixed #2034:make CCUserDefault compatible with previous version on Android and iOS
2013-04-08 21:35:43 +08:00
935b7af11c
Merge branch 'openal' of https://github.com/azmeuk/cocos2d-x into azmeuk-openal
...
Conflicts:
AUTHORS
2013-04-08 17:53:14 +08: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
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
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
4e2819e86d
Fixing a warning.
2013-04-08 13:51:24 +08: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
7c6cb8c8cd
commit latest uthash.h utlist.h
2013-04-08 10:59:41 +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
2436d87cb3
Merge pull request #2256 from waiter/master
...
Add CCRemoveSelf Action
2013-04-06 19:09:17 -07: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
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
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
7f565bb2fa
Fix CCUserDefault.cpp compiling on Android.
...
CCUserDefault.cpp shouldn't compile on Android.
2013-03-31 22:24:10 -07: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
cd3a2be720
change comment type
2013-03-29 17:21:29 +08:00
4690a45f3e
change a method name
...
change method name from isScissorEnable() to isScissorEnabled() in
class CCEGLViewProtocal
2013-03-29 17:19:47 +08:00
18c43e29b2
change method name from getIsScissorEnable() to isScissorEnable()
2013-03-29 15:32:30 +08:00
253ebe49e4
add getIsScissorEnable() and getScissorRect() for CCEGLViewProtocal
2013-03-29 01:28:26 +08:00
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
8c013fe619
* Basic Linux OpenAL support.
2013-03-28 12:07:09 +01:00
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
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
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
fd35ebd4d4
Added support for setting integer uniforms
2013-03-26 18:20:38 +00:00
af9e3442c6
Add CCRemoveSelf Action
2013-03-25 18:18:38 +08:00
f7b2ca2125
Fixing compilation errors when enable CC_ENABLE_PROFILERS.
2013-03-25 11:47:27 +08:00
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
f6742c3bcd
Add RemoveSelf Action
2013-03-25 11:14:19 +08:00
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
cdfe693583
- changed cocos2d mac project to support universal build and x86
...
- fixed issues associated with that
2013-03-23 16:04:51 +00:00
636f07a43f
Merge pull request #2243 from sbc100/fix_linux_build
...
Fix linux compilation of CCTexturePVR.cpp
2013-03-22 19:07:24 -07:00
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
71659f4aa9
Merge pull request #2247 from hailongiPhone/master
...
release && set nil
2013-03-22 04:09:47 -07:00
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
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
21cab34029
Fixing profiling compile error
2013-03-22 07:58:57 +01:00
949700ca1a
issue #1848:use CCConfiguration::supportsPVRTC() to determine if the device support powertc format
2013-03-21 15:50:41 +08:00
e2e9bc8ce0
Fixing memoryleaks.
2013-03-21 09:00:55 +08:00
406ea3f69d
Merge https://github.com/cocos2d/cocos2d-x into test-before-release
2013-03-20 15:19:19 +08:00
9336ab710f
fix a logic error and a memory leak in CCLabelBMFont.
2013-03-20 13:55:43 +08:00
9afc6729dc
fix build error caused by libcurl on android x86
2013-03-20 11:53:19 +08:00
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
ac509f70db
[iOS] Using system font by `[UIFont systemFontOfSize]` when font name wasn't found.
2013-03-19 13:11:33 +08:00
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
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
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
ac2a52e71b
modify version
2013-03-18 11:25:27 +08:00
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
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
a1602a992b
fontcache map is now static, as we do not need external linkage for it.
2013-03-15 17:54:24 +01:00
d3ecb09c9b
Merge branch 'master' into feature-linux-fontcache
2013-03-15 08:54:15 +01:00
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
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
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
3bef9cc749
Merge pull request #2159 from DarraghCoy/add_ccset_create
...
Add CCSet::create() function
2013-03-14 03:21:17 -07:00
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
55dd6a6129
Add CCSet::create() to create, autorelease and return a new empty set.
2013-03-13 10:58:24 -07:00
29aa62d923
fixed #1830 : Using JS::CompileOptions::setUTF8(true) to compile script.
2013-03-13 18:10:54 +08:00
521fac290d
fix: can't generate CCNode.h's document with doxygen 1.8.3
2013-03-13 14:56:17 +08:00
2bc703c3f0
Merge pull request #2069 from jxhgzs/cocos2dx_getDeltaTime
...
add m_fDeltaTime getter function
2013-03-12 19:38:57 -07:00
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
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
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
94a5cdad29
Added Method to create a CCMenuItemToggle from a CCArray with a target selector.
2013-03-12 12:41:41 +05:30
1d51f9a3d7
issue #1529:CCUserDefault work ok on Android
2013-03-11 16:45:20 +08:00
ac888fee01
issue #1529:CCUserDefault supports default value on iOS
2013-03-11 14:45:07 +08:00
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
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
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
a889322a47
Fixed compilation error for MAC port.
2013-03-10 16:34:41 +08:00
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
2c7b178d7f
fixed #1812 : Minor fix.
2013-03-08 16:00:14 +08:00
aa53211f86
fixed #1812 : A warning of getStringWithEllipsisJni function when compiling it with clang.
2013-03-08 15:56:17 +08:00
e8d4b17a23
issue #1529:modify CCUserDefault.cpp path in linux makefile
2013-03-08 11:18:34 +08:00
7149f0598d
Adding missing eclipse project files
2013-03-07 12:13:50 -08:00
dd8681b18b
Merge pull request #2113 from minggo/refactor-ccuserdefault
...
Refactor ccuserdefault
2013-03-06 23:05:50 -08:00
a691df2251
Merge pull request #2100 from fins/master
...
getStartLocationInView() and getStartLocation() methods in CCTouch
2013-03-06 22:40:12 -08:00
2842719e35
issue #1529:add user_default into vs2010 project
2013-03-07 10:31:01 +08:00
e85989f76e
issue #1529:modify marmalade and native client project configuration
2013-03-07 09:51:26 +08:00
ce247a6304
[NaCl] Fix warnings in ARM build
2013-03-06 13:02:55 -08:00
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
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
648e9a7bf1
issue #1529:use NSUserDefaults on iOS and SharedPreferences on Android to implement CCUserDefault
2013-03-06 16:36:44 +08:00
7969224bf3
Merge pull request #2106 from waiter/master
...
Update unload effect function (android normal)
2013-03-05 22:45:10 -08:00
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
e2119e1323
Merge pull request #1 from cocos2d/master
...
update cocos2d/cocos2d-x
2013-03-05 18:43:21 -08:00
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
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
4d0aa01c4b
Fix all gcc warnings in NaCl build.
2013-03-05 17:01:40 -08:00
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
a9fa61af34
issue #1529:CCUserDefault -> user_default
2013-03-05 14:55:26 +08:00
f37b1525b4
issue #1529:use NSUserDefault to implement CCUserDefault on iOS
2013-03-05 14:53:37 +08:00
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
ae3c104fba
issue #1686:disable depth test by default
2013-03-05 10:36:32 +08:00
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
e8e229cc93
add getStartLocation() and getStartLocationInView() to CCTouch to access the start point of a touch
2013-03-04 13:08:19 +01:00
96c5be91e3
Merge pull request #2076 from sbc100/cocos_nacl
...
Native Client port
2013-03-03 18:24:04 -08:00
71589e68ee
fixed #1760 : Redefinition of cpufeatures module.
2013-03-04 10:08:02 +08:00
33c422d1d5
Add new port: Native Client
2013-03-02 12:15:24 -08:00
85fd30aacf
fix compile error when run xcode on case-sensive file system.
2013-03-02 18:15:05 +08:00
a959986e5e
add cpp function
2013-03-02 16:31:19 +08:00
370fe7d937
issue #1686:fixed a logical error in CCLabelBMFont
2013-03-01 18:15:20 +08:00
0dfab6744a
issue #1686:use correct values to initialize CCNodeRGBA member variables
2013-03-01 16:14:10 +08:00
df56a2e3ec
issue #1686 : invoke sceneOrder() in CCTransitionScene::initWithDuration()
2013-03-01 15:30:40 +08:00
3e7e9ead5d
issue #1686:add getInnerAction to CCEaseAction
2013-03-01 14:08:23 +08:00
5feeaf024e
add m_fDeltaTime getter function
2013-03-01 13:40:38 +08:00
65f19f5c53
Removing some deprecated functions.
2013-03-01 10:57:52 +08:00
7093807f3f
CCNodeRGA isn't a pure abstract class anymore. Updated tools/tojs/cocos2d.ini.
2013-03-01 10:41:06 +08:00
7d0eafa42c
Merge pull request #2065 from minggo/iss1686-synchronize
...
issue #1686:fix some compiling error
2013-02-28 17:52:45 -08:00
7c8bb82c67
issue #1686:fix some compiling error
2013-03-01 09:51:42 +08:00
514799db73
Merge pull request #2063 from minggo/iss1686-synchronize
...
Synchronize to cocos2d-iphone v2.1rc0a
2013-02-28 17:28:28 -08:00
b7ca4656b6
Flush log messages.
2013-02-28 16:17:49 +01:00
70a70d38fc
Merge pull request #9 from dumganhar/iss1686-synchronize
...
issue #1686 : Synchronizing LayerTest, LabelTest.
2013-02-28 00:48:32 -08:00
3b3adc3eea
issue #1686 : Synchronizing LayerTest.
2013-02-28 16:45:59 +08:00
c75e440e22
issue #1686:synchronized RenderTexture
2013-02-28 16:35:42 +08:00
8ba46c574a
fix for conflict of project.pbxproj.
2013-02-28 13:37:45 +08:00
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
63e4091bfa
fixed #1686:finish updating
2013-02-28 11:55:36 +08:00
0070371045
issue #1686:synchronize CCLabelBMFont.cpp
2013-02-28 10:37:47 +08:00
14a35cff11
issue #1686:synchronize CCMenu.cpp
2013-02-28 10:15:09 +08:00
3f74cd8190
fixed #1753 : Adding ccUTF8.h/.cpp for MAC, LINUX and MARMALADE port.
2013-02-28 09:44:37 +08:00
cd4f18c48f
issue #1686:synchronize CCLayer.cpp
2013-02-27 18:21:35 +08:00
8dc431425c
issue #1686:synchronize CCMenuItem.cpp
2013-02-27 17:23:39 +08:00
537abaec42
fixed #1753 : Android works ok now.
2013-02-27 16:57:36 +08:00
7eb93128c2
issue #1686:synchronize CCMotionStreak.cpp
2013-02-27 16:52:19 +08:00
00e978bbe9
issue #1686:synchronize CCParticleExample.cpp
2013-02-27 16:46:05 +08:00
2b0ff4ec62
issue #1686:synchronize CCParticleSystem.cpp
2013-02-27 16:26:42 +08:00
24e8664700
issue #1686:synchronize CCParticleSystemQuad.cpp
2013-02-27 16:24:33 +08:00
4b8708b762
issue #1686:synchronize CCProgressTimer.cpp
2013-02-27 15:52:14 +08:00
0d70e6f92f
issue #1753 : Win32 works ok.
2013-02-27 15:45:23 +08:00
088bc959f6
issue #1686:synchronize CCRenderTexture.cpp
2013-02-27 15:44:36 +08:00
94076a5b9c
issue #1686:synchronize CCSprite.cpp
2013-02-27 15:30:49 +08:00
473e8e6139
issue #1753 : Upgrading SpiderMonkey to Firefox19.0, iOS works ok.
2013-02-27 15:16:49 +08:00
f571d66ed7
issue #1686:synchronize CCNode.cpp
2013-02-27 14:48:19 +08:00
8ed8def97f
Merge branch 'iss1686-sync-rc0a' of https://github.com/dumganhar/cocos2d-x into iss1686-synchronize
2013-02-27 14:25:24 +08:00
8288e2124e
issue #1686:synchronize CCTextureCache.cpp
2013-02-27 11:35:38 +08:00
James Gregory