Mercurial Mercurial > hedgewars-draft / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge from default 0.9.18
authorkoda
Thu, 01 Nov 2012 21:42:06 +0100
branch0.9.18
changeset 7927 a96614777ce6
parent 7925 de3814a13f65 (diff)
parent 7921 6b074de32bea (current diff)
child 7930 a4320272bb9a
merge from default
CMakeLists.txt file | annotate | diff | comparison | revisions
QTfrontend/hwform.cpp file | annotate | diff | comparison | revisions
QTfrontend/ui/page/pagemain.cpp file | annotate | diff | comparison | revisions 
--- a/.hgtags	Fri Nov 02 00:09:40 2012 +0400
+++ b/.hgtags	Thu Nov 01 21:42:06 2012 +0100
@@ -51,3 +51,11 @@
 4670f003f91b3246665ca0de95fa056d2d2f3f54 0.9.17-release
 ce2b24995ab2efc088accecd7f7b116bb946fff7 hedgeroid-alpha
 2f203395bacab0d5594d3d303b5d87b2f152df50 0.9.18-release
+2f203395bacab0d5594d3d303b5d87b2f152df50 0.9.18-release
+0000000000000000000000000000000000000000 0.9.18-release
+0000000000000000000000000000000000000000 0.9.18-release
+be11c26a3a0be8a2e062d5bf6a746e9a08eac472 0.9.18-release
+be11c26a3a0be8a2e062d5bf6a746e9a08eac472 0.9.18-release
+0000000000000000000000000000000000000000 0.9.18-release
+0000000000000000000000000000000000000000 0.9.18-release
+2fc02902c7cbf3c29bfe08a50e5f37983582b251 0.9.18-release
--- a/CMakeLists.txt	Fri Nov 02 00:09:40 2012 +0400
+++ b/CMakeLists.txt	Thu Nov 01 21:42:06 2012 +0100
@@ -12,7 +12,7 @@
 
 
 #detect Mercurial revision (if present)
-set(version_suffix "-dev") #UNSET THIS VARIABLE AT RELEASE TIME
+set(version_suffix "") #UNSET THIS VARIABLE AT RELEASE TIME
 set(HGCHANGED "")
 IF(version_suffix MATCHES "-dev")
     set(HW_DEV true)
@@ -43,8 +43,8 @@
 #versioning
 set(CPACK_PACKAGE_VERSION_MAJOR 0)
 set(CPACK_PACKAGE_VERSION_MINOR 9)
-set(CPACK_PACKAGE_VERSION_PATCH 19${version_suffix})
-set(HEDGEWARS_PROTO_VER 44)
+set(CPACK_PACKAGE_VERSION_PATCH 18${version_suffix})
+set(HEDGEWARS_PROTO_VER 43)
 set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 
 
--- a/QTfrontend/hwform.cpp	Fri Nov 02 00:09:40 2012 +0400
+++ b/QTfrontend/hwform.cpp	Thu Nov 01 21:42:06 2012 +0100
@@ -190,8 +190,10 @@
     connect(ui.pageMain->BtnSetup, SIGNAL(clicked()), pageSwitchMapper, SLOT(map()));
     pageSwitchMapper->setMapping(ui.pageMain->BtnSetup, ID_PAGE_SETUP);
 
+#if 0
     connect(ui.pageMain->BtnFeedback, SIGNAL(clicked()), pageSwitchMapper, SLOT(map()));
     pageSwitchMapper->setMapping(ui.pageMain->BtnFeedback, ID_PAGE_FEEDBACK);
+#endif
 
     connect(ui.pageMain->BtnNet, SIGNAL(clicked()), pageSwitchMapper, SLOT(map()));
     pageSwitchMapper->setMapping(ui.pageMain->BtnNet, ID_PAGE_NETTYPE);
@@ -1068,7 +1070,7 @@
 
     GoToPage(ID_PAGE_CONNECTING);
 
-    connect(hwnet, SIGNAL(AskForRunGame()), this, SLOT(CreateNetGame()), Qt::QueuedConnection);
+    connect(hwnet, SIGNAL(AskForRunGame()), this, SLOT(CreateNetGame()));
     connect(hwnet, SIGNAL(connected()), this, SLOT(NetConnected()), Qt::QueuedConnection);
     connect(hwnet, SIGNAL(Error(const QString&)), this, SLOT(NetError(const QString&)), Qt::QueuedConnection);
     connect(hwnet, SIGNAL(Warning(const QString&)), this, SLOT(NetWarning(const QString&)), Qt::QueuedConnection);
@@ -1471,8 +1473,8 @@
     connect(game, SIGNAL(SendNet(const QByteArray &)), hwnet, SLOT(SendNet(const QByteArray &)));
     connect(game, SIGNAL(SendChat(const QString &)), hwnet, SLOT(chatLineToNet(const QString &)));
     connect(game, SIGNAL(SendTeamMessage(const QString &)), hwnet, SLOT(SendTeamMessage(const QString &)));
-    connect(hwnet, SIGNAL(FromNet(const QByteArray &)), game, SLOT(FromNet(const QByteArray &)));
-    connect(hwnet, SIGNAL(chatStringFromNet(const QString &)), game, SLOT(FromNetChat(const QString &)));
+    connect(hwnet, SIGNAL(FromNet(const QByteArray &)), game, SLOT(FromNet(const QByteArray &)), Qt::QueuedConnection);
+    connect(hwnet, SIGNAL(chatStringFromNet(const QString &)), game, SLOT(FromNetChat(const QString &)), Qt::QueuedConnection);
 
     game->StartNet();
 }
--- a/QTfrontend/ui/page/pagemain.cpp	Fri Nov 02 00:09:40 2012 +0400
+++ b/QTfrontend/ui/page/pagemain.cpp	Thu Nov 01 21:42:06 2012 +0100
@@ -58,9 +58,11 @@
     BtnInfo->setWhatsThis(tr("Read about who is behind the Hedgewars Project"));
     pageLayout->setAlignment(BtnInfo, Qt::AlignHCenter);
 
+#if 0
     BtnFeedback = addButton("Feedback", pageLayout, 4, 0, 1, 4, false);
     BtnFeedback->setWhatsThis(tr("Leave a feedback here reporting issues, suggesting features or just saying how you like Hedgewars"));
     pageLayout->setAlignment(BtnFeedback, Qt::AlignHCenter);
+#endif
 
     BtnDataDownload = addButton(tr("Downloadable Content"), pageLayout, 5, 0, 1, 4, false);
     //BtnDataDownload->setToolTip(tr(Downloadable Content"));
--- a/hedgewars/uLand.pas	Fri Nov 02 00:09:40 2012 +0400
+++ b/hedgewars/uLand.pas	Thu Nov 01 21:42:06 2012 +0100
@@ -405,6 +405,7 @@
 procedure MakeFortsMap;
 var tmpsurf: PSDL_Surface;
 begin
+ResizeLand(4096,2048);
 MaxHedgehogs:= 32;
 // For now, defining a fort is playable area as 3072x1200 - there are no tall forts.  The extra height is to avoid triggering border with current code, also if user turns on a border, it will give a bit more maneuvering room.
 playHeight:= 1200;
hedgewars-draft