From 4762f9f7cacca690c62b0c8eee186d95b1b1e05f Mon Sep 17 00:00:00 2001 From: lotodore Date: Sun, 22 Dec 2013 13:41:53 +0100 Subject: [PATCH] Preparing release 1.1 --- ChangeLog | 12 ++++++++++++ src/game_defs.h | 4 ++-- src/session.cpp | 8 ++++---- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 907da8de..d78e2067 100755 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2013-12-22 version 1.1 +- New web-based spectator mode on http://www.pokerth.net/live (#37) +- New option to allow/disallow spectators when creating a game (#215) +- Show list of spectators in the lobby and on the game table (#196) +- Support for WebSocket connections was integrated in the server +- Added option to disable emoticons in the chat (#172) +- Avatars are no longer displayed for players which are on the ignore list (#187) +- BUGFIX: context menu in connected player list was fixed (#183) +- BUGFIX: "display idle players" in the lobby was fixed (#136) +- BUGFIX: No longer beep if ignored player uses nickname in chat (#221) +- translation updates + 2013-12-01 version 1.1 beta4 - Updated several translations - New icon for spectator list on table (#217) diff --git a/src/game_defs.h b/src/game_defs.h index 2dd70952..28935870 100644 --- a/src/game_defs.h +++ b/src/game_defs.h @@ -45,8 +45,8 @@ #define POKERTH_VERSION_MINOR 10 #define POKERTH_VERSION ((POKERTH_VERSION_MAJOR << 8) | POKERTH_VERSION_MINOR) -#define POKERTH_BETA_REVISION 4 -#define POKERTH_BETA_RELEASE_STRING "1.1 beta4" +#define POKERTH_BETA_REVISION 0 +#define POKERTH_BETA_RELEASE_STRING "1.1" #define SQLITE_LOG_VERSION 1 diff --git a/src/session.cpp b/src/session.cpp index 138f303d..8db33601 100755 --- a/src/session.cpp +++ b/src/session.cpp @@ -189,11 +189,11 @@ void Session::startInternetClient() myNetClient->Init( myConfig->readConfigString("InternetServerAddress"), -// myConfig->readConfigString("InternetServerListAddress"), - "pokerth.net/serverlist_testing.xml.z", + myConfig->readConfigString("InternetServerListAddress"), +// "pokerth.net/serverlist_testing.xml.z", myConfig->readConfigString("ServerPassword"), -// myConfig->readConfigInt("InternetServerConfigMode") == 0, - true, + myConfig->readConfigInt("InternetServerConfigMode") == 0, +// true, myConfig->readConfigInt("InternetServerPort"), myConfig->readConfigInt("InternetServerUseIpv6") == 1, myConfig->readConfigInt("InternetServerUseSctp") == 1,