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

4241 Commits

Author SHA1 Message Date
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
James Chen c42ef7e44a Merge pull request #1953 from dualface/add_CCFileUtils_Lua_support 
issue #1687: Adding CCFileUtils Lua support. Adding CCFileUtils::addSearchPath, addSearchResolutionsOrder.
 2013-02-04 18:59:49 -08:00
minggo ca0b9ca521 Merge pull request #1957 from thomaslee/initwithimage-without-release 
Don't call release() if CCTexture2D::initWith* fails
 2013-02-04 02:12:32 -08:00
Tom Lee 4023fcc094 Return false instead of NULL 2013-02-04 01:38:22 -08:00
minggo 5f9e0b5ac2 Merge branch 'tinyxml2' of https://github.com/martell/cocos2d-x into tinyxml 2013-02-04 17:24:22 +08:00
Tom Lee 610aeb28cf Don't call release() if initWith* fails 2013-02-04 01:04:54 -08:00
minggo 0465a950c7 Merge pull request #1951 from dumganhar/iss1697-render-texture 
issue #1697: fixed two logical errors in CCRenderTexture::initWithWithAndHeight.
 2013-02-04 00:28:54 -08:00
minggo 8511e75745 fixed #1689:fixed a compiling error 2013-02-04 16:17:59 +08:00
dualface 5904512ac6 add CCFileUtils Lua support 2013-02-04 12:41:24 +08:00
dualface c13965c939 remove duplicate codes 2013-02-04 11:52:16 +08:00
James Chen 7f81db038c issue #1697: fixed two logical error in CCRenderTexture::initWithWithAndHeight. 2013-02-04 11:33:13 +08:00
minggo 744bfb3cb2 Merge pull request #1945 from dualface/add_CCLuaObjcBridge 
add CCLuaObjcBridge
 2013-02-03 19:32:17 -08:00
minggo 7f594f00b8 Merge pull request #1930 from NatWeiss/tmxpolygons 
Added TMX polygon parsing.
 2013-02-02 19:17:44 -08:00
James Chen a0bf0d8655 issue #1687: Moving the implementation of NS2CC.mm to CCFileUtilsIOS(MAC).mm. 2013-02-03 10:56:59 +08:00
dualface f8c372ca9b fix CCLuaLog() 2013-02-02 15:05:30 +08:00
dualface c58a63aa92 fix for android 2013-02-02 14:56:09 +08:00
dualface d6686fe57c Merge branch 'upstream_master' into add_webp_support 2013-02-02 12:24:05 +08:00
dualface 7839ceb45b add CCLuaObjcBridge 2013-02-02 02:05:52 +08:00
James Chen e25c79f1ec issue #1687: CCFileUtils::isFileExist now support relative path. 2013-02-01 22:19:58 +08:00
James Chen ae0b973cf1 issue #1687: Moving the global function( ccFileUtils_dictionaryWithContentsOfFileThreadSafe, ccFileUtils_arrayWithContentsOfFileThreadSafe) to the CCFileUtils class. 
)
 2013-02-01 18:48:44 +08:00
James Chen 1acdf1c957 issue #1687: Updating the comments for CCFileUtils. 2013-02-01 17:16:33 +08:00
James Chen 357da4f2fc issue #1687: Updating the comments for CCFileUtils. 2013-02-01 16:46:15 +08:00
James Chen a110778739 issue #1687: Updating comments for CCFileUtils. 2013-02-01 15:41:41 +08:00
James Chen c296ab363f issue #1687: Comments some logs output for CCFileUtils. 2013-02-01 11:53:05 +08:00
James Chen 63778570d2 issue #1687: [Marmalade] If the font name wasn't end with `.ttf`, skip making a full path. 2013-02-01 11:40:55 +08:00
James Chen 3a9346e6ff issue #1687: Refactoring CCFileUtils, abstracting the same implementations for all platforms. 2013-02-01 11:20:46 +08:00
James Chen 9b5d0bd251 Merge pull request #1935 from moadib/bb_eglview_event_handler 
fixed #1015: Added CCEGLView::EventHandler class for Blackberry platform.
 2013-01-30 22:31:03 -08:00
James Chen eb7cae93fd Merge pull request #1937 from dumganhar/revert-ttf-update 
Reverted the logic of CCLabelTTF::updateTexture.
 2013-01-30 22:28:48 -08:00
James Chen da59570214 Reverted the logic of CCLabelTTF::updateTexture. 2013-01-31 14:26:45 +08:00
James Chen 157e229f8c fixed #1634: Added the very first implementation of CCEditBox for Win32. 2013-01-31 14:04:49 +08:00
moadib 4d271e782b Added CCEGLView::EventHandler class for Blackberry platform 
Added CCEGLView ::getWindowGroupId() method for Blackberry platform
 2013-01-30 18:28:06 +04:00
James Chen 6b0417902c Merge pull request #1932 from Weeds/feature_linux-font-alignment 
fixed #1689: [Linux] fixed horizontal font alignment.
 2013-01-29 22:22:01 -08:00
Andre Rudlaff 9b8f3ca01e [Linux] fixed horizontal font alignment 
kAlignTop and kAlignBottom should center text horizontally
 2013-01-30 02:04:59 +01:00
Andre Rudlaff 5959c24b80 [Linux] fixed loading truetype fonts from resource directory 
We should use CCFileUtils to get the full path to font resources.
Additionally the input font is converted to lowercase for checking if it is
a ttf file. So we can also load .TTF or .tTf files.
 2013-01-30 01:43:21 +01:00
Nat Weiss 9b98e4548f Added TMX polygon parsing. 2013-01-29 14:45:41 -08:00
James Chen bb431c54ed Comments some logs in CCFileUtils. 2013-01-29 19:12:55 +08:00
minggo fb1a32e696 Merge pull request #1923 from dumganhar/master 
Updating doxygen comments for CCFileUtils.h.
 2013-01-29 02:50:16 -08:00
minggo de7dfdbc2c Merge pull request #1925 from minggo/master 
update js-tests codes from upstream and fix a logical bug of CCRect
 2013-01-29 02:08:08 -08:00
James Chen 2ca28d7e3d Updating comments for CCFileUtils.h. 2013-01-29 16:45:11 +08:00
James Chen 632b91ee08 Updating comments for CCFileUtils.h. 2013-01-29 16:31:28 +08:00
James Chen 0cd9efcf6d Updating comments for CCFileUtils.h. 2013-01-29 16:28:59 +08:00
James Chen 3cff253446 Updating comments for CCFileUtils.h. 2013-01-29 16:10:18 +08:00
James Chen 558a4bb3cc Updating comments for CCFileUtils.h. 2013-01-29 16:07:50 +08:00
James Chen 0bd2e11d75 Updating comments for CCFileUtils.h. 2013-01-29 15:56:08 +08:00
James Chen 0141b7856d Updating comments for CCFileUtils.h. 2013-01-29 15:52:33 +08:00
James Chen 13c494ad69 Updating doxygen comments for CCFileUtils.h. 2013-01-29 15:50:57 +08:00
James Chen 170fb32b6c Updating CCFileUtils.cpp for BlackBerry. 2013-01-29 15:07:36 +08:00
minggo fbcb33eefd make CCRect accept width<0 and height<0 2013-01-29 14:03:03 +08:00
James Chen 0c01711293 Comments some LOGs in CCFileUtils::fullPathForName. 2013-01-29 10:48:31 +08:00
James Chen 31681e005e CCFileUtils::fullPathFromRelativePath -> fullPathForFilename. 2013-01-29 10:40:44 +08:00
James Chen 6baeee3ff9 Adding LOG in CCFIleUtils::fullPathForFilename for Marmalade port. 2013-01-29 10:27:36 +08:00
James Chen 2694cb150b CCFileUtils::s|gSearchPath -> CCFileUtils::s\gSearchPaths. 2013-01-29 09:56:38 +08:00
James Chen d5237d637d Absolute path check for blackberry. 2013-01-29 00:42:21 +08:00
James Chen 1f0b422112 Fix a typo. 2013-01-28 23:40:56 +08:00
James Chen c160d3ed0a Using full path in CCFileUtils::getFileData. 2013-01-28 23:37:04 +08:00
James Chen 7c89086173 Merge remote-tracking branch 'cocos2d-x/master' 2013-01-28 23:29:41 +08:00
James Chen 341193eec6 Updating comments for CCFileUtils. 2013-01-28 23:28:14 +08:00
minggo 3ea562b4ad fix some logical errors and compiling errors 2013-01-28 23:19:57 +08:00
James Chen 2e421304ca Merge pull request #1911 from dumganhar/iss1683-ccfileutils 
issue #1683: Updating CCFileUtils for Blackberry and Marmalade.
 2013-01-28 05:43:41 -08:00
James Chen f0fc414a81 Fixing a bug in CCLabelTTF.cpp, checking the return value of CCTexture2D::initWithString. 2013-01-28 21:17:43 +08:00
James Chen 75d926f810 issue #1683: Fixing complication errors for blackberry. 2013-01-28 21:16:01 +08:00
minggo 05363ee8dd Merge pull request #1908 from minggo/master 
fix some warnings
 2013-01-28 04:36:01 -08:00
