Skip to content

Commit 9b226d5

Browse files
pandamicropandamicro
committed
Merge pull request #1505 from MSOpenTech/wp8-fix
WP8 project fixes
2 parents 4652fe9 + 47744cb commit 9b226d5

21 files changed

+753
-726
lines changed

‎samples/js-moonwarriors/project/proj.wp8-xaml/js-moonwarriors/Assets/AlignmentGrid.png

8.83 KB
Loading

‎samples/js-moonwarriors/project/proj.wp8-xaml/js-moonwarriors/Assets/ApplicationIcon.png

3.31 KB
Loading

‎samples/js-moonwarriors/project/proj.wp8-xaml/js-moonwarriors/Assets/Tiles/FlipCycleTileLarge.png

9.7 KB
Loading

‎samples/js-moonwarriors/project/proj.wp8-xaml/js-moonwarriors/Assets/Tiles/FlipCycleTileMedium.png

8.86 KB
Loading

‎samples/js-moonwarriors/project/proj.wp8-xaml/js-moonwarriors/Assets/Tiles/FlipCycleTileSmall.png

3.59 KB
Loading

‎samples/js-moonwarriors/project/proj.wp8-xaml/js-moonwarriors/Assets/Tiles/IconicTileMediumLarge.png

4.82 KB
Loading

‎samples/js-moonwarriors/project/proj.wp8-xaml/js-moonwarriors/Assets/Tiles/IconicTileSmall.png

3.64 KB
Loading

‎samples/js-moonwarriors/project/proj.wp8-xaml/js-moonwarriors/MainPage.xaml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<phone:PhoneApplicationPage
2+
x:Class="cocos2d.MainPage"
3+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:phone="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone"
6+
xmlns:shell="clr-namespace:Microsoft.Phone.Shell;assembly=Microsoft.Phone"
7+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
8+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
9+
mc:Ignorable="d"
10+
FontFamily="{StaticResource PhoneFontFamilyNormal}"
11+
FontSize="{StaticResource PhoneFontSizeNormal}"
12+
Foreground="{StaticResource PhoneForegroundBrush}"
13+
SupportedOrientations="Portrait" Orientation="Portrait"
14+
shell:SystemTray.IsVisible="False">
15+
16+
<!--LayoutRoot is the root grid where all page content is placed-->
17+
<DrawingSurfaceBackgroundGrid x:Name="DrawingSurfaceBackground" Loaded="DrawingSurfaceBackground_Loaded">
18+
<StackPanel Orientation="Horizontal" Margin="10,0,0,0" Height="30" VerticalAlignment="Top" x:Name="MemoryDisplay">
19+
<TextBlock Text="Memory: "/>
20+
<TextBlock x:Name="MemoryTextBlock"/>
21+
<TextBlock Text=" MB"/>
22+
<TextBlock Text=" Peak: "/>
23+
<TextBlock x:Name="PeakMemoryTextBlock"/>
24+
<TextBlock Text=" MB"/>
25+
</StackPanel>
26+
</DrawingSurfaceBackgroundGrid>
27+
28+
</phone:PhoneApplicationPage>

‎samples/js-moonwarriors/project/proj.wp8-xaml/js-moonwarriors/SplashScreenImage.jpg

-1.81 KB
Loading

‎samples/js-moonwarriors/project/proj.wp8-xaml/js-moonwarriors/js-moonwarriors.csproj

Lines changed: 201 additions & 202 deletions
Large diffs are not rendered by default.

‎samples/js-moonwarriors/project/proj.wp8-xaml/js-moonwarriors/js-moonwarriors.csproj.user

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
4-
<CurrentDeployCmdId>256</CurrentDeployCmdId>
5-
<CurrentDeployID>5E7661DF-D928-40ff-B747-A4B1957194F9</CurrentDeployID>
6-
</PropertyGroup>
7-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
8-
<CurrentDeployCmdId>256</CurrentDeployCmdId>
9-
<CurrentDeployID>5E7661DF-D928-40ff-B747-A4B1957194F9</CurrentDeployID>
10-
</PropertyGroup>
11-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
12-
<CurrentDeployCmdId>256</CurrentDeployCmdId>
13-
<CurrentDeployID>30F105C9-681E-420b-A277-7C086EAD8A4E</CurrentDeployID>
14-
</PropertyGroup>
15-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
16-
<CurrentDeployCmdId>256</CurrentDeployCmdId>
17-
<CurrentDeployID>30F105C9-681E-420b-A277-7C086EAD8A4E</CurrentDeployID>
18-
</PropertyGroup>
19-
<ProjectExtensions>
20-
<VisualStudio>
21-
<FlavorProperties GUID="{C089C8C0-30E0-4E22-80C0-CE093F111A43}">
22-
<SilverlightMobileCSProjectFlavor>
23-
<FullDeploy>False</FullDeploy>
24-
<DebuggerType>Native</DebuggerType>
25-
<DebuggerAgentType>Native</DebuggerAgentType>
26-
<Tombstone>False</Tombstone>
27-
</SilverlightMobileCSProjectFlavor>
28-
</FlavorProperties>
29-
</VisualStudio>
30-
</ProjectExtensions>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
4+
<CurrentDeployCmdId>256</CurrentDeployCmdId>
5+
<CurrentDeployID>5E7661DF-D928-40ff-B747-A4B1957194F9</CurrentDeployID>
6+
</PropertyGroup>
7+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
8+
<CurrentDeployCmdId>256</CurrentDeployCmdId>
9+
<CurrentDeployID>5E7661DF-D928-40ff-B747-A4B1957194F9</CurrentDeployID>
10+
</PropertyGroup>
11+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
12+
<CurrentDeployCmdId>256</CurrentDeployCmdId>
13+
<CurrentDeployID>30F105C9-681E-420b-A277-7C086EAD8A4E</CurrentDeployID>
14+
</PropertyGroup>
15+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
16+
<CurrentDeployCmdId>256</CurrentDeployCmdId>
17+
<CurrentDeployID>30F105C9-681E-420b-A277-7C086EAD8A4E</CurrentDeployID>
18+
</PropertyGroup>
19+
<ProjectExtensions>
20+
<VisualStudio>
21+
<FlavorProperties GUID="{C089C8C0-30E0-4E22-80C0-CE093F111A43}">
22+
<SilverlightMobileCSProjectFlavor>
23+
<FullDeploy>False</FullDeploy>
24+
<DebuggerType>Native</DebuggerType>
25+
<DebuggerAgentType>Native</DebuggerAgentType>
26+
<Tombstone>False</Tombstone>
27+
</SilverlightMobileCSProjectFlavor>
28+
</FlavorProperties>
29+
</VisualStudio>
30+
</ProjectExtensions>
3131
</Project>

0 commit comments

Comments
 (0)