Commit Graph

3482 Commits

Author SHA1 Message Date
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
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
É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
James Chen ac509f70db [iOS] Using system font by `[UIFont systemFontOfSize]` when font name wasn't found. 2013-03-19 13:11:33 +08: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