minggo 249b935be8 fix some warnins 2013-01-28 20:34:52 +08:00
James Chen 59f2ae13f8 issue #1683: Updating CCFileUtils for Blackberry and Marmalade. 2013-01-28 20:12:48 +08:00
James Chen 6bceb2ac6f Merge remote-tracking branch 'cocos2d-x/master' into iss1683-ccfileutils 2013-01-28 19:54:02 +08:00
James Chen ba852e8606 issue #1683: Adding default path to the vector of searching path. 2013-01-28 19:53:16 +08:00
James Chen 0d8756c900 Merge pull request #1907 from dumganhar/iss1683-ccfileutils 
issue #1683: Updating CCFileUtils.cpp for Win32.
 2013-01-28 03:51:59 -08:00
James Chen 031380d4e9 issue #1683: Updating CCFileUtils.cpp for Win32. 2013-01-28 19:49:34 +08:00
James Chen c5975dd7c4 Merge pull request #1905 from dumganhar/iss1683-ccfileutils 
issue #1683: Fixed compilation errors for linux.
 2013-01-28 02:34:24 -08:00
James Chen 733a334ec2 issue #1683: Fixed compilation errors for linux. 2013-01-28 18:32:34 +08:00
James Chen 57eb58df42 Merge pull request #1904 from dumganhar/iss1683-ccfileutils 
issue #1683: Adding FileUtilsTest.Adding default search path if developer didn't pass it.
 2013-01-28 01:57:46 -08:00
James Chen 632f99b611 issue #1683: Updating CCFileUtils for MAC. 2013-01-28 17:54:49 +08:00
James Chen e736ed487f issue #1683: Adding default search path if developer didn't pass it. 2013-01-28 17:44:53 +08:00
minggo cd75f37d06 change version string 2013-01-28 15:24:13 +08:00
James Chen 13881ba8a8 issue #1683: Updating CCApplication.h/.cpp for linux. 2013-01-28 11:56:56 +08:00
James Chen 345f18ebeb issue #1683: Refactoring CCFileUtils::setResourceRootPath for BB, Linux, MAC. 2013-01-28 10:48:47 +08:00
James Chen c24ca63a0c issue #1683: Making CCApplication::setResourceRootPath deprecated. 2013-01-28 10:36:37 +08:00
James Chen 78c16fdd22 issue #1683: Fixing absolute path check for Android. 2013-01-28 10:23:19 +08:00
James Chen f2dad83610 issue #1683: Refactoring CCFileUtils for MAC port. 2013-01-27 20:53:32 +08:00
James Chen d532670640 Removing some CCLOG. 2013-01-27 20:16:46 +08:00
James Chen 09cef5511a issue #1683: Updating CCFileUtils. 2013-01-26 23:24:41 +08:00
James Chen be6c0c9d9b Updated CCFileUtils of linux. 2013-01-26 23:20:40 +08:00
James Chen 119115502d issue #1683: Making some api of CCFileUtils more c++ friendly by using std::vector rather than CCArray. 2013-01-26 22:31:57 +08:00
James Chen ca9e96213f issue #1683: Commented one LOG. 2013-01-26 15:02:04 +08:00
martell 0e3560bcd5 final fix.. tested 2013-01-26 06:27:49 +00:00
James Chen d9fd3c6c60 issue #1683: Fixed an issue about OPENGLES ERROR 501 Warning in CCTextureAtlas.cpp. 2013-01-26 14:20:24 +08:00
James Chen 3328cfd6a4 Refactoring some logic of CCFileUtils. 2013-01-26 14:19:14 +08:00
James Chen 522e860205 issue #1683: Fixed a bug in file lookup for Android. 2013-01-26 12:10:55 +08:00
martell 05bece9d07 added ccuserdefault tinyxml2 ver 2013-01-26 02:41:27 +00:00
James Chen f71df5a873 Fixed an issue in CCFileUtils::setResourceDirectory for android. 2013-01-25 23:01:47 +08:00
James Chen 2c399de28e issue #1683: Moved CCFileUtils::setResourceDirectory. And fix a compatible issue for android. 2013-01-25 22:55:20 +08:00
James Chen 2235f745d3 issue #1683: Fixed compilation error for Win32. 2013-01-25 22:30:16 +08:00
James Chen ef131beed1 Merge pull request #1885 from dumganhar/refactor-ccfileutils 
issue #1683 :Refactoring CCFileUtils.TO BE DONE: 
Making the api of CCFileUtils more c++ friendly.
 2013-01-25 05:55:10 -08:00
James Chen fde39c6dcb Adding cache support for CCFileUtils. 2013-01-25 21:52:35 +08:00
James Chen 55af1fd3bf Removing unneeded codes in CCFileUtils.mm for iOS port. 2013-01-25 21:17:28 +08:00
James Chen a1574fe9f6 Reverted this commit (be305f84b6) since i didn't find the crash. 2013-01-25 20:59:58 +08:00
James Chen 6f3b22031f Using new API of getting full path for file name. 2013-01-25 20:51:52 +08:00
martell 684b46dd74 Initial Import of tinyxml2 to replace libxml2 2013-01-25 10:39:54 +00:00
James Chen b3f54f6c1d Merge remote-tracking branch 'origin/refactor-ccfileutils' into refactor-ccfileutils 2013-01-25 17:23:58 +08:00
James Chen 70b8e624d6 Merge pull request #8 from rohankuruvilla/fileutils_test 
Merged @Rohan's improvements for CCFileUtils.
 2013-01-25 01:20:51 -08:00
minggo dcaa3900a4 fixed #1679: use unstripped libs for armeabi-v7a 2013-01-25 14:49:25 +08:00
James Chen 805067b046 Refactored CCFileUtils for blackberry port. 2013-01-25 14:09:56 +08:00
James Chen 314445e1ca Refectored CCFileUtils for MAC port. 2013-01-25 11:12:38 +08:00
Rohan Kuruvilla 9750bbab95 removing absolute path lookup in fullPathForFilename 2013-01-24 19:04:27 -08:00
Rohan Kuruvilla f5c74d9022 Adding support for getInstance in Cocos2dxGLSurfaceView, to allow for running tasks on GL Thread 2013-01-24 18:37:24 -08:00
Rohan Kuruvilla be305f84b6 Fixing bug where it doesn't use embedded texture data, if texture filename is not available 2013-01-24 18:37:23 -08:00
Rohan Kuruvilla 287b5575f4 Changing architecture of CCFileUtils 2013-01-24 18:37:23 -08:00
James Chen cefef60e11 Refactored CCFileUtils for Marmalade port. 2013-01-24 17:38:43 +08:00
James Chen 73389d68d5 Refactor CCFileUtils for Linux port. 2013-01-24 16:44:13 +08:00
James Chen e954ce4f75 Made compatibility with old api CCFileUtils::setResourceDirectory. 2013-01-24 14:07:48 +08:00
James Chen 7589be6fb7 Refactoring CCFileUtils for win32. CrystalCraze works ok on WIN32 now. 2013-01-24 13:56:50 +08:00
James Chen dcf1127d31 Merge branch 'master' into refactor-ccfileutils 2013-01-24 11:21:23 +08:00
Ed Bartley 908035bdee Fixed a CCMenu bug that prevented the touch priority from being set to the value specified by a call to CCMenu::setTouchPriority(int). 2013-01-23 14:00:23 -05:00
James Chen 46f38c57fb issue #1661: CrystalCraze works ok on android. 2013-01-24 00:32:22 +08:00
James Chen 8cfd912a06 CrystalCraze works ok on iOS. 2013-01-23 23:17:44 +08:00
James Chen 388e1d82c3 Added resource structure which is the same as cocos2d-iphone. 2013-01-23 22:29:00 +08:00
James Chen 294509c4c0 Merge branch 'master' of https://github.com/dumganhar/cocos2d-x into myccfileutils 2013-01-23 19:52:17 +08:00
James Chen f2303b854a Fixed a typo, and regenerated luabinding codes. 2013-01-23 15:59:13 +08:00
James Chen c92d00dfa1 Merge pull request #1857 from walzer/master 
fixed #1678: Well documented CCNode member functions and variables.
 2013-01-22 23:35:14 -08:00
James Chen 2b9f79efc0 Merge pull request #1882 from dumganhar/memoryleak-action 
Fixed memory leaks in CCActionCatmullRom class.
 2013-01-22 22:41:44 -08:00
James Chen 317ac3dd95 Fixed memory leaks in CCActionCatmullRom class. 2013-01-23 14:38:46 +08:00
James Chen de8a237d73 Merge pull request #1881 from dumganhar/linux-fix 
fixed #1676: Refactoring Makefile and eclipse project configuration for LINUX port.
 2013-01-22 03:22:41 -08:00
James Chen 8ec1a66db4 Removed glew-1.7.0.tgz. 2013-01-22 18:34:51 +08:00
James Chen 3f57b01f94 Fix for 32bit. 2013-01-22 18:30:16 +08:00
James 1d7650767b Updated Makefile and project configurations for linux port. 2013-01-22 16:45:35 +08:00
James Chen 219657ee1a Merge pull request #1872 from moadib/android_manifest_gles20 
fixed #1673: Added <uses-feature android:glEsVersion="0x00020000"/> to AndroidManifest.
 2013-01-21 23:52:32 -08:00
