Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix

This commit is contained in:
samuele3hu 2014-06-06 17:19:27 +08:00
parent eba954b410 76d9916864
commit 1f291dc2c6
9 changed files with 59 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -831,6 +831,7 @@ Developers:
Fixed incompatible pointer conversion in external/chipmunk/src/cpArray.c Fixed incompatible pointer conversion in external/chipmunk/src/cpArray.c
Fixed memory leak in 'Image' Fixed memory leak in 'Image'
Fixed loosing precision when using 'recv' in 'Console' Fixed loosing precision when using 'recv' in 'Console'
Fixed link error with Xcode 6 when building with 32-bit architecture
ololomax ololomax
Fixed a potential crash in SceneReader::createNodeWithSceneFile Fixed a potential crash in SceneReader::createNodeWithSceneFile

1
CHANGELOG
View File

@ -14,6 +14,7 @@ cocos2d-x-3.2 ???
[FIX] Lua-binding: compiling error on release mode [FIX] Lua-binding: compiling error on release mode
[FIX] Lua-binding: Add xxtea encrypt support [FIX] Lua-binding: Add xxtea encrypt support
[FIX] Node: setPhysicsBody() can not work correctly if it is added to a Node [FIX] Node: setPhysicsBody() can not work correctly if it is added to a Node
[FIX] Other: link error with Xcode 6 when building with 32-bit architecture
[FIX] Repeat: will run one more over in rare situations [FIX] Repeat: will run one more over in rare situations
[FIX] Scale9Sprite: support culling [FIX] Scale9Sprite: support culling
[FIX] Schedule: schedulePerFrame() can not be called twice [FIX] Schedule: schedulePerFrame() can not be called twice

2
cocos/base/ccTypes.h
View File

@ -328,7 +328,7 @@ struct BlendFunc
bool operator<(const BlendFunc &a) const bool operator<(const BlendFunc &a) const
{ {
return src < a.src || (src < a.src && dst < a.dst); return src < a.src || (src == a.src && dst < a.dst);
} }
}; };

20
cocos/platform/CCImage.cpp
View File

@ -39,6 +39,26 @@ THE SOFTWARE.
extern "C" extern "C"
{ {
// To resolve link error when building 32bits with Xcode 6.
// More information please refer to the discussion in https://github.com/cocos2d/cocos2d-x/pull/6986
#if defined(__APPLE__) || defined(__unix)
#ifndef __ENABLE_COMPATIBILITY_WITH_UNIX_2003__
#define __ENABLE_COMPATIBILITY_WITH_UNIX_2003__
#include <stdio.h>
FILE *fopen$UNIX2003( const char *filename, const char *mode )
{
return fopen(filename, mode);
}
size_t fwrite$UNIX2003( const void *a, size_t b, size_t c, FILE *d )
{
return fwrite(a, b, c, d);
}
char *strerror$UNIX2003( int errnum )
{
return strerror(errnum);
}
#endif
#endif
#include "png.h" #include "png.h"
#include "tiffio.h" #include "tiffio.h"
#include "base/etc1.h" #include "base/etc1.h"

5
cocos/ui/UILayout.h
View File

@ -56,6 +56,11 @@ public:
* @js NA * @js NA
* @lua NA * @lua NA
*/ */
#if (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) || (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT)
#ifdef RELATIVE
#undef RELATIVE
#endif
#endif
class Layout : public Widget, public LayoutProtocol class Layout : public Widget, public LayoutProtocol
{ {

2
cocos/ui/proj.wp8/libGUI.vcxproj
View File

@ -186,6 +186,7 @@
<ClInclude Include="..\..\ui\UIVBox.h" /> <ClInclude Include="..\..\ui\UIVBox.h" />
<ClInclude Include="..\..\ui\UIWidget.h" /> <ClInclude Include="..\..\ui\UIWidget.h" />
<ClInclude Include="..\UIHBox.h" /> <ClInclude Include="..\UIHBox.h" />
<ClInclude Include="..\UILayoutManager.h" />
<ClInclude Include="..\UIRelativeBox.h" /> <ClInclude Include="..\UIRelativeBox.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -210,6 +211,7 @@
<ClCompile Include="..\..\ui\UIVBox.cpp" /> <ClCompile Include="..\..\ui\UIVBox.cpp" />
<ClCompile Include="..\..\ui\UIWidget.cpp" /> <ClCompile Include="..\..\ui\UIWidget.cpp" />
<ClCompile Include="..\UIHBox.cpp" /> <ClCompile Include="..\UIHBox.cpp" />
<ClCompile Include="..\UILayoutManager.cpp" />
<ClCompile Include="..\UIRelativeBox.cpp" /> <ClCompile Include="..\UIRelativeBox.cpp" />
</ItemGroup> </ItemGroup>
</Project> </Project>

6
cocos/ui/proj.wp8/libGUI.vcxproj.filters
View File

@ -84,6 +84,9 @@
<ClInclude Include="..\UIRelativeBox.h"> <ClInclude Include="..\UIRelativeBox.h">
<Filter>Layouts</Filter> <Filter>Layouts</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\UILayoutManager.h">
<Filter>Layouts</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\ui\UILayout.cpp"> <ClCompile Include="..\..\ui\UILayout.cpp">
@ -152,5 +155,8 @@
<ClCompile Include="..\UIRelativeBox.cpp"> <ClCompile Include="..\UIRelativeBox.cpp">
<Filter>Layouts</Filter> <Filter>Layouts</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\UILayoutManager.cpp">
<Filter>Layouts</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
</Project> </Project>

22
templates/cpp-template-default/proj.wp8-xaml/HelloCppComponent/HelloCppComponent.vcxproj
View File

@ -203,11 +203,11 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\cocos2d\cocos\2d\platform\wp8-xaml\cpp\Cocos2dRenderer.cpp" /> <ClCompile Include="..\..\cocos2d\cocos\platform\wp8-xaml\cpp\Cocos2dRenderer.cpp" />
<ClCompile Include="..\..\cocos2d\cocos\2d\platform\wp8-xaml\cpp\Direct3DContentProvider.cpp" /> <ClCompile Include="..\..\cocos2d\cocos\platform\wp8-xaml\cpp\Direct3DContentProvider.cpp" />
<ClCompile Include="..\..\cocos2d\cocos\2d\platform\wp8-xaml\cpp\Direct3DInterop.cpp" /> <ClCompile Include="..\..\cocos2d\cocos\platform\wp8-xaml\cpp\Direct3DInterop.cpp" />
<ClCompile Include="..\..\cocos2d\cocos\2d\platform\wp8-xaml\cpp\DirectXBase.cpp" /> <ClCompile Include="..\..\cocos2d\cocos\platform\wp8-xaml\cpp\DirectXBase.cpp" />
<ClCompile Include="..\..\cocos2d\cocos\2d\platform\wp8-xaml\cpp\EditBoxEvent.cpp" /> <ClCompile Include="..\..\cocos2d\cocos\platform\wp8-xaml\cpp\EditBoxEvent.cpp" />
<ClCompile Include="..\..\Classes\AppDelegate.cpp" /> <ClCompile Include="..\..\Classes\AppDelegate.cpp" />
<ClCompile Include="..\..\Classes\HelloWorldScene.cpp" /> <ClCompile Include="..\..\Classes\HelloWorldScene.cpp" />
<ClCompile Include="pch.cpp"> <ClCompile Include="pch.cpp">
@ -218,12 +218,12 @@
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\cocos2d\cocos\2d\platform\wp8-xaml\cpp\Cocos2dRenderer.h" /> <ClInclude Include="..\..\cocos2d\cocos\platform\wp8-xaml\cpp\Cocos2dRenderer.h" />
<ClInclude Include="..\..\cocos2d\cocos\2d\platform\wp8-xaml\cpp\Direct3DContentProvider.h" /> <ClInclude Include="..\..\cocos2d\cocos\platform\wp8-xaml\cpp\Direct3DContentProvider.h" />
<ClInclude Include="..\..\cocos2d\cocos\2d\platform\wp8-xaml\cpp\Direct3DInterop.h" /> <ClInclude Include="..\..\cocos2d\cocos\platform\wp8-xaml\cpp\Direct3DInterop.h" />
<ClInclude Include="..\..\cocos2d\cocos\2d\platform\wp8-xaml\cpp\DirectXBase.h" /> <ClInclude Include="..\..\cocos2d\cocos\platform\wp8-xaml\cpp\DirectXBase.h" />
<ClInclude Include="..\..\cocos2d\cocos\2d\platform\wp8-xaml\cpp\DirectXHelper.h" /> <ClInclude Include="..\..\cocos2d\cocos\platform\wp8-xaml\cpp\DirectXHelper.h" />
<ClInclude Include="..\..\cocos2d\cocos\2d\platform\wp8-xaml\cpp\EditBoxEvent.h" /> <ClInclude Include="..\..\cocos2d\cocos\platform\wp8-xaml\cpp\EditBoxEvent.h" />
<ClInclude Include="..\..\Classes\AppDelegate.h" /> <ClInclude Include="..\..\Classes\AppDelegate.h" />
<ClInclude Include="..\..\Classes\HelloWorldScene.h" /> <ClInclude Include="..\..\Classes\HelloWorldScene.h" />
<ClInclude Include="pch.h" /> <ClInclude Include="pch.h" />

22
templates/cpp-template-default/proj.wp8-xaml/HelloCppComponent/HelloCppComponent.vcxproj.filters
View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\cocos2d\cocos\2d\platform\wp8-xaml\cpp\Cocos2dRenderer.cpp" /> <ClCompile Include="..\..\cocos2d\cocos\platform\wp8-xaml\cpp\Cocos2dRenderer.cpp" />
<ClCompile Include="..\..\cocos2d\cocos\2d\platform\wp8-xaml\cpp\Direct3DContentProvider.cpp" /> <ClCompile Include="..\..\cocos2d\cocos\platform\wp8-xaml\cpp\Direct3DContentProvider.cpp" />
<ClCompile Include="..\..\cocos2d\cocos\2d\platform\wp8-xaml\cpp\Direct3DInterop.cpp" /> <ClCompile Include="..\..\cocos2d\cocos\platform\wp8-xaml\cpp\Direct3DInterop.cpp" />
<ClCompile Include="..\..\cocos2d\cocos\2d\platform\wp8-xaml\cpp\DirectXBase.cpp" /> <ClCompile Include="..\..\cocos2d\cocos\platform\wp8-xaml\cpp\DirectXBase.cpp" />
<ClCompile Include="..\..\cocos2d\cocos\2d\platform\wp8-xaml\cpp\EditBoxEvent.cpp" /> <ClCompile Include="..\..\cocos2d\cocos\platform\wp8-xaml\cpp\EditBoxEvent.cpp" />
<ClCompile Include="pch.cpp" /> <ClCompile Include="pch.cpp" />
<ClCompile Include="..\..\Classes\AppDelegate.cpp"> <ClCompile Include="..\..\Classes\AppDelegate.cpp">
<Filter>Classes</Filter> <Filter>Classes</Filter>
@ -15,12 +15,12 @@
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\cocos2d\cocos\2d\platform\wp8-xaml\cpp\Cocos2dRenderer.h" /> <ClInclude Include="..\..\cocos2d\cocos\platform\wp8-xaml\cpp\Cocos2dRenderer.h" />
<ClInclude Include="..\..\cocos2d\cocos\2d\platform\wp8-xaml\cpp\Direct3DContentProvider.h" /> <ClInclude Include="..\..\cocos2d\cocos\platform\wp8-xaml\cpp\Direct3DContentProvider.h" />
<ClInclude Include="..\..\cocos2d\cocos\2d\platform\wp8-xaml\cpp\Direct3DInterop.h" /> <ClInclude Include="..\..\cocos2d\cocos\platform\wp8-xaml\cpp\Direct3DInterop.h" />
<ClInclude Include="..\..\cocos2d\cocos\2d\platform\wp8-xaml\cpp\DirectXBase.h" /> <ClInclude Include="..\..\cocos2d\cocos\platform\wp8-xaml\cpp\DirectXBase.h" />
<ClInclude Include="..\..\cocos2d\cocos\2d\platform\wp8-xaml\cpp\DirectXHelper.h" /> <ClInclude Include="..\..\cocos2d\cocos\platform\wp8-xaml\cpp\DirectXHelper.h" />
<ClInclude Include="..\..\cocos2d\cocos\2d\platform\wp8-xaml\cpp\EditBoxEvent.h" /> <ClInclude Include="..\..\cocos2d\cocos\platform\wp8-xaml\cpp\EditBoxEvent.h" />
<ClInclude Include="pch.h" /> <ClInclude Include="pch.h" />
<ClInclude Include="..\..\Classes\AppDelegate.h"> <ClInclude Include="..\..\Classes\AppDelegate.h">
<Filter>Classes</Filter> <Filter>Classes</Filter>