diff options
| author | Simon Howard | 2010-02-06 03:14:20 +0000 |
|---|---|---|
| committer | Simon Howard | 2010-02-06 03:14:20 +0000 |
| commit | d9520b6415f8e373cf759f316094b986e57f0f5a (patch) | |
| tree | d256f7d4f1941ec33ae3c956449c70349de7297d /data | |
| parent | 57011e785808847273461aaf6d8ed1df76ff1db9 (diff) | |
| parent | 52f81b4ef175358d1e1f7f9eecab2a1edb7f4b65 (diff) | |
| download | chocolate-doom-d9520b6415f8e373cf759f316094b986e57f0f5a.tar.gz chocolate-doom-d9520b6415f8e373cf759f316094b986e57f0f5a.tar.bz2 chocolate-doom-d9520b6415f8e373cf759f316094b986e57f0f5a.zip | |
Merge from trunk.
Subversion-branch: /branches/strife-branch
Subversion-revision: 1849
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 |