epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+resampled sounds, readded and completed Arrakis tileset

Browse Source 
all tilesets combined into one without redundancy
This commit is contained in:
Matthias Mailänder
2012-06-14 21:09:44 +02:00
parent 72d038e04e
commit 722c7a5f7d
78 changed files with 6676 additions and 5266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.TilesetBuilder/OpenRA.TilesetBuilder.csproj
View File

@@ -9,7 +9,7 @@
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OpenRA.TilesetBuilder</RootNamespace>
<AssemblyName>OpenRA.TilesetBuilder2</AssemblyName>
<AssemblyName>OpenRA.TilesetBuilder</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ApplicationIcon>tilesetbuilder_icon copy.ico</ApplicationIcon>
@@ -18,7 +18,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\</OutputPath>
<OutputPath>..</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -29,7 +29,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<OutputPath>..</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>

2
OpenRA.TilesetBuilder/Properties/Resources.Designer.cs generated
View File

@@ -44,7 +44,7 @@ namespace OpenRA.TilesetBuilder.Properties
{
if ((resourceMan == null))
{
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("OpenRA.TilesetBuilder2.Properties.Resources", typeof(Resources).Assembly);
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("OpenRA.TilesetBuilder.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;

4
OpenRA.TilesetBuilder/defaults.yaml
View File

@@ -3,6 +3,10 @@ Terrain:
Type: Sand
AcceptSmudge: True
Color: 208, 192, 160
TerrainType@Transition:
Type: Transition
AcceptSmudge: True
Color: 207, 166, 100
TerrainType@Rock:
Type: Rock
AcceptSmudge: True

4
OpenRA.TilesetBuilder/frmBuilder.cs
View File

@@ -246,7 +246,7 @@ namespace OpenRA.TilesetBuilder
string ExportTemplate(Template t, int n, string suffix, string dir)
{
var TileSize = size;
var filename = Path.Combine(dir, "t{0:00}{1}".F(n, suffix));
var filename = Path.Combine(dir, "{0}{1:00}{2}".F(txtTilesetName.Text, n, suffix));
var totalTiles = t.Width * t.Height;
var ms = new MemoryStream();
@@ -391,7 +391,7 @@ namespace OpenRA.TilesetBuilder
var template = new TileTemplate()
{
Id = cur,
Image = "t{0:00}".F(cur),
Image = "{0}{1:00}".F(txtTilesetName.Text, cur),
Size = new int2(tp.Width,tp.Height),
};