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