[deng] 01/03: import upstream 1.15.1
Michael Gilbert
mgilbert at moszumanska.debian.org
Tue Jul 7 03:20:35 UTC 2015
This is an automated email from the git hooks/post-receive script.
mgilbert pushed a commit to branch master
in repository deng.
commit a5cf2eb2d3dd932908a73da82fba9b84f99a83be
Author: Michael Gilbert <mgilbert at debian.org>
Date: Mon Jul 6 20:31:15 2015 +0000
import upstream 1.15.1
---
doomsday/api/dd_version.h | 4 +-
doomsday/client/include/versioninfo.h | 16 ++-
doomsday/client/net.dengine.client.pack/Info.dei | 2 +-
.../net.dengine.client.pack/defaultstyle.pack/Info | 2 +-
.../net.dengine.client.pack/renderer.pack/Info | 2 +-
.../renderer.pack/lensflares.pack/Info | 2 +-
.../res/macx/English.lproj/InfoPlist.strings | Bin 586 -> 0 bytes
doomsday/client/res/macx/Info.plist | 26 ----
doomsday/client/res/macx/deng.icns | Bin 934433 -> 0 bytes
doomsday/client/res/windows/.gitignore | 2 -
doomsday/client/res/windows/doomsday.exe.manifest | 10 --
doomsday/client/res/windows/doomsday.ico | Bin 92099 -> 0 bytes
doomsday/client/res/windows/doomsday.rc | 150 ---------------------
doomsday/client/src/def_main.cpp | 4 +-
doomsday/client/src/resource/hq2x.cpp | 2 +-
doomsday/doc/output/doomsday.6 | 2 +-
doomsday/doc/readme/readme.ame | 2 +-
doomsday/doc/server/server.ame | 2 +-
doomsday/doc/shell-text/shell-text.ame | 2 +-
doomsday/libappfw/appfw.doxy | 2 +-
doomsday/libcore/net.dengine.stdlib.pack/Info | 2 +-
doomsday/libcore/res/win32/.gitignore | 1 -
doomsday/libcore/res/win32/core.rc.in | 143 --------------------
doomsday/libcore/res/win32/deng_core.dll.manifest | 10 --
doomsday/libcore/res/win32/generate_rc.py | 45 -------
doomsday/libcore/res/win32/resource.h | 15 ---
doomsday/libdoomsday/src/defs/dedparser.cpp | 11 +-
doomsday/libgui/gui.doxy | 2 +-
doomsday/libgui/net.dengine.stdlib.gui.pack/Info | 2 +-
doomsday/net.dengine.base.pack/Info | 2 +-
doomsday/plugins/doom/data/conhelp.txt | 15 ++-
doomsday/plugins/doom/src/d_main.cpp | 3 +-
doomsday/plugins/heretic/data/conhelp.txt | 12 +-
doomsday/plugins/hexen/data/conhelp.txt | 15 ++-
doomsday/plugins/hexen/src/p_mobj.c | 3 +
doomsday/sdk-qch.doxy | 4 +-
.../res/macx/AppIcon.appiconset/icon_128x128.png | Bin 21935 -> 0 bytes
.../macx/AppIcon.appiconset/icon_128x128 at 2x.png | Bin 78125 -> 0 bytes
.../res/macx/AppIcon.appiconset/icon_16x16.png | Bin 848 -> 0 bytes
.../res/macx/AppIcon.appiconset/icon_16x16 at 2x.png | Bin 2543 -> 0 bytes
.../res/macx/AppIcon.appiconset/icon_256x256.png | Bin 78125 -> 0 bytes
.../macx/AppIcon.appiconset/icon_256x256 at 2x.png | Bin 291599 -> 0 bytes
.../res/macx/AppIcon.appiconset/icon_32x32.png | Bin 2461 -> 0 bytes
.../res/macx/AppIcon.appiconset/icon_32x32 at 2x.png | Bin 7333 -> 0 bytes
.../res/macx/AppIcon.appiconset/icon_512x512.png | Bin 291599 -> 0 bytes
.../res/macx/English.lproj/InfoPlist.strings | Bin 596 -> 0 bytes
.../shell/shell-gui/res/macx/Info-Xcode.plist | 26 ----
doomsday/tools/shell/shell-gui/res/macx/Info.plist | 28 ----
doomsday/tools/shell/shell-gui/res/macx/shell.icns | Bin 799550 -> 0 bytes
doomsday/tools/shell/shell-gui/res/shell.png | Bin 62561 -> 0 bytes
doomsday/tools/shell/shell-gui/res/shell.qrc | 9 --
doomsday/tools/shell/shell-gui/res/shell at 2x.png | Bin 208205 -> 0 bytes
.../tools/shell/shell-gui/res/toolbar_console.png | Bin 4004 -> 0 bytes
.../shell/shell-gui/res/toolbar_placeholder.png | Bin 3888 -> 0 bytes
.../tools/shell/shell-gui/res/toolbar_status.png | Bin 4491 -> 0 bytes
.../tools/shell/shell-gui/res/windows/shell.ico | Bin 99017 -> 0 bytes
.../tools/shell/shell-gui/res/windows/shell.rc | 1 -
57 files changed, 71 insertions(+), 510 deletions(-)
diff --git a/doomsday/api/dd_version.h b/doomsday/api/dd_version.h
index a39f867..f045417 100644
--- a/doomsday/api/dd_version.h
+++ b/doomsday/api/dd_version.h
@@ -51,8 +51,8 @@ extern "C" {
* Revision number increases with each small (maintenance) release.
*/
-#define DOOMSDAY_VERSION_BASE "1.15.0"
-#define DOOMSDAY_VERSION_NUMBER 1,15,0,0 // For WIN32 version info.
+#define DOOMSDAY_VERSION_BASE "1.15.1"
+#define DOOMSDAY_VERSION_NUMBER 1,15,1,0 // For WIN32 version info.
//#define DOOMSDAY_RELEASE_NAME "Example"
/**
diff --git a/doomsday/client/include/versioninfo.h b/doomsday/client/include/versioninfo.h
index 2e25be2..446b0c4 100644
--- a/doomsday/client/include/versioninfo.h
+++ b/doomsday/client/include/versioninfo.h
@@ -46,11 +46,17 @@ struct VersionInfo
void parseVersionString(de::String const &version)
{
- QStringList parts = version.split('.');
- major = parts[0].toInt();
- minor = parts[1].toInt();
- revision = 0;
- patch = 0;
+ major = minor = revision = patch = 0;
+
+ QStringList const parts = version.split('.');
+ if(parts.size() > 0)
+ {
+ major = parts[0].toInt();
+ }
+ if(parts.size() > 1)
+ {
+ minor = parts[1].toInt();
+ }
if(parts.size() > 2)
{
if(parts[2].contains('-'))
diff --git a/doomsday/client/net.dengine.client.pack/Info.dei b/doomsday/client/net.dengine.client.pack/Info.dei
index d62ef7a..3d93e78 100644
--- a/doomsday/client/net.dengine.client.pack/Info.dei
+++ b/doomsday/client/net.dengine.client.pack/Info.dei
@@ -1,7 +1,7 @@
# Client's primary resources
title: Doomsday Client
-version: 1.15.0
+version: 1.15.1
license: GPL 3+
tags: core client
diff --git a/doomsday/client/net.dengine.client.pack/defaultstyle.pack/Info b/doomsday/client/net.dengine.client.pack/defaultstyle.pack/Info
index cde264b..758a674 100644
--- a/doomsday/client/net.dengine.client.pack/defaultstyle.pack/Info
+++ b/doomsday/client/net.dengine.client.pack/defaultstyle.pack/Info
@@ -1,4 +1,4 @@
title: Doomsday Default UI Style
-version: 1.15.0
+version: 1.15.1
license: GPL 3+
tags: ui style
diff --git a/doomsday/client/net.dengine.client.pack/renderer.pack/Info b/doomsday/client/net.dengine.client.pack/renderer.pack/Info
index 4ff2a2f..e091e90 100644
--- a/doomsday/client/net.dengine.client.pack/renderer.pack/Info
+++ b/doomsday/client/net.dengine.client.pack/renderer.pack/Info
@@ -1,6 +1,6 @@
# General resources for the renderer
title: Doomsday Renderer
-version: 1.15.0
+version: 1.15.1
license: GPL 3+
tags: core
diff --git a/doomsday/client/net.dengine.client.pack/renderer.pack/lensflares.pack/Info b/doomsday/client/net.dengine.client.pack/renderer.pack/lensflares.pack/Info
index 9cb09b3..b17ec6e 100644
--- a/doomsday/client/net.dengine.client.pack/renderer.pack/lensflares.pack/Info
+++ b/doomsday/client/net.dengine.client.pack/renderer.pack/lensflares.pack/Info
@@ -1,5 +1,5 @@
title: Doomsday Default Lens Flares
-version: 1.15.0
+version: 1.15.1
license: GPL 3+
tags: core fx
diff --git a/doomsday/client/res/macx/English.lproj/InfoPlist.strings b/doomsday/client/res/macx/English.lproj/InfoPlist.strings
deleted file mode 100755
index 28e2a97..0000000
Binary files a/doomsday/client/res/macx/English.lproj/InfoPlist.strings and /dev/null differ
diff --git a/doomsday/client/res/macx/Info.plist b/doomsday/client/res/macx/Info.plist
deleted file mode 100644
index 3b9547f..0000000
--- a/doomsday/client/res/macx/Info.plist
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>CFBundleIdentifier</key>
- <string>net.dengine.doomsday</string>
- <key>CFBundleExecutable</key>
- <string>Doomsday</string>
- <key>CFBundleIconFile</key>
- <string>deng.icns</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleVersion</key>
- <string>1.15</string>
- <key>NSPrincipalClass</key>
- <string>NSApplication</string>
- <key>NSHighResolutionCapable</key>
- <string>True</string>
-</dict>
-</plist>
diff --git a/doomsday/client/res/macx/deng.icns b/doomsday/client/res/macx/deng.icns
deleted file mode 100644
index 8beca09..0000000
Binary files a/doomsday/client/res/macx/deng.icns and /dev/null differ
diff --git a/doomsday/client/res/windows/.gitignore b/doomsday/client/res/windows/.gitignore
deleted file mode 100644
index cd20fc7..0000000
--- a/doomsday/client/res/windows/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-
-*.res
\ No newline at end of file
diff --git a/doomsday/client/res/windows/doomsday.exe.manifest b/doomsday/client/res/windows/doomsday.exe.manifest
deleted file mode 100644
index e693382..0000000
--- a/doomsday/client/res/windows/doomsday.exe.manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
- <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
- <security>
- <requestedPrivileges>
- <requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel>
- </requestedPrivileges>
- </security>
- </trustInfo>
-</assembly>
\ No newline at end of file
diff --git a/doomsday/client/res/windows/doomsday.ico b/doomsday/client/res/windows/doomsday.ico
deleted file mode 100644
index 932e8ae..0000000
Binary files a/doomsday/client/res/windows/doomsday.ico and /dev/null differ
diff --git a/doomsday/client/res/windows/doomsday.rc b/doomsday/client/res/windows/doomsday.rc
deleted file mode 100644
index 6dbe30a..0000000
--- a/doomsday/client/res/windows/doomsday.rc
+++ /dev/null
@@ -1,150 +0,0 @@
-/**\file
- *\section License
- * License: GPL
- * Online License Link: http://www.gnu.org/licenses/gpl.html
- *
- *\author Copyright � 2008-2009 Daniel Swanson <danij at dengine.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301 USA
- */
-
-/**
- * doomsday.rc: Doomsday.exe resource script.
- */
-
-#include "../../include/windows/resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-
-#include "windows.h"
-#include "../../../api/dd_version.h"
-
-#undef APSTUDIO_READONLY_SYMBOLS
-
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-# ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-# endif //_WIN32
-
-# ifdef APSTUDIO_INVOKED
-1 TEXTINCLUDE
-BEGIN
- "resource.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
- "#include ""windows.h""\r\n"
- "#include ""../../api/dd_version.h""\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
- "#ifndef NO_MANIFEST\r\n"
- " CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST ""doomsday.exe.manifest""\r\n"
- "#endif\r\n"
- "\r\n"
- "VS_VERSION_INFO VERSIONINFO\r\n"
- "FILEVERSION DOOMSDAY_VERSION_NUMBER\r\n"
- "PRODUCTVERSION DOOMSDAY_VERSION_NUMBER\r\n"
- "# if defined(_DEBUG)\r\n"
- "FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE\r\n"
- "# elif defined(DOOMSDAY_RELEASE_FULL)\r\n"
- "FILEFLAGSMASK VS_FF_SPECIALBUILD\r\n"
- "# else\r\n"
- "FILEFLAGSMASK 0\r\n"
- "# endif\r\n"
- "FILEOS VOS_NT_WINDOWS32\r\n"
- "FILETYPE VFT_APP\r\n"
- "FILESUBTYPE VFT2_UNKNOWN\r\n"
- "BEGIN\r\n"
- " BLOCK ""StringFileInfo""\r\n"
- " BEGIN\r\n"
- " BLOCK ""040904b0""\r\n"
- " BEGIN\r\n"
- " VALUE ""CompanyName"", ""\0""\r\n"
- " VALUE ""FileDescription"", ""Doomsday Engine\0""\r\n"
- " VALUE ""FileVersion"", DOOMSDAY_VERSION_TEXT ""\0""\r\n"
- " VALUE ""InternalName"", ""Doomsday Engine\0""\r\n"
- " VALUE ""LegalCopyright"", ""Copyright � 2003-2012, deng Team\0""\r\n"
- " VALUE ""OriginalFilename"", ""Doomsday.exe\0""\r\n"
- " VALUE ""ProductName"", ""Doomsday Engine\0""\r\n"
- " VALUE ""ProductVersion"", DOOMSDAY_VERSION_TEXT ""\0""\r\n"
- "#if !defined(_DEBUG) && !defined(DOOMSDAY_RELEASE_FULL) && defined(DOOMSDAY_RELEASE_NAME)\r\n"
- " VALUE ""SpecialBuild"", DOOMSDAY_RELEASE_NAME ""\0""\r\n"
- "#endif\r\n"
- " END\r\n"
- " END\r\n"
- "\r\n"
- " BLOCK ""VarFileInfo""\r\n"
- " BEGIN\r\n"
- " VALUE ""Translation"", 0x409, 1200\r\n"
- " END\r\n"
- "END\r\n"
-END
-# endif
-
-/**
- * Icons:
- * Icon with lowest ID value placed first to ensure application icon
- * remains consistent on all systems.
- */
-IDI_GAME_ICON ICON DISCARDABLE "doomsday.ico"
-
-#endif // English (U.S.) resources
-
-#ifndef APSTUDIO_INVOKED
-VS_VERSION_INFO VERSIONINFO
-FILEVERSION DOOMSDAY_VERSION_NUMBER
-PRODUCTVERSION DOOMSDAY_VERSION_NUMBER
-# if defined(_DEBUG)
-FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE
-# elif !defined(DOOMSDAY_RELEASE_FULL)
-FILEFLAGSMASK VS_FF_SPECIALBUILD
-# else
-FILEFLAGSMASK 0
-# endif
-FILEOS VOS_NT_WINDOWS32
-FILETYPE VFT_APP
-FILESUBTYPE VFT2_UNKNOWN
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904E4"
- BEGIN
- VALUE "CompanyName", "\0"
- VALUE "FileDescription", "Doomsday Engine\0"
- VALUE "FileVersion", DOOMSDAY_VERSION_TEXT "\0"
- VALUE "InternalName", "Doomsday Engine\0"
- VALUE "LegalCopyright", "Copyright � 2003-2012, deng Team\0"
- VALUE "OriginalFilename", "Doomsday.exe\0"
- VALUE "ProductName", "Doomsday Engine\0"
- VALUE "ProductVersion", DOOMSDAY_VERSION_TEXT "\0"
-#if !defined(_DEBUG) && !defined(DOOMSDAY_RELEASE_FULL) && defined(DOOMSDAY_RELEASE_NAME)
- VALUE "SpecialBuild", DOOMSDAY_RELEASE_NAME "\0"
-#endif
- END
- END
-
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-#endif
diff --git a/doomsday/client/src/def_main.cpp b/doomsday/client/src/def_main.cpp
index bf93bda..805aac6 100644
--- a/doomsday/client/src/def_main.cpp
+++ b/doomsday/client/src/def_main.cpp
@@ -1981,7 +1981,7 @@ int Def_Get(int type, char const *id, void *out)
return defs.getSoundNumForName(id);
case DD_DEF_SOUND_LUMPNAME: {
- int i = *((long *) id);
+ int32_t i = *((int32_t *) id);
if(i < 0 || i >= runtimeDefs.sounds.size())
return false;
qstrcpy((char *)out, runtimeDefs.sounds[i].lumpName);
@@ -2002,7 +2002,7 @@ int Def_Get(int type, char const *id, void *out)
return idx; }
case DD_DEF_VALUE_BY_INDEX: {
- int idx = *((long *) id);
+ int32_t idx = *((int32_t *) id);
if(idx >= 0 && idx < defs.values.size())
{
if(out) *(char **) out = defs.values[idx].text;
diff --git a/doomsday/client/src/resource/hq2x.cpp b/doomsday/client/src/resource/hq2x.cpp
index 5151f5c..4b6b4e5 100644
--- a/doomsday/client/src/resource/hq2x.cpp
+++ b/doomsday/client/src/resource/hq2x.cpp
@@ -152,7 +152,7 @@
#define PIXEL11_90 Interp9(pOut+BpL+4, w[5], w[6], w[8]);
#define PIXEL11_100 Interp10(pOut+BpL+4, w[5], w[6], w[8]);
-static uint32_t lutBGR888toYUV888[32*64*32-1];
+static uint32_t lutBGR888toYUV888[32*64*32];
static uint32_t YUV1, YUV2;
void LerpColor(uint8_t* pc, uint32_t c1, uint32_t c2, uint32_t c3, uint32_t f1,
diff --git a/doomsday/doc/output/doomsday.6 b/doomsday/doc/output/doomsday.6
index 197a36c..e3fc759 100644
--- a/doomsday/doc/output/doomsday.6
+++ b/doomsday/doc/output/doomsday.6
@@ -1,5 +1,5 @@
.\" manual page generated by Amethyst (mdoc+tbl)
-.Dd June 5, 2015
+.Dd July 1, 2015
.Os
.Dt "DOOMSDAY" 6
.Sh NAME
diff --git a/doomsday/doc/readme/readme.ame b/doomsday/doc/readme/readme.ame
index b6b7e74..0e4099f 100644
--- a/doomsday/doc/readme/readme.ame
+++ b/doomsday/doc/readme/readme.ame
@@ -5,7 +5,7 @@
@macro{TITLE}{ doomsday }
}
@macro{ONELINER}{ Enhanced source port of Doom, Heretic and Hexen }
- at macro{VERSION}{ Version 1.15 }
+ at macro{VERSION}{ Version 1.15.1 }
@macro{AUTHOR}{ Deng Team }
@macro{LINK}{ http://dengine.net/ }
@require{amestd}
diff --git a/doomsday/doc/server/server.ame b/doomsday/doc/server/server.ame
index 34a18d5..e433d15 100644
--- a/doomsday/doc/server/server.ame
+++ b/doomsday/doc/server/server.ame
@@ -1,7 +1,7 @@
$ Man page for doomsday-server
@macro{TITLE}{ doomsday-server }
@macro{ONELINER}{ Doomsday Engine multiplayer daemon }
- at macro{VERSION}{ Version 1.15 }
+ at macro{VERSION}{ Version 1.15.1 }
@macro{AUTHOR}{ Deng Team }
@macro{LINK}{ http://dengine.net/ }
@require{amestd}
diff --git a/doomsday/doc/shell-text/shell-text.ame b/doomsday/doc/shell-text/shell-text.ame
index c1b5e9e..4f5f95b 100644
--- a/doomsday/doc/shell-text/shell-text.ame
+++ b/doomsday/doc/shell-text/shell-text.ame
@@ -1,7 +1,7 @@
$ Man page for doomsday-shell-text
@macro{TITLE}{ doomsday-shell-text }
@macro{ONELINER}{ Utility for controlling and monitoring Doomsday servers }
- at macro{VERSION}{ Version 1.15 }
+ at macro{VERSION}{ Version 1.15.1 }
@macro{AUTHOR}{ Deng Team }
@macro{LINK}{ http://dengine.net/ }
@require{amestd}
diff --git a/doomsday/libappfw/appfw.doxy b/doomsday/libappfw/appfw.doxy
index 543c281..2c579b0 100644
--- a/doomsday/libappfw/appfw.doxy
+++ b/doomsday/libappfw/appfw.doxy
@@ -2,7 +2,7 @@
@INCLUDE = ../doomsday.doxy
PROJECT_NAME = "libappfw"
-PROJECT_NUMBER = 1.15.0
+PROJECT_NUMBER = 1.15.1
PROJECT_BRIEF = "Application Framework"
OUTPUT_DIRECTORY = ../apidoc/appfw/
diff --git a/doomsday/libcore/net.dengine.stdlib.pack/Info b/doomsday/libcore/net.dengine.stdlib.pack/Info
index 2f3ca37..5ee8396 100644
--- a/doomsday/libcore/net.dengine.stdlib.pack/Info
+++ b/doomsday/libcore/net.dengine.stdlib.pack/Info
@@ -1,5 +1,5 @@
title: Doomsday Script Standard Library
-version: 1.15.0
+version: 1.15.1
license: GPL 3+
tags: core script
diff --git a/doomsday/libcore/res/win32/.gitignore b/doomsday/libcore/res/win32/.gitignore
deleted file mode 100644
index b5b9140..0000000
--- a/doomsday/libcore/res/win32/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-core.rc
diff --git a/doomsday/libcore/res/win32/core.rc.in b/doomsday/libcore/res/win32/core.rc.in
deleted file mode 100644
index d38772a..0000000
--- a/doomsday/libcore/res/win32/core.rc.in
+++ /dev/null
@@ -1,143 +0,0 @@
-/**
- * @file core.rc
- * Win32 resource script (template).
- *
- * @authors Copyright © 2008-2013 Daniel Swanson <danij at dengine.net>
- * @authors Copyright © 2012-2013 Jaakko Keranen <jaakko.keranen at iki.fi>
- *
- * @par License
- * LGPL: http://www.gnu.org/licenses/lgpl.html
- *
- * <small>This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or (at your
- * option) any later version. This program is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
- * General Public License for more details. You should have received a copy of
- * the GNU Lesser General Public License along with this program; if not, see:
- * http://www.gnu.org/licenses</small>
- */
-
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-
-#include "windows.h"
-
-#undef APSTUDIO_READONLY_SYMBOLS
-
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-# ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-# endif //_WIN32
-
-# ifdef APSTUDIO_INVOKED
-1 TEXTINCLUDE
-BEGIN
- "resource.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
- "#include ""windows.h""\r\n"
-END
-
-3 TEXTINCLUDE
-BEGIN
- "#ifndef NO_MANIFEST\r\n"
- " CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST ""deng_core.dll.manifest""\r\n"
- "#endif\r\n"
- "\r\n"
- "VS_VERSION_INFO VERSIONINFO\r\n"
- "FILEVERSION LIBDENG2_VERSION_NUMBER\r\n"
- "PRODUCTVERSION LIBDENG2_VERSION_NUMBER\r\n"
- "# if defined(_DEBUG)\r\n"
- "FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE\r\n"
- "# elif defined(LIBDENG2_RELEASE_FULL)\r\n"
- "FILEFLAGSMASK VS_FF_SPECIALBUILD\r\n"
- "# else\r\n"
- "FILEFLAGSMASK 0\r\n"
- "# endif\r\n"
- "FILEOS VOS_NT_WINDOWS32\r\n"
- "FILETYPE VFT_DLL\r\n"
- "FILESUBTYPE VFT2_UNKNOWN\r\n"
- "BEGIN\r\n"
- " BLOCK ""StringFileInfo""\r\n"
- " BEGIN\r\n"
- " BLOCK ""040904b0""\r\n"
- " BEGIN\r\n"
- " VALUE ""CompanyName"", ""\0""\r\n"
- "#if defined(UNICODE)\r\n"
- " VALUE ""FileDescription"", LIBDENG2_DESC_WSTR ""\0""\r\n"
- "#else\r\n"
- " VALUE ""FileDescription"", LIBDENG2_DESC ""\0""\r\n"
- "#endif\r\n"
- " VALUE ""FileVersion"", LIBDENG2_VERSION_TEXT ""\0""\r\n"
- " VALUE ""InternalName"", LIBDENG2_NICENAME ""\0""\r\n"
- " VALUE ""LegalCopyright"", ""Copyright (c) "" LIBDENG2_COPYRIGHT ""\0""\r\n"
- " VALUE ""OriginalFilename"", LIBDENG2_FILENAME ""\0""\r\n"
- " VALUE ""ProductName"", LIBDENG2_NICENAME ""\0""\r\n"
- " VALUE ""ProductVersion"", LIBDENG2_VERSION_TEXT ""\0""\r\n"
- "#if !defined(_DEBUG) && !defined(LIBDENG2_RELEASE_FULL) && defined(LIBDENG2_RELEASE_NAME)\r\n"
- " VALUE ""SpecialBuild"", LIBDENG2_RELEASE_NAME ""\0""\r\n"
- "#endif\r\n"
- " END\r\n"
- " END\r\n"
- "\r\n"
- " BLOCK ""VarFileInfo""\r\n"
- " BEGIN\r\n"
- " VALUE ""Translation"", 0x409, 1200\r\n"
- " END\r\n"
- "END\r\n"
-END
-# endif
-
-#endif // English (U.S.) resources
-
-#ifndef APSTUDIO_INVOKED
-VS_VERSION_INFO VERSIONINFO
-FILEVERSION LIBDENG2_VERSION_NUMBER
-PRODUCTVERSION LIBDENG2_VERSION_NUMBER
-# if defined(_DEBUG)
-FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE
-# elif !defined(LIBDENG2_RELEASE_FULL)
-FILEFLAGSMASK VS_FF_SPECIALBUILD
-# else
-FILEFLAGSMASK 0
-# endif
-FILEOS VOS_NT_WINDOWS32
-FILETYPE VFT_DLL
-FILESUBTYPE VFT2_UNKNOWN
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904E4"
- BEGIN
- VALUE "CompanyName", "\0"
-#if defined(UNICODE)
- VALUE "FileDescription", LIBDENG2_DESC_WSTR "\0"
-#else
- VALUE "FileDescription", LIBDENG2_DESC "\0"
-#endif
- VALUE "FileVersion", LIBDENG2_VERSION_TEXT "\0"
- VALUE "InternalName", LIBDENG2_NICENAME "\0"
- VALUE "LegalCopyright", "Copyright (c) " LIBDENG2_COPYRIGHT "\0"
- VALUE "OriginalFilename", LIBDENG2_FILENAME "\0"
- VALUE "ProductName", LIBDENG2_NICENAME "\0"
- VALUE "ProductVersion", LIBDENG2_VERSION_TEXT "\0"
-#if !defined(_DEBUG) && !defined(LIBDENG2_RELEASE_FULL) && defined(LIBDENG2_RELEASE_NAME)
- VALUE "SpecialBuild", LIBDENG2_RELEASE_NAME "\0"
-#endif
- END
- END
-
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-#endif
diff --git a/doomsday/libcore/res/win32/deng_core.dll.manifest b/doomsday/libcore/res/win32/deng_core.dll.manifest
deleted file mode 100644
index a7be608..0000000
--- a/doomsday/libcore/res/win32/deng_core.dll.manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
- <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
- <security>
- <requestedPrivileges>
- <requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel>
- </requestedPrivileges>
- </security>
- </trustInfo>
-</assembly>
\ No newline at end of file
diff --git a/doomsday/libcore/res/win32/generate_rc.py b/doomsday/libcore/res/win32/generate_rc.py
deleted file mode 100644
index 7a39e1b..0000000
--- a/doomsday/libcore/res/win32/generate_rc.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# The arguments:
-# 1 - output file (+".in" for input file)
-# 2 - major
-# 3 - minor
-# 4 - patch
-# 5 - label
-# 6 - build number (optional)
-
-import sys
-import string
-import time
-
-def todays_build():
- now = time.localtime()
- return str((now.tm_year - 2011)*365 + now.tm_yday)
-
-inFile = file(sys.argv[1] + '.in', 'rt')
-outFile = file(sys.argv[1], 'wt')
-
-if len(sys.argv) > 6:
- BUILD = sys.argv[6]
-else:
- BUILD = todays_build()
-
-VERSION = string.join(sys.argv[2:5], '.')
-WIN_VERSION = string.join(sys.argv[2:5], ',') + ',' + BUILD
-
-# Read in the template, substituting symbols for the correct info.
-for line in inFile.readlines():
- def quoted(s):
- if line.strip() and line.strip()[0] == '"':
- return '""%s""' % s
- else:
- return '"%s"' % s
-
- line = line \
- .replace('LIBDENG2_VERSION_NUMBER', WIN_VERSION) \
- .replace('LIBDENG2_DESC_WSTR', quoted('Doomsday 2 core library')) \
- .replace('LIBDENG2_DESC', quoted('Doomsday 2 core library')) \
- .replace('LIBDENG2_VERSION_TEXT', quoted(VERSION)) \
- .replace('LIBDENG2_NICENAME', quoted('libcore')) \
- .replace('LIBDENG2_COPYRIGHT', quoted('2004-2014 Deng Team')) \
- .replace('LIBDENG2_FILENAME', quoted('deng_core.dll'))
-
- outFile.write(line)
diff --git a/doomsday/libcore/res/win32/resource.h b/doomsday/libcore/res/win32/resource.h
deleted file mode 100644
index 4003709..0000000
--- a/doomsday/libcore/res/win32/resource.h
+++ /dev/null
@@ -1,15 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by core.rc
-//
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 101
-#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1000
-#define _APS_NEXT_SYMED_VALUE 100
-#endif
-#endif
diff --git a/doomsday/libdoomsday/src/defs/dedparser.cpp b/doomsday/libdoomsday/src/defs/dedparser.cpp
index d59d40d..d957644 100644
--- a/doomsday/libdoomsday/src/defs/dedparser.cpp
+++ b/doomsday/libdoomsday/src/defs/dedparser.cpp
@@ -1783,9 +1783,14 @@ DENG2_PIMPL(DEDParser)
}
else
{
- LOG_RES_WARNING("Ignoring unknown Music \"%s\" in %s on line #%i")
- << otherMusicId << (source? source->fileName : "?")
- << (source? source->lineNumber : 0);
+ // Don't print a warning about the translated MAPINFO definitions
+ // (see issue #2083).
+ if(!source || source->fileName != "[TranslatedMapInfos]")
+ {
+ LOG_RES_WARNING("Ignoring unknown Music \"%s\" in %s on line #%i")
+ << otherMusicId << (source? source->fileName : "?")
+ << (source? source->lineNumber : 0);
+ }
// We'll read into a dummy definition.
defn::Music(dummyMusic).resetToDefaults();
diff --git a/doomsday/libgui/gui.doxy b/doomsday/libgui/gui.doxy
index 3d9bf77..2cf5ee6 100644
--- a/doomsday/libgui/gui.doxy
+++ b/doomsday/libgui/gui.doxy
@@ -2,7 +2,7 @@
@INCLUDE = ../doomsday.doxy
PROJECT_NAME = "libgui"
-PROJECT_NUMBER = 1.15.0
+PROJECT_NUMBER = 1.15.1
PROJECT_BRIEF = "Graphics, Audio and Input Library"
OUTPUT_DIRECTORY = ../apidoc/gui/
diff --git a/doomsday/libgui/net.dengine.stdlib.gui.pack/Info b/doomsday/libgui/net.dengine.stdlib.gui.pack/Info
index 20e00a1..5415e50 100644
--- a/doomsday/libgui/net.dengine.stdlib.gui.pack/Info
+++ b/doomsday/libgui/net.dengine.stdlib.gui.pack/Info
@@ -1,5 +1,5 @@
title: Doomsday Script Standard Library: GUI
-version: 1.15.0
+version: 1.15.1
license: GPL 3+
tags: core script gui
diff --git a/doomsday/net.dengine.base.pack/Info b/doomsday/net.dengine.base.pack/Info
index 2b38669..e9d68c5 100644
--- a/doomsday/net.dengine.base.pack/Info
+++ b/doomsday/net.dengine.base.pack/Info
@@ -1,6 +1,6 @@
# Shared resources for all Doomsday applications
title: Doomsday Base
-version: 1.15.0
+version: 1.15.1
license: GPL 3+
tags: core
diff --git a/doomsday/plugins/doom/data/conhelp.txt b/doomsday/plugins/doom/data/conhelp.txt
index b6560a2..bf7eb33 100644
--- a/doomsday/plugins/doom/data/conhelp.txt
+++ b/doomsday/plugins/doom/data/conhelp.txt
@@ -38,6 +38,10 @@ desc = Show the Help screens.
[kill]
desc = Kill all the monsters on the map.
+[leavemap]
+desc = Leave the current map and load the next according to the map progression of the current episode.
+inf = USAGE:\nleavemap [(exit)]\nIf (exit) is specified, an exit by this name will be searched for in the defined map progression for the current episode, rather than the default exit; "next".
+
[loadgame]
desc = Load a game-save or open the load menu.
inf = Params: loadgame (game-save-name|<keyword>|save-slot-num) (confirm)\nKeywords: last, quick\nExamples:\nOpen load menu: 'loadgame'\nLoading named game: 'loadgame "running low on ammo"'\nLoading current "quick" slot, confirmed: 'loadgame quick confirm'\nLoading slot #0: 'loadgame 0'
@@ -166,9 +170,6 @@ desc = Gives you weapons, ammo, power-ups, etc.
[god]
desc = God mode (cheat).
-[leavemap]
-desc = Leave the current map.
-
[setclass]
desc = Set player class.
@@ -646,11 +647,14 @@ desc = 1=Allow cheating in multiplayer games (god, noclip, give).
[server-game-deathmatch]
desc = 1=Start multiplayer games as deathmatch.
+[server-game-episode]
+desc = Identifier of the episode to be played in a multiplayer game.
+
[server-game-jump]
desc = 1=Allow jumping in multiplayer games.
[server-game-map]
-desc = Map to use in multiplayer games.
+desc = Identifier of the map to be played in a multiplayer game.
[server-game-mapcycle-noexit]
desc = 1=Disable exit buttons during map rotation.
@@ -925,9 +929,6 @@ desc = 1=Respawn items in co-op games.
[server-game-deathmatch-killmsg]
desc = 1=Announce frags in deathmatch.
-[server-game-episode]
-desc = Episode to use in multiplayer games.
-
[server-game-nobfg]
desc = 1=Disable BFG9000 in all netgames.
diff --git a/doomsday/plugins/doom/src/d_main.cpp b/doomsday/plugins/doom/src/d_main.cpp
index c0ca954..7c8e931 100644
--- a/doomsday/plugins/doom/src/d_main.cpp
+++ b/doomsday/plugins/doom/src/d_main.cpp
@@ -237,7 +237,8 @@ void D_PreInit()
}
cfg.common.hudScale = .6f;
- memcpy(cfg.common.hudColor, defFontRGB2, sizeof(cfg.common.hudColor));
+ memcpy(cfg.common.hudColor, defFontRGB2, MIN_OF(sizeof(defFontRGB2),
+ sizeof(cfg.common.hudColor)));
cfg.common.hudColor[CA] = 1;
cfg.common.hudFog = 1;
diff --git a/doomsday/plugins/heretic/data/conhelp.txt b/doomsday/plugins/heretic/data/conhelp.txt
index 902cd32..2911352 100644
--- a/doomsday/plugins/heretic/data/conhelp.txt
+++ b/doomsday/plugins/heretic/data/conhelp.txt
@@ -38,6 +38,10 @@ desc = Show the Help screens.
[kill]
desc = Kill all the monsters on the map.
+[leavemap]
+desc = Leave the current map and load the next according to the map progression of the current episode.
+inf = USAGE:\nleavemap [(exit)]\nIf (exit) is specified, an exit by this name will be searched for in the defined map progression for the current episode, rather than the default exit; "next".
+
[loadgame]
desc = Load a game-save or open the load menu.
inf = Params: loadgame (game-save-name|<keyword>|save-slot-num) (confirm)\nKeywords: last, quick\nExamples:\nOpen load menu: 'loadgame'\nLoading named game: 'loadgame "running low on ammo"'\nLoading current "quick" slot, confirmed: 'loadgame quick confirm'\nLoading slot #0: 'loadgame 0'
@@ -163,9 +167,6 @@ inf = Params: cheat (cheat)\nFor example, 'cheat rambo'.
[chicken]
desc = Turn yourself into a chicken. Go ahead.
-[exitmap]
-desc = Exit the current map.
-
[give]
desc = Cheat command to give you various kinds of things.
@@ -649,11 +650,14 @@ desc = 1=Allow cheating in multiplayer games (god, noclip, give).
[server-game-deathmatch]
desc = 1=Start multiplayer games as deathmatch.
+[server-game-episode]
+desc = Identifier of the episode to be played in a multiplayer game.
+
[server-game-jump]
desc = 1=Allow jumping in multiplayer games.
[server-game-map]
-desc = Map to use in multiplayer games.
+desc = Identifier of the map to be played in a multiplayer game.
[server-game-mapcycle-noexit]
desc = 1=Disable exit buttons during map rotation.
diff --git a/doomsday/plugins/hexen/data/conhelp.txt b/doomsday/plugins/hexen/data/conhelp.txt
index ed3dece..7410ed1 100644
--- a/doomsday/plugins/hexen/data/conhelp.txt
+++ b/doomsday/plugins/hexen/data/conhelp.txt
@@ -38,6 +38,10 @@ desc = Show the Help screens.
[kill]
desc = Kill all the monsters on the map.
+[leavemap]
+desc = Leave the current map and load the next according to the map progression of the current episode.
+inf = USAGE:\nleavemap [(exit)]\nIf (exit) is specified, an exit by this name will be searched for in the defined map progression for the current episode, rather than the default exit; "next".
+
[loadgame]
desc = Load a game-save or open the load menu.
inf = Params: loadgame (game-save-name|<keyword>|save-slot-num) (confirm)\nKeywords: last, quick\nExamples:\nOpen load menu: 'loadgame'\nLoading named game: 'loadgame "running low on ammo"'\nLoading current "quick" slot, confirmed: 'loadgame quick confirm'\nLoading slot #0: 'loadgame 0'
@@ -425,6 +429,9 @@ desc = Door glow thickness in the automap (with map-door-colors).
[map-episode]
desc = Current episode id.
+[map-hub]
+desc = Current hub id.
+
[map-huddisplay]
desc = 0=No HUD when in the automap 1=Current HUD display shown when in the automap 2=Always show Status Bar when in the automap
@@ -659,11 +666,14 @@ desc = 1=Allow cheating in multiplayer games (god, noclip, give).
[server-game-deathmatch]
desc = 1=Start multiplayer games as deathmatch.
+[server-game-episode]
+desc = Identifier of the episode to be played in a multiplayer game.
+
[server-game-jump]
desc = 1=Allow jumping in multiplayer games.
[server-game-map]
-desc = Map to use in multiplayer games.
+desc = Identifier of the map to be played in a multiplayer game.
[server-game-mapcycle-noexit]
desc = 1=Disable exit buttons during map rotation.
@@ -770,9 +780,6 @@ desc = Show mana when the status bar is hidden. 1=top, 2=bottom, 0=off
[hud-unhide-pickup-invitem]
desc = 1=Unhide the HUD when player collects an inventory item.
-[map-hub]
-desc = Current hub id.
-
[msg-hub-override]
desc = Override the transition hub message.
diff --git a/doomsday/plugins/hexen/src/p_mobj.c b/doomsday/plugins/hexen/src/p_mobj.c
index 5891549..014556b 100644
--- a/doomsday/plugins/hexen/src/p_mobj.c
+++ b/doomsday/plugins/hexen/src/p_mobj.c
@@ -1711,6 +1711,9 @@ mobj_t* P_SpawnMissile(mobjtype_t type, mobj_t* source, mobj_t* dest)
angle_t angle;
float aim;
+ // Destination is required for the missile; if missing, can't spawn.
+ if(!dest) return NULL;
+
switch(type)
{
case MT_MNTRFX1: // Minotaur swing attack missile
diff --git a/doomsday/sdk-qch.doxy b/doomsday/sdk-qch.doxy
index 60ce5c9..789161b 100644
--- a/doomsday/sdk-qch.doxy
+++ b/doomsday/sdk-qch.doxy
@@ -5,8 +5,8 @@ OUTPUT_DIRECTORY = apidoc-qch/
# Also generate help files for Qt Creator
GENERATE_QHP = YES
QCH_FILE = "doomsday.qch"
-QHP_NAMESPACE = "net.dengine.sdk.1150"
-QHP_VIRTUAL_FOLDER = "doomsday-1.15.0"
+QHP_NAMESPACE = "net.dengine.sdk.1151"
+QHP_VIRTUAL_FOLDER = "doomsday-1.15.1"
QHG_LOCATION = "../build/scripts/qhelp.py"
# Dynamic HTML doesn't work inside Qt Creator
diff --git a/doomsday/tools/shell/shell-gui/res/macx/AppIcon.appiconset/icon_128x128.png b/doomsday/tools/shell/shell-gui/res/macx/AppIcon.appiconset/icon_128x128.png
deleted file mode 100644
index 330e32d..0000000
Binary files a/doomsday/tools/shell/shell-gui/res/macx/AppIcon.appiconset/icon_128x128.png and /dev/null differ
diff --git a/doomsday/tools/shell/shell-gui/res/macx/AppIcon.appiconset/icon_128x128 at 2x.png b/doomsday/tools/shell/shell-gui/res/macx/AppIcon.appiconset/icon_128x128 at 2x.png
deleted file mode 100644
index 3a6a5d1..0000000
Binary files a/doomsday/tools/shell/shell-gui/res/macx/AppIcon.appiconset/icon_128x128 at 2x.png and /dev/null differ
diff --git a/doomsday/tools/shell/shell-gui/res/macx/AppIcon.appiconset/icon_16x16.png b/doomsday/tools/shell/shell-gui/res/macx/AppIcon.appiconset/icon_16x16.png
deleted file mode 100644
index 050796c..0000000
Binary files a/doomsday/tools/shell/shell-gui/res/macx/AppIcon.appiconset/icon_16x16.png and /dev/null differ
diff --git a/doomsday/tools/shell/shell-gui/res/macx/AppIcon.appiconset/icon_16x16 at 2x.png b/doomsday/tools/shell/shell-gui/res/macx/AppIcon.appiconset/icon_16x16 at 2x.png
deleted file mode 100644
index 2746f52..0000000
Binary files a/doomsday/tools/shell/shell-gui/res/macx/AppIcon.appiconset/icon_16x16 at 2x.png and /dev/null differ
diff --git a/doomsday/tools/shell/shell-gui/res/macx/AppIcon.appiconset/icon_256x256.png b/doomsday/tools/shell/shell-gui/res/macx/AppIcon.appiconset/icon_256x256.png
deleted file mode 100644
index 3a6a5d1..0000000
Binary files a/doomsday/tools/shell/shell-gui/res/macx/AppIcon.appiconset/icon_256x256.png and /dev/null differ
diff --git a/doomsday/tools/shell/shell-gui/res/macx/AppIcon.appiconset/icon_256x256 at 2x.png b/doomsday/tools/shell/shell-gui/res/macx/AppIcon.appiconset/icon_256x256 at 2x.png
deleted file mode 100644
index 4cf4532..0000000
Binary files a/doomsday/tools/shell/shell-gui/res/macx/AppIcon.appiconset/icon_256x256 at 2x.png and /dev/null differ
diff --git a/doomsday/tools/shell/shell-gui/res/macx/AppIcon.appiconset/icon_32x32.png b/doomsday/tools/shell/shell-gui/res/macx/AppIcon.appiconset/icon_32x32.png
deleted file mode 100644
index d743441..0000000
Binary files a/doomsday/tools/shell/shell-gui/res/macx/AppIcon.appiconset/icon_32x32.png and /dev/null differ
diff --git a/doomsday/tools/shell/shell-gui/res/macx/AppIcon.appiconset/icon_32x32 at 2x.png b/doomsday/tools/shell/shell-gui/res/macx/AppIcon.appiconset/icon_32x32 at 2x.png
deleted file mode 100644
index aeefa95..0000000
Binary files a/doomsday/tools/shell/shell-gui/res/macx/AppIcon.appiconset/icon_32x32 at 2x.png and /dev/null differ
diff --git a/doomsday/tools/shell/shell-gui/res/macx/AppIcon.appiconset/icon_512x512.png b/doomsday/tools/shell/shell-gui/res/macx/AppIcon.appiconset/icon_512x512.png
deleted file mode 100644
index 4cf4532..0000000
Binary files a/doomsday/tools/shell/shell-gui/res/macx/AppIcon.appiconset/icon_512x512.png and /dev/null differ
diff --git a/doomsday/tools/shell/shell-gui/res/macx/English.lproj/InfoPlist.strings b/doomsday/tools/shell/shell-gui/res/macx/English.lproj/InfoPlist.strings
deleted file mode 100755
index 9dec0f7..0000000
Binary files a/doomsday/tools/shell/shell-gui/res/macx/English.lproj/InfoPlist.strings and /dev/null differ
diff --git a/doomsday/tools/shell/shell-gui/res/macx/Info-Xcode.plist b/doomsday/tools/shell/shell-gui/res/macx/Info-Xcode.plist
deleted file mode 100644
index 91182d3..0000000
--- a/doomsday/tools/shell/shell-gui/res/macx/Info-Xcode.plist
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>CFBundleExecutable</key>
- <string>Shell</string>
- <key>CFBundleIdentifier</key>
- <string>net.dengine.shell</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleVersion</key>
- <string>1.15</string>
- <key>LSApplicationCategoryType</key>
- <string>public.app-category.action-games</string>
- <key>NSHighResolutionCapable</key>
- <string>True</string>
- <key>NSPrincipalClass</key>
- <string>NSApplication</string>
-</dict>
-</plist>
diff --git a/doomsday/tools/shell/shell-gui/res/macx/Info.plist b/doomsday/tools/shell/shell-gui/res/macx/Info.plist
deleted file mode 100644
index 792ef49..0000000
--- a/doomsday/tools/shell/shell-gui/res/macx/Info.plist
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>CFBundleExecutable</key>
- <string>Doomsday Shell</string>
- <key>CFBundleIdentifier</key>
- <string>net.dengine.shell</string>
- <key>CFBundleIconFile</key>
- <string>shell.icns</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleVersion</key>
- <string>1.15</string>
- <key>LSApplicationCategoryType</key>
- <string>public.app-category.action-games</string>
- <key>NSHighResolutionCapable</key>
- <string>True</string>
- <key>NSPrincipalClass</key>
- <string>NSApplication</string>
-</dict>
-</plist>
diff --git a/doomsday/tools/shell/shell-gui/res/macx/shell.icns b/doomsday/tools/shell/shell-gui/res/macx/shell.icns
deleted file mode 100644
index 67e2b31..0000000
Binary files a/doomsday/tools/shell/shell-gui/res/macx/shell.icns and /dev/null differ
diff --git a/doomsday/tools/shell/shell-gui/res/shell.png b/doomsday/tools/shell/shell-gui/res/shell.png
deleted file mode 100644
index bad97c1..0000000
Binary files a/doomsday/tools/shell/shell-gui/res/shell.png and /dev/null differ
diff --git a/doomsday/tools/shell/shell-gui/res/shell.qrc b/doomsday/tools/shell/shell-gui/res/shell.qrc
deleted file mode 100644
index 7b59dd2..0000000
--- a/doomsday/tools/shell/shell-gui/res/shell.qrc
+++ /dev/null
@@ -1,9 +0,0 @@
-<RCC>
- <qresource prefix="/images">
- <file>shell.png</file>
- <file>shell at 2x.png</file>
- <file>toolbar_placeholder.png</file>
- <file>toolbar_console.png</file>
- <file>toolbar_status.png</file>
- </qresource>
-</RCC>
diff --git a/doomsday/tools/shell/shell-gui/res/shell at 2x.png b/doomsday/tools/shell/shell-gui/res/shell at 2x.png
deleted file mode 100644
index d8f444f..0000000
Binary files a/doomsday/tools/shell/shell-gui/res/shell at 2x.png and /dev/null differ
diff --git a/doomsday/tools/shell/shell-gui/res/toolbar_console.png b/doomsday/tools/shell/shell-gui/res/toolbar_console.png
deleted file mode 100644
index a12e87f..0000000
Binary files a/doomsday/tools/shell/shell-gui/res/toolbar_console.png and /dev/null differ
diff --git a/doomsday/tools/shell/shell-gui/res/toolbar_placeholder.png b/doomsday/tools/shell/shell-gui/res/toolbar_placeholder.png
deleted file mode 100644
index 34a6b96..0000000
Binary files a/doomsday/tools/shell/shell-gui/res/toolbar_placeholder.png and /dev/null differ
diff --git a/doomsday/tools/shell/shell-gui/res/toolbar_status.png b/doomsday/tools/shell/shell-gui/res/toolbar_status.png
deleted file mode 100644
index d4a2ce7..0000000
Binary files a/doomsday/tools/shell/shell-gui/res/toolbar_status.png and /dev/null differ
diff --git a/doomsday/tools/shell/shell-gui/res/windows/shell.ico b/doomsday/tools/shell/shell-gui/res/windows/shell.ico
deleted file mode 100644
index 1e4496e..0000000
Binary files a/doomsday/tools/shell/shell-gui/res/windows/shell.ico and /dev/null differ
diff --git a/doomsday/tools/shell/shell-gui/res/windows/shell.rc b/doomsday/tools/shell/shell-gui/res/windows/shell.rc
deleted file mode 100644
index c3c36cb..0000000
--- a/doomsday/tools/shell/shell-gui/res/windows/shell.rc
+++ /dev/null
@@ -1 +0,0 @@
-IDI_ICON1 ICON DISCARDABLE "shell.ico"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/deng.git
More information about the Pkg-games-commits
mailing list