James 680fbe3517 Fixed compilation errors for linux port. 2013-01-22 15:21:37 +08:00
PickleMan ae9c56f084 Fixed syntax, integrated lines.png and lines.plist 2013-01-21 21:30:22 -05:00
ivzave 03f1efff78 ignore unpacked glew 2013-01-21 18:01:57 +04:00
walzer db59b047f0 remove "inline" keyword from set/getPositionX/Y() methods to make the compilation property without additional flags. 2013-01-21 20:57:06 +08:00
PickleMan 5c915fc584 Added rotationIsDir to Particle System. It sets the rotation of each particle to its direction 2013-01-21 04:39:48 -05:00
moadib e39829269d Added <uses-feature android:glEsVersion="0x00020000" /> to AndroidManifest.xml 2013-01-21 13:03:55 +04:00
walzer b1285ca7a7 CCNode: add [set|get]Position[X|Y](void) back. 2013-01-21 16:26:33 +08:00
walzer 996d2be2b6 CCNode: add [set|get]Position[X|Y](void) back. 2013-01-21 16:26:02 +08:00
James Chen b810aac103 issue #1667: Updated the comments for CCFileUtils.h. 2013-01-21 10:11:57 +08:00
James Chen 30b2a8a882 issue #1867: Updated CCFileUtils.cpp for android. 2013-01-18 22:18:55 +08:00
James Chen 9eb149efda Updated CCFileUtils.mm. 2013-01-18 22:14:03 +08:00
James Chen bc76cf09c4 Added filename lookup support for win32. 2013-01-18 21:54:48 +08:00
walzer 8657da80a6 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2013-01-18 18:06:51 +08:00
James Chen 0a42829428 issue #1667: Adding file name lookup support for iOS and Android, TBD: Other platform supports. 2013-01-18 18:05:32 +08:00
minggo 6379b61400 fixed #1664:fixed a logical error in CCAtlasNode::setOpacityModifyRGB() 2013-01-18 16:40:42 +08:00
minggo fcecd43f55 Merge pull request #1862 from Horcruxes/master 
getFileData("a.png") doesn't work on iOS.
 2013-01-17 17:46:23 -08:00
Michael Ding 088e568c8e Update cocos2dx/platform/ios/CCFileUtils.mm 
fix the problem when calling CCFileUtils::sharedFileUtils()->getFileData("a.png") doesn't work.
 2013-01-18 09:27:22 +11:00
James Chen c8dfa45993 Merge pull request #1859 from dumganhar/crystal-game 
issue #1661: Adding jsb sample game CrystallCraze.
 2013-01-17 01:09:18 -08:00
James Chen 31e91e554e issue #1661: Added CrystalCraze for win32 and fix some compilation errors. 2013-01-17 17:07:18 +08:00
minggo 3e482e30d3 Merge pull request #1861 from minggo/iss1547-ccmenuitem 
fixed #1547:set selected menu item to null when it is removed from a menu
 2013-01-16 23:06:53 -08:00
minggo a7dca5c05a fixed #1547:set selected menu item to null when it is removed from a menu 2013-01-17 15:04:48 +08:00
James Chen f70e4db254 fixed #1662: Getting full path will fail if texture name in the plist is without relative path. 2013-01-17 11:42:41 +08:00
walzer 7b16494862 well documented CCNode 2013-01-17 11:20:25 +08:00
James Chen 375666fd6c fixed #1468: Exported CCPoint, CCSize and CCRect. 2013-01-15 18:59:35 +08:00
James Chen 5d7cc39edd issue #1650: Inline function needs to be implemented in header file on Android platform. 2013-01-15 18:15:14 +08:00
James Chen 547f95d761 issue #1650: Made the destructor of CCDictElement as public method. 2013-01-15 17:20:04 +08:00
James Chen c3d697a0f8 issue #1650: Adding detailed doxgen comments for CCDictionary. 2013-01-15 17:09:25 +08:00
ivzave 806398519a repair CCTransitionSplitCols & CCTransitionSplitRows 2013-01-15 00:49:05 +04:00
minggo 78fc7cb5b5 Merge pull request #1840 from walzer/gles20 
Doxygen sample in CCSprite.h
 2013-01-14 06:07:50 -08:00
walzer 4ae43e5901 fix typos in doxygen of CCSprite and CCProtocol 2013-01-14 21:51:47 +08:00
minggo 90a4653530 Merge pull request #1839 from fnz/gles20 
Fix addImageAsync iOS memory leak
 2013-01-14 03:22:11 -08:00
walzer c9c227873f Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2013-01-14 17:07:07 +08:00
walzer 1ab552b482 Add a sample doxygen sample in CCSprite.h and CCProtocol.h 2013-01-14 16:54:20 +08:00
Victor K bf01df0f52 Fix addImageAsync iOS memory leak 
Bug: http://www.cocos2d-x.org/issues/1087
Thread: http://www.cocos2d-x.org/boards/6/topics/17031
 2013-01-14 15:32:30 +07:00
James Chen 6733f786a5 fixed #1649: Reverted some invokings of function that returns const reference. 2013-01-14 16:06:18 +08:00
James Chen 22ebf3a5e5 Merge remote-tracking branch 'cocos2d-x/gles20' into iss1649-return-const 2013-01-14 15:52:42 +08:00
James Chen 6565fa92cc fixed #1649: Changed return type to const reference for member variable access. 2013-01-14 15:51:53 +08:00
minggo c08c982f89 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1468-ccpoint 2013-01-14 15:07:21 +08:00
minggo 984b304ec5 issue #1468:change CCPoint CCSize CCRect from class to struct 2013-01-14 14:45:16 +08:00
James Chen 0fd16e7b31 Merge pull request #1827 from folecr/assert_fix 
fixed #1654: Assert fix for android.
 2013-01-13 22:15:11 -08:00
johnangel a1155f52e6 Merge remote branch 'upstream/gles20' into gles20 2013-01-11 21:48:47 +01:00
folecr 58874dc7a5 CCAssert uses CC_ASSERT directly 
* ... after call to cc_assert_script_compatible()
 * CCAssert will now report the correct line number
 2013-01-10 12:26:12 -08:00
johnangel 16269d952d Detect VS2012 Update 1 2013-01-10 11:55:30 +01:00
James Chen 9f322d9646 fix a typo. 2013-01-10 15:58:52 +08:00
folecr e3cf517f32 Assert implementation for Android 
* __android_log_assert is not stable
    * Uses __android_log_print instead
 2013-01-09 18:51:49 -08:00
folecr c0ecad31fe Consistent use of CCAssert 
* Remove @
 * Use CCAssert instead of CC_ASSERT (number of parameters differ between the two)
 2013-01-08 14:11:34 -08:00
johnangel e32a193561 Setting Windows app title for non-Debug mode, also. 2013-01-07 12:17:50 +01:00
johnangel 674bb8e728 Setting PlatformToolSet to v110_xp instead of default v110 in Visual Studio 2012 for Windows XP support, leaving default v100 in Visual Studio 2010. 2013-01-07 11:51:05 +01:00
James Chen b662d5c569 fixed #1620: Added license. Removed LocalStorage.h from cocos-ext.h. 2013-01-07 18:06:53 +08:00
James Chen 3fa771f0c4 fixed #1620: Using sqlite3 to implement sys.LocalStorage for iOS and android. 2013-01-07 17:22:06 +08:00
James Chen 266e6e8acc fixed #1641: The coins in Watermelon Me fail to animate in cocos2d-x JS binding. 2013-01-05 18:54:08 +08:00
James Chen 9ef74bef80 fixed #1636: Deleted CC_ENABLE_CHIPMUNK_INTEGRATION and CC_ENABLE_BOX2D_INTEGRATION in ccConfig.h since they are moved to extension, it doesn't depend on engine any more. 
Added platform macro for CCEditBoxImpl* files.
 2013-01-05 11:10:24 +08:00
dualface 37a0f19c46 remove RGB565 support 2013-01-04 23:34:24 +08:00
minggo 539bb56256 Merge pull request #1799 from tks2shimizu/gles20 
Added CCFloat, CCDouble and CCBool
 2013-01-03 19:32:35 -08:00
James Chen f95d1677df Merge branch 'gles20' of https://github.com/dducharme/cocos2d-x into iss-blackberry 2013-01-04 09:52:01 +08:00
James Chen b50bf716a2 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2013-01-03 19:58:10 +08:00
James Chen 760a8c1d39 fix a compilation error for android. 2013-01-03 19:56:34 +08:00
Dale Ducharme 611db78b39 Removing grskia dependancy and adding in freetype support to the builds. 2013-01-02 18:53:31 -05:00
fape 29a2f273b1 reorganize third party libs 2012-12-29 23:56:14 +01:00
fape 4421b6bf7a remove unused libs 2012-12-29 23:53:39 +01:00
dualface d9ef93bbe5 fix some issues 2012-12-30 02:14:30 +08:00
dualface 0b25220f22 update libwebp to 2.1 
add support RGB888, RGB565,RGBA4444
 2012-12-30 02:12:02 +08:00
