diff options
author | Simon Howard | 2010-01-27 19:50:30 +0000 |
---|---|---|
committer | Simon Howard | 2010-01-27 19:50:30 +0000 |
commit | 0b8bf3cfe37a3d6e8ad01c0f6726430f53c0ad7e (patch) | |
tree | 483f983aacbd9907290cf61f0e3b3afb1b03f7e9 /data | |
parent | 3cf74a97261b1a0aceb591b495b0857781918edd (diff) | |
parent | a9e2d244a5a37fed344405e40698de2a2969c12a (diff) | |
download | chocolate-doom-0b8bf3cfe37a3d6e8ad01c0f6726430f53c0ad7e.tar.gz chocolate-doom-0b8bf3cfe37a3d6e8ad01c0f6726430f53c0ad7e.tar.bz2 chocolate-doom-0b8bf3cfe37a3d6e8ad01c0f6726430f53c0ad7e.zip |
Merge from trunk.
Subversion-branch: /branches/opl-branch
Subversion-revision: 1829
Diffstat (limited to 'data')
-rw-r--r-- | data/README | 7 | ||||
-rw-r--r-- | data/doom.ico | bin | 2238 -> 36726 bytes | |||
-rw-r--r-- | data/doom8.ico | bin | 0 -> 2238 bytes | |||
-rw-r--r-- | data/setup.ico | bin | 2238 -> 36726 bytes | |||
-rw-r--r-- | data/setup8.ico | bin | 0 -> 2238 bytes |
5 files changed, 7 insertions, 0 deletions
diff --git a/data/README b/data/README index 8b927335..82fac17e 100644 --- a/data/README +++ b/data/README @@ -3,3 +3,10 @@ The Chocolate Doom icon is based on an image by Chris Metcalf http://www.flickr.com/photos/laffy4k/448920776/ +The "foo8.ico" files are 8-bit depth only, while the "foo.ico" files +contain full 32-bit versions, scaled to different sizes and with proper +alpha masks (as well as the 8-bit versions). The 8-bit versions are +used when setting the icon within SDL, as SDL under Windows displays +full color icons in a very poor quality. The full-color versions are +used in the resource files. + diff --git a/data/doom.ico b/data/doom.ico Binary files differindex f55ff28f..025cb698 100644 --- a/data/doom.ico +++ b/data/doom.ico diff --git a/data/doom8.ico b/data/doom8.ico Binary files differnew file mode 100644 index 00000000..f55ff28f --- /dev/null +++ b/data/doom8.ico diff --git a/data/setup.ico b/data/setup.ico Binary files differindex 6d734a11..dae4e5ec 100644 --- a/data/setup.ico +++ b/data/setup.ico diff --git a/data/setup8.ico b/data/setup8.ico Binary files differnew file mode 100644 index 00000000..6d734a11 --- /dev/null +++ b/data/setup8.ico |