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
b3e499c6db
Merge pull request #2379 from natural-law/master
...
issue #1723 : Remove the protocol IAP Online.
2013-04-15 23:52:55 -07:00
d762283c9b
Resolve the ndk build error.
2013-04-16 14:51:32 +08:00
244740a0c9
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2013-04-16 14:42:51 +08:00
75557bbe7b
Remove the protocol IAP Online
2013-04-16 14:41:35 +08:00
5da2b53869
Merge pull request #2377 from CocosRobot/updategeneratedsubmodule_1366077719
...
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-04-15 19:08:58 -07:00
5928d2836c
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-04-16 10:02:11 +08:00
f478da6e2f
Update AUTHORS
2013-04-15 23:11:57 +08:00
bf4344a53f
Merge pull request #2231 from sbc100/physics_fixes
...
fixed #2055 : Physics fixes.
1) 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.
2) Fix typo in make-all-linux-project.sh
3) 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 08:06:15 -07:00
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
57d34bf161
Fix typo in make-all-linux-project.sh
2013-04-15 07:35:50 -07:00
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
92647db858
Merge pull request #2373 from dumganhar/iss1876-9sprite-setColor
...
fixed #1876 : CCScale9Sprite::setColor(...), setOpacity(...) are broken.
2013-04-15 01:38:58 -07:00
5b2196075a
fixed #1876 : CCScale9Sprite::setColor(...), setOpacity(...) are broken.
2013-04-15 16:37:35 +08:00
85932f1120
Merge pull request #2371 from CocosRobot/updategeneratedsubmodule_1366005697
...
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-04-14 23:56:44 -07:00
d6e9d4420e
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-04-15 14:01:47 +08:00
d1b1c6972b
Update AUTHORS
2013-04-15 13:40:02 +08:00
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
d89b5cbcb2
Merge pull request #2370 from dumganhar/iss2054-s9sp-anchorpoint-ccb
...
Fixed #2054 : AnchorPoint property of CCScale9Sprite doesn't work in CCBReader.
2013-04-14 20:54:02 -07:00
7a676982db
Updating AUTHORS.
2013-04-15 11:51:47 +08:00
b7e16e9895
Fixed #2054 : AnchorPoint property of CCScale9Sprite doesn't work in CCBReader.
...
Invoking init method in CCScale9Sprite::create().
2013-04-15 11:51:26 +08:00
b228a13218
Merge branch 'patch-1' of https://github.com/zhanghaojie/cocos2d-x into iss2054-s9sp-anchorpoint-ccb
2013-04-15 11:45:59 +08:00
233a987265
Update AUTHORS
2013-04-15 11:12:44 +08:00
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
028bba3959
Update AUTHORS
2013-04-15 10:47:17 +08:00
0c8e3e9129
Merge pull request #2349 from rogerzanoni/master
...
fixed #2052 : [Linux] [-Werror=array-bounds] error appears when compiling Box2dTestBed.
2013-04-14 19:45:35 -07:00
4ae375e7fe
Merge pull request #2369 from dumganhar/iss1860-subccb-onNodeLoaded
...
fixed #1860 : onNodeLoaded will be called twice if ccb was added as a CCBFile and adding test.
2013-04-14 19:41:08 -07:00
a5d78830db
fixed #1860 : onNodeLoaded will be called twice if ccb was added as a CCBFile.
2013-04-15 10:39:44 +08:00
c7631d5343
Merge pull request #2368 from dumganhar/iss2040-ccb-getScale
...
fixed #2040 : Getting scale property from sub-ccb node may trigger an assert of 'CCAssert( m_fScaleX == m_fScaleY, "CCNode#scale. ScaleX != ScaleY. Don't know which one to return");'.
2013-04-14 19:20:36 -07:00
a1568d1f74
fixed #2040 : Getting scale property from sub-ccb node may trigger an assert of 'CCAssert( m_fScaleX == m_fScaleY, "CCNode#scale. ScaleX != ScaleY. Don't know which one to return");'.
2013-04-15 10:18:35 +08:00
a06d2c44c1
Merge pull request #2367 from dumganhar/iss1862-setContainer
...
fixed #1862 : CCScrollView::setContainer may cause dangling pointer when NULL is passed into.
2013-04-14 18:57:13 -07:00
6c15c75c78
fixed #1862 : CCScrollView::setContainer may cause dangling pointer when NULL is passed into.
2013-04-15 09:52:46 +08:00
fdd6529bd2
Merge pull request #2364 from dumganhar/iss2051-builder-crash-64bit
...
fixed #2051 : TestCpp/ExtensionsTest/CocosbuilderTest crashes under x86_64 target.
2013-04-14 01:06:51 -07:00
84b4c5ac2b
fixed #2051 : Comment update, int ~> intptr_t.
2013-04-14 16:05:54 +08:00
ea78ee9bb7
fixed #2051 : TestCpp/ExtensionsTest/CocosbuilderTest crashes under x86_64 target.
2013-04-14 16:00:50 +08:00
2757962748
Merge branch 'master' of https://github.com/billy1380/cocos2d-x into billy1380-master
2013-04-14 14:49:02 +08:00
a9617a2c20
Merge pull request #2363 from dumganhar/master
...
Fixing an issue of out of bound in CCTableView.cpp.
2013-04-13 20:19:16 -07:00
17599174ad
Fixing an issue of out of bound in CCTableView.cpp.
2013-04-14 11:05:03 +08:00
9dcb69d53b
Update AUTHORS
2013-04-13 17:49:58 +08:00
b60ff750e4
Merge pull request #2360 from tiantian20007/backToUpsteram
...
fix syntax error;
2013-04-13 02:48:37 -07:00
edf1e53d2d
fix syntax error;
2013-04-13 15:18:54 +08:00
9c82c39978
remove duplicate default variable definition
2013-04-12 10:11:26 -07:00
493d1d90ed
fixed a bug that was causing x86_64 tests to crash while loading
...
ccbuilder files
2013-04-12 14:37:28 +01:00
873354f84b
Merge pull request #2358 from dumganhar/master
...
Adding Box2D and chipmunk dependence for TestLua. Removing the definition of GL_RGB565 in CCTexture2D.pkg.
2013-04-11 23:29:04 -07:00
0ecf9da3a6
Adding Box2D and chipmunk dependence for TestLua. Removing the definition of GL_RGB565 in CCTexture2D.pkg.
2013-04-12 14:27:29 +08:00
f18cddac75
Merge pull request #2357 from dumganhar/iss2043-upgrade-spidermonkey20
...
fixed #2043 : Upgrading SpiderMonkey to Firefox20.0.
2013-04-11 22:52:13 -07:00
b5bad26a88
fixed #2043 : Updating spidermonkey to Firefox v20 for Windows.
2013-04-12 13:38:21 +08:00
e1ed841b8e
fixed #2043 : Updating to spidermonkey20 for android.
2013-04-12 12:52:50 +08:00
fea712fcf8
fixed #2043 : Disabled YARR_JIT on ios.
2013-04-12 11:58:53 +08:00
42997f7390
Merge branch 'master' into iss2043-upgrade-spidermonkey20
2013-04-12 10:57:33 +08:00
NatWeiss