dualface 1dcb3742e9 fix for win32 2012-12-29 17:43:34 +08:00
James Chen d2ad820a48 fixed #1627: Adding view name for sample applications. 2012-12-29 14:50:00 +08:00
dualface 39c4765423 fix for mac 2012-12-29 14:17:52 +08:00
dualface 806138d990 fix some issues 2012-12-29 13:58:02 +08:00
James Chen 9bd302e35b fixed #1627: VS version check in project file. 2012-12-29 13:54:46 +08:00
James Chen b120874a87 fix compilation errors. 2012-12-29 11:23:31 +08:00
Tomoaki Shimizu 1293c8a6c2 added licence 2012-12-29 11:32:27 +09:00
dualface b50e4cdf2b add WebP support 2012-12-29 10:27:43 +08:00
James Chen f2f3aa55bf Merge branch 'gles20' of https://github.com/johnangel/cocos2d-x into iss-vs2012 
Conflicts:
	samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj
	samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj
	samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj
	samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj
	samples/Javascript/TestJavascript/proj.win32/TestJavascript.vcxproj
	samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj
	samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj
	samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj
	scripting/javascript/bindings/generated
	scripting/lua/proj.win32/liblua.vcxproj
 2012-12-29 09:48:22 +08:00
Tomoaki Shimizu b4edd167af The variable name was changed.The check of pRet was added. 2012-12-28 12:24:28 +09:00
Tomoaki Shimizu 87146d82e1 Added CCFloat, CCDouble and CCBool 2012-12-27 23:15:13 +09:00
James Chen f159df2e13 Compilation warning fix for CCAssert macro. 2012-12-27 16:48:02 +08:00
minggo 4cdc984b0e Merge pull request #1797 from dumganhar/gles20 
fixed #1597: TestCpp crashes when running ActionEaseTest after running ParticlesTest.
 2012-12-27 00:10:53 -08:00
James Chen b62d254f63 fixed #1597: Added return pointer check. 2012-12-27 16:07:48 +08:00
James Chen ac7755e68b fixed #1597: TestCpp crashes when running ActionEaseTest after running ParticlesTest 2012-12-27 15:42:55 +08:00
minggo 0adc6abe30 Merge pull request #1776 from dualface/make_ccassert_compatible_lua 
[luabinding] make CCAssert compatible Lua
 2012-12-26 23:28:32 -08:00
James Chen f07987418c Merge pull request #1794 from dumganhar/sync 
fixed #1625: Added stackable action support. Exchanged the order of parameter for 3d actions.
 2012-12-26 20:50:32 -08:00
James Chen 7d9f06b48c fixed #1625: Updated TestCpp. 'ccg' --> 'CCSizeMake' . And exchanged the parameter order for 3D action tests. 2012-12-27 10:55:25 +08:00
James Chen bb486af6a7 Added stackable action support. Exchanged the order of action. 2012-12-26 18:59:31 +08:00
dualface 09b1d9f520 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into make_ccassert_compatible_lua 2012-12-26 18:37:51 +08:00
dualface 57bccc7e4a remove CC_LUA_ENGINE_ENABLED macro 2012-12-26 18:33:55 +08:00
fape 3550550568 marmalade acceleromater improvement 2012-12-24 17:24:10 +01:00
johnangel 08cd9e37fc Setting PlatformToolSet to v110_xp for Visual Studio 2012 only. 2012-12-24 10:27:56 +01:00
minggo df73cd12a6 fixed #1623:use file descriptor instead of file path to create media player 2012-12-24 17:20:44 +08:00
minggo 0f669114fc Merge pull request #1775 from mingulov/music 
CocosDenshion Android - missing sound effects with some conditions
 2012-12-23 22:45:47 -08:00
ivzave fcce930188 repair linux eclipse build & add 64-bit project configurations 2012-12-22 07:14:59 +04:00
dualface cc69e39c8a [luabinding] make CCAssert compatible Lua 2012-12-22 10:13:37 +08:00
Denis Mingulov ca00d50259 CocosDenshion Android - missing sound effects with some conditions 
Android SoundPool.load returns 0 if sound might not be loaded - for
example, it does not exist. Previously - 0 has been ignored and
incorrectly written to HashMap, so it was not possible to
understand on the application side that something goes wrong
(and use some additional workaround).

Use case:
1) On the game loading - preload all possible sound effects
   (to speed up their playing later, when it will be needed)
2) Game APK does not have any sound file, they are downloaded
   later in a separate thread.
3) Application tries to play sound effects as usual, when needed.

So due to this bug - as there was no any sound file exist
during the game loading - internal HashMap contains incorrect
0 as id for every effect, and there is no any sound effect during
the first application start.
 2012-12-21 23:15:29 +02:00
James Chen d94a0cf4c7 issue #1603: fixed a warning in unzip.cpp. 2012-12-20 18:39:29 +08:00
James Chen 9a0a5e6b31 issue #1603: fixed some warnings. 2012-12-20 17:18:49 +08:00
johnangel b8eaf00359 ESC button on Windows behaves like Back button 2012-12-19 21:11:26 +01:00
johnangel f409aba724 Setting Windows app title 2012-12-19 20:43:09 +01:00
unknown adb68ddbb6 Enable Windows XP support in Visual Studio 2012 Update 1. 
Not tested with Visual Studio 2010, not sure will it work with PlatformToolset v110_xp.
 2012-12-19 19:28:25 +01:00
minggo e9c7db5a36 Merge pull request #1761 from dualface/fix_ccnode_scheduleupdate_lua 
[lua] remove current schedule before register new script schedule
 2012-12-16 17:26:59 -08:00
dualface c3f900d36c [lua] remove current schedule before register new script schedule 2012-12-14 18:06:21 +08:00
dualface 98ea80329e fix android compile warning 2012-12-14 18:01:54 +08:00
dualface d6a84e0d16 fix compile error for ios/mac c++11 2012-12-10 18:10:41 +08:00
minggo e15c0a33ae fixed #1610:skip only white character 2012-12-10 17:18:20 +08:00
James Chen 15251626b0 Merge pull request #1748 from guanqun/fix-doxygen 
fix the doxygen output of CCAtlasNode
 2012-12-10 01:01:21 -08:00
James Chen 0adc070146 Merge pull request #1749 from guanqun/fix-reorder 
fix the reorder warning of class CCCallFunc
 2012-12-10 00:59:00 -08:00
James Chen 6cca9b6548 Merge pull request #1750 from dumganhar/iss1608-lua-scheduleUpdateWithPriority 
fixed #1608: Adding CCNode::scheduleUpdateWithPriorityLua() for LuaBinding.
 2012-12-10 00:54:16 -08:00
James Chen fcead8ba34 Merge branch 'lua_add_CCNode_scheduleUpdateScriptHandlerWithPriority' of https://github.com/dualface/cocos2d-x into lua-schedule-improvement 2012-12-10 16:36:46 +08:00
minggo 0f58987ad1 Merge pull request #1740 from rtissera/gles20 
[android] Cocos2dxHelper/CCFileUtils JNI fixes and improvements
 2012-12-10 00:33:11 -08:00
dualface f08b9c4573 performance fix 2012-12-10 16:31:57 +08:00
dualface 268aa45d2c rename CCNode:scheduleUpdateScriptHandlerWithPriority() to CCNode::scheduleUpdateWhitPriorityLua() 
remove unused functions
 2012-12-10 16:09:23 +08:00
Lu Guanqun b2c13cba9d fix the reorder warning of class CCCallFunc 
../actions/CCActionInstant.h: In constructor 'cocos2d::CCCallFunc::CCCallFunc()':
../actions/CCActionInstant.h:240:25: warning: 'cocos2d::CCCallFunc::<anonymous union>::m_pCallFunc' will be initialized after [-Wreorder]
../actions/CCActionInstant.h:236:6: warning:   'int cocos2d::CCCallFunc::m_nScriptHandler' [-Wreorder]
../actions/CCActionInstant.h:188:5: warning:   when initialized here [-Wreorder]
 2012-12-10 16:07:19 +08:00
Lu Guanqun 497ae7c33f fix the reorder warning of class CCCallFunc 
../actions/CCActionInstant.h: In constructor 'cocos2d::CCCallFunc::CCCallFunc()':
../actions/CCActionInstant.h:240:25: warning: 'cocos2d::CCCallFunc::<anonymous union>::m_pCallFunc' will be initialized after [-Wreorder]
../actions/CCActionInstant.h:236:6: warning:   'int cocos2d::CCCallFunc::m_nScriptHandler' [-Wreorder]
../actions/CCActionInstant.h:188:5: warning:   when initialized here [-Wreorder]
 2012-12-10 16:05:17 +08:00
Lu Guanqun 64772d09b0 fix the doxygen output of CCAtlasNode 2012-12-10 15:31:26 +08:00
James Chen fc16cd8d01 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-12-10 14:21:18 +08:00
James Chen 839288671e fixed #1606: Override update function for ExtraAction. 2012-12-10 14:11:42 +08:00
minggo 71f61596e9 fixed #1580:request focus after keyboard closed 2012-12-10 14:08:01 +08:00
dualface d854f68c63 [scripting] add CCNode::scheduleUpdateScriptHandlerWithPriority() 2012-12-10 13:51:37 +08:00
dualface c8753f72ef [scripting] add CCNode::scheduleUpdateScriptHandlerWithPriority() 2012-12-10 13:48:27 +08:00
James Chen f8c96483a0 fixed #1606: Return CCSequence pointer for CCSequence::create. 2012-12-10 12:02:24 +08:00
James Chen 73dd652604 fixed #1605: Crash occurs when adding just one action to CCSequence. 2012-12-10 11:10:11 +08:00
James Chen 062179c497 fixed #1604: The enum values in ccPVR3TexturePixelFormat are truncated to 32bit 2012-12-10 10:22:06 +08:00
Mat Hopwood f75f6c2b64 Mac OS Marmalade fixes 
Fixed compile issues on Mac OS
 2012-12-10 09:54:34 +08:00
