# HG changeset patch
# User Vittorio Giovara
# Date 1447090677 -3600
# Node ID 8ce376b1613263b66b18ad00542f0af5f4ac237f
# Parent 14de659a4b796775d8b1b154d082c9b7b57b6bf3# Parent facac91c7c658aa6d1081367c116406a436f8b1b
Merge pull request #33 from bananaoomarang/cmakeWarnings
Remove quotes when checking Haskell Modules to adopt CMP0054
diff -r facac91c7c65 -r 8ce376b16132 .hgignore
--- a/.hgignore Sun Apr 26 13:02:38 2015 +0100
+++ b/.hgignore Mon Nov 09 18:37:57 2015 +0100
@@ -26,7 +26,7 @@
glob:*.diff
glob:vittorio.*
glob:project_files/HedgewarsMobile/Data/
-glob:project_files/HedgewarsMobile/build/
+glob:project_files/HedgewarsMobile/Build/
glob:gameServer/dist/
glob:misc/liblua/Xcode/build/
glob:misc/libphysfs/Xcode/build/
@@ -65,3 +65,18 @@
glob:*.tar.*
glob:*.or
glob:*.res
+glob:Hedgewars.app/*
+glob:tools/CreateMacBundle.cmake
+glob:share/Info.plist
+glob:CTestTestfile.cmake
+glob:arch.c
+glob:*.swp
+glob:*~.nib
+glob:*.pbxuser
+glob:*.perspective
+glob:*.perspectivev3
+glob:*.project.xcworkspace
+glob:*.xcuserdata
+glob:xcuserdata
+glob:*.mode1v3
+glob:*.mode2v3
diff -r facac91c7c65 -r 8ce376b16132 .hgtags
--- a/.hgtags Sun Apr 26 13:02:38 2015 +0100
+++ b/.hgtags Mon Nov 09 18:37:57 2015 +0100
@@ -61,3 +61,12 @@
2fc02902c7cbf3c29bfe08a50e5f37983582b251 0.9.18-release
1617149e01a4fa25637e2ab655d0287ef9c21b7c 0.9.19-release
af0520a6bf0061b27f8321514d35fcd2b1ef5f9c 0.9.20-release
+7e55468ffe384a3065524c483eb5e3cdb1658fd5 0.9.21-release
+7e55468ffe384a3065524c483eb5e3cdb1658fd5 fab746a3597e
+0f5961910e2712582b162abd08ae3eed330cc978 Nice one
+d9622394ec9c2974a84b9b4d9e6c0ac26c4060ff 0.9.22-RC
+0f5961910e2712582b162abd08ae3eed330cc978 Nice one
+0000000000000000000000000000000000000000 Nice one
+4c4f22cc3fa4e6c1e5cd6cce35350dd93478415f 0.9.22-release
+4c4f22cc3fa4e6c1e5cd6cce35350dd93478415f 0.9.22-release
+9621fdcad96589b3fd78713a0f31e72f26f068bb 0.9.22-release
diff -r facac91c7c65 -r 8ce376b16132 CMakeLists.txt
--- a/CMakeLists.txt Sun Apr 26 13:02:38 2015 +0100
+++ b/CMakeLists.txt Mon Nov 09 18:37:57 2015 +0100
@@ -32,6 +32,7 @@
option(MINIMAL_FLAGS "Respect system flags as much as possible (off)" OFF)
option(NOAUTOUPDATE "Disable OS X Sparkle update checking (off)" OFF)
+option(SKIPBUNDLE "Do not create relocate bundle (off)" OFF)
option(BUILD_ENGINE_C "Compile hwengine as native C (off)" OFF)
option(GL2 "Enable OpenGL 2 rendering !!!EXPERIMENTAL - DO NOT USE!!! [default: off)" OFF)
@@ -51,8 +52,8 @@
#versioning
set(CPACK_PACKAGE_VERSION_MAJOR 0)
set(CPACK_PACKAGE_VERSION_MINOR 9)
-set(CPACK_PACKAGE_VERSION_PATCH 22)
-set(HEDGEWARS_PROTO_VER 50)
+set(CPACK_PACKAGE_VERSION_PATCH 23)
+set(HEDGEWARS_PROTO_VER 52)
set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
include(${CMAKE_MODULE_PATH}/revinfo.cmake)
diff -r facac91c7c65 -r 8ce376b16132 CREDITS
--- a/CREDITS Sun Apr 26 13:02:38 2015 +0100
+++ b/CREDITS Mon Nov 09 18:37:57 2015 +0100
@@ -46,6 +46,8 @@
==========
- John Dum -> Nature theme
- Jonatan Nilsson -> Pirate theme, City theme, Oriental theme, Snow theme
+- yd - http://opengameart.org/users/yd -> "oriented", used as Olympics SD theme
+- Kevin MacLeod - http://incompetech.com/ -> "hitman", used as basis for preliminary default SD theme
==========
= THEMES
diff -r facac91c7c65 -r 8ce376b16132 ChangeLog.txt
--- a/ChangeLog.txt Sun Apr 26 13:02:38 2015 +0100
+++ b/ChangeLog.txt Mon Nov 09 18:37:57 2015 +0100
@@ -1,11 +1,45 @@
+ features
* bugfixes
+0.9.22 -> 0.9.23
+ * Hammer damage is now rounded down. This means it will cause NO DAMAGE to a hedgehog with less than 3 hp.
+ * Fixed bee not being affected by wrap world edge while still being thrown
+ * Fixed turn not ending when sticky mine was trapped on rubberband
+
+0.9.21 -> 0.9.22
+ + New Weapon / Map object: AirMine (floating mine that will follow nearby hedgehogs)
+ + Extensive changes to TechRacer: Variable terrain types, enhanced parameters, hwmap interpreter, fuel limiter, etc.
+ + HedgeEditor - create missions/etc. in-game! see http://hedgewars.org/HedgeEditor
+ + Map previews can now take script parameters into account and preview waypoints in TechRacer
+ + Added a couple new flags
+ + Various tweaks to the interface and in-game chat
+ + Divided teams options will now just be ignored when more/less than 2 teams/clans, instead of displaying a fatal error
+ + Added 6 TechRacer maps to TechMaps
+ + Added 3 SpeedShoppa Challenges: Shoppa Love, Ropes and Crates, The Customer is King
+ + Hammer damage is now rounded up. This means it can be used to execute hedgehogs with only 1 hp.
+ + Improved "Art" theme.
+ * Generated bridges/girders are now connected better to the land mass
+ * Fixed rubberband sprite
+ * Fixed Wind-Indicator being wrong in certain situations
+ * Melon Bomb Pieces now bounce on Rubberband
+ * Reduced menu music volume
+ * The game will now fallback to default voicepack if a team's voicepack is not locally installed. (Instead of rendering team voiceless)
+ * Hammer now does more damage when the Extra-Damage utility is used
+ * Many other bug fixes
+
+Lua-API:
+ + New map parameter: MapFeatureSize -- numeric representation of detail slider below map preview; use within onGameInit()/onPreviewInit()
+ + New function: SetMaxBuildDistance([ distInPx ]) -- specify how many pixels away a hedgehog can still place girders/etc. set to 0 for no limit; call with no param to reset to default
+ + New hook: onSuddenDeath() -- called by engine when sudden death begins
+ * Previously missing gear states are now available (gstSubmersible, gstFrozen and gstNoGravity)
+ * Fixed OnHogAttack giving the incorrect AmmoType (amNothing) under certain conditions
+
0.9.20 -> 0.9.21:
+ New type of randomly generated maps: Perlin Maps.
+ Old Random generated maps are more diverse now.
+ Slider for adjusting land generation detail.
+ Highlander gamemode can now be used with custom weapon schemes (1-8=How probable to get this weapon. 9=All hogs get it)
+ + New playable themes: "Hoggywood" and "Cake"
+ New gameplay mode "Construction Mode"
+ New gameplay mode "TechRacer"
+ New game play mode "DiagonalMaze" (generates a simple diagonal maze)
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/achievements.cpp
--- a/QTfrontend/achievements.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/achievements.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/achievements.h
--- a/QTfrontend/achievements.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/achievements.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/binds.cpp
--- a/QTfrontend/binds.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/binds.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/binds.h
--- a/QTfrontend/binds.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/binds.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/campaign.cpp
--- a/QTfrontend/campaign.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/campaign.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/campaign.h
--- a/QTfrontend/campaign.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/campaign.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/drawmapscene.cpp
--- a/QTfrontend/drawmapscene.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/drawmapscene.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/drawmapscene.h
--- a/QTfrontend/drawmapscene.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/drawmapscene.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/game.cpp
--- a/QTfrontend/game.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/game.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/game.h
--- a/QTfrontend/game.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/game.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/gameuiconfig.cpp
--- a/QTfrontend/gameuiconfig.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/gameuiconfig.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/gameuiconfig.h
--- a/QTfrontend/gameuiconfig.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/gameuiconfig.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/hwconsts.cpp.in
--- a/QTfrontend/hwconsts.cpp.in Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/hwconsts.cpp.in Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/hwconsts.h
--- a/QTfrontend/hwconsts.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/hwconsts.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/hwform.cpp
--- a/QTfrontend/hwform.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/hwform.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
@@ -164,14 +164,12 @@
ui.pageVideos->init(config);
#endif
-#ifdef __APPLE__
+#if defined(__APPLE__) && defined(SPARKLE_ENABLED)
if (config->isAutoUpdateEnabled())
{
AutoUpdater* updater = NULL;
-#ifdef SPARKLE_ENABLED
updater = new SparkleAutoUpdater();
-#endif
if (updater)
{
updater->checkForUpdates();
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/hwform.h
--- a/QTfrontend/hwform.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/hwform.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/main.cpp
--- a/QTfrontend/main.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/main.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/model/GameStyleModel.cpp
--- a/QTfrontend/model/GameStyleModel.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/model/GameStyleModel.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/model/GameStyleModel.h
--- a/QTfrontend/model/GameStyleModel.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/model/GameStyleModel.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/model/HatModel.cpp
--- a/QTfrontend/model/HatModel.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/model/HatModel.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/model/HatModel.h
--- a/QTfrontend/model/HatModel.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/model/HatModel.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/model/MapModel.cpp
--- a/QTfrontend/model/MapModel.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/model/MapModel.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/model/MapModel.h
--- a/QTfrontend/model/MapModel.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/model/MapModel.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/model/ThemeModel.cpp
--- a/QTfrontend/model/ThemeModel.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/model/ThemeModel.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/model/ThemeModel.h
--- a/QTfrontend/model/ThemeModel.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/model/ThemeModel.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/model/ammoSchemeModel.cpp
--- a/QTfrontend/model/ammoSchemeModel.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/model/ammoSchemeModel.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/model/ammoSchemeModel.h
--- a/QTfrontend/model/ammoSchemeModel.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/model/ammoSchemeModel.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/model/netserverslist.cpp
--- a/QTfrontend/model/netserverslist.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/model/netserverslist.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/model/netserverslist.h
--- a/QTfrontend/model/netserverslist.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/model/netserverslist.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/model/roomslistmodel.cpp
--- a/QTfrontend/model/roomslistmodel.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/model/roomslistmodel.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/model/roomslistmodel.h
--- a/QTfrontend/model/roomslistmodel.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/model/roomslistmodel.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/net/hwmap.cpp
--- a/QTfrontend/net/hwmap.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/net/hwmap.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2007 Ulyanov Igor
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
@@ -42,13 +42,14 @@
return !m_hasStarted;
}
-void HWMap::getImage(const QString & seed, int filter, MapGenerator mapgen, int maze_size, const QByteArray & drawMapData, QString & script, int feature_size)
+void HWMap::getImage(const QString & seed, int filter, MapGenerator mapgen, int maze_size, const QByteArray & drawMapData, QString & script, QString & scriptparam, int feature_size)
{
m_seed = seed;
m_script = script;
+ m_scriptparam = scriptparam;
templateFilter = filter;
m_mapgen = mapgen;
- m_maze_size = maze_size; // TODO replace with feature_size
+ m_maze_size = maze_size;
m_feature_size = feature_size;
if(mapgen == MAPGEN_DRAWN) m_drawMapData = drawMapData;
Start(true);
@@ -125,6 +126,7 @@
if (!m_script.isEmpty())
{
SendIPC(QString("escript Scripts/Multiplayer/%1.lua").arg(m_script).toUtf8());
+ SendIPC(QString("e$scriptparam %1").arg(m_scriptparam).toUtf8());
}
switch (m_mapgen)
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/net/hwmap.h
--- a/QTfrontend/net/hwmap.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/net/hwmap.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006 Igor Ulyanov
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
@@ -42,7 +42,7 @@
public:
HWMap(QObject *parent = 0);
virtual ~HWMap();
- void getImage(const QString & seed, int templateFilter, MapGenerator mapgen, int maze_size, const QByteArray & drawMapData, QString & script, int feature_size);
+ void getImage(const QString & seed, int templateFilter, MapGenerator mapgen, int maze_size, const QByteArray & drawMapData, QString & script, QString & scriptparam, int feature_size);
bool couldBeRemoved();
protected:
@@ -57,6 +57,7 @@
private:
QString m_seed;
QString m_script;
+ QString m_scriptparam;
int templateFilter;
MapGenerator m_mapgen;
int m_maze_size; // going to try and deprecate this one
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/net/netregister.cpp
--- a/QTfrontend/net/netregister.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/net/netregister.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/net/netregister.h
--- a/QTfrontend/net/netregister.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/net/netregister.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/net/netserver.cpp
--- a/QTfrontend/net/netserver.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/net/netserver.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2008 Igor Ulyanov
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/net/netserver.h
--- a/QTfrontend/net/netserver.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/net/netserver.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2008 Igor Ulyanov
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/net/netudpserver.cpp
--- a/QTfrontend/net/netudpserver.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/net/netudpserver.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2007-2008 Igor Ulyanov
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/net/netudpserver.h
--- a/QTfrontend/net/netudpserver.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/net/netudpserver.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2007-2008 Igor Ulyanov
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/net/netudpwidget.cpp
--- a/QTfrontend/net/netudpwidget.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/net/netudpwidget.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2007 Igor Ulyanov
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/net/netudpwidget.h
--- a/QTfrontend/net/netudpwidget.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/net/netudpwidget.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2007 Igor Ulyanov
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/net/newnetclient.cpp
--- a/QTfrontend/net/newnetclient.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/net/newnetclient.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2008 Igor Ulyanov
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/net/newnetclient.h
--- a/QTfrontend/net/newnetclient.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/net/newnetclient.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2008 Igor Ulyanov
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/net/proto.cpp
--- a/QTfrontend/net/proto.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/net/proto.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/net/proto.h
--- a/QTfrontend/net/proto.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/net/proto.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/net/recorder.cpp
--- a/QTfrontend/net/recorder.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/net/recorder.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/net/recorder.h
--- a/QTfrontend/net/recorder.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/net/recorder.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/net/tcpBase.cpp
--- a/QTfrontend/net/tcpBase.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/net/tcpBase.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2007 Igor Ulyanov
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/net/tcpBase.h
--- a/QTfrontend/net/tcpBase.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/net/tcpBase.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2007 Igor Ulyanov
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/res/html/about.html
--- a/QTfrontend/res/html/about.html Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/res/html/about.html Mon Nov 09 18:37:57 2015 +0100
@@ -35,6 +35,7 @@
Keybinds, feedback, maps and hats interfaces: Drew Gottlieb <gottlieb.drew@gmail.com>
Login dialogs, frontend improvements: Ondrej Skopek <skopekondrej@gmail.com>
Icegun weapon: Julia Struchenko <urbertar@gmail.com>
+ iPhone/iPad ports: Anton Malmygin <antonc27@mail.ru>
Art:
@@ -82,7 +83,7 @@
Lithuanian: Lukas Urbonas <lukasu08@gmail.com>
Polish: Maciej Mroziński <mynick2@o2.pl>, Wojciech Latkowski <magik17l@gmail.com>, Piotr Mitana, Maciej Górny
Portuguese: Fábio Canário <inufabie@gmail.com>
- Russian: Andrey Korotaev <unC0Rr@gmail.com>, Vitaly Novichkov <admin@wohlnet.ru>
+ Russian: Andrey Korotaev <unC0Rr@gmail.com>, Vitaly Novichkov <admin@wohlnet.ru>, Anton Malmygin <antonc27@mail.ru>
Slovak: Jose Riha
Spanish: Carlos Vives <mail@carlosvives.es>
Swedish: Niklas Grahn <raewolusjoon@yaoo.com>, Henrik Rostedt <henrik.rostedt@gmail.com>
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/sdlkeys.h
--- a/QTfrontend/sdlkeys.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/sdlkeys.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/team.cpp
--- a/QTfrontend/team.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/team.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/team.h
--- a/QTfrontend/team.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/team.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
* Copyright (c) 2007 Igor Ulyanov
*
* This program is free software; you can redistribute it and/or modify
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/dialog/ask_quit.cpp
--- a/QTfrontend/ui/dialog/ask_quit.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/dialog/ask_quit.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/dialog/ask_quit.h
--- a/QTfrontend/ui/dialog/ask_quit.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/dialog/ask_quit.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/dialog/input_ip.cpp
--- a/QTfrontend/ui/dialog/input_ip.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/dialog/input_ip.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/dialog/input_ip.h
--- a/QTfrontend/ui/dialog/input_ip.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/dialog/input_ip.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/dialog/input_password.cpp
--- a/QTfrontend/ui/dialog/input_password.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/dialog/input_password.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/dialog/input_password.h
--- a/QTfrontend/ui/dialog/input_password.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/dialog/input_password.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/dialog/upload_video.cpp
--- a/QTfrontend/ui/dialog/upload_video.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/dialog/upload_video.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/dialog/upload_video.h
--- a/QTfrontend/ui/dialog/upload_video.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/dialog/upload_video.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/AbstractPage.cpp
--- a/QTfrontend/ui/page/AbstractPage.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/AbstractPage.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/AbstractPage.h
--- a/QTfrontend/ui/page/AbstractPage.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/AbstractPage.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pageadmin.cpp
--- a/QTfrontend/ui/page/pageadmin.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pageadmin.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pageadmin.h
--- a/QTfrontend/ui/page/pageadmin.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pageadmin.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pagecampaign.cpp
--- a/QTfrontend/ui/page/pagecampaign.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pagecampaign.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pagecampaign.h
--- a/QTfrontend/ui/page/pagecampaign.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pagecampaign.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pageconnecting.cpp
--- a/QTfrontend/ui/page/pageconnecting.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pageconnecting.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pageconnecting.h
--- a/QTfrontend/ui/page/pageconnecting.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pageconnecting.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pagedata.cpp
--- a/QTfrontend/ui/page/pagedata.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pagedata.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pagedata.h
--- a/QTfrontend/ui/page/pagedata.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pagedata.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pagedrawmap.cpp
--- a/QTfrontend/ui/page/pagedrawmap.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pagedrawmap.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pagedrawmap.h
--- a/QTfrontend/ui/page/pagedrawmap.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pagedrawmap.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pageeditteam.cpp
--- a/QTfrontend/ui/page/pageeditteam.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pageeditteam.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pageeditteam.h
--- a/QTfrontend/ui/page/pageeditteam.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pageeditteam.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pagegamestats.cpp
--- a/QTfrontend/ui/page/pagegamestats.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pagegamestats.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pagegamestats.h
--- a/QTfrontend/ui/page/pagegamestats.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pagegamestats.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pageinfo.cpp
--- a/QTfrontend/ui/page/pageinfo.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pageinfo.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pageinfo.h
--- a/QTfrontend/ui/page/pageinfo.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pageinfo.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pageingame.cpp
--- a/QTfrontend/ui/page/pageingame.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pageingame.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pageingame.h
--- a/QTfrontend/ui/page/pageingame.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pageingame.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pagemain.cpp
--- a/QTfrontend/ui/page/pagemain.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pagemain.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pagemain.h
--- a/QTfrontend/ui/page/pagemain.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pagemain.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pagemultiplayer.cpp
--- a/QTfrontend/ui/page/pagemultiplayer.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pagemultiplayer.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pagemultiplayer.h
--- a/QTfrontend/ui/page/pagemultiplayer.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pagemultiplayer.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pagenet.cpp
--- a/QTfrontend/ui/page/pagenet.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pagenet.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pagenet.h
--- a/QTfrontend/ui/page/pagenet.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pagenet.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pagenetgame.cpp
--- a/QTfrontend/ui/page/pagenetgame.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pagenetgame.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pagenetgame.h
--- a/QTfrontend/ui/page/pagenetgame.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pagenetgame.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pagenetserver.cpp
--- a/QTfrontend/ui/page/pagenetserver.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pagenetserver.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pagenetserver.h
--- a/QTfrontend/ui/page/pagenetserver.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pagenetserver.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pageoptions.cpp
--- a/QTfrontend/ui/page/pageoptions.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pageoptions.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pageoptions.h
--- a/QTfrontend/ui/page/pageoptions.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pageoptions.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pageplayrecord.cpp
--- a/QTfrontend/ui/page/pageplayrecord.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pageplayrecord.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pageplayrecord.h
--- a/QTfrontend/ui/page/pageplayrecord.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pageplayrecord.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pageroomslist.cpp
--- a/QTfrontend/ui/page/pageroomslist.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pageroomslist.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pageroomslist.h
--- a/QTfrontend/ui/page/pageroomslist.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pageroomslist.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pagescheme.cpp
--- a/QTfrontend/ui/page/pagescheme.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pagescheme.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pagescheme.h
--- a/QTfrontend/ui/page/pagescheme.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pagescheme.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pageselectweapon.cpp
--- a/QTfrontend/ui/page/pageselectweapon.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pageselectweapon.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pageselectweapon.h
--- a/QTfrontend/ui/page/pageselectweapon.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pageselectweapon.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pagesingleplayer.cpp
--- a/QTfrontend/ui/page/pagesingleplayer.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pagesingleplayer.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pagesingleplayer.h
--- a/QTfrontend/ui/page/pagesingleplayer.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pagesingleplayer.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pagetraining.cpp
--- a/QTfrontend/ui/page/pagetraining.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pagetraining.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pagetraining.h
--- a/QTfrontend/ui/page/pagetraining.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pagetraining.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pagevideos.cpp
--- a/QTfrontend/ui/page/pagevideos.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pagevideos.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/page/pagevideos.h
--- a/QTfrontend/ui/page/pagevideos.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/page/pagevideos.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/FreqSpinBox.cpp
--- a/QTfrontend/ui/widget/FreqSpinBox.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/FreqSpinBox.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/FreqSpinBox.h
--- a/QTfrontend/ui/widget/FreqSpinBox.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/FreqSpinBox.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/HistoryLineEdit.cpp
--- a/QTfrontend/ui/widget/HistoryLineEdit.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/HistoryLineEdit.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2007 Igor Ulyanov
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/HistoryLineEdit.h
--- a/QTfrontend/ui/widget/HistoryLineEdit.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/HistoryLineEdit.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2007 Igor Ulyanov
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/SmartLineEdit.cpp
--- a/QTfrontend/ui/widget/SmartLineEdit.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/SmartLineEdit.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2007 Igor Ulyanov
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/SmartLineEdit.h
--- a/QTfrontend/ui/widget/SmartLineEdit.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/SmartLineEdit.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2007 Igor Ulyanov
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/SquareLabel.cpp
--- a/QTfrontend/ui/widget/SquareLabel.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/SquareLabel.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/SquareLabel.h
--- a/QTfrontend/ui/widget/SquareLabel.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/SquareLabel.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/about.cpp
--- a/QTfrontend/ui/widget/about.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/about.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/about.h
--- a/QTfrontend/ui/widget/about.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/about.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/bgwidget.cpp
--- a/QTfrontend/ui/widget/bgwidget.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/bgwidget.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2009 Kristian Lehmann
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/bgwidget.h
--- a/QTfrontend/ui/widget/bgwidget.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/bgwidget.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2009 Kristian Lehmann
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/chatwidget.cpp
--- a/QTfrontend/ui/widget/chatwidget.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/chatwidget.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2007 Igor Ulyanov
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/chatwidget.h
--- a/QTfrontend/ui/widget/chatwidget.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/chatwidget.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2007 Igor Ulyanov
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/databrowser.cpp
--- a/QTfrontend/ui/widget/databrowser.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/databrowser.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/databrowser.h
--- a/QTfrontend/ui/widget/databrowser.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/databrowser.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/drawmapwidget.cpp
--- a/QTfrontend/ui/widget/drawmapwidget.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/drawmapwidget.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/drawmapwidget.h
--- a/QTfrontend/ui/widget/drawmapwidget.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/drawmapwidget.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/feedbackdialog.cpp
--- a/QTfrontend/ui/widget/feedbackdialog.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/feedbackdialog.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/feedbackdialog.h
--- a/QTfrontend/ui/widget/feedbackdialog.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/feedbackdialog.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/fpsedit.cpp
--- a/QTfrontend/ui/widget/fpsedit.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/fpsedit.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/fpsedit.h
--- a/QTfrontend/ui/widget/fpsedit.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/fpsedit.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/frameTeam.cpp
--- a/QTfrontend/ui/widget/frameTeam.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/frameTeam.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2007 Igor Ulyanov
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/frameTeam.h
--- a/QTfrontend/ui/widget/frameTeam.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/frameTeam.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2007 Igor Ulyanov
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/gamecfgwidget.cpp
--- a/QTfrontend/ui/widget/gamecfgwidget.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/gamecfgwidget.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
@@ -459,7 +459,7 @@
if (param == "SCRIPT")
{
Scripts->setCurrentIndex(Scripts->findText(value));
- pMapContainer->setScript(Scripts->itemData(Scripts->currentIndex(), GameStyleModel::ScriptRole).toString().toUtf8());
+ pMapContainer->setScript(Scripts->itemData(Scripts->currentIndex(), GameStyleModel::ScriptRole).toString().toUtf8(), schemeData(43).toString());
return;
}
if (param == "DRAWNMAP")
@@ -606,6 +606,7 @@
}
}
}
+ pMapContainer->setScript(Scripts->itemData(Scripts->currentIndex(), GameStyleModel::ScriptRole).toString().toUtf8(), schemeData(43).toString());
}
void GameCFGWidget::scriptChanged(int index)
@@ -661,12 +662,11 @@
}
if (!index)
{
- pMapContainer->setScript(QString(""));
+ pMapContainer->setScript(QString(""), QString(""));
}
else
{
- pMapContainer->setScript(name);
- pMapContainer->setScript(Scripts->itemData(index, GameStyleModel::ScriptRole).toString().toUtf8());
+ pMapContainer->setScript(Scripts->itemData(index, GameStyleModel::ScriptRole).toString().toUtf8(), schemeData(43).toString());
}
emit paramChanged("SCRIPT", QStringList(name));
}
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/gamecfgwidget.h
--- a/QTfrontend/ui/widget/gamecfgwidget.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/gamecfgwidget.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/hatbutton.cpp
--- a/QTfrontend/ui/widget/hatbutton.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/hatbutton.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/hatbutton.h
--- a/QTfrontend/ui/widget/hatbutton.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/hatbutton.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/hatprompt.cpp
--- a/QTfrontend/ui/widget/hatprompt.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/hatprompt.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/hatprompt.h
--- a/QTfrontend/ui/widget/hatprompt.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/hatprompt.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/hedgehogerWidget.cpp
--- a/QTfrontend/ui/widget/hedgehogerWidget.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/hedgehogerWidget.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2008 Ulyanov Igor
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/hedgehogerWidget.h
--- a/QTfrontend/ui/widget/hedgehogerWidget.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/hedgehogerWidget.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2007 Ulyanov Igor
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/igbox.cpp
--- a/QTfrontend/ui/widget/igbox.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/igbox.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/igbox.h
--- a/QTfrontend/ui/widget/igbox.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/igbox.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/keybinder.cpp
--- a/QTfrontend/ui/widget/keybinder.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/keybinder.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/keybinder.h
--- a/QTfrontend/ui/widget/keybinder.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/keybinder.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/lineeditcursor.cpp
--- a/QTfrontend/ui/widget/lineeditcursor.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/lineeditcursor.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/lineeditcursor.h
--- a/QTfrontend/ui/widget/lineeditcursor.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/lineeditcursor.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/mapContainer.cpp
--- a/QTfrontend/ui/widget/mapContainer.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/mapContainer.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -326,6 +326,7 @@
getMazeSize(),
getDrawnMapData(),
m_script,
+ m_scriptparam,
m_mapFeatureSize
);
@@ -431,9 +432,10 @@
updatePreview();
}
-void HWMapContainer::setScript(const QString & script)
+void HWMapContainer::setScript(const QString & script, const QString & scriptparam)
{
m_script = script;
+ m_scriptparam = scriptparam;
if ((m_mapInfo.type == MapModel::GeneratedMap)
|| (m_mapInfo.type == MapModel::GeneratedMaze)
|| (m_mapInfo.type == MapModel::GeneratedPerlin)
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/mapContainer.h
--- a/QTfrontend/ui/widget/mapContainer.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/mapContainer.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2007 Igor Ulyanov
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
@@ -73,7 +73,7 @@
public slots:
void askForGeneratedPreview();
void setSeed(const QString & seed);
- void setScript(const QString & script);
+ void setScript(const QString & script, const QString & scriptparam);
void setMap(const QString & map);
void setTheme(const QString & theme);
void setTemplateFilter(int);
@@ -131,6 +131,7 @@
HWMap* pMap;
QString m_seed;
QString m_script;
+ QString m_scriptparam;
QPushButton* seedSet;
QLabel* seedLabel;
int hhLimit;
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/qpushbuttonwithsound.cpp
--- a/QTfrontend/ui/widget/qpushbuttonwithsound.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/qpushbuttonwithsound.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/qpushbuttonwithsound.h
--- a/QTfrontend/ui/widget/qpushbuttonwithsound.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/qpushbuttonwithsound.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/roomnameprompt.cpp
--- a/QTfrontend/ui/widget/roomnameprompt.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/roomnameprompt.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/roomnameprompt.h
--- a/QTfrontend/ui/widget/roomnameprompt.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/roomnameprompt.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/seedprompt.cpp
--- a/QTfrontend/ui/widget/seedprompt.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/seedprompt.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/seedprompt.h
--- a/QTfrontend/ui/widget/seedprompt.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/seedprompt.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/selectWeapon.cpp
--- a/QTfrontend/ui/widget/selectWeapon.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/selectWeapon.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2008 Igor Ulyanov
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/selectWeapon.h
--- a/QTfrontend/ui/widget/selectWeapon.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/selectWeapon.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2008 Igor Ulyanov
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/teamselect.cpp
--- a/QTfrontend/ui/widget/teamselect.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/teamselect.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2007 Igor Ulyanov
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/teamselect.h
--- a/QTfrontend/ui/widget/teamselect.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/teamselect.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2007 Igor Ulyanov
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/teamselhelper.cpp
--- a/QTfrontend/ui/widget/teamselhelper.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/teamselhelper.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2007 Igor Ulyanov
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/teamselhelper.h
--- a/QTfrontend/ui/widget/teamselhelper.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/teamselhelper.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2007 Igor Ulyanov
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/themeprompt.cpp
--- a/QTfrontend/ui/widget/themeprompt.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/themeprompt.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/themeprompt.h
--- a/QTfrontend/ui/widget/themeprompt.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/themeprompt.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/togglebutton.cpp
--- a/QTfrontend/ui/widget/togglebutton.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/togglebutton.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2009 Kristian Lehmann
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/togglebutton.h
--- a/QTfrontend/ui/widget/togglebutton.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/togglebutton.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2009 Kristian Lehmann
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/vertScrollArea.cpp
--- a/QTfrontend/ui/widget/vertScrollArea.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/vertScrollArea.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006 Igor Ulyanov
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/vertScrollArea.h
--- a/QTfrontend/ui/widget/vertScrollArea.h Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/vertScrollArea.h Mon Nov 09 18:37:57 2015 +0100
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006 Igor Ulyanov
- * Copyright (c) 2004-2014 Andrey Korotaev
+ * Copyright (c) 2004-2015 Andrey Korotaev
*
* 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
diff -r facac91c7c65 -r 8ce376b16132 QTfrontend/ui/widget/weaponItem.cpp
--- a/QTfrontend/ui/widget/weaponItem.cpp Sun Apr 26 13:02:38 2015 +0100
+++ b/QTfrontend/ui/widget/weaponItem.cpp Mon Nov 09 18:37:57 2015 +0100
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2008 Igor Ulyanov
- * Copyright (c) 2004-2014 Andrey Korotaev