Ed Bartley
|
f424da2a7e
|
* CCControl* should not respond to touches if the control is not visible.
|
2012-10-30 11:10:05 -04:00 |
minggo
|
f7df5b7df9
|
Merge pull request #1519 from minggo/gles20
Do some fix while testing
|
2012-10-30 03:23:48 -07:00 |
minggo
|
af12b8dfc2
|
revert CCSpriteBatchNode::removeSpriteFromAtlas()
|
2012-10-30 18:20:47 +08:00 |
James Chen
|
0f69da10b2
|
Merge pull request #1518 from dumganhar/gles20
Updated jenkins_scripts/mac/android/generate-js-cxx-bindings.sh.
|
2012-10-30 02:56:01 -07:00 |
James Chen
|
1538ad4e78
|
Updated jenkins_scripts/mac/android/generate-js-cxx-bindings.sh.
The local repo needs to be updated in Jenkins command before executing this script.
So commented some codes.
|
2012-10-30 17:54:48 +08:00 |
minggo
|
fe8c1573f2
|
set MoonWarriors to be portrait on iOS 5.1
|
2012-10-30 11:38:24 +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
|
a7f3bb1c7a
|
Merge pull request #1516 from dumganhar/update-luabindings
Updated LuaBindings codes since CCEGLViewProtocol::getSize has been rena...
|
2012-10-29 19:37:20 -07:00 |
James Chen
|
8ed7d63309
|
Updated LuaBindings codes since CCEGLViewProtocol::getSize has been renamed to CCEGLViewProtocol::getDesignResolutionSize.
|
2012-10-30 10:35:19 +08:00 |
James Chen
|
997b8f4079
|
Merge pull request #1515 from dumganhar/iss1531-updateTransform
fixed #1531: The CCSprite::updateTransform() function needs to inherited from a base function on the CCNode.
|
2012-10-29 19:28:30 -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
|
3cbbb7e4b2
|
Merge pull request #1513 from CocosRobot/updategeneratedsubmodule_1351506160
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
|
2012-10-29 03:51:06 -07:00 |
James Chen
|
f0ee1851fa
|
Merge pull request #1514 from CocosRobot/update-jenkins-script
Updated jenkins script for auto-gen jsbinding codes.
|
2012-10-29 03:50:39 -07:00 |
CocosRobot
|
bf255f6162
|
Updated jenkins script for auto-gen jsbinding codes.
|
2012-10-29 18:47:03 +08:00 |
CocosRobot
|
e3304e44ba
|
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
|
2012-10-29 18:22:46 +08:00 |
minggo
|
811a56d0a2
|
Merge pull request #1512 from minggo/moonwarrior
Moonwarrior
|
2012-10-29 02:57:03 -07:00 |
minggo
|
7073481077
|
fixed #1527: modify some project setting
|
2012-10-29 17:54:31 +08:00 |
minggo
|
9a2a535fef
|
fixed #1527:add correct icon for xcode project
|
2012-10-29 16:59:23 +08:00 |
minggo
|
2a118a4172
|
fixed #1527:re-create MoonWarriors xcode project to fix the bug that it will not run on simulator sometimes
|
2012-10-29 16:47:09 +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
|
00e23e45b1
|
Merge pull request #1511 from dumganhar/iss1530-js-improvements
issue #1530: Some JSBinding improvements.
|
2012-10-29 01:14:34 -07:00 |
James Chen
|
d4b7c55ce6
|
issue #1530: Added resources of cocos2d-html5-tests for TestJavascript project of IOS port.
|
2012-10-29 16:06:06 +08:00 |
James Chen
|
d97ce3e7e9
|
issue #1530: Removed the dependence of Chipmunk for MoonWarriors project setting.
|
2012-10-29 15:41:39 +08:00 |
James Chen
|
2cfad104fa
|
issue #1530: Corrected the logic of CClayer::registerWithTouchDispatcher function.
|
2012-10-29 15:38:44 +08:00 |
Rohan Kuruvilla
|
8f026d0b21
|
Fixing Javascript bindings Android makefile to include extensions
|
2012-10-29 15:15:00 +08:00 |
Rohan Kuruvilla
|
6773dc4154
|
Adding object roots for extra parameter of CallFunc and schedule
|
2012-10-29 15:14:25 +08:00 |
Rohan Kuruvilla
|
5760ea305c
|
Fixing CallFuncN bindings to properly pass optional third parameter
|
2012-10-29 15:14:11 +08:00 |
James Chen
|
25a858ae2b
|
Merge pull request #4 from minggo/update-curl
Update curl
|
2012-10-29 00:11:54 -07:00 |
Rohan Kuruvilla
|
094d52664d
|
Fixing bug in CCNode::copy bindings. Fixes MoonWarriors crash
|
2012-10-29 15:10:29 +08:00 |
James Chen
|
1ede7b6434
|
Modifying action/schedules cleanup, ignoring libjs_static.a of debugging version.
|
2012-10-29 15:10:13 +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
|
a409fc0164
|
Fixing CallFunc bindings to support easier cleanup
|
2012-10-29 15:07:27 +08:00 |
Rohan Kuruvilla
|
f8fc7328d7
|
Fixing bug in bindings for MenuItemImage
|
2012-10-29 15:06:56 +08:00 |
Rohan Kuruvilla
|
c24acd4733
|
Changing ScriptingCore flow of execution of targetted Touch events
|
2012-10-29 15:06:34 +08:00 |
Rohan Kuruvilla
|
7ede1373f7
|
Adding function to cleanup actions and schedule to ScriptingCore
|
2012-10-29 15:06:10 +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
|
0d43d53eb7
|
Merge pull request #1509 from dumganhar/gles20
issue #1312: Upgraded libcurl to 7.26.0 for windows port.
|
2012-10-28 19:59:30 -07: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 |
walzer
|
f8fcc608c9
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
|
2012-10-28 10:04:17 +08:00 |
James Chen
|
44262fd0cf
|
Merge pull request #1507 from Xyzyx101/gles20
fixed a couple typos
|
2012-10-27 08:12:41 -07:00 |
Andrew Perrault
|
138ea49b0e
|
fixed a couple typos
|
2012-10-27 09:58:49 -04:00 |
minggo
|
076e64d84d
|
Merge pull request #1506 from minggo/update-libcurl
fix a compiling error
|
2012-10-25 21:05:43 -07:00 |
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 |