Romain TISSERAND bc0309f1a3 [android] Removed hardcoded /data/data path in CCFileUtils, make use of Context.getCacheDir() through JNI callback instead. Needed in order to get CCUserDefault working fine on Nexus 10 (Androi 4.2 multi-user environment) 2012-12-09 19:40:41 +01:00
Romain TISSERAND 4cb7506932 Added proper JNIEXPORT / JNICALL modifiers to Cocos2dxHelper JNI functions called from Java side 2012-12-09 13:44:41 +01:00
James Chen 0d90fea7b3 Merge branch 'myFeature' of https://github.com/tks2shimizu/cocos2d-x into iss1602-rand-ccdictionary 
Conflicts:
	cocos2dx/cocoa/CCDictionary.cpp
	cocos2dx/cocoa/CCDictionary.h
 2012-12-07 10:40:32 +08:00
Tomoaki Shimizu e680e5f0f2 Add randomObject to CCDictionary 
Although CCArray has randomObject(), CCDictionary does not have it.
So CCDictionary should have randomObject().
 2012-12-06 23:56:49 +09:00
minggo a75f8b7e7a fixed #1593:remove all deprecated methods expect CCBAnimationManager 2012-12-06 18:51:33 +08:00
minggo cfd6e6c82a Merge pull request #1726 from fape/hungarian_language_support 
Add Hungarian language support
 2012-12-05 17:39:46 -08:00
fape e488361e3b cosmetics: fix formating 2012-12-05 11:43:04 +01:00
fape 320d532e15 add Hungarian language support 2012-12-05 11:31:05 +01:00
minggo d858ce2fe2 some android devices can not compile this frag 2012-12-05 17:15:47 +08:00
minggo 99781368c4 Merge pull request #1677 from chenium/gles20 
Fix for CCRenderTexture on Android sleep/resume
 2012-12-04 22:40:00 -08:00
minggo c3a5e870af Merge pull request #1725 from minggo/merge_jp_support 
Merge jp support
 2012-12-04 22:11:42 -08:00
minggo a256d35a5b fix some confilcs 2012-12-05 14:01:05 +08:00
minggo 75d7df5bcf Merge pull request #1684 from lvklabs/gles20-for-pull 
Added removeAllObjects() to CCSet
 2012-12-04 20:05:56 -08:00
minggo cb2427e780 do some modification 2012-12-04 17:25:40 +08:00
James Chen 3e88f8d2e4 fix compilation errors in eclipse project for linux. 2012-12-04 16:48:23 +08:00
James Chen 8a8038b342 Enable stencil buffer for linux. 2012-12-04 16:48:23 +08:00
James Chen 6aa15e0636 Added -DCOCOS2D_DEBUG=1 for linux if building in debug mode. 2012-12-04 16:48:23 +08:00
James Chen cedd58bb77 #extension GL_OES_standard_derivatives : enable only valid in GL_ES, this fixes crashes on some Linux machines. 2012-12-04 16:47:57 +08:00
James Chen ed86e2967f Merge pull request #1706 from dumganhar/iss1590-jpeg-fix-mm 
fixed #1590: JPEG and File fixes and CocosDenshion fix for marmalade.
 2012-12-03 19:10:14 -08:00
Mat Hopwood 3b2eea2541 JPEG and File fixes 
* Fixes to JPEG loader
* Fixes to image loader to load tiff and unknown formats properly
 2012-12-04 11:03:34 +08:00
minggo bbcbfa71ef Merge pull request #1704 from minggo/cclayer_script_support 
Cclayer script support
 2012-12-03 18:55:11 -08:00
James Chen 609fce7e2f fix MenuTest crash after the commit(SHA-1:98045f667f80f78fec8452103a114b573f3a3204). 2012-12-04 10:36:13 +08:00
minggo 7ad2484a91 Merge branch 'fix_CCLayer_script_support' of https://github.com/dualface/cocos2d-x into cclayer_script_support 2012-12-04 09:50:01 +08:00
James Chen 7c074d4ced issue #1550: fixed a memory leak in jsbinding. 2012-12-03 22:17:53 +08:00
minggo af530878fd Merge pull request #1690 from dualface/fix_CCCallFunc_script_support 
Fix cc call func script support
 2012-12-02 18:26:05 -08:00
dualface e0ee27cb17 [luabinding] fix CCLayer:getScriptTOuchHandlerEntry() 
[luabinding] add CCLayer keypad, accelerometer support
 2012-12-02 15:17:34 +08:00
dualface 030f5e7079 [luabinding] cleanup script handler when release CCCallFunc 2012-12-02 15:01:12 +08:00
dualface 393ce26330 rollback commit 2012-12-02 14:56:44 +08:00
dualface d929fe2893 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-12-01 22:20:08 +08:00
dualface 058b6e9f65 fix CCCallFunc for script 2012-12-01 22:19:54 +08:00
folecr fc65b786ad Use the "old" particle system quad code. 2012-11-30 13:22:01 -08:00
Andres Pagliano 97efff6e46 Removed unnescessary header 2012-11-30 11:30:45 -03:00
Andres Pagliano 8adb3eb6eb Refactoring in CCSet 2012-11-30 11:23:44 -03:00
Gonzalo Buteler 43cc383346 Implementation of removeAllObjects() methods in CCSet 2012-11-30 10:44:09 -03:00
James Chen 95875112fa Merge branch 'iss1583-js-tests' of https://github.com/dumganhar/cocos2d-x into iss1583-js-tests 2012-11-30 21:19:19 +08:00
James Chen 98045f667f issue #1583: Added CCMenu::alignItemsInColumnsWithArray, CCMenu::alignItemsInRowsWithArray, CCLayer::CCLayerMultiplex and CCLayer::initWithArray. 2012-11-30 21:13:25 +08:00
minggo 54309c56b2 change accelerometer accurate to SENSOR_DELAY_GAME 2012-11-30 14:07:01 +08:00
minggo 75fb997513 Merge pull request #1670 from rohankuruvilla/gles20 
Fixing Accelerometer crash on Android
 2012-11-29 22:01:16 -08:00
minggo 84b35c6d48 Merge pull request #1680 from minggo/gles20 
comment codes for FPS controlling
 2012-11-29 21:58:49 -08:00
minggo 61b2e2b880 comment codes for FPS controlling 2012-11-30 13:55:25 +08:00
James Chen 23629b8187 Made all projects compiled ok on Blackberry port. 2012-11-30 12:40:47 +08:00
William Chen 132a76d801 Fix for CCRenderTexture on Android sleep/resume 
When an android app goes into the background, all gl context is lost, including any frame buffer objects that are required for rendering to a texture. When the android app returns to focus, a new FBO is generated for each render texture allowing rendering to the texture to continue.
 2012-11-29 18:04:07 -05:00
James Chen 788b478b3c Make sure HelloCpp can be full screen. 2012-11-29 16:31:29 +08:00
Rohan Kuruvilla a4b55b5217 Fixing Accelerometer crash on Android 2012-11-28 15:56:57 -08:00
Taro Kobayashi 3a814de07e implemented CCApplication::getCurrentLanguage() for linux platform 2012-11-28 19:41:50 +09:00
Taro Kobayashi a37e034e61 added support for Japanese language 2012-11-28 17:53:10 +09:00
fape 1843d576d8 create cocos2dx-ext marmalade project 2012-11-26 20:14:10 +01:00
James Chen d7ebd681ec fix a warning in CCRenderTexture. 2012-11-26 22:11:56 +08:00
James Chen be914811fb fixed #1576: CCNode::setUserObject needs to be retained. 2012-11-26 22:11:04 +08:00
minggo 69f6b3970a Merge pull request #1647 from guanqun/fix-doxygen 
Fix doxygen related errors and warnings
 2012-11-25 23:26:48 -08:00
minggo 6bb11d8d71 Merge branch 'gles20' of https://github.com/minggo/cocos2d-x into gles20 2012-11-26 15:09:34 +08:00
minggo bd025c94c3 use macro CC_TARGET_OS_IPHONE instead of TARGET_OS_IPHONE and make xcode template work ok 2012-11-26 15:08:40 +08:00
minggo 1b9a38e195 issue #1564:work ok on linux 2012-11-26 11:46:37 +08:00
James Chen a730f8866f Merge pull request #1644 from fape/testcpp_marmalade 
fixed #1575: Update samples/TestCpp to compatible with marmalade
 2012-11-25 17:51:32 -08:00
Lu Guanqun 64bec838c0 fix doxygen rendering output of CCLayerGradient 
Otherwise, the first line of CCLayerGradient is rendered with a box in
doxygen's output.
 2012-11-25 23:27:29 +08:00
fape e259467873 update marmalade languages 2012-11-25 12:13:30 +01:00
fape 3cc5920aac Update samples/TestCpp to compatible with marmalade 2012-11-24 20:14:01 +01:00
minggo 1cf237d296 Merge pull request #1643 from minggo/gles20 
issue #1564:make iOS test work ok
 2012-11-23 00:31:06 -08:00
