minggo
9d530c8d54
fix a compiling error
2012-10-26 12:04:45 +08:00
minggo
78ce10d45e
Merge pull request #1505 from minggo/update-libcurl
...
Update libcurl
2012-10-25 19:13:23 -07:00
minggo
77b69262c8
not invoke CCDirector::reshapeProjection() in EAGLView::layoutSubViews
2012-10-26 10:10:34 +08:00
James Chen
ebb46e2629
Merge pull request #1504 from dumganhar/gles20
...
Updating submodule reference to latest autogenerated bindings.
2012-10-25 19:05:54 -07:00
James Chen
0ce4f61bb6
Updating submodule reference to latest autogenerated bindings.
2012-10-26 10:04:29 +08:00
James Chen
c322c9847e
Merge pull request #1503 from dumganhar/gles20
...
Updated the submodule of tools/cxx-generator.
2012-10-25 19:01:02 -07:00
James Chen
132d927f18
Updated the submodule of tools/cxx-generator.
2012-10-26 09:57:01 +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
c99c9baf6d
Update AUTHORS
2012-10-25 17:07:18 +08:00
minggo
a09367ca7e
Merge pull request #1491 from sburavtsov/HttpClient-destroy-fix
...
Fix for correct unscheduling and instance destruction
2012-10-25 02:05:34 -07:00
James Chen
bd6eb68797
Merge pull request #1501 from dumganhar/gles20
...
Updated the submodule of cocos2d-html5-test.
2012-10-25 01:34:47 -07:00
James Chen
f1da845bf9
Updated the submodule of cocos2d-html5-test.
2012-10-25 16:33:34 +08: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
0103b820f2
Merge pull request #1500 from dumganhar/gles20
...
Updated submodule for JS-Bindings auto-gen codes.
2012-10-24 20:42:31 -07:00
James Chen
26f7b36797
update submodule for JS-Bindings auto-gen codes.
2012-10-25 11:40:24 +08:00
Rolando Abarca
463ae31180
upgrades to new spidermonkey API
...
FF beta - this fixes the auto-compartment issue
2012-10-24 11:14:15 -07:00
James Chen
1829d57aa7
Merge pull request #1497 from dumganhar/gles20
...
fixes a compilation error in TestCpp.
2012-10-24 01:29:59 -07:00
James Chen
e07ca43c3d
fixes a compilation error in TestCpp.
2012-10-24 16:28:54 +08:00
James Chen
630bd1b25f
Merge pull request #1496 from dumganhar/gles20
...
Removed some unused codes about "enableRetinaDisplay".
2012-10-24 01:14:39 -07:00
James Chen
ffe52a157f
Removed some unused codes about "enableRetinaDisplay".
2012-10-24 16:12:40 +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
210a1bf724
Merge pull request #1492 from dumganhar/iss1522-clip
...
fixed #1522 : CCEGLView class of desktop platforms should override CCEGLViewProtocol::setScissorInPoints.
2012-10-23 19:27:45 -07:00
James Chen
b93cc8a17d
Merge pull request #1490 from dumganhar/iss1521-relative-pos
...
fixed #1521 : Using relative coordinates in TestCpp.
2012-10-23 19:17:13 -07:00
James Chen
53ebff0bcb
Merge pull request #3 from minggo/zoom-scale
...
fixed #1512 : add VisableRect.cpp/h into iOS and mac project
2012-10-23 19:15:11 -07:00
minggo
38cd1ecd46
fixed #1512 : add VisableRect.cpp/h into iOS and mac project
2012-10-24 10:09:25 +08:00
James Chen
c797af0fe9
fixed #1522 : CCEGLView class of desktop platforms should override CCEGLViewProtocol::setScissorInPoints.
2012-10-24 10:03:19 +08:00
Mat Hopwood
6074dea6cc
Marmalade fixes and optimisation of TestCpp assets
...
* .gitignore added to folders that contain app.icf to ensure that these
files get included in the repo
* Made TestCPP compatible with Marmalade
* Removed data folder from TestCPP example, now points at the samples
Resource folder
2012-10-24 01:03:06 +01:00
Sergey Buravtsov
0b381357b0
Fix for correct unscheduling and instance destruction
2012-10-24 03:33:17 +04:00
James Chen
62f7b25df2
issue #1521 : Using relative coordinates in TestCpp.
2012-10-23 17:48:50 +08:00
James Chen
b383704ebc
fixed #1520 : Updated one comment in HelloCpp.
2012-10-23 14:04:35 +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
minggo
0fd3a541f2
Merge pull request #1487 from dumganhar/iss1493-comments
...
fixed #1493 : Added doxygen comments in CCNotificationCenter.h
2012-10-22 18:38:24 -07: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
77c2f530f3
Update AUTHORS
2012-10-22 09:52:07 +08: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
James Chen
0513310675
Merge pull request #1483 from dumganhar/iss1517
...
fixed #1517 : Updated Project configuration for vs2008.
2012-10-19 18:32:07 -07:00
James Chen
aea21bc271
fixed #1517 : Updated Project configuration for vs2008.
2012-10-20 09:29:20 +08:00
James Chen
bbaf8d51ef
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1517
2012-10-20 09:28:49 +08:00
James Chen
6e86889338
Merge pull request #1482 from funkaster/gles20
...
fixed #1517 : fixes ScriptingCore for FF 16 API.
2012-10-19 18:28:15 -07:00
James Chen
1157be5105
Merge branch 'gles20' of https://github.com/funkaster/cocos2d-x into pr1482
2012-10-20 08:50:18 +08:00
Rolando Abarca
003f6e4cf3
fixes ScriptingCore for FF 16 API
2012-10-19 09:54:21 -07: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