--- a/CMakeLists.txt Sat Sep 17 13:40:54 2011 -0400
+++ b/CMakeLists.txt Sun Sep 18 21:59:34 2011 +0200
@@ -42,7 +42,7 @@
set(CPACK_PACKAGE_VERSION_MAJOR 0)
set(CPACK_PACKAGE_VERSION_MINOR 9)
set(CPACK_PACKAGE_VERSION_PATCH 16${version_suffix})
-set(HEDGEWARS_PROTO_VER 38)
+set(HEDGEWARS_PROTO_VER 39)
set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
@@ -262,10 +262,10 @@
"config\\\\.inc$"
"hwengine\\\\.desktop$"
"CMakeCache\\\\.txt$"
- "^${CMAKE_CURRENT_SOURCE_DIR}/misc/libopenalbridge"
- "^${CMAKE_CURRENT_SOURCE_DIR}/misc/libfreetype"
- "^${CMAKE_CURRENT_SOURCE_DIR}/misc/liblua"
- "^${CMAKE_CURRENT_SOURCE_DIR}/misc/libtremor"
+# "^${CMAKE_CURRENT_SOURCE_DIR}/misc/libopenalbridge"
+# "^${CMAKE_CURRENT_SOURCE_DIR}/misc/libfreetype"
+# "^${CMAKE_CURRENT_SOURCE_DIR}/misc/liblua"
+# "^${CMAKE_CURRENT_SOURCE_DIR}/misc/libtremor"
"^${CMAKE_CURRENT_SOURCE_DIR}/project_files/HedgewarsMobile/"
"^${CMAKE_CURRENT_SOURCE_DIR}/bin/[a-z]"
"^${CMAKE_CURRENT_SOURCE_DIR}/tools/templates"
--- a/QTfrontend/chatwidget.cpp Sat Sep 17 13:40:54 2011 -0400
+++ b/QTfrontend/chatwidget.cpp Sun Sep 18 21:59:34 2011 +0200
@@ -203,7 +203,7 @@
QList<QListWidgetItem *> items = chatNicks->findItems(nick, Qt::MatchExactly);
if (items.size() < 1)
return;
- QMenu * popup = new QMenu();
+ QMenu * popup = new QMenu(this);
// selecting an item will automatically scroll there, so let's save old position
QScrollBar * scrollBar = chatNicks->verticalScrollBar();
int oldScrollPos = scrollBar->sliderPosition();
--- a/QTfrontend/newnetclient.cpp Sat Sep 17 13:40:54 2011 -0400
+++ b/QTfrontend/newnetclient.cpp Sun Sep 18 21:59:34 2011 +0200
@@ -826,7 +826,7 @@
case 0:
{
bool ok = false;
- QString newNick = QInputDialog::getText(0, tr("Nickname"), tr("Some one already uses\n your nickname %1\non the server.\nPlease pick another nickname:").arg(mynick), QLineEdit::Normal, mynick, &ok);
+ QString newNick = QInputDialog::getText(m_pGameCFGWidget, tr("Nickname"), tr("Some one already uses\n your nickname %1\non the server.\nPlease pick another nickname:").arg(mynick), QLineEdit::Normal, mynick, &ok);
if (!ok || newNick.isEmpty()) {
Disconnect();
--- a/QTfrontend/pagenetgame.cpp Sat Sep 17 13:40:54 2011 -0400
+++ b/QTfrontend/pagenetgame.cpp Sun Sep 18 21:59:34 2011 +0200
@@ -41,6 +41,7 @@
pChatWidget->setShowFollow(false); // don't show follow in nicks' context menus
pageLayout->addWidget(pChatWidget, 2, 0, 1, 2);
pageLayout->setRowStretch(1, 100);
+ pageLayout->setRowStretch(2, 100);
pGameCFG = new GameCFGWidget(this);
pageLayout->addWidget(pGameCFG, 0, 0);
--- a/hedgewars/uGears.pas Sat Sep 17 13:40:54 2011 -0400
+++ b/hedgewars/uGears.pas Sun Sep 18 21:59:34 2011 +0200
@@ -224,6 +224,7 @@
gear^.SoundChannel:= -1;
gear^.ImpactSound:= sndNone;
gear^.nImpactSounds:= 0;
+gear^.Density:= _1;
// Define ammo association, if any.
gear^.AmmoType:= GearKindAmmoTypeMap[Kind];
if Ammoz[Gear^.AmmoType].Ammo.Propz and ammoprop_NeedTarget <> 0 then gear^.Z:= cHHZ+1