minggo a423317abc issue #1564:make iOS test work ok 2012-11-23 16:30:09 +08:00
minggo 3980a710a3 Merge pull request #1641 from minggo/gles20 
issue #1564: make tests run on mac osx
 2012-11-22 22:24:25 -08:00
minggo 96ecb05ca9 issue #1564: make tests run on mac osx 2012-11-23 14:22:50 +08:00
minggo f82e800695 Merge pull request #1640 from minggo/gles20 
modify lua project setting
 2012-11-22 18:42:45 -08:00
minggo 226b10a9e2 modify lua project setting 2012-11-23 10:41:41 +08:00
James Chen 00ad0689ec Merge pull request #1620 from fape/remove_physics_nodes 
remove physics_nodes from marmalade
 2012-11-22 03:43:24 -08:00
minggo 2ba1bcb5af Merge pull request #1633 from minggo/gles20 
issue #1564:enable depth test by default
 2012-11-22 00:02:28 -08:00
minggo 76197f1126 issue #1564:enable depth test by default 2012-11-22 16:01:30 +08:00
James Chen b79b3335bd Merge pull request #1630 from dumganhar/iss1564-update-tests 
issue #1564: Made ChipmunkTest of TestJavascript works
 2012-11-21 23:30:14 -08:00
James Chen b66bc98a46 issue #1564: Made ChipmunkTest of TestJavascript works 2012-11-22 15:19:16 +08:00
James Chen aa8e582b7e Merge pull request #1629 from dumganhar/iss1564-update-tests 
issue #1564: fix the wrong order of parameters in CCScheduler::scheduleSelector.
 2012-11-21 20:07:45 -08:00
James Chen 51d61ba214 issue #1564: fix the wrong order of parameters in CCScheduler::scheduleSelector. 
Made MoonWarriors works.
 2012-11-22 12:05:38 +08:00
minggo 14dbe091c8 fix a logical bug in CCRenderTExture 2012-11-22 11:06:07 +08:00
James Chen 73b409f116 issue #1564: Enable point size by default on windows. This can fix point size is always equal to 1 pixel in DrawPrimitivesTest. 2012-11-22 10:04:35 +08:00
James Chen 6c81e21935 issue #1564: Set depth buffer to 24bit, stencil buffer to 8bit. 2012-11-22 09:55:44 +08:00
James Chen e1f7c0bab6 issue #1564: Removing one unnecessary line in CCRenderTexture::visit. 2012-11-22 09:55:43 +08:00
fape db883f4efc remove physics_nodes from marmalade 2012-11-21 21:34:33 +01:00
James Chen 24c83cb461 Merge pull request #1617 from dumganhar/iss1564-update-tests 
issue #1564: Fix crash of ParticlesTest.
 2012-11-21 01:24:59 -08:00
James Chen 3fc2f9888b issue #1564: Fix crash of ParticlesTest. 2012-11-21 17:22:26 +08:00
minggo a69ff7957c issue #1564:fix a logical erroe in CCRotationTo 2012-11-21 16:53:23 +08:00
James Chen 170978d6a5 issue #1564: Added ClippingNodeTest. 2012-11-21 15:22:54 +08:00
James Chen b632c3cd7c issue #1564: Minor fix in CCLabelBMFont::createFontChars(). 2012-11-21 10:06:03 +08:00
minggo a246d11110 issue #1564: update some test cases 2012-11-20 17:30:05 +08:00
James Chen 8f6c8e202e Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1564-update-tests 
Conflicts:
	samples/TestCpp/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp
 2012-11-20 16:35:42 +08:00
James Chen ebd522e3fa issue #1564: Return a new object instead of 'const reference' for some get methods. 2012-11-20 16:34:55 +08:00
James Chen eed80761be issue #1564: Bugs fixes in CCDrawNode.cpp. 2012-11-20 16:31:33 +08:00
James Chen e8cf71407d issue #1564: Deleted physics_nodes in cocos2dx since it was moved to extension. 2012-11-20 16:27:47 +08:00
James Chen 76c5ad8b32 issue #1564: Deleted physics_nodes in cocos2dx since it was moved to extension. 2012-11-20 16:24:40 +08:00
James Chen 8a21d4e824 issue #1564: Moved physics_node to extension. 2012-11-20 16:17:20 +08:00
folecr 03d9a04608 cc_utf8_strlen is used in Android native code; should not be static 2012-11-19 15:57:16 -08:00
James Chen c3e02f3e52 Merge pull request #1597 from dumganhar/iss1555-update 
issue #1555: Updated ActionsTest.cpp, enabled point size in DrawPrimitivesTest.cpp.
 2012-11-19 02:15:22 -08:00
James Chen 18d583153b setUniformLocationwithMatrix4fv ~> setUniformLocationWithMatrix4fv 2012-11-19 17:16:06 +08:00
minggo 2d191befe0 Merge pull request #1596 from minggo/iss1562-label-test 
fix a memory leak in CCLabelBMFont
 2012-11-19 00:10:36 -08:00
minggo 9dc5302b4b fixed #1562:fix a memory leak in CCLabelBMFont 2012-11-19 16:08:18 +08:00
James Chen f2e0df4de3 issue #1565: Removed VS2008 support. 2012-11-19 14:42:27 +08:00
minggo fb5b7ed7bb fixed #1560:fix a logical error in CCNode::schedule() 2012-11-19 11:24:03 +08:00
James Chen db2175e41c Merge pull request #1582 from guanqun/build-fixes 
two simple build fixes
 2012-11-17 02:13:22 -08:00
James Chen b892993a83 Merge pull request #1587 from mrmop/gles20 
fixed #1559: If file in resource directory doesn't exist, it will not search the root directory.
 2012-11-16 04:56:59 -08:00
Mat Hopwood fcb265088d Rssource path root change 
fullPathFromRelativePath will now search root if file is not found in
path
 2012-11-16 10:56:11 +00:00
James Chen 18273e06e3 issue #1555: Fixed coordinate conversion errors. 
It needs to be based on 'Design Resolution Size' rather than 'Frame Size'
Please refer to the implementations of CCDirector::convertToGL and CCDirector::convertToUI.
 2012-11-16 18:55:57 +08:00
James Chen df6a50a23a issue #1555: Fixed some compilation error for marmalade and blackberry ports. 2012-11-16 18:13:55 +08:00
James Chen c5b5b978fa issue #1555: Made win32 works ok. 2012-11-16 17:08:34 +08:00
James Chen 7601cc7e27 Merge branch 'iss1555-update' of https://github.com/minggo/cocos2d-x into iss1555-update 
Conflicts:
	cocos2dx/layers_scenes_transitions_nodes/CCLayer.cpp
 2012-11-16 16:21:16 +08:00
James Chen 7557a78e05 issue #1530: Defined a macro 'snprintf' since it's named '_snprintf' on win32. 2012-11-16 15:58:19 +08:00
James Chen bb6df91749 issue #1530: Exported CCUserDefault to js. 2012-11-16 15:58:18 +08:00
James Chen da7f3f2969 issue #1530: Added empty implementation of 'CCAccelerometer::setAccelerometerInterval' for win32,blackberry,linux,mac and marmalade ports. 2012-11-16 15:56:51 +08:00
Rohan Kuruvilla 6d59009953 Adding executeAccelerometerEvent for to CCScriptSupport and ScriptingCore 2012-11-16 15:56:29 +08:00
Rohan Kuruvilla 50fbf86180 Uncommenting accelerometer callback in CCLayer 2012-11-16 15:56:28 +08:00
Rohan Kuruvilla af3bc76062 Fixing script callbacks for schedule updates with negative and positive priorities 2012-11-16 15:55:34 +08:00
minggo 605771697a Merge pull request #1566 from mingulov/unzip_crc 
Zip support: broken CRC check / unzCloseCurrentFile
 2012-11-15 23:31:14 -08:00
minggo 6a1feb70bc issue #1555:linux work ok 2012-11-16 15:16:55 +08:00
Lu Guanqun 8270ee3e48 fix -Wreorder warning 
In the class definition, the field m_nScriptHandler is declared before
m_pCallFunc, so we should follow the order in initialization as well.
 2012-11-16 15:10:25 +08:00
minggo b497143f93 issue #1555:menu can receive touch event now 2012-11-16 14:51:48 +08:00
minggo a4a53df159 issue #1555:build ok on android 2012-11-16 14:23:14 +08:00
minggo cb2bc37513 issue #1555: make tests work 2012-11-15 18:34:23 +08:00
minggo e19b418c62 issue #1555: update to v2.1 beta3 2012-11-15 17:16:51 +08:00
James Chen a3437d09df issue #1557: Fixed particle crash.We should check the file format by the file header when the format isn't defined. 2012-11-15 10:43:29 +08:00
James Chen c79cac3af6 Merge branch 'gles20' of https://github.com/mrmop/cocos2d-x into iss1557-marmalade 2012-11-15 10:10:53 +08:00
Mat Hopwood 148a558405 Tiff support and resource location 
* Tiff support added to CCImage
* CCFileUtils updated to support resource folders
* Examples updated to support multiple resolution assets
 2012-11-14 17:46:09 +00:00
