[deng] 01/06: import upstream 1.15.2
Michael Gilbert
mgilbert at moszumanska.debian.org
Sat Sep 5 23:29:14 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 b32db2fb7f013bbb085474250d27674c0447f3f5
Author: Michael Gilbert <mgilbert at debian.org>
Date: Sat Aug 29 18:37:38 2015 +0000
import upstream 1.15.2
---
doomsday/api/dd_version.h | 4 ++--
doomsday/client/include/world/p_players.h | 5 +++++
doomsday/client/net.dengine.client.pack/Info.dei | 2 +-
doomsday/client/net.dengine.client.pack/defaultstyle.pack/Info | 2 +-
doomsday/client/net.dengine.client.pack/renderer.pack/Info | 2 +-
.../net.dengine.client.pack/renderer.pack/lensflares.pack/Info | 2 +-
doomsday/client/src/ui/b_util.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/libgui/gui.doxy | 2 +-
doomsday/libgui/net.dengine.stdlib.gui.pack/Info | 2 +-
doomsday/net.dengine.base.pack/Info | 2 +-
doomsday/sdk-qch.doxy | 4 ++--
17 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/doomsday/api/dd_version.h b/doomsday/api/dd_version.h
index f045417..ea24c91 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.1"
-#define DOOMSDAY_VERSION_NUMBER 1,15,1,0 // For WIN32 version info.
+#define DOOMSDAY_VERSION_BASE "1.15.2"
+#define DOOMSDAY_VERSION_NUMBER 1,15,2,0 // For WIN32 version info.
//#define DOOMSDAY_RELEASE_NAME "Example"
/**
diff --git a/doomsday/client/include/world/p_players.h b/doomsday/client/include/world/p_players.h
index 6bf46ce..4b22168 100644
--- a/doomsday/client/include/world/p_players.h
+++ b/doomsday/client/include/world/p_players.h
@@ -58,6 +58,11 @@ int P_LocalToConsole(int localPlayer);
/**
* Determine the local player number used by a particular console. Local
* players are numbered starting from zero.
+ *
+ * @param playerNum Console number.
+ *
+ * @return Local player number. Returns -1 if @a playerNum does not correspond
+ * to any local player.
*/
int P_ConsoleToLocal(int playerNum);
diff --git a/doomsday/client/net.dengine.client.pack/Info.dei b/doomsday/client/net.dengine.client.pack/Info.dei
index 3d93e78..cda5078 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.1
+version: 1.15.2
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 758a674..ab79a3f 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.1
+version: 1.15.2
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 e091e90..2f1a516 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.1
+version: 1.15.2
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 b17ec6e..0c7e3db 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.1
+version: 1.15.2
license: GPL 3+
tags: core fx
diff --git a/doomsday/client/src/ui/b_util.cpp b/doomsday/client/src/ui/b_util.cpp
index 46f5826..ae1f057 100644
--- a/doomsday/client/src/ui/b_util.cpp
+++ b/doomsday/client/src/ui/b_util.cpp
@@ -507,6 +507,8 @@ void B_EvaluateImpulseBindings(BindContext *context, int localNum, int impulseId
*pos = 0;
*relativeOffset = 0;
+
+ if(localNum < 0 || localNum >= DDMAXPLAYERS) return; // No local player specified.
uint const nowTime = Timer_RealMilliseconds();
bool conflicted[NUM_IBD_TYPES]; de::zap(conflicted);
diff --git a/doomsday/doc/output/doomsday.6 b/doomsday/doc/output/doomsday.6
index e3fc759..4be0cb5 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 July 1, 2015
+.Dd August 1, 2015
.Os
.Dt "DOOMSDAY" 6
.Sh NAME
diff --git a/doomsday/doc/readme/readme.ame b/doomsday/doc/readme/readme.ame
index 0e4099f..fb99cc9 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.1 }
+ at macro{VERSION}{ Version 1.15.2 }
@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 e433d15..823c8ee 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.1 }
+ at macro{VERSION}{ Version 1.15.2 }
@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 4f5f95b..9ee13c9 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.1 }
+ at macro{VERSION}{ Version 1.15.2 }
@macro{AUTHOR}{ Deng Team }
@macro{LINK}{ http://dengine.net/ }
@require{amestd}
diff --git a/doomsday/libappfw/appfw.doxy b/doomsday/libappfw/appfw.doxy
index 2c579b0..e99371a 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.1
+PROJECT_NUMBER = 1.15.2
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 5ee8396..707e1f5 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.1
+version: 1.15.2
license: GPL 3+
tags: core script
diff --git a/doomsday/libgui/gui.doxy b/doomsday/libgui/gui.doxy
index 2cf5ee6..e24e5d2 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.1
+PROJECT_NUMBER = 1.15.2
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 5415e50..0b9c37d 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.1
+version: 1.15.2
license: GPL 3+
tags: core script gui
diff --git a/doomsday/net.dengine.base.pack/Info b/doomsday/net.dengine.base.pack/Info
index e9d68c5..b022dc3 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.1
+version: 1.15.2
license: GPL 3+
tags: core
diff --git a/doomsday/sdk-qch.doxy b/doomsday/sdk-qch.doxy
index 789161b..4ee077e 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.1151"
-QHP_VIRTUAL_FOLDER = "doomsday-1.15.1"
+QHP_NAMESPACE = "net.dengine.sdk.1152"
+QHP_VIRTUAL_FOLDER = "doomsday-1.15.2"
QHG_LOCATION = "../build/scripts/qhelp.py"
# Dynamic HTML doesn't work inside Qt Creator
--
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