mirror of https://github.com/axmolengine/axmol.git
Merge branch 'v3' into v3-winrt-audio
This commit is contained in:
Dale Stammen
commit
0a5581b534
18
README.md
18
README.md
|
|
@ -13,7 +13,7 @@ cocos2d-x
|
|||
|
||||
[cocos2d-x][1] is a multi-platform framework for building 2d games, interactive books, demos and other graphical applications.
|
||||
It is based on [cocos2d-iphone][2], but instead of using Objective-C, it uses C++.
|
||||
It works on iOS, Android, Windows Phone, OS X, Windows and Linux.
|
||||
It works on iOS, Android, Windows Phone and Store Apps, OS X, Windows and Linux.
|
||||
|
||||
cocos2d-x is:
|
||||
|
||||
|
|
@ -86,16 +86,20 @@ Run
|
|||
|
||||
$ cocos run -p win32
|
||||
|
||||
### Build and run new project for Windows 8.1 and Windows Phone 8.1 ###
|
||||
### Build and run new project for Windows 8.1/10.0 and Windows Phone 8.1/10.0 ###
|
||||
|
||||
$ cocos new MyGame -p com.your_company.mygame -l cpp -d projects
|
||||
|
||||
Visual Studio 2013 Update 4 or later is required.
|
||||
* Visual Studio 2013 Update 4 or later is required for Windows 8.1 Universal Apps
|
||||
|
||||
* Visual Studio 2015 RC and Windows 10.0 (build 10074 or higher) is required for Windows 10.0 UWP Apps
|
||||
|
||||
Starting with Cocos2d-x v3.3, you can create Windows 8.1 Universal Apps (Windows Store and Windows Phone 8.1).
|
||||
Starting with Cocos2d-x v3.6 you can create Windows 10.0 UWP Apps (Windows Store and Windows Phone 10.0).
|
||||
Starting with Cocos2d-x v3.6 there will no longer be support for Windows Phone 8.0.
|
||||
|
||||
Starting with Cocos2d-x v3.3, you can create Windows 8.1 Universal Apps (Windows Store and Windows Phone 8.1)
|
||||
See more info on How to install and Create games on Windows RT (Windows and Windows Phone 8.1) at http://msopentech.github.io/cocos2d-x/
|
||||
|
||||
Starting with Cocos2d-x v3.6 there will no longer be support for Windows Phone 8.0
|
||||
|
||||
Main features
|
||||
-------------
|
||||
|
|
@ -145,10 +149,10 @@ Runtime Requirements
|
|||
--------------------
|
||||
* iOS 5.0+ for iPhone / iPad games
|
||||
* Android 2.3+ for Android games
|
||||
* Windows Phone 8 and 8.1 for Windows Phone games
|
||||
* Windows 8.1 for Windows Phone/Store 8.1 games
|
||||
* Windows 10.0 for Windows Phone/Store 10.0 games
|
||||
* OS X v10.6+ for Mac games
|
||||
* Windows 7+ for Win games
|
||||
* Windows 8+ for WinRT games (Modern Apps)
|
||||
|
||||
|
||||
Running Tests
|
||||
|
|
|
|||
|
|
@ -16,6 +16,11 @@
|
|||
<Applications>
|
||||
<Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="cocos2d_Windows.App">
|
||||
<m2:VisualElements DisplayName="HelloCpp.Windows" Square150x150Logo="Assets\Logo.png" Square30x30Logo="Assets\SmallLogo.png" Description="HelloCpp.Windows" ForegroundText="light" BackgroundColor="#464646">
|
||||
<m2:DefaultTile>
|
||||
<m2:ShowNameOnTiles>
|
||||
<m2:ShowOn Tile="square150x150Logo" />
|
||||
</m2:ShowNameOnTiles>
|
||||
</m2:DefaultTile>
|
||||
<m2:SplashScreen Image="Assets\SplashScreen.png" />
|
||||
<m2:InitialRotationPreference>
|
||||
<m2:Rotation Preference="landscape" />
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"win32_cfg": {
|
||||
"project_path": "../../build",
|
||||
"sln_file": "cocos2d-win32.vc2013.sln",
|
||||
"sln_file": "cocos2d-win32.sln",
|
||||
"project_name": "cpp-empty-test",
|
||||
"build_cfg_path": "proj.win32"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -16,6 +16,11 @@
|
|||
<Applications>
|
||||
<Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="cocos2d_Windows.App">
|
||||
<m2:VisualElements DisplayName="HelloCpp.Windows" Square150x150Logo="Assets\Logo.png" Square30x30Logo="Assets\SmallLogo.png" Description="HelloCpp.Windows" ForegroundText="light" BackgroundColor="#464646">
|
||||
<m2:DefaultTile>
|
||||
<m2:ShowNameOnTiles>
|
||||
<m2:ShowOn Tile="square150x150Logo" />
|
||||
</m2:ShowNameOnTiles>
|
||||
</m2:DefaultTile>
|
||||
<m2:SplashScreen Image="Assets\SplashScreen.png" />
|
||||
<m2:InitialRotationPreference>
|
||||
<m2:Rotation Preference="landscape" />
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"win32_cfg": {
|
||||
"project_path": "../../build",
|
||||
"sln_file": "cocos2d-win32.vc2013.sln",
|
||||
"sln_file": "cocos2d-win32.sln",
|
||||
"project_name": "cpp-tests",
|
||||
"build_cfg_path": "proj.win32"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -64,9 +64,9 @@ bool UIRichTextTest::init()
|
|||
_richText->ignoreContentAdaptWithSize(false);
|
||||
_richText->setContentSize(Size(100, 100));
|
||||
|
||||
RichElementText* re1 = RichElementText::create(1, Color3B::WHITE, 255, str1, "Marker Felt", 10);
|
||||
RichElementText* re1 = RichElementText::create(1, Color3B::WHITE, 255, str1, "SimSun", 10);
|
||||
RichElementText* re2 = RichElementText::create(2, Color3B::YELLOW, 255, "And this is yellow. ", "Helvetica", 10);
|
||||
RichElementText* re3 = RichElementText::create(3, Color3B::GRAY, 255, str2, "Helvetica", 10);
|
||||
RichElementText* re3 = RichElementText::create(3, Color3B::GRAY, 255, str2, "Yu Mincho", 10);
|
||||
RichElementText* re4 = RichElementText::create(4, Color3B::GREEN, 255, "And green with TTF support. ", "fonts/Marker Felt.ttf", 10);
|
||||
RichElementText* re5 = RichElementText::create(5, Color3B::RED, 255, "Last one is red ", "Helvetica", 10);
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
"has_native": true,
|
||||
"win32_cfg": {
|
||||
"project_path": "../../build",
|
||||
"sln_file": "cocos2d-js-win32.vc2013.sln",
|
||||
"sln_file": "cocos2d-js-win32.sln",
|
||||
"project_name": "js-tests",
|
||||
"build_cfg_path": "project/proj.win32"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"win32_cfg": {
|
||||
"project_path": "../../build",
|
||||
"sln_file": "cocos2d-win32.vc2013.sln",
|
||||
"sln_file": "cocos2d-win32.sln",
|
||||
"project_name": "lua-empty-test",
|
||||
"build_cfg_path": "project/proj.win32"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"win32_cfg": {
|
||||
"project_path": "../../build",
|
||||
"sln_file": "cocos2d-win32.vc2013.sln",
|
||||
"sln_file": "cocos2d-win32.sln",
|
||||
"project_name": "lua-tests",
|
||||
"build_cfg_path": "project/proj.win32"
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in New Issue