minggo a701eaecce issue #1555:update to v2.1 beta3 2012-11-14 18:05:15 +08:00
minggo 5fd56370d8 issue #1555:fix a bug about CCGLProgram 2012-11-13 11:06:32 +08:00
minggo 6661f2c88d issue 1555:add CCPhysicsSprite 2012-11-12 15:22:26 +08:00
minggo bfa78a8d73 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1555-update 2012-11-12 11:02:30 +08:00
minggo d4aeb8076c Merge pull request #1562 from mingulov/apk 
Android: Access to files from APK is boosted
 2012-11-11 18:55:03 -08:00
James Chen 833b5b1be8 Merge branch 'gles20' of https://github.com/mrmop/cocos2d-x into iss1557-marmalade 
Conflicts:
	cocos2dx/base_nodes/CCNode.cpp
	cocos2dx/sprite_nodes/CCSprite.cpp
	samples/TestCpp/Classes/TouchesTest/Ball.cpp
	samples/TestCpp/Classes/VisibleRect.cpp
	samples/TestCpp/Classes/VisibleRect.h
 2012-11-12 10:20:04 +08:00
Denis Mingulov 869168a884 ZipFile - speedup initialization for zip archive by 30-50% 
unzip.h/.cpp - unzGoToFirstFile/unzGoToNextFile retrieves information
about the current file, so it is possible to remove redundant calls
to unzGetCurrentFileInfo and speed up general execution.

unzip.h/.cpp are modified accordingly by creation unzGoToFirstFile64
and unzGoToNextFile64 with file info (unz_file_info64) and name as
possible output parameters.

ZipFile::setFilter (it is used to create a file list at ZipFile
constructor) - redundant calls to unzGetCurrentFileInfo64 are removed,
so briefly the time required to generate a zip file list is something
like 1 average old unzLocateFile call.
 2012-11-11 15:04:41 +02:00
Denis Mingulov eaed42c8bd Zip support: broken CRC check / unzCloseCurrentFile 
A fix for changes at 75ae8d2201
- unzOpenCurrentFile3 has set pfile_in_zip_read_info->crc32_wait
just in case if Zip file has unknown structure / might not be
unpacked, so almost any unpacked file was considered as having
UNZ_CRCERROR.
 2012-11-11 10:22:48 +02:00
minggo ac363576a9 issue #1555:add CCPyhsicsDebugNode 2012-11-09 17:52:12 +08:00
Denis Mingulov 83cf8aaf29 Android: Access to files from APK is boosted - 1st review update 2012-11-09 09:53:40 +02:00
minggo d2a5723973 issue #1555:add CCDrawNode 2012-11-09 12:08:18 +08:00
Denis Mingulov 071d264cc5 Android: Access to files from APK is boosted 
Open APK file just once and cache a file list information (name and
position inside archive). Also a general ZipFile helper class is
created to read multiple files from Zip archives - might be used
for another platforms if needed.

Previously it was so for each separate file access operation:
- Open zip archive, initially parse its structure (unzOpen)
- Locate the particular file there by a linear search through
  full archive (unzLocateFile).
  So if file does not exist - still an archive has to be handled
  fully, even slower than a file exists.
- Read file.
- Close zip archive

After this commit:
- Once - open zip/apk file and collect file list information
  (average consumed time - the same like a search for 2 different
  files by unzLocateFile)
- When needed - directly retrieve file position inside the archive,
  setting it up to the zip reader and reading file

ZipFile class is located in support/zip_support/ZipUtils.h and .cpp
to prevent creation of a new files and adding them to multiple
project files.
 2012-11-08 13:46:53 +02:00
minggo 6159a8b592 issue #1555:add CCClippingNode 2012-11-08 17:55:25 +08:00
James Chen 6d1a7e089b fixed #1556: Removed CCParticleFire::create(const char* pListFile) since particle can be constructed from plist by CCParticleSystemQuad::create(plist). 2012-11-08 12:55:32 +08:00
James Chen 4d48e79d47 fixed #1556: Added a newline at the end of firePngData.h file. 2012-11-08 12:06:02 +08:00
James Chen 4a37c8fa8b fixed #1556: Set a defaut texture for CCParticleFire, CCParticleFireworks, etc. 
Added some static constructors.
 2012-11-08 12:03:49 +08:00
minggo 3f3d09fabb Merge pull request #1532 from wenbin1989/gles20 
Add error handler when read image data using libjpeg.
 2012-11-06 20:10:21 -08:00
James Chen 21e4f80fbd Added "executeAccelerometerEvent" for CCScriptEngineProtocol class. Exported Accelerometer event to JS. 2012-11-06 14:18:13 +08:00
James Chen 270676b74d issue #1549: Added some functions for CCNode. 
virtual void removeFromParent();
virtual void removeChild(CCNode* child);
virtual void removeChildByTag(int tag);
virtual void removeAllChildren();
 2012-11-05 18:41:52 +08:00
James Chen 26547c7b30 fixed #1548: Updated libcurl header files to 7.26.0 on iOS. 2012-11-05 13:13:46 +08:00
James Chen 2f5f7a601b issue #1526: Moved implementations of static functions in CCActionEase.h, CCLabelBMFont.h to CCActionEase.cpp, CCLabelBMFont.cpp. 2012-11-02 10:06:48 +08:00
James Chen 0abcd694c6 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into test-js-device-crash 2012-11-01 22:19:20 +08:00
James Chen 0ace12fc52 issue #1526: Moved implementations of static functions in CCParticleExample.h, CCLayer.h to CCParticleExample.cpp, CCLayer.cpp. 2012-11-01 22:17:12 +08:00
minggo d16a6bbe2f issue #1526:move implementation of static methond into .cpp file 2012-11-01 22:12:13 +08:00
wenbin1989 470fcacc81 Add error handler when read image data using libjpeg. 
Fix errors when read image using libjpeg.
Fix errors when read image with broken data using libjpeg.
 2012-11-01 21:45:51 +08:00
minggo 95d3f87bd7 fix compiling error on linux 64 bit 2012-11-01 15:38:48 +08:00
minggo 21900c26db update xcode template and version string 2012-11-01 12:06:15 +08:00
James Chen e8bf21e6a6 fixed #1543: The CCLayerGradient background of CocosBuilderTest can't be shown. 2012-10-31 18:00:51 +08:00
YuLei Liao 4fe16a262b fix incorrect delete 2012-10-31 14:08:28 +08:00
YuLei Liao 01866ddc95 fix win32 CCLuaLog memory leaks, and invalid Console UTF8 output 2012-10-31 11:02:36 +08:00
minggo af12b8dfc2 revert CCSpriteBatchNode::removeSpriteFromAtlas() 2012-10-30 18:20:47 +08:00
minggo 4d8f1aa678 Merge pull request #1420 from sburavtsov/gles20-fixSpriteBatch 
Fix removeTileAt crash corresponding this post: http://www.cocos2d-x.org...
 2012-10-29 20:12:21 -07:00
James Chen 9f6d263c15 fixed #1531: The CCSprite::updateTransform() function needs to inherited from a base function on the CCNode. 2012-10-30 10:24:28 +08:00
James Chen 9113702903 Merge pull request #1510 from dumganhar/gles20 
fixed #1312: Upgraded libcurl to 7.26.0 for linux port
 2012-10-29 01:24:29 -07:00
James Chen 2cfad104fa issue #1530: Corrected the logic of CClayer::registerWithTouchDispatcher function. 2012-10-29 15:38:44 +08:00
Rohan Kuruvilla d6753f8a2f Adding accelerometer setInterval support to Android 2012-10-29 15:08:16 +08:00
Rohan Kuruvilla ecee64d07c Adding accelerometer setInterval support to iOS 2012-10-29 15:08:07 +08:00
Rohan Kuruvilla a2ee6c3761 Changing Touch API in cocos2d-x. Also change ScriptEngine callbacks for targetted Touches 2012-10-29 15:01:30 +08:00
Rohan Kuruvilla 16d5659b17 Adding ScriptingEngine callback for onCleanup event 2012-10-29 15:00:52 +08:00
minggo 5aad6eeb9b Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into update-curl 2012-10-29 14:44:26 +08:00
minggo e992408a86 issue #1312:update libcurl for linux 64 2012-10-29 14:39:44 +08:00
James Chen 45783574fd Upgraded libcurl to 7.26.0 for linux port(32bit). 2012-10-29 11:27:25 +08:00
James Chen 6d34e66018 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-10-29 10:51:58 +08:00
James Chen 9673b20775 issue #1312: Upgraded libcurl to 7.26.0 for windows port. 2012-10-29 10:49:28 +08:00
Andrew Perrault 138ea49b0e fixed a couple typos 2012-10-27 09:58:49 -04:00
minggo 9d530c8d54 fix a compiling error 2012-10-26 12:04:45 +08:00
minggo 77b69262c8 not invoke CCDirector::reshapeProjection() in EAGLView::layoutSubViews 2012-10-26 10:10:34 +08:00
Mat Hopwood 2b265929e2 Marmalade Sample data removed and merged changes 
* Marmalade samples now use Resources folder, excess data removed
* Merged in James' changes
* CCNode::updateTransform() added
 2012-10-25 21:40:37 +01:00
minggo 81ff3d3495 issue #1312: use --strip-unneeded parameter to strip lib 2012-10-25 16:30:14 +08:00
minggo 84e48ed7e7 issue #1312:update libcurl for android and strip all libs 2012-10-25 14:32:28 +08:00
James Chen 7d9b3d3969 Merge pull request #1488 from dumganhar/iss1520-comments 
fixed #1520: Added comments for using multiresolution in HelloCpp.
 2012-10-24 01:00:39 -07:00
James Chen c797af0fe9 fixed #1522: CCEGLView class of desktop platforms should override CCEGLViewProtocol::setScissorInPoints. 2012-10-24 10:03:19 +08:00
James Chen b3db7e91f8 fixed #1520: Updated some comments. 2012-10-23 14:01:48 +08:00
James Chen 9b644f2757 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1520-comments 2012-10-23 10:51:05 +08:00
James Chen f4f63fd824 fixed #1520: Added comments for using multiresolution in HelloCpp. 2012-10-23 10:50:47 +08:00
James Chen 56cdb76867 fixed #1493: Updated one comment. 2012-10-22 15:52:11 +08:00
James Chen 7af2f7c5ce fixed #1493: Updated one comment. 2012-10-22 15:51:06 +08:00
James Chen 6f4e56cd92 fixed #1493: Corrected some comments for CCNotificationCenter. 2012-10-22 15:49:33 +08:00
James Chen 1c0240b5de fixed #1493: Added doxygen comments in CCNotificationCenter.h 2012-10-22 13:48:11 +08:00
minggo 677ba22b5c Merge pull request #1485 from mingulov/menu_cast 
CCMenu - prevent a crash if some child item is not CCMenuItem
 2012-10-21 19:18:20 -07:00
minggo 9cf3f4c5f6 Merge pull request #1474 from wenbin1989/gles20 
Add kLanguageKorean to ccLanguageType and getCurrentLanguage()
 2012-10-21 18:49:42 -07:00
Denis Mingulov d4f65b5348 CCMenu - prevent a crash if some child item is not CCMenuItem 
CCMenu::itemForTouch expects that all children are CCMenuItems.
But it is still possible to add other child types, for example
if CCAssert is disabled or some other addChild method is called.

In this case dynamic_cast to CCNode and later try to do
((CCMenuItem*)pChild)->isEnabled() triggers an undefined behaviour
- up to a crash or something else.

Fixed by a dynamic_cast straightforward to CCMenuItem.
 2012-10-21 11:16:10 +03:00
Mat Hopwood 24115675b0 Marmalade Cocos2d-x Main Repo Changes 
These are changes to the main Cocos2d-x repo that Marmalade would like
to request for inclusion in the main repo
 2012-10-19 16:38:58 +01:00
Mat Hopwood 988835560d Marmalade Support 
Full Marmalade support added for Cocos2d-x
 2012-10-19 16:26:34 +01:00
James Chen 5751d82e6b Renamed "setFrameZoom" to "setFrameZoomFactor", added 'getFrameZoomFactor'. 2012-10-19 17:39:55 +08:00
James Chen e905da1b73 Merge branch 'gles20' of https://github.com/ImperialPenguin/cocos2d-x into iss1024-bb-ttf 2012-10-19 16:19:55 +08:00
James Chen c9ce1892af Merge branch 'gles20' into iss1024-bb-ttf 2012-10-19 16:18:30 +08:00
minggo f40b6ac4eb fixed #1515: implement zoom function on mac os 2012-10-19 11:33:06 +08:00
John Garrison f4d68a707f More BB Font fixes 2012-10-18 13:43:31 -04:00
wenbin1989 62351462a8 Add kLanguageKorean to ccLanguageType and CCApplication::getCurrentLanguage() 2012-10-18 17:17:11 +08:00
minggo 986a0a34c0 Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into zoom-scale 2012-10-18 17:01:27 +08:00
minggo fa044d3cee Merge pull request #1472 from wenbin1989/gles20 
Fix stack overflow in CCLog
 2012-10-18 01:57:27 -07:00
James Chen 549dd92d8e fixed #1516: The font size of labels for displaying FPS,SPF,DrawCount is incorrect in different design resolutions. 2012-10-18 15:53:08 +08:00
wenbin1989 29a63a3b0f Fix stack overflow in CCLog 2012-10-18 14:39:56 +08:00
James Chen a5639281ec Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20 2012-10-18 12:01:55 +08:00
James Chen a5e260dbdb issue #1515: Refactored some codes for win32 port. 2012-10-18 12:01:30 +08:00
James Chen 41c784ec61 issue #1515: [LINUX support] Adding a zoom function for debugging large resolution (e.g.new ipad) app on desktop. 2012-10-18 11:51:02 +08:00
James Chen 0b101bedd0 issue #1515: Adding a zoom function for debugging large resolution (e.g.new ipad) app on desktop. 2012-10-18 10:54:19 +08:00
James Chen c1ab8a6ead fixed #1511: Changed '#if(WINVER >= 0x0601)' to '#if(_MSC_VER >= 1600)'. 2012-10-18 09:54:24 +08:00
James Chen 9f7019e48c Updated a comment. 2012-10-17 16:52:09 +08:00
James Chen 5ab37c86b2 Fix a bug about calculating client area on win32. 2012-10-17 16:50:07 +08:00
James Chen 249ef92697 fix a bug about wrong touch area for windows. 2012-10-17 15:38:03 +08:00
James Chen 3f7b79fb08 issue #1511: Rename some static variables. 2012-10-17 15:14:34 +08:00
James Chen 2779b4f1ab Merge branch 'gles20' of https://github.com/johnangel/cocos2d-x into johnangel 2012-10-17 15:08:25 +08:00
James Chen ddfc08904a issue #1024: Made blackberry/CCImage.cpp compiled ok. 2012-10-17 10:57:21 +08:00
John Garrison 8e7b939f61 Added TTF support to Blackberry 2012-10-16 13:47:04 -04:00
johnangel cd82403638 Fix to make MultiTouchTest work properly 2012-10-16 19:02:24 +02:00
johnangel 054128c5ee Correction for touch and display area 2012-10-16 18:53:31 +02:00
johnangel a2e1400402 Merge remote branch 'upstream/gles20' into gles20 2012-10-16 08:42:30 +02:00
minggo 2ded8ea034 Merge pull request #1442 from dumganhar/iss1486-multi-res 
Multiresolution support
 2012-10-15 02:15:21 -07:00
johnangel 8d0dc8d2a7 Windows Touch support for desktop 2012-10-15 10:39:42 +02:00
James Chen a6b57f7d79 Merge pull request #1451 from micahli/gles20 
fixed #1508: Potential observer array modification while it's traversed in CCNotificationCenter.
 2012-10-14 22:50:47 -07:00
James Chen a65f13defe issue #1486: Fix bugs for CCEditBox iOS port. 2012-10-15 13:01:36 +08:00
minggo 93d702e3cc fixed #1491:remove dependency of FontLabel lib 2012-10-15 12:03:15 +08:00
micahli c69a11296e fix the potential Container iterator bug with CCNotification 
revert last fix which may contain other bugs
 2012-10-15 09:55:37 +08:00
minggo 67383ff7ce Merge pull request #1453 from shinriyo/patch-2 
getDelta() is delta function
 2012-10-14 18:34:03 -07:00
minggo eadbbf6928 Merge pull request #1447 from minggo/android-effect 
use SoundPool.OnLoadCompleteListener to play effect if it is not preloaded
 2012-10-14 18:29:35 -07:00
shinriyo 1569550528 getDelta() is delta function 
I'm sorry, I mistook the pull request.
 2012-10-14 21:20:31 +09:00
James Chen 2c670a9efc issue #1486: Fix a bug in CCRenderTexture.cpp about calculate width and height by multiply CC_CONTENT_SCALE_FACTOR(). 2012-10-13 18:19:37 +08:00
micahli 7d1d46ee3f fix a bug with CCNotificationCenter that observer->performSelector(observer) may call CCNotificationCenter::removeObserver and cause CCARRAY_FOREACH(m_observers, obj) access invalid address 2012-10-13 16:44:46 +08:00
James Chen 6cf602ea3b issue #1486: CCDirector::getWinSizeInPixel return 'winSize* CC_CONTENT_SCALE_FACTOR()'. This change fixes the wrong display bug in CCRenderTexture. 2012-10-13 10:18:03 +08:00
minggo 0a39fa8bef fixed #1507: use SoundPool.OnLoadCompleteListener to play effect if it is not preloaded 2012-10-12 17:43:43 +08:00
James Chen 965540ecec issue #1486: fix a warning in CCAutoreleasePool.cpp. 2012-10-12 16:03:53 +08:00
James Chen f5abe422ea Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1486-multi-res 2012-10-12 15:50:11 +08:00
James Chen e1c0ea761b issue #1486: Removed some unused codes, made it works on WINDOWS. 2012-10-12 09:58:42 +08:00
Rohan Kuruvilla 540b41c091 Fixing LabelAtlas to read texture relative to path of plist file 2012-10-11 18:44:46 -07:00
James Chen cdf54a872f issue #1486: A bug fix. 2012-10-11 17:02:27 +08:00
James Chen ade54a3de7 Merge branch 'multi_resolution_support' of https://github.com/BorMor/cocos2d-x into bormor-multi-res 
Conflicts:
	samples/HelloCpp/Classes/AppDelegate.cpp
	samples/HelloCpp/Classes/HelloWorldScene.cpp
 2012-10-11 16:12:22 +08:00