From 9c829c0410da89fdbb873f706d7ba63cf26b088f Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 29 Oct 2010 18:58:22 +0100
Subject: Preliminary work on appearance layers. No user functionality yet.

---
 bin/assets/TexturesAssetSet/TexturesAssetSet.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'bin/assets/TexturesAssetSet')

diff --git a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
index c5cafa7..7c74a48 100644
--- a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
+++ b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
@@ -1,4 +1,10 @@
 <Nini>
+  <Section Name="Default Alpha">
+    <Key Name="assetID" Value="1578a2b1-5179-4b53-b618-fe00ca5a5594" />
+    <Key Name="name" Value="alpha" />
+    <Key Name="assetType" Value="0" />
+    <Key Name="fileName" Value="defaultalpha.jp2" />
+  </Section>
   <Section Name="texture1">
     <Key Name="assetID" Value="00000000-0000-2222-3333-000000000099" />
     <Key Name="name" Value="femface" />
-- 
cgit v1.1


From e6fe83cd93691f5ecfbc00e4e140ffe98aa3ee1d Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 29 Oct 2010 20:17:59 +0100
Subject: Revert "Preliminary work on appearance layers. No user functionality
 yet." This work conflicts with cmickeyb's more extensive, related work

This reverts commit 9c829c0410da89fdbb873f706d7ba63cf26b088f.
---
 bin/assets/TexturesAssetSet/TexturesAssetSet.xml | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'bin/assets/TexturesAssetSet')

diff --git a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
index 7c74a48..c5cafa7 100644
--- a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
+++ b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
@@ -1,10 +1,4 @@
 <Nini>
-  <Section Name="Default Alpha">
-    <Key Name="assetID" Value="1578a2b1-5179-4b53-b618-fe00ca5a5594" />
-    <Key Name="name" Value="alpha" />
-    <Key Name="assetType" Value="0" />
-    <Key Name="fileName" Value="defaultalpha.jp2" />
-  </Section>
   <Section Name="texture1">
     <Key Name="assetID" Value="00000000-0000-2222-3333-000000000099" />
     <Key Name="name" Value="femface" />
-- 
cgit v1.1


From 5f4badf9e2cd96f4a4a48b0019bd5f39298213ab Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 29 Oct 2010 20:48:37 +0200
Subject: Add my work on top of cmickeyb's

---
 bin/assets/TexturesAssetSet/TexturesAssetSet.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'bin/assets/TexturesAssetSet')

diff --git a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
index c5cafa7..7c74a48 100644
--- a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
+++ b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
@@ -1,4 +1,10 @@
 <Nini>
+  <Section Name="Default Alpha">
+    <Key Name="assetID" Value="1578a2b1-5179-4b53-b618-fe00ca5a5594" />
+    <Key Name="name" Value="alpha" />
+    <Key Name="assetType" Value="0" />
+    <Key Name="fileName" Value="defaultalpha.jp2" />
+  </Section>
   <Section Name="texture1">
     <Key Name="assetID" Value="00000000-0000-2222-3333-000000000099" />
     <Key Name="name" Value="femface" />
-- 
cgit v1.1


From 32e5bee3a7cd417a802f960d3d104e8c78a1ab5d Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 29 Oct 2010 20:31:17 +0200
Subject: Add a default alpha layer

---
 bin/assets/TexturesAssetSet/defaultalpha.jp2 | Bin 0 -> 319 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 bin/assets/TexturesAssetSet/defaultalpha.jp2

(limited to 'bin/assets/TexturesAssetSet')

diff --git a/bin/assets/TexturesAssetSet/defaultalpha.jp2 b/bin/assets/TexturesAssetSet/defaultalpha.jp2
new file mode 100644
index 0000000..af73c1e
Binary files /dev/null and b/bin/assets/TexturesAssetSet/defaultalpha.jp2 differ
-- 
cgit v1.1


From 4f39329d6f3441617e8a289989a908848a2f4326 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 29 Oct 2010 21:10:19 +0100
Subject: Rename the new default texture to be consistent with the others

---
 bin/assets/TexturesAssetSet/TexturesAssetSet.xml |   2 +-
 bin/assets/TexturesAssetSet/default_alpha.jp2    | Bin 0 -> 319 bytes
 bin/assets/TexturesAssetSet/defaultalpha.jp2     | Bin 319 -> 0 bytes
 3 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 bin/assets/TexturesAssetSet/default_alpha.jp2
 delete mode 100644 bin/assets/TexturesAssetSet/defaultalpha.jp2

(limited to 'bin/assets/TexturesAssetSet')

diff --git a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
index 7c74a48..5484ee2 100644
--- a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
+++ b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
@@ -3,7 +3,7 @@
     <Key Name="assetID" Value="1578a2b1-5179-4b53-b618-fe00ca5a5594" />
     <Key Name="name" Value="alpha" />
     <Key Name="assetType" Value="0" />
-    <Key Name="fileName" Value="defaultalpha.jp2" />
+    <Key Name="fileName" Value="default_alpha.jp2" />
   </Section>
   <Section Name="texture1">
     <Key Name="assetID" Value="00000000-0000-2222-3333-000000000099" />
diff --git a/bin/assets/TexturesAssetSet/default_alpha.jp2 b/bin/assets/TexturesAssetSet/default_alpha.jp2
new file mode 100644
index 0000000..af73c1e
Binary files /dev/null and b/bin/assets/TexturesAssetSet/default_alpha.jp2 differ
diff --git a/bin/assets/TexturesAssetSet/defaultalpha.jp2 b/bin/assets/TexturesAssetSet/defaultalpha.jp2
deleted file mode 100644
index af73c1e..0000000
Binary files a/bin/assets/TexturesAssetSet/defaultalpha.jp2 and /dev/null differ
-- 
cgit v1.1