--- a/CREDITS Fri Sep 11 21:41:35 2015 +0200
+++ b/CREDITS Sat Sep 12 04:02:27 2015 +0200
@@ -46,6 +46,8 @@
==========
- John Dum <fizzy@gmail.com> -> Nature theme
- Jonatan Nilsson <jonatanfan@gmail.com> -> 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
--- a/ChangeLog.txt Fri Sep 11 21:41:35 2015 +0200
+++ b/ChangeLog.txt Sat Sep 12 04:02:27 2015 +0200
@@ -9,10 +9,12 @@
+ Divided teams options will now just be ignored when more/less than 2 teams, 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
* 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
0.9.20 -> 0.9.21:
--- a/QTfrontend/achievements.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/achievements.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/achievements.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/achievements.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/binds.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/binds.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/binds.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/binds.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/campaign.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/campaign.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/campaign.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/campaign.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/drawmapscene.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/drawmapscene.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/drawmapscene.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/drawmapscene.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/game.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/game.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/game.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/game.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/gameuiconfig.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/gameuiconfig.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/gameuiconfig.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/gameuiconfig.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/hwconsts.cpp.in Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/hwconsts.cpp.in Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/hwconsts.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/hwconsts.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/hwform.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/hwform.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/hwform.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/hwform.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/main.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/main.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/model/GameStyleModel.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/model/GameStyleModel.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/model/GameStyleModel.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/model/GameStyleModel.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/model/HatModel.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/model/HatModel.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/model/HatModel.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/model/HatModel.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/model/MapModel.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/model/MapModel.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/model/MapModel.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/model/MapModel.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/model/ThemeModel.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/model/ThemeModel.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/model/ThemeModel.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/model/ThemeModel.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/model/ammoSchemeModel.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/model/ammoSchemeModel.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/model/ammoSchemeModel.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/model/ammoSchemeModel.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/model/netserverslist.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/model/netserverslist.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/model/netserverslist.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/model/netserverslist.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/model/roomslistmodel.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/model/roomslistmodel.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/model/roomslistmodel.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/model/roomslistmodel.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/net/hwmap.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/net/hwmap.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2007 Ulyanov Igor <iulyanov@gmail.com>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/net/hwmap.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/net/hwmap.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/net/netregister.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/net/netregister.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/net/netregister.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/net/netregister.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/net/netserver.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/net/netserver.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2008 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/net/netserver.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/net/netserver.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2008 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/net/netudpserver.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/net/netudpserver.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2007-2008 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/net/netudpserver.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/net/netudpserver.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2007-2008 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/net/netudpwidget.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/net/netudpwidget.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2007 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/net/netudpwidget.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/net/netudpwidget.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2007 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/net/newnetclient.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/net/newnetclient.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2008 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/net/newnetclient.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/net/newnetclient.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2008 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/net/proto.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/net/proto.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/net/proto.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/net/proto.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/net/recorder.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/net/recorder.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/net/recorder.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/net/recorder.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/net/tcpBase.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/net/tcpBase.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2007 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/net/tcpBase.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/net/tcpBase.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2007 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/sdlkeys.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/sdlkeys.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/team.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/team.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/team.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/team.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
* Copyright (c) 2007 Igor Ulyanov <iulyanov@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
--- a/QTfrontend/ui/dialog/ask_quit.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/dialog/ask_quit.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/dialog/ask_quit.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/dialog/ask_quit.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/dialog/input_ip.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/dialog/input_ip.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/dialog/input_ip.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/dialog/input_ip.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/dialog/input_password.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/dialog/input_password.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/dialog/input_password.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/dialog/input_password.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/dialog/upload_video.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/dialog/upload_video.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/dialog/upload_video.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/dialog/upload_video.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/AbstractPage.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/AbstractPage.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/AbstractPage.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/AbstractPage.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pageadmin.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pageadmin.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pageadmin.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pageadmin.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pagecampaign.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pagecampaign.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pagecampaign.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pagecampaign.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pageconnecting.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pageconnecting.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pageconnecting.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pageconnecting.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pagedata.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pagedata.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pagedata.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pagedata.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pagedrawmap.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pagedrawmap.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pagedrawmap.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pagedrawmap.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pageeditteam.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pageeditteam.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pageeditteam.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pageeditteam.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pagegamestats.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pagegamestats.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pagegamestats.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pagegamestats.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pageinfo.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pageinfo.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pageinfo.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pageinfo.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pageingame.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pageingame.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pageingame.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pageingame.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pagemain.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pagemain.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pagemain.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pagemain.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pagemultiplayer.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pagemultiplayer.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pagemultiplayer.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pagemultiplayer.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pagenet.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pagenet.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pagenet.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pagenet.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pagenetgame.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pagenetgame.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pagenetgame.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pagenetgame.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pagenetserver.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pagenetserver.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pagenetserver.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pagenetserver.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pageoptions.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pageoptions.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pageoptions.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pageoptions.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pageplayrecord.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pageplayrecord.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pageplayrecord.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pageplayrecord.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pageroomslist.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pageroomslist.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pageroomslist.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pageroomslist.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pagescheme.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pagescheme.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pagescheme.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pagescheme.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pageselectweapon.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pageselectweapon.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pageselectweapon.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pageselectweapon.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pagesingleplayer.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pagesingleplayer.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pagesingleplayer.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pagesingleplayer.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pagetraining.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pagetraining.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pagetraining.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pagetraining.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pagevideos.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pagevideos.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/page/pagevideos.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/page/pagevideos.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/FreqSpinBox.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/FreqSpinBox.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/FreqSpinBox.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/FreqSpinBox.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/HistoryLineEdit.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/HistoryLineEdit.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2007 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/HistoryLineEdit.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/HistoryLineEdit.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2007 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/SmartLineEdit.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/SmartLineEdit.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2007 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/SmartLineEdit.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/SmartLineEdit.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2007 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/SquareLabel.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/SquareLabel.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/SquareLabel.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/SquareLabel.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/about.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/about.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/about.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/about.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/bgwidget.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/bgwidget.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2009 Kristian Lehmann <email@thexception.net>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/bgwidget.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/bgwidget.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2009 Kristian Lehmann <email@thexception.net>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/chatwidget.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/chatwidget.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2007 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/chatwidget.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/chatwidget.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2007 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/databrowser.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/databrowser.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/databrowser.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/databrowser.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/drawmapwidget.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/drawmapwidget.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/drawmapwidget.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/drawmapwidget.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/feedbackdialog.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/feedbackdialog.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/feedbackdialog.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/feedbackdialog.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/fpsedit.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/fpsedit.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/fpsedit.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/fpsedit.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/frameTeam.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/frameTeam.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2007 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/frameTeam.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/frameTeam.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2007 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/gamecfgwidget.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/gamecfgwidget.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/gamecfgwidget.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/gamecfgwidget.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/hatbutton.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/hatbutton.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/hatbutton.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/hatbutton.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/hatprompt.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/hatprompt.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/hatprompt.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/hatprompt.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/hedgehogerWidget.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/hedgehogerWidget.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2008 Ulyanov Igor <iulyanov@gmail.com>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/hedgehogerWidget.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/hedgehogerWidget.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2007 Ulyanov Igor <iulyanov@gmail.com>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/igbox.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/igbox.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/igbox.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/igbox.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/keybinder.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/keybinder.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/keybinder.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/keybinder.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/lineeditcursor.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/lineeditcursor.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/lineeditcursor.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/lineeditcursor.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/mapContainer.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/mapContainer.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2007 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/qpushbuttonwithsound.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/qpushbuttonwithsound.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/qpushbuttonwithsound.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/qpushbuttonwithsound.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/roomnameprompt.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/roomnameprompt.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/roomnameprompt.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/roomnameprompt.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/seedprompt.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/seedprompt.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/seedprompt.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/seedprompt.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/selectWeapon.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/selectWeapon.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2008 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/selectWeapon.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/selectWeapon.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2008 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/teamselect.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/teamselect.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2007 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/teamselect.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/teamselect.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2007 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/teamselhelper.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/teamselhelper.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2007 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/teamselhelper.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/teamselhelper.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2007 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/themeprompt.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/themeprompt.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/themeprompt.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/themeprompt.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/togglebutton.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/togglebutton.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2009 Kristian Lehmann <email@thexception.net>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/togglebutton.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/togglebutton.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2009 Kristian Lehmann <email@thexception.net>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/vertScrollArea.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/vertScrollArea.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/vertScrollArea.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/vertScrollArea.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/weaponItem.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/weaponItem.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2008 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui/widget/weaponItem.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui/widget/weaponItem.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2008 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui_hwform.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui_hwform.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/ui_hwform.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/ui_hwform.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/util/DataManager.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/util/DataManager.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/util/DataManager.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/util/DataManager.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/util/LibavInteraction.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/util/LibavInteraction.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/util/LibavInteraction.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/util/LibavInteraction.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/util/MessageDialog.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/util/MessageDialog.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/util/MessageDialog.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/util/MessageDialog.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/util/SDLInteraction.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/util/SDLInteraction.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/util/SDLInteraction.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/util/SDLInteraction.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/util/namegen.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/util/namegen.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2009 Martin Minarik <ttsmj@pokec.sk>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/util/namegen.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/util/namegen.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2009 Martin Minarik <ttsmj@pokec.sk>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/util/platform/CocoaInitializer.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/util/platform/CocoaInitializer.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/util/platform/CocoaInitializer.mm Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/util/platform/CocoaInitializer.mm Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/util/platform/InstallController.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/util/platform/InstallController.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/util/platform/InstallController.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/util/platform/InstallController.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/util/platform/M3Panel.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/util/platform/M3Panel.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/util/platform/M3Panel.mm Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/util/platform/M3Panel.mm Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/util/platform/SparkleAutoUpdater.mm Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/util/platform/SparkleAutoUpdater.mm Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/util/platform/xfire.cpp Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/util/platform/xfire.cpp Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/QTfrontend/util/platform/xfire.h Fri Sep 11 21:41:35 2015 +0200
+++ b/QTfrontend/util/platform/xfire.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/README Fri Sep 11 21:41:35 2015 +0200
+++ b/README Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
Hedgewars - a turn based strategy game.
=======================================
-Copyright 2004-2014 Andrey Korotaev <unC0Rr@gmail.com> and others.
+Copyright 2004-2015 Andrey Korotaev <unC0Rr@gmail.com> and others.
See QTfrontend/res/html/about.html and CREDITS for a complete list of authors.
Licence:
--- a/gameServer/Actions.hs Fri Sep 11 21:41:35 2015 +0200
+++ b/gameServer/Actions.hs Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
{-
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/gameServer/ClientIO.hs Fri Sep 11 21:41:35 2015 +0200
+++ b/gameServer/ClientIO.hs Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
{-
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/gameServer/ConfigFile.hs Fri Sep 11 21:41:35 2015 +0200
+++ b/gameServer/ConfigFile.hs Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
{-
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/gameServer/Consts.hs Fri Sep 11 21:41:35 2015 +0200
+++ b/gameServer/Consts.hs Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
{-
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/gameServer/CoreTypes.hs Fri Sep 11 21:41:35 2015 +0200
+++ b/gameServer/CoreTypes.hs Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
{-
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/gameServer/EngineInteraction.hs Fri Sep 11 21:41:35 2015 +0200
+++ b/gameServer/EngineInteraction.hs Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
{-
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/gameServer/FloodDetection.hs Fri Sep 11 21:41:35 2015 +0200
+++ b/gameServer/FloodDetection.hs Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
{-
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/gameServer/HWProtoChecker.hs Fri Sep 11 21:41:35 2015 +0200
+++ b/gameServer/HWProtoChecker.hs Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
{-
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/gameServer/HWProtoCore.hs Fri Sep 11 21:41:35 2015 +0200
+++ b/gameServer/HWProtoCore.hs Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
{-
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
@@ -50,7 +50,19 @@
else
return [ModifyClient (\c -> c{pingsQueue = pingsQueue c - 1})]
-handleCmd ["CMD", parameters] = uncurry h $ extractParameters parameters
+handleCmd cmd = do
+ (ci, irnc) <- ask
+ let cl = irnc `client` ci
+ if logonPassed cl then
+ if isChecker cl then
+ handleCmd_checker cmd
+ else
+ handleCmd_loggedin cmd
+ else
+ handleCmd_NotEntered cmd
+
+
+handleCmd_loggedin ["CMD", parameters] = uncurry h $ extractParameters parameters
where
h "DELEGATE" n | not $ B.null n = handleCmd ["DELEGATE", n]
h "SAVEROOM" n | not $ B.null n = handleCmd ["SAVEROOM", n]
@@ -84,19 +96,6 @@
extractParameters p = let (a, b) = B.break (== ' ') p in (upperCase a, B.dropWhile (== ' ') b)
-
-handleCmd cmd = do
- (ci, irnc) <- ask
- let cl = irnc `client` ci
- if logonPassed cl then
- if isChecker cl then
- handleCmd_checker cmd
- else
- handleCmd_loggedin cmd
- else
- handleCmd_NotEntered cmd
-
-
handleCmd_loggedin ["INFO", asknick] = do
(_, rnc) <- ask
maybeClientId <- clientByNick asknick
--- a/gameServer/HWProtoInRoomState.hs Fri Sep 11 21:41:35 2015 +0200
+++ b/gameServer/HWProtoInRoomState.hs Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
{-
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/gameServer/HWProtoLobbyState.hs Fri Sep 11 21:41:35 2015 +0200
+++ b/gameServer/HWProtoLobbyState.hs Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
{-
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
@@ -82,9 +82,10 @@
let isBanned = host cl `elem` roomBansList jRoom
let clTeams =
if (clientProto cl >= 48) && (isJust $ gameInfo jRoom) then
- map teamname . filter (\t -> teamowner t == nick cl) . teamsAtStart . fromJust $ gameInfo jRoom
+ filter (\t -> teamowner t == nick cl) . teamsAtStart . fromJust $ gameInfo jRoom
else
[]
+ let clTeamsNames = map teamname clTeams
return $
if isNothing maybeRI then
[Warning $ loc "No such room"]
@@ -101,18 +102,21 @@
else
(
MoveToRoom jRI
- : ModifyClient (\c -> c{isJoinedMidGame = isJust $ gameInfo jRoom, teamsInGame = fromIntegral $ length clTeams})
+ : ModifyClient (\c -> c{isJoinedMidGame = isJust $ gameInfo jRoom
+ , teamsInGame = fromIntegral $ length clTeams
+ , clientClan = teamcolor `fmap` listToMaybe clTeams})
: AnswerClients chans ["CLIENT_FLAGS", "-r", nick cl]
: [(AnswerClients [sendChan cl] $ "JOINED" : nicks) | not $ null nicks]
)
- ++ [ModifyRoom (\r -> let (t', g') = moveTeams clTeams . fromJust $ gameInfo r in r{gameInfo = Just g', teams = t'}) | not $ null clTeams]
+ ++ [ModifyRoom (\r -> let (t', g') = moveTeams clTeamsNames . fromJust $ gameInfo r in r{gameInfo = Just g', teams = t'}) | not $ null clTeams]
++ [AnswerClients [sendChan cl] ["CLIENT_FLAGS", "+h", nick $ fromJust owner] | isJust owner]
++ [sendStateFlags cl jRoomClients | not $ null jRoomClients]
++ answerFullConfig cl jRoom
++ answerTeams cl jRoom
++ watchRound cl jRoom chans
++ [AnswerClients [sendChan cl] ["CHAT", "[greeting]", greeting jRoom] | greeting jRoom /= ""]
- ++ map (\t -> AnswerClients chans ["EM", toEngineMsg $ 'G' `B.cons` t]) clTeams
+ ++ map (\t -> AnswerClients chans ["EM", toEngineMsg $ 'G' `B.cons` t]) clTeamsNames
+ ++ [AnswerClients [sendChan cl] ["EM", toEngineMsg "I"] | isPaused `fmap` gameInfo jRoom == Just True]
where
moveTeams :: [B.ByteString] -> GameInfo -> ([TeamInfo], GameInfo)
--- a/gameServer/HWProtoNEState.hs Fri Sep 11 21:41:35 2015 +0200
+++ b/gameServer/HWProtoNEState.hs Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
{-
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/gameServer/HandlerUtils.hs Fri Sep 11 21:41:35 2015 +0200
+++ b/gameServer/HandlerUtils.hs Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
{-
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/gameServer/JoinsMonitor.hs Fri Sep 11 21:41:35 2015 +0200
+++ b/gameServer/JoinsMonitor.hs Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
{-
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/gameServer/NetRoutines.hs Fri Sep 11 21:41:35 2015 +0200
+++ b/gameServer/NetRoutines.hs Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
{-
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/gameServer/OfficialServer/DBInteraction.hs Fri Sep 11 21:41:35 2015 +0200
+++ b/gameServer/OfficialServer/DBInteraction.hs Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
{-
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/gameServer/OfficialServer/GameReplayStore.hs Fri Sep 11 21:41:35 2015 +0200
+++ b/gameServer/OfficialServer/GameReplayStore.hs Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
{-
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/gameServer/OfficialServer/checker.hs Fri Sep 11 21:41:35 2015 +0200
+++ b/gameServer/OfficialServer/checker.hs Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
{-
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/gameServer/OfficialServer/extdbinterface.hs Fri Sep 11 21:41:35 2015 +0200
+++ b/gameServer/OfficialServer/extdbinterface.hs Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
{-
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
@@ -37,7 +37,7 @@
dbQueryAccount =
- "SELECT users.pass, \
+ "SELECT CASE WHEN users.status = 1 THEN users.pass ELSE '' END, \
\ (SELECT COUNT(users_roles.rid) FROM users_roles WHERE users.uid = users_roles.uid AND users_roles.rid = 3), \
\ (SELECT COUNT(users_roles.rid) FROM users_roles WHERE users.uid = users_roles.uid AND users_roles.rid = 13) \
\ FROM users WHERE users.name = ?"
--- a/gameServer/Opts.hs Fri Sep 11 21:41:35 2015 +0200
+++ b/gameServer/Opts.hs Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
{-
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/gameServer/RoomsAndClients.hs Fri Sep 11 21:41:35 2015 +0200
+++ b/gameServer/RoomsAndClients.hs Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
{-
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/gameServer/ServerCore.hs Fri Sep 11 21:41:35 2015 +0200
+++ b/gameServer/ServerCore.hs Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
{-
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/gameServer/ServerState.hs Fri Sep 11 21:41:35 2015 +0200
+++ b/gameServer/ServerState.hs Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
{-
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/gameServer/Store.hs Fri Sep 11 21:41:35 2015 +0200
+++ b/gameServer/Store.hs Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
{-
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/gameServer/Utils.hs Fri Sep 11 21:41:35 2015 +0200
+++ b/gameServer/Utils.hs Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
{-
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/gameServer/Votes.hs Fri Sep 11 21:41:35 2015 +0200
+++ b/gameServer/Votes.hs Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
{-
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/gameServer/hedgewars-server.hs Fri Sep 11 21:41:35 2015 +0200
+++ b/gameServer/hedgewars-server.hs Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
{-
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/gameServer/stresstest.hs Fri Sep 11 21:41:35 2015 +0200
+++ b/gameServer/stresstest.hs Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
{-
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/gameServer/stresstest2.hs Fri Sep 11 21:41:35 2015 +0200
+++ b/gameServer/stresstest2.hs Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
{-
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/gameServer/stresstest3.hs Fri Sep 11 21:41:35 2015 +0200
+++ b/gameServer/stresstest3.hs Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
{-
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/ArgParsers.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/ArgParsers.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/PNGh.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/PNGh.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/SDLh.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/SDLh.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/avwrapper/avwrapper.c Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/avwrapper/avwrapper.c Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/config.inc.in Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/config.inc.in Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/hwLibrary.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/hwLibrary.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/hwengine.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/hwengine.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
@@ -545,7 +545,7 @@
var Preview: TPreview;
{$ELSE}
var Preview: TPreviewAlpha;
-{$ENDIF MOBILE}
+{$ENDIF}
begin
initEverything(false);
@@ -558,7 +558,7 @@
GenPreview(Preview);
{$ELSE}
GenPreviewAlpha(Preview);
-{$ENDIF MOBILE}
+{$ENDIF}
WriteLnToConsole('Sending preview...');
SendIPCRaw(@Preview, sizeof(Preview));
SendIPCRaw(@MaxHedgehogs, sizeof(byte));
--- a/hedgewars/options.inc Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/options.inc Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uAI.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uAI.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uAIActions.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uAIActions.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uAIAmmoTests.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uAIAmmoTests.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uAIMisc.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uAIMisc.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uAmmos.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uAmmos.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uCaptions.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uCaptions.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uChat.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uChat.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uCollisions.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uCollisions.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
@@ -211,10 +211,15 @@
i:= y + Gear^.Radius * 2 - 2;
repeat
if (y and LAND_HEIGHT_MASK) = 0 then
- if Land[y, x] and Gear^.CollisionMask > 255 then
- exit(Land[y, x] and Gear^.CollisionMask)
- else if Land[y, x] and Gear^.CollisionMask <> 0 then
- pixel:= Land[y, x] and Gear^.CollisionMask;
+ begin
+ if Land[y, x] and Gear^.CollisionMask <> 0 then
+ begin
+ if Land[y, x] and Gear^.CollisionMask > 255 then
+ exit(Land[y, x] and Gear^.CollisionMask)
+ else
+ pixel:= Land[y, x] and Gear^.CollisionMask;
+ end;
+ end;
inc(y)
until (y > i);
end;
@@ -274,10 +279,12 @@
repeat
if (x and LAND_WIDTH_MASK) = 0 then
if Land[y, x] > 0 then
+ begin
if Land[y, x] and Gear^.CollisionMask > 255 then
exit(Land[y, x] and Gear^.CollisionMask)
- else if Land[y, x] <> 0 then
+ else // if Land[y, x] <> 0 then
pixel:= Land[y, x] and Gear^.CollisionMask;
+ end;
inc(x)
until (x > i);
end;
--- a/hedgewars/uCommandHandlers.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uCommandHandlers.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uCommands.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uCommands.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uConsole.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uConsole.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uConsts.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uConsts.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
@@ -171,6 +171,8 @@
cFontBorder = 2;
+ cDefaultBuildMaxDist = 256;
+
// do not change this value
cDefaultZoomLevel = 2.0;
--- a/hedgewars/uDebug.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uDebug.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uFloat.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uFloat.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uGame.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uGame.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uGears.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uGears.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uGearsHandlers.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uGearsHandlers.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uGearsHandlersMess.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uGearsHandlersMess.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
@@ -2769,10 +2769,10 @@
if Gear^.AmmoType = amRubber then LandFlags:= lfBouncy
else if cIce then LandFlags:= lfIce;
- distFail:= ((Distance(tx - x, ty - y) > _256) and ((WorldEdge <> weWrap) or
+ distFail:= (cBuildMaxDist > 0) and ((hwRound(Distance(tx - x, ty - y)) > cBuildMaxDist) and ((WorldEdge <> weWrap) or
(
- (Distance(tx - int2hwFloat(rightX+(rx-leftX)), ty - y) > _256) and
- (Distance(tx - int2hwFloat(leftX-(rightX-rx)), ty - y) > _256)
+ (hwRound(Distance(tx - int2hwFloat(rightX+(rx-leftX)), ty - y)) > cBuildMaxDist) and
+ (hwRound(Distance(tx - int2hwFloat(leftX-(rightX-rx)), ty - y)) > cBuildMaxDist)
)));
if distFail
or (not TryPlaceOnLand(Gear^.Target.X - SpritesData[Ammoz[Gear^.AmmoType].PosSprite].Width div 2, Gear^.Target.Y - SpritesData[Ammoz[Gear^.AmmoType].PosSprite].Height div 2, Ammoz[Gear^.AmmoType].PosSprite, Gear^.State, true, LandFlags)) then
@@ -2807,11 +2807,12 @@
HHGear: PGear;
begin
HHGear := Gear^.Hedgehog^.Gear;
- doStepHedgehogMoving(HHGear);
+ if HHGear <> nil then doStepHedgehogMoving(HHGear);
// if not infattack mode wait for hedgehog finish falling to collect cases
if ((GameFlags and gfInfAttack) <> 0)
+ or (HHGear = nil)
or ((HHGear^.State and gstMoving) = 0)
- or (Gear^.Hedgehog^.Gear^.Damage > 0)
+ or (HHGear^.Damage > 0)
or ((HHGear^.State and gstDrowning) = 1) then
begin
DeleteGear(Gear);
@@ -2821,7 +2822,7 @@
procedure doStepTeleportAnim(Gear: PGear);
begin
- if (Gear^.Hedgehog^.Gear^.Damage > 0) then
+ if (Gear^.Hedgehog^.Gear = nil) or (Gear^.Hedgehog^.Gear^.Damage > 0) then
begin
DeleteGear(Gear);
AfterAttack;
@@ -2848,6 +2849,11 @@
AllInactive := false;
HHGear := Gear^.Hedgehog^.Gear;
+ if HHGear = nil then
+ begin
+ DeleteGear(Gear);
+ exit
+ end;
valid:= false;
@@ -3671,7 +3677,14 @@
FollowGear := Gear;
if Gear^.Timer > 0 then
+ begin
+ if Gear^.Timer = 1 then
+ begin
+ StopSoundChan(Gear^.SoundChannel);
+ Gear^.SoundChannel:= -1;
+ end;
dec(Gear^.Timer);
+ end;
fChanged := false;
if (HHGear = nil) or ((HHGear^.State and gstHHDriven) = 0) or (Gear^.Timer = 0) then
@@ -5206,11 +5219,14 @@
procedure doStepHammer(Gear: PGear);
var HHGear, tmp, tmp2: PGear;
t: PGearArray;
- i: LongInt;
+ i, dmg, d: LongInt;
begin
HHGear:= Gear^.Hedgehog^.Gear;
HHGear^.State:= HHGear^.State or gstNoDamage;
DeleteCI(HHGear);
+SetLittle(HHGear^.dY);
+HHGear^.dY.IsNegative:= true;
+HHGear^.State:= HHGear^.State or gstMoving;
t:= CheckGearsCollision(Gear);
@@ -5225,17 +5241,37 @@
if (tmp^.State and gstNoDamage) = 0 then
if (tmp^.Kind = gtHedgehog) or (tmp^.Kind = gtMine) or (tmp^.Kind = gtExplosives) then
begin
+ dmg:= 0;
//tmp^.State:= tmp^.State or gstFlatened;
if (tmp^.Kind <> gtHedgehog) or (tmp^.Hedgehog^.Effects[heInvulnerable] = 0) then
- ApplyDamage(tmp, CurrentHedgehog, tmp^.Health div 3, dsUnknown);
- //DrawTunnel(tmp^.X, tmp^.Y - _1, _0, _0_5, cHHRadius * 6, cHHRadius * 3);
- tmp2:= AddGear(hwRound(tmp^.X), hwRound(tmp^.Y), gtHammerHit, 0, _0, _0, 0);
- tmp2^.LinkedGear:= tmp;
- SetAllToActive
- end
- else
- begin
- end
+ begin
+ // base damage on remaining health
+ dmg:= (tmp^.Health - tmp^.Damage);
+ if dmg > 0 then
+ begin
+ // do 1/2 current hp worth of damage if extra damage is enabled (1/3 damage if not)
+ if cDamageModifier > _1 then
+ d:= 2
+ else
+ d:= 3;
+ // always round up
+ if dmg mod d > 0 then
+ dmg:= dmg div d + 1
+ else
+ dmg:= dmg div d;
+
+ ApplyDamage(tmp, CurrentHedgehog, dmg, dsUnknown);
+ end;
+ end;
+
+ if (tmp^.Kind <> gtHedgehog) or (dmg > 0) or (tmp^.Health > tmp^.Damage) then
+ begin
+ //DrawTunnel(tmp^.X, tmp^.Y - _1, _0, _0_5, cHHRadius * 6, cHHRadius * 3);
+ tmp2:= AddGear(hwRound(tmp^.X), hwRound(tmp^.Y), gtHammerHit, 0, _0, _0, 0);
+ tmp2^.LinkedGear:= tmp;
+ SetAllToActive
+ end;
+ end;
end;
HHGear^.State:= HHGear^.State and (not gstNoDamage);
--- a/hedgewars/uGearsHandlersRope.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uGearsHandlersRope.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uGearsHedgehog.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uGearsHedgehog.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uGearsList.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uGearsList.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
@@ -155,7 +155,7 @@
Gear^.NextGear^.PrevGear:= Gear^.PrevGear;
if Gear^.PrevGear <> nil then
Gear^.PrevGear^.NextGear:= Gear^.NextGear
-else
+else
GearsList:= Gear^.NextGear;
Gear^.NextGear:= nil;
@@ -671,6 +671,7 @@
t,i: Longword;
k: boolean;
cakeData: PCakeData;
+ iterator: PGear;
begin
ScriptCall('onGearDelete', gear^.uid);
@@ -679,6 +680,31 @@
FreeAndNilTexture(Gear^.Tex);
+// remove potential links to this gear
+// currently relevant to: gears linked by hammer
+if (Gear^.Kind = gtHedgehog) or (Gear^.Kind = gtMine) or (Gear^.Kind = gtExplosives) then
+ begin
+ // check all gears for stuff to port through
+ iterator := nil;
+ while true do
+ begin
+
+ // iterate through GearsList
+ if iterator = nil then
+ iterator := GearsList
+ else
+ iterator := iterator^.NextGear;
+
+ // end of list?
+ if iterator = nil then
+ break;
+
+ if iterator^.LinkedGear = Gear then
+ iterator^.LinkedGear:= nil;
+ end;
+
+ end;
+
// make sure that portals have their link removed before deletion
if (Gear^.Kind = gtPortal) then
begin
--- a/hedgewars/uGearsRender.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uGearsRender.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
@@ -746,32 +746,39 @@
amRubber,
amGirder: begin
DrawSpriteRotated(sprHandConstruction, hx, hy, sign, aangle);
- if WorldEdge = weWrap then
+ if cBuildMaxDist = cDefaultBuildMaxDist then
begin
- if hwRound(Gear^.X) < LongInt(leftX) + 256 then
- DrawSpriteClipped(sprGirder,
- rightX+(ox-leftX)-256,
- oy-256,
- LongInt(topY)+WorldDy,
- LongInt(rightX)+WorldDx,
- cWaterLine+WorldDy,
- LongInt(leftX)+WorldDx);
- if hwRound(Gear^.X) > LongInt(rightX) - 256 then
- DrawSpriteClipped(sprGirder,
- leftX-(rightX-ox)-256,
- oy-256,
- LongInt(topY)+WorldDy,
- LongInt(rightX)+WorldDx,
- cWaterLine+WorldDy,
- LongInt(leftX)+WorldDx)
+ if WorldEdge = weWrap then
+ begin
+ if hwRound(Gear^.X) < LongInt(leftX) + 256 then
+ DrawSpriteClipped(sprGirder,
+ rightX+(ox-leftX)-256,
+ oy-256,
+ LongInt(topY)+WorldDy,
+ LongInt(rightX)+WorldDx,
+ cWaterLine+WorldDy,
+ LongInt(leftX)+WorldDx);
+ if hwRound(Gear^.X) > LongInt(rightX) - 256 then
+ DrawSpriteClipped(sprGirder,
+ leftX-(rightX-ox)-256,
+ oy-256,
+ LongInt(topY)+WorldDy,
+ LongInt(rightX)+WorldDx,
+ cWaterLine+WorldDy,
+ LongInt(leftX)+WorldDx)
+ end;
+ DrawSpriteClipped(sprGirder,
+ ox-256,
+ oy-256,
+ LongInt(topY)+WorldDy,
+ LongInt(rightX)+WorldDx,
+ cWaterLine+WorldDy,
+ LongInt(leftX)+WorldDx)
+ end
+ else if cBuildMaxDist > 0 then
+ begin
+ DrawCircle(hx, hy, cBuildMaxDist, 3, $FF, 0, 0, $80);
end;
- DrawSpriteClipped(sprGirder,
- ox-256,
- oy-256,
- LongInt(topY)+WorldDy,
- LongInt(rightX)+WorldDx,
- cWaterLine+WorldDy,
- LongInt(leftX)+WorldDx)
end;
amBee: DrawSpriteRotatedF(sprHandBee, hx, hy, (RealTicks div 125) mod 4, sign, aangle);
amFlamethrower: DrawSpriteRotatedF(sprHandFlamethrower, hx, hy, (RealTicks div 125) mod 4, sign, aangle);
--- a/hedgewars/uGearsUtils.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uGearsUtils.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uIO.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uIO.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uInputHandler.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uInputHandler.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uLand.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uLand.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uLandGenMaze.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uLandGenMaze.pas Sat Sep 12 04:02:27 2015 +0200
@@ -315,42 +315,42 @@
begin
case cTemplateFilter of
0: begin
- cellsize := small_cell_size;
- maze_inverted := false;
- minDistance:= max(cFeatureSize*8,32);
- dabDiv:= 150;
- end;
+ cellsize := small_cell_size;
+ maze_inverted := false;
+ minDistance:= max(cFeatureSize*8,32);
+ dabDiv:= 150;
+ end;
1: begin
- cellsize := medium_cell_size;
- minDistance:= max(cFeatureSize*6,20);
- maze_inverted := false;
- dabDiv:= 100;
- end;
+ cellsize := medium_cell_size;
+ minDistance:= max(cFeatureSize*6,20);
+ maze_inverted := false;
+ dabDiv:= 100;
+ end;
2: begin
- cellsize := large_cell_size;
- minDistance:= max(cFeatureSize*5,12);
- maze_inverted := false;
- dabDiv:= 90;
- end;
+ cellsize := large_cell_size;
+ minDistance:= max(cFeatureSize*5,12);
+ maze_inverted := false;
+ dabDiv:= 90;
+ end;
3: begin
- cellsize := small_cell_size;
- minDistance:= max(cFeatureSize*8,32);
- maze_inverted := true;
- dabDiv:= 130;
- end;
+ cellsize := small_cell_size;
+ minDistance:= max(cFeatureSize*8,32);
+ maze_inverted := true;
+ dabDiv:= 130;
+ end;
4: begin
- cellsize := medium_cell_size;
- minDistance:= max(cFeatureSize*6,20);
- maze_inverted := true;
- dabDiv:= 100;
- end;
+ cellsize := medium_cell_size;
+ minDistance:= max(cFeatureSize*6,20);
+ maze_inverted := true;
+ dabDiv:= 100;
+ end;
5: begin
- cellsize := large_cell_size;
- minDistance:= max(cFeatureSize*5,12);
- maze_inverted := true;
- dabDiv:= 85;
+ cellsize := large_cell_size;
+ minDistance:= max(cFeatureSize*5,12);
+ maze_inverted := true;
+ dabDiv:= 85;
+ end;
end;
-end;
num_cells_x := LAND_WIDTH div cellsize;
if not odd(num_cells_x) then
@@ -379,10 +379,10 @@
done := false;
for current_step := 0 to num_steps - 1 do
-begin
+ begin
step_done[current_step] := false;
came_from_pos[current_step] := 0;
-end;
+ end;
current_step := 0;
@@ -444,14 +444,14 @@
begin
done := true;
for current_step := 0 to num_steps-1 do
- begin
+ begin
if not step_done[current_step] then
- begin
+ begin
see_cell;
done := false;
+ end;
end;
end;
-end;
for x := 0 to seen_cells_x - 1 do
for y := 0 to seen_cells_y - 1 do
--- a/hedgewars/uLandGraphics.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uLandGraphics.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uLandObjects.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uLandObjects.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uLandPainted.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uLandPainted.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uLandTemplates.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uLandTemplates.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uLandTexture.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uLandTexture.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uLocale.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uLocale.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uMisc.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uMisc.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
@@ -250,7 +250,7 @@
exit;
end;
-// read pixels from the front buffer
+// read pixels from land array
if dump > 0 then
begin
for y:= 0 to LAND_HEIGHT-1 do
@@ -274,6 +274,7 @@
end
end
else
+// read pixels from the front buffer
begin
glReadPixels(0, 0, cScreenWidth, cScreenHeight, format, GL_UNSIGNED_BYTE, p);
{$IFDEF USE_VIDEO_RECORDING}
--- a/hedgewars/uPhysFSLayer.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uPhysFSLayer.pas Sat Sep 12 04:02:27 2015 +0200
@@ -153,7 +153,7 @@
cPhysfsId: shortstring;
{$IFNDEF MOBILE}
fp: PChar;
-{$ENDIF MOBILE}
+{$ENDIF}
begin
{$IFDEF HWLIBRARY}
//TODO: http://icculus.org/pipermail/physfs/2011-August/001006.html
@@ -173,7 +173,7 @@
if fp <> nil then
pfsMount(ansistring(fp), PChar('/Fonts'));
end;
-{$ENDIF MOBILE}
+{$ENDIF}
pfsMountAtRoot(PathPrefix);
pfsMountAtRoot(UserPathPrefix + ansistring('/Data'));
--- a/hedgewars/uRandom.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uRandom.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uRender.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uRender.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uRenderUtils.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uRenderUtils.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uScript.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uScript.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
@@ -440,6 +440,26 @@
lc_setweapon:= 0;
end;
+// no parameter means reset to default (and 0 means unlimited)
+function lc_setmaxbuilddistance(L : Plua_State) : LongInt; Cdecl;
+var np: LongInt;
+const
+ call = 'SetMaxBuildDistance';
+ params = '[ distInPx ]';
+begin
+ if CheckAndFetchParamCountRange(L, 0, 1, call, params, np) then
+ begin
+ if np = 0 then
+ begin
+ // no args? reset
+ cBuildMaxDist:= cDefaultBuildMaxDist;
+ end
+ else
+ CBuildMaxDist:= lua_tointeger(L, 1);
+ end;
+ lc_setmaxbuilddistance:= 0;
+end;
+
// sets weapon to whatever weapons is next (wraps around, amSkip is skipped)
function lc_setnextweapon(L : Plua_State) : LongInt; Cdecl;
var at : LongInt;
@@ -2276,7 +2296,7 @@
else flipVert := false;
lf:= 0;
- // accept any amount of landflags, loop is never executed if n>6
+ // accept any amount of landflags, loop is never executed if n<9
for i:= 9 to n do
lf:= lf or lua_tointeger(L, i);
@@ -2305,7 +2325,7 @@
eraseOnLFMatch, onlyEraseLF, flipHoriz, flipVert : boolean;
const
call = 'EraseSprite';
- params = 'x, y, sprite, frameIdx, eraseOnLFMatch, flipHoriz, flipVert, [, landFlag, ... ]';
+ params = 'x, y, sprite, frameIdx, eraseOnLFMatch, onlyEraseLF, flipHoriz, flipVert, [, landFlag, ... ]';
begin
if CheckAndFetchLuaParamMinCount(L, 4, call, params, n) then
begin
@@ -2323,7 +2343,7 @@
else flipVert := false;
lf:= 0;
- // accept any amount of landflags, loop is never executed if n>6
+ // accept any amount of landflags, loop is never executed if n<9
for i:= 9 to n do
lf:= lf or lua_tointeger(L, i);
@@ -2472,7 +2492,7 @@
lc_setwaterline:= 0
end;
-function lc_setaihintsongear(L : Plua_State) : LongInt; Cdecl;
+function lc_setgearaihints(L : Plua_State) : LongInt; Cdecl;
var gear: PGear;
begin
if CheckLuaParamCount(L, 2, 'SetAIHintOnGear', 'gearUid, aiHints') then
@@ -2481,7 +2501,7 @@
if gear <> nil then
gear^.aihints:= lua_tointeger(L, 2);
end;
- lc_setaihintsongear:= 0
+ lc_setgearaihints:= 0
end;
@@ -2647,6 +2667,7 @@
ScriptSetInteger('TemplateFilter', cTemplateFilter);
ScriptSetInteger('TemplateNumber', LuaTemplateNumber);
ScriptSetInteger('MapGen', ord(cMapGen));
+ScriptSetInteger('MapFeatureSize', cFeatureSize);
ScriptCall('onPreviewInit');
@@ -2655,6 +2676,7 @@
cTemplateFilter := ScriptGetInteger('TemplateFilter');
LuaTemplateNumber:= ScriptGetInteger('TemplateNumber');
cMapGen := TMapGen(ScriptGetInteger('MapGen'));
+cFeatureSize := ScriptGetInteger('MapFeatureSize');
end;
procedure ScriptOnGameInit;
@@ -2673,6 +2695,7 @@
ScriptSetInteger('TemplateFilter', cTemplateFilter);
ScriptSetInteger('TemplateNumber', LuaTemplateNumber);
ScriptSetInteger('MapGen', ord(cMapGen));
+ScriptSetInteger('MapFeatureSize', cFeatureSize);
ScriptSetInteger('ScreenHeight', cScreenHeight);
ScriptSetInteger('ScreenWidth', cScreenWidth);
ScriptSetInteger('TurnTime', cHedgehogTurnTime);
@@ -2702,6 +2725,7 @@
cTemplateFilter := ScriptGetInteger('TemplateFilter');
LuaTemplateNumber:= ScriptGetInteger('TemplateNumber');
cMapGen := TMapGen(ScriptGetInteger('MapGen'));
+cFeatureSize := ScriptGetInteger('MapFeatureSize');
GameFlags := ScriptGetInteger('GameFlags');
cHedgehogTurnTime:= ScriptGetInteger('TurnTime');
cCaseFactor := ScriptGetInteger('CaseFreq');
@@ -3156,7 +3180,7 @@
ScriptSetInteger('gstAttacked' , gstAttacked);
ScriptSetInteger('gstAttacking' , gstAttacking);
ScriptSetInteger('gstCollision' , gstCollision);
-ScriptSetInteger('gstChooseTarget', gstChooseTarget);
+ScriptSetInteger('gstChooseTarget' , gstChooseTarget);
ScriptSetInteger('gstHHJumping' , gstHHJumping);
ScriptSetInteger('gsttmpFlag' , gsttmpFlag);
ScriptSetInteger('gstHHThinking' , gstHHThinking);
@@ -3170,6 +3194,9 @@
ScriptSetInteger('gstLoser' , gstLoser);
ScriptSetInteger('gstHHGone' , gstHHGone);
ScriptSetInteger('gstInvisible' , gstInvisible);
+ScriptSetInteger('gstSubmersible' , gstSubmersible);
+ScriptSetInteger('gstFrozen' , gstFrozen);
+ScriptSetInteger('gstNoGravity' , gstNoGravity);
// ai hints
ScriptSetInteger('aihUsualProcessing', aihUsualProcessing);
@@ -3298,11 +3325,12 @@
lua_register(luaState, _P'SetWaterLine', @lc_setwaterline);
lua_register(luaState, _P'SetNextWeapon', @lc_setnextweapon);
lua_register(luaState, _P'SetWeapon', @lc_setweapon);
+lua_register(luaState, _P'SetMaxBuildDistance', @lc_setmaxbuilddistance);
// drawn map functions
lua_register(luaState, _P'AddPoint', @lc_addPoint);
lua_register(luaState, _P'FlushPoints', @lc_flushPoints);
-lua_register(luaState, _P'SetGearAIHints', @lc_setaihintsongear);
+lua_register(luaState, _P'SetGearAIHints', @lc_setgearaihints);
lua_register(luaState, _P'HedgewarsScriptLoad', @lc_hedgewarsscriptload);
lua_register(luaState, _P'DeclareAchievement', @lc_declareachievement);
--- a/hedgewars/uSinTable.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uSinTable.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uSound.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uSound.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
@@ -727,6 +727,7 @@
RegisterVariable('mute' , @chMute , true );
MusicFN:='';
+ SDMusicFN:= 'sdmusic.ogg';
Mus:= nil;
isAudioMuted:= false;
isSEBackup:= isSoundEnabled;
--- a/hedgewars/uStats.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uStats.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uStore.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uStore.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uTeams.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uTeams.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uTextures.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uTextures.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uTypes.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uTypes.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uUtils.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uUtils.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uVariables.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uVariables.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
@@ -179,6 +179,7 @@
cElastic : hwFloat;
cGravity : hwFloat;
cGravityf : real;
+ cBuildMaxDist : LongInt;
cDamageModifier : hwFloat;
cLaserSighting : boolean;
cVampiric : boolean;
@@ -2492,6 +2493,7 @@
procedure initModule;
var s: shortstring;
+ i: integer;
begin
cLocale:= cLocaleFName;
SplitByChar(cLocale, s, '.');
@@ -2565,6 +2567,7 @@
cElastic := _0_9;
cGravity := cMaxWindSpeed * 2;
cGravityf := 0.00025 * 2;
+ cBuildMaxDist := cDefaultBuildMaxDist;
cDamageModifier := _1;
TargetPoint := cTargetPointRef;
@@ -2705,6 +2708,43 @@
AprilOne := false;
ChatPasteBuffer:= '';
+
+ // initialize pointers to nil
+ // (don't rely on implicit init of fpc, because that one only happens ONCE when used as lib)
+ CurAmmoGear:= nil;
+ lastGearByUID:= nil;
+ GearsList:= nil;
+ CurrentTeam:= nil;
+ PreviousTeam:= nil;
+ CurrentHedgehog:= nil;
+ FollowGear:= nil;
+ lastVisualGearByUID:= nil;
+
+ ChefHatTexture:= nil;
+ CrosshairTexture:= nil;
+ GenericHealthTexture:= nil;
+ WeaponTooltipTex:= nil;
+ HHTexture:= nil;
+ LandBackSurface:= nil;
+ ConfirmTexture:= nil;
+ MissionIcons:= nil;
+ ropeIconTex:= nil;
+
+ for i:= Low(ClansArray) to High(ClansArray) do
+ begin
+ ClansArray[i]:= nil;
+ end;
+
+ for i:= Low(TeamsArray) to High(TeamsArray) do
+ begin
+ TeamsArray[i]:= nil;
+ end;
+
+ for i:= Low(CountTexz) to High(CountTexz) do
+ begin
+ CountTexz[i]:= nil;
+ end;
+
end;
procedure freeModule;
--- a/hedgewars/uVideoRec.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uVideoRec.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uVisualGears.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uVisualGears.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uVisualGearsHandlers.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uVisualGearsHandlers.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uVisualGearsList.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uVisualGearsList.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/hedgewars/uWorld.pas Fri Sep 11 21:41:35 2015 +0200
+++ b/hedgewars/uWorld.pas Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
(*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
@@ -1737,7 +1737,7 @@
CursorPoint.X:= (prevPoint.X * 7 + dstX) div 8;
end;
- if isPhone() or (cScreenHeight < 600) or ((FollowGear^.dY * z).Round < 10) then
+ if isPhone() or (cScreenHeight < 600) or (hwFloat(FollowGear^.dY * z).Round < 10) then
CursorPoint.Y:= (prevPoint.Y * 7 + cScreenHeight - (hwRound(FollowGear^.Y) + WorldDy)) div 8
else
CursorPoint.Y:= (prevPoint.Y * 7 + cScreenHeight - (hwRound(FollowGear^.Y) + hwSign(FollowGear^.dY) * z + WorldDy)) div 8;
--- a/man/hedgewars.6 Fri Sep 11 21:41:35 2015 +0200
+++ b/man/hedgewars.6 Sat Sep 12 04:02:27 2015 +0200
@@ -42,7 +42,7 @@
.
.SH "COPYRIGHT"
.
-Copyright \(co 2004\-2014 Andrey Korotaev, Igor Ulyanov
+Copyright \(co 2004\-2015 Andrey Korotaev, Igor Ulyanov
.br
This is Free Software; this software is licensed under the GPL version 2, as published by the Free Software Foundation.
There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/misc/libphyslayer/physfscompat.c Fri Sep 11 21:41:35 2015 +0200
+++ b/misc/libphyslayer/physfscompat.c Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/misc/libphyslayer/physfscompat.h Fri Sep 11 21:41:35 2015 +0200
+++ b/misc/libphyslayer/physfscompat.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* 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
--- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/SDLActivity.java Fri Sep 11 21:41:35 2015 +0200
+++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/SDLActivity.java Sat Sep 12 04:02:27 2015 +0200
@@ -2,7 +2,7 @@
* Hedgewars for Android. An Android port of Hedgewars, a free turn based strategy game
* Copyright (c) 2011-2012 Richard Deurwaarder <xeli@xelification.com>
* Copyright (C) 2012 Simeon Maxein <smaxein@googlemail.com>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
--- a/project_files/frontlib/hwconsts.h Fri Sep 11 21:41:35 2015 +0200
+++ b/project_files/frontlib/hwconsts.h Sat Sep 12 04:02:27 2015 +0200
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
* Copyright (c) 2012 Simeon Maxein <smaxein@googlemail.com>
*
* This program is free software; you can redistribute it and/or modify
--- a/project_files/frontlib/net/netconn.c Fri Sep 11 21:41:35 2015 +0200
+++ b/project_files/frontlib/net/netconn.c Sat Sep 12 04:02:27 2015 +0200
@@ -1,7 +1,7 @@
/*
* Hedgewars, a free turn based strategy game
* Copyright (c) 2006-2008 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2004-2014 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
* Copyright (c) 2012 Simeon Maxein <smaxein@googlemail.com>
*
* This program is free software; you can redistribute it and/or modify
--- a/project_files/hwc/CMakeLists.txt Fri Sep 11 21:41:35 2015 +0200
+++ b/project_files/hwc/CMakeLists.txt Sat Sep 12 04:02:27 2015 +0200
@@ -40,6 +40,7 @@
list(REMOVE_ITEM engine_sources_pas "${CMAKE_SOURCE_DIR}/hedgewars/pas2cSystem.pas")
list(REMOVE_ITEM engine_sources_pas "${CMAKE_SOURCE_DIR}/hedgewars/pas2cRedo.pas")
list(REMOVE_ITEM engine_sources_pas "${CMAKE_SOURCE_DIR}/hedgewars/hwLibrary.pas")
+list(REMOVE_ITEM engine_sources_pas "${CMAKE_SOURCE_DIR}/hedgewars/uMatrix.pas")
#remove and readd hwengine so that it is compiled first, compiling every other file in the process
list(REMOVE_ITEM engine_sources_pas ${CMAKE_SOURCE_DIR}/hedgewars/hwengine.pas)
--- a/share/Info.plist.in Fri Sep 11 21:41:35 2015 +0200
+++ b/share/Info.plist.in Sat Sep 12 04:02:27 2015 +0200
@@ -23,7 +23,7 @@
<key>CFBundleShortVersionString</key>
<string>${HEDGEWARS_VERSION}</string>
<key>NSHumanReadableCopyright</key>
- <string>Copyright © 2004-2014, Hedgewars Project</string>
+ <string>Copyright © 2004-2015, Hedgewars Project</string>
<key>NSAppleScriptEnabled</key>
<true/>
<key>LSRequiresNativeExecution</key>
--- a/share/hedgewars/Data/Locale/en.txt Fri Sep 11 21:41:35 2015 +0200
+++ b/share/hedgewars/Data/Locale/en.txt Sat Sep 12 04:02:27 2015 +0200
@@ -1,11 +1,11 @@
; English locale
00:00=Grenade
-00:01=ClusterBomb
+00:01=Cluster Bomb
00:02=Bazooka
00:03=Homing Bee
00:04=Shotgun
-00:05=PickHammer
+00:05=Pick Hammer
00:06=Skip
00:07=Rope
00:08=Mine
@@ -53,7 +53,7 @@
00:50=Drill Strike
00:51=Mudball
00:52=No weapon selected
-00:53=TimeBox
+00:53=Time Box
; 00:54=Structure
00:54=Land Spray
00:55=Freezer
@@ -70,7 +70,7 @@
01:06=Sudden Death!
01:07=%1 remaining
01:08=Fuel
-01:09=Synchronizing...
+01:09=Synchronizing ...
01:10=Using this utility won't end your turn!
01:11=This weapon or utility is not yet available!
01:12=Last round till Sudden Death!
@@ -103,7 +103,6 @@
02:00=%1 has timed out!
02:00=%1 says peace out!
02:00=%1 will be fondly remembered!
-02:00=%1 has an aneurysm!
02:00=%1 leaves behind a wife and child
02:00=%1 has launched his last bazooka
02:00=%1 has tossed his last grenade
@@ -118,8 +117,8 @@
02:00=%1 has gone to play a better game
02:00=%1 has ragequit life
02:00=%1 fails
-02:00=Poor poor %1...
-02:00=%1 prefers wormux
+02:00=Poor, poor %1 ...
+02:00=%1 prefers WarMUX
02:00=%1 has been blocking shots with his face
02:00=%1 is a hero amongst me...err...hogs
02:00=%1 finds his place in Valhalla
@@ -206,7 +205,7 @@
02:02=Let's go!
02:02=Let's rock!
02:02=Let's jam!
-02:02=It's beginning...
+02:02=It's beginning ...
02:02=This is the start of something big
02:02=Welcome to Hedgewars
02:02=Welcome to the front lines
@@ -262,7 +261,7 @@
02:05=Medic!
02:05=First aid from the skies!
02:05=A health pack for you
-02:05=Good health... in box form!
+02:05=Good health ... in box form!
02:05=The doctor calls
02:05=Fresh band-aids!
02:05=This will make you feel better
@@ -271,7 +270,7 @@
02:05=Grab it
02:05=A healthy snack
02:05=A remedy to pain
-02:05=Correct Dosage: as many as you can find!
+02:05=Correct dosage: as many as you can find!
02:05=Urgent delivery
02:05=Supplies!
@@ -302,7 +301,7 @@
; New utility crate
02:07=Tooltime!
-02:07=This could come in handy...
+02:07=This could come in handy ...
02:07=Utilities!
02:07=Utilise this box
02:07=Watch out below
@@ -314,7 +313,7 @@
02:07=You might need this
; Hog (%1) skips his turn
-02:08=%1 is sooo boring...
+02:08=%1 is sooo boring ...
02:08=%1 couldn't be bothered
02:08=%1 is one lazy hog
02:08=%1 is thoughtless
@@ -399,56 +398,56 @@
02:11=%1 has to go
; Weapon Categories
-03:00=Timed Grenade
-03:01=Timed Grenade
-03:02=Ballistic Weapon
-03:03=Guided Weapon
+03:00=Timed grenade
+03:01=Timed grenade
+03:02=Ballistic weapon
+03:03=Guided weapon
03:04=Gun (multiple shots)
-03:05=Digging Tool
+03:05=Digging tool
03:06=Action
-03:07=Transport Utility
-03:08=Proximity Bomb
+03:07=Transport utility
+03:08=Proximity bomb
03:09=Gun (multiple shots)
03:10=BOOM!
03:11=Bonk!
-03:12=Martial Arts
+03:12=Martial arts
03:13=UNUSED
-03:14=Transport Utility
-03:15=Airborne Attack
-03:16=Airborne Attack
-03:17=Digging Tool
+03:14=Transport utility
+03:15=Airborne attack
+03:16=Airborne attack
+03:17=Digging tool
03:18=Utility
-03:19=Transport Utility
+03:19=Transport utility
03:20=Action
-03:21=Ballistic Weapon
+03:21=Ballistic weapon
03:22=Call me Indiana!
03:23=(Really) Martial Arts
03:24=The cake is NOT a lie!
-03:25=Costume Kit
-03:26=Juicy Grenade
-03:27=Fiery Grenade
-03:28=Ballistic Weapon
-03:29=Ballistic Weapon
-03:30=Airborne Attack
-03:31=Remote Controlled Bomb
-03:32=Temporary Effect
-03:33=Temporary Effect
-03:34=Temporary Effect
-03:35=Temporary Effect
-03:36=Temporary Effect
-03:37=Temporary Effect
+03:25=Costume kit
+03:26=Juicy grenade
+03:27=Fiery grenade
+03:28=Ballistic weapon
+03:29=Ballistic weapon
+03:30=Airborne attack
+03:31=Remote-controlled bomb
+03:32=Temporary effect
+03:33=Temporary effect
+03:34=Temporary effect
+03:35=Temporary effect
+03:36=Temporary effect
+03:37=Temporary effect
03:38=Gun (multiple shots)
-03:39=Transport Utility
-03:40=Incinerating Grenade
+03:39=Transport utility
+03:40=Incinerating grenade
03:41=Huge fan of Squawks
-03:42=I'm making a note here...
+03:42=I'm making a note here ...
; the misspelled "Beethoven" is intentional (-> to beat)
03:43=Performing Beathoven's deadly sonata
03:44=Best before: 1923
03:45=The power of science
-03:46=Hot Hot Hot!
+03:46=Hot, hot, hot!
03:47=Stick these somewhere useful!
-03:48=It's Hammer time!
+03:48=It's Hammer Time!
03:49=Bring back the dead TO hell!
03:50=Moles fan
03:51=Found on the ground
@@ -459,66 +458,68 @@
03:55=It doesn't get cooler than this!
03:56=Please use or misuse
03:57=Utility
+03:58=Floating proximity bomb
; Weapon Descriptions (use | as line breaks)
-04:00=Attack your enemies using a simple grenade.|It will explode once its timer reaches zero.|1-5: Set grenade's timer|Attack: Hold to throw with more power
-04:01=Attack your enemies using a cluster bomb.|It will split into smaller bombs once its timer|reaches zero.|1-5: Set grenade's timer|Attack: Hold to throw with more power
+04:00=Attack your enemies using a simple grenade.|It will explode once its timer reaches zero.|1-5: Set grenade's timer|Precise + 1-5: Set bounce strength|Attack: Hold to throw with more power
+04:01=Attack your enemies using a cluster bomb.|It will split into smaller bombs once its timer|reaches zero.|1-5: Set cluster bomb's timer|Precise + 1-5: Set bounce strength|Attack: Hold to throw with more power
04:02=Attack your enemies using a ballistic projectile|that might be influenced by wind.|Attack: Hold to shoot with more power
04:03=Launch an explosive bee that will lock on|the selected target. Don't shoot with full power|to improve its precision.|Cursor: Pick target|Attack: Hold to shoot with more power
04:04=Attack your enemy using a shotgun with two shots.|Thanks to its spread you don't need direct hits|to harm your opponents.|Attack: Shoot (multiple times)
-04:05=Move underground! Use the pickhammer to drill|a hole into the ground and reach other areas.|Attack: Start or stop digging
+04:05=Move underground! Use the pick hammer to drill|a hole into the ground and reach other areas.|Attack: Start or stop digging|Left/Right: Move while drilling
04:06=Bored? No way to attack? Save your ammo?|No problem! Just skip your turn, coward!|Attack: Skip your turn without fighting
-04:07=Bridge huge distances using timed shots with the|rope. Use your momentum to slide into other hogs|or drop grenades and other weapons on them.|Attack: Shoot or release the rope|Long Jump: Drop grenades or similar weapons
-04:08=Keep your enemies away by dropping a mine in|narrow passages or right below their feet. Be|sure to retreat before you trigger it yourself!|Attack: Drop mine next to your feet
+04:07=Bridge huge distances using timed shots with the|rope. Use your momentum to slide into other hogs|or drop grenades and other weapons on them.|Attack: Shoot or release the rope|Up/Down: Retract/Extend rope|Long Jump: Drop grenades or similar weapons
+04:08=Keep your enemies away by dropping a mine in|narrow passages or right below their feet. Be|sure to retreat before you trigger it yourself!|Attack: Drop mine next to your feet|Precise + 1-5: Set mine's bounce strength
04:09=Not sure about your aiming? Use the Desert|Eagle to attack using up to four shots.|Attack: Shoot (multiple times)
04:10=Brute force is always an option. Drop this classic|explosive next to your enemies and retreat.|Attack: Drop dynamite next to your feet
04:11=Get rid of enemy hogs by batting them over|the map borders or into water. Or how about|knocking some mines to your friends?|Attack: Bat everything in front of you
04:12=Get close and personal to unleash the power of|this almost deadly martial arts technique.|Attack: Perform the amazing Shoryuken.
04:13=UNUSED
-04:14=Fear of heights? Better grab a parachute.|It will unfold once|you fall too far and|save your hog from taking fall damage.|Attack: Unfold the parachute|Long Jump: Drop grenades or similar weapons
+04:14=Fear of heights? Better grab a parachute.|It will unfold automatically once|you fall too far and|save your hog from taking fall damage.|Attack: Unfold or deactivate the parachute manually|Left/Right/Up/Down: Control your flight|Long Jump: Drop grenades or similar weapons
04:15=Call in an airplane to attack your enemies|using a bombing run.|Left/Right: Determine attack direction|Cursor: Select target region
04:16=Call in an airplane to drop several mines|in the target area.|Left/Right: Determine attack direction|Cursor: Select target region
-04:17=Need shelter? Use the blow torch to dig|a tunnel into solid ground granting you|cover.|Attack: Start or stop digging
+04:17=Need shelter? Use the blow torch to dig|a tunnel into solid ground granting you|cover.|Attack: Start or stop digging|Up/down: Change digging direction
04:18=Need additional protection or want to pass|unpassable ground? Place some girders as you|like.|Left/Right: Select girder to place|Cursor: Place girder in a valid position
-04:19=Used at the right moment teleportation can|be more powerful than almost all weapons as|it allows you to save hogs from dangerous|situations within seconds.|Cursor: Select target region
-04:20=Allows you to play the current turn with|a different hog.|Attack: Enable switching hogs
-04:21=Shoot a grenade-like projectile that will|release multiple bombs upon impact.|Attack: Shoot at full power
+04:19=Used at the right moment teleportation can|be more powerful than almost all weapons as|it allows you to save hogs from dangerous|situations within seconds.|Cursor: Select target region|Left/Right: Choose facing direction
+04:20=Allows you to play the current turn with|a different hog.|Attack: Enable switching hogs|Switch: Select next hog|Precise + Switch: Select previous hog
+04:21=Shoot a projectile that will release|multiple clusters upon impact. The|clusters are hurled backwards and are|more dangerous than the main projectile.|Attack: Shoot at full power
04:22=Not just for Indiana Jones! The whip is a|useful weapon in many situations. Especially|when you'd like to shove someone off a cliff.|Attack: Strike everything in front of you
-04:23=If you have nothing to lose, this might be|quite handy. Sacrifice your hog by launching|him into a specific direction hurting everything|on his way and exploding at the end.|Attack: Launch the devastating and deadly attack
+04:23=If you have nothing to lose, this might be|quite handy. Sacrifice your hog by launching|it into a specific direction hurting everything|on his way and exploding at the end.|Attack: Launch the devastating and deadly attack
04:24=Happy Birthday! Launch this cake, let it walk right|next to your enemies and let them have an explosive|party. The cake is able to pass almost all terrain|but he might detonate earlier this way.|Attack: Start the cake or let it stop and explode
04:25=Use this disguise kit to get your enemies to jump|towards your hog (and into some gap or hole).|Attack: Use the kit and try to seduce another hog
-04:26=Throw this juicy watermelon at your enemies. Once|the timer expires, it will split into several|explosive pieces.|1-5: Set watermelon's timer|Attack: Hold to shoot with more power
+04:26=Throw this juicy (and bouncy) watermelon at|your enemies. Once the timer expires, it will|split into several explosive pieces.|1-5: Set watermelon's timer|Attack: Hold to shoot with more power
04:27=Let hellfire rain onto your opponents by using|this fiendish explosive. Don't get too close to|the explosion as smaller fires might last longer.|Attack: Hold to shoot with more power
04:28=Short time after launching this rocket, it will|start drilling through solid ground and explode|once its fuse is triggered or it resurfaces again.|Attack: Hold to shoot with more power
04:29=This is nothing for small kids! The ball gun fires|tons of small colored balls filled with explosives.|Attack: Shoot at full power|Up/Down: Continue aiming
04:30=Call in an airplane to launch a powerful napalm|strike. With proper aiming this attack can eradicate|huge parts of landscape including unlucky hogs|sitting there.|Left/Right: Determine attack direction|Cursor: Select target region
04:31=The RC plane is the ideal weapon to collect crates or|attack far away hogs. Either steer it into enemies or|drop some bombs first.|Attack: Launch the plane or drop bombs|Long Jump: Let the valkyries ride into battle|Left/Right: Steer the plane
04:32=Low gravity is more effective than any diet! Jump|higher and over greater distances or let your enemies|fly even further.|Attack: Activate
-04:33=Sometimes you just need that little extra boost to|deal some more damage.|Attack: Activate
-04:34=Can't touch me!|Attack: Activate
-04:35=Sometimes time's running too fast. Grab some extra|seconds to finish your attack.|Attack: Activate
+04:33=Sometimes you just need that little extra boost to|deal some more damage. Activating this increases|the damage dealt by 50% for the rest of the turn.|Attack: Activate
+04:34=Makes you immune to damage for the|rest of your turn. But don't be too|cocky, you could still drown.|Attack: Activate
+04:35=Sometimes time's running too fast.|Grab 30 extra seconds to finish your attack.|Attack: Activate
04:36=Well, sometimes you're just too bad in aiming. Get|some assistance using modern day technology.|Attack: Activate
-04:37=Don't fear the daylight. It will just last one turn|but will enable you to absorb the damage you do to|other hogs.|Attack: Activate
-04:38=The sniper rifle can be the most devastating weapon|in your whole arsenal, however it's very ineffective|at close quarters. The damage dealt increases with|the distance to its target.|Attack: Shoot (twice)
-04:39=Fly to other parts of the map using the flying|saucer. This hard to master utility can|take you to almost any position on the battlefield.|Attack: Activate|Up/Left/Right: Apply force in one direction|Long Jump: Drop grenades or similar weapons
+04:37=Don't fear the daylight. It will just last one turn|but will enable you to absorb 80% of the damage|dealt to other hogs.|Attack: Activate
+04:38=The sniper rifle can be the most devastating weapon|in your whole arsenal, however it's very ineffective|at close quarters. The damage dealt increases with|the distance to its target. Aiming is difficult, so as long this|weapon is activated, you have to hold your position.|Attack: Activate built-in laser sight, then fire (twice)|Left/Right: Turn around (between shots)
+04:39=Fly to other parts of the map using the flying|saucer. This hard to master utility can|take you to almost any position on the battlefield.|Attack: Activate/Deactivate|Up/Left/Right: Apply a short boost into one direction|Long Jump: Drop grenades or similar weapons|Precise + Long Jump: Launch weapon to crosshair|Precise + Up/Down: Adjust aim
04:40=Set some ground on fire using this bottle filled|with (soon to be) burning liquid.|Attack: Hold to shoot with more power
-04:41=The evidence nature might even top the flying|saucer. Birdy can carry your hog around and|drop eggs on your enemies!|Be quick, as using Birdy eats into your turn|time!|Attack: Activate and drop eggs|Up/Left/Right: Flap in one direction
-04:42=This portable portal device is capable|of instantly transporting you, your enemies,|or your weaponry between two points on the|terrain.|Use it wisely and your campaign will be a...|HUGE SUCCESS!|Attack: Shoot a portal|Switch: Cycle portal colours
-04:43=Make your musical debut an explosive success!|Drop a piano from the heavens, but beware...|someone needs to play it, and that may cost you|your life!|Cursor: Select target region|F1-F9: Play the piano
-04:44=This isn't just cheese, it's biological warfare!|It won't cause an huge amount of damage once|the timer reaches zero but it will definitely|poison anyone unlucky to touch the smell!|1-5: Set grenade's timer|Attack: Hold to throw with more power
-04:45=All those physics classes have finally|paid off, launch a devastating Sine|wave at your foes.|Watch out, this weapon packs quite a kick. (This weapon is incomplete)|Attack: Shoot
+04:41=The evidence nature might even top the flying|saucer. Birdy can carry your hog around and|drop eggs on your enemies to poison them!|Be quick, as using Birdy eats into your turn|time!|Attack: Activate and drop eggs|Up/Left/Right: Flap in one direction
+04:42=This portable portal device is capable|of instantly transporting you, your enemies,|or your weaponry between two points on the|terrain.|Use it wisely and your campaign will be a ...|HUGE SUCCESS!|Disclaimer. Does not work on rubber bands.|Attack: Shoot a portal|Switch: Change portal colour
+04:43=Make your musical debut an explosive success!|Drop a mighty piano from the heavens,|stomping everything in its path, but beware:|Your hog must be sacrificed to play the piano.|Cursor: Select target region|F1-F9: Play the piano
+04:44=This isn't just cheese, it's biological warfare!|It won't cause an huge amount of damage once|the timer reaches zero but it will definitely|poison anyone unlucky to touch the smell!|1-5: Set timer|Precise + 1-5: Set bounce strength|Attack: Hold to throw with more power
+04:45=All those physics classes have finally paid off!|Launch a devastating sine wave which burns itself|through terrain.|Watch out, this weapon has a strong knockback.|Attack: Shoot
04:46=Cover your foes with sizzling liquid flame.|Heartwarming!|Attack: Activate|Up/Down: Continue aiming|Left/Right: Modify spitting power
04:47=Double the fun with two spiky, sneaky, sticky mines.|Set up a chain reaction or defend yourself (or both!)|Attack: Hold to shoot with more power (twice)
-04:48=Why should the moles get all the abuse?|Wacking a hog can be just as fun! A good|blow from this hammer will shave off one|third of a hog's health and plunge them|underground.|Attack: Activate
-04:49=Resurrect your friends!|But beware that this also resurrects your foes.|Attack: Keep attack pressed to resurrect slowly|Up: Accelerate resurrection
-04:50=Is someone hiding underground?|Dig them out with a drill strike!|Timer controls how far it will dig.|Left/Right: Determine attack direction|Cursor: Select target region
-04:51=Get in a free shot by hurling a ball of mud.|Stings a bit, and knocks hogs back.|Attack: Hold to shoot with more power
+04:48=Why should the moles get all the abuse? Wacking|a hog (or mines, or barrels) can be just as fun!|A good blow from this hammer will shave off|one third of a hog's health (or one half with|Extra Damage) and plunge them underground.|Attack: Activate
+04:49=Sacrifice your health to resurrect your friends!|But beware that this also resurrects your foes.|Attack: Keep attack pressed to resurrect slowly|Up: Accelerate resurrection
+04:50=Is someone hiding underground?|Dig them out with a drill strike!|Timer controls how far it will dig.|Left/Right: Determine attack direction|1-5: Set timer|Cursor: Select target region
+04:51=Get in a free shot by hurling a ball of mud.|Deals no damage, but knocks hogs and|objects back.|Attack: Hold to shoot with more power
04:52=UNUSED
04:53=Take a trip through time and space,|while leaving your comrades to fight on alone.|Be prepared to return at any time,|or for Sudden Death or if they are all defeated.|Disclaimer. Does not function in Sudden Death,|if you are alone, or if you are a King.|Attack: Activate
04:54=Spray a stream of sticky flakes.|Build bridges, bury enemies, seal off tunnels.|Be careful you don't get any on you!|Attack: Activate|Up/Down: Continue aiming|Left/Right: Modify spitting power
-04:55=Bring back the ice-age!|Freeze hedgehogs, make the floor slippery or|save yourself from drowning by freezing the water.|Attack: Shoot
+04:55=Bring back the ice-age!|Freeze hedgehogs, make the floor slippery or|save yourself from drowning by freezing the water.|Attack: Activate/Deactivate freezeray|Up/Down: Continue aiming
04:56=You can throw two cleavers at your enemy,|block passages and tunnels and even use them for climbing!|Be careful! Playing with knifes is dangerous.|Attack: Hold to shoot with more power (twice)
-04:57=Build an elastic bar made of rubber,|from which hedgehogs and other|things bounce off without taking fall damage.|Left/Right: Change rubber bar orientation|Cursor: Place rubber bar in a valid position
+04:57=Build a VERY elastic rubber band, from which|hedgehogs and other things bounce off|without taking fall damage.|Left/Right: Change rubber band orientation|Cursor: Place rubber band in a valid position
+04:58=This proximity bomb will float freely in the air and follow|hedgehogs careless enouogh to come too close to it.|Its explosion is weaker than that of the land mine, however.|Attack: Hold to shoot with more power
; Game goal strings
05:00=Game Modes
@@ -526,7 +527,7 @@
05:02=Forts: Defend your fortress; vanquish your enemies!
05:03=Low Gravity: Watch your step
05:04=Invulnerability: Hogs are (almost) invulnerable
-05:05=Vampirism: Hogs will be healed for the damage dealt
+05:05=Vampirism: Hogs will be healed for 80% of the damage dealt
05:06=Karma: Hogs will be damaged for the damage dealt
05:07=Protect the King: Don't let your king die!|Place the King: Pick a protected starting point for your King
05:08=Place Hedgehogs: Place your hogs before the game starts
@@ -536,7 +537,7 @@
05:12=Mine Timers: Mines will detonate after %1 second(s)
05:13=Mine Timers: Mines will detonate instantly
05:14=Mine Timers: Mines will detonate after 0 - 5 seconds
-05:15=Damage Modifier: All weapons will do %1% damage
+05:15=Damage Modifier: (Almost) all weapons will deal %1% damage
05:16=Health of all hogs is reset on end of turn
05:17=AI hogs respawn on death
05:18=Unlimited Attacks
--- a/share/hedgewars/Data/Locale/tips_en.xml Fri Sep 11 21:41:35 2015 +0200
+++ b/share/hedgewars/Data/Locale/tips_en.xml Sat Sep 12 04:02:27 2015 +0200
@@ -3,59 +3,77 @@
Tips between the platform specific tags are shown only on those platforms.
Do not escape characters or use the CDATA tag. -->
<tips>
- <tip>Simply pick the same color as a friend to play together as a team. Each of you will still control his or her own hedgehogs but they'll win or lose together.</tip>
+ <tip>Simply pick the same color as a friend to play together as a clan. Each of you will still control his or her own hedgehogs but they’ll win or lose together.</tip>
<tip>Some weapons might do only low damage but they can be a lot more devastating in the right situation. Try to use the Desert Eagle to knock multiple hedgehogs into the water.</tip>
- <tip>If you're unsure what to do and don't want to waste ammo, skip one round. But don't let too much time pass as there will be Sudden Death!</tip>
- <tip>Want to save ropes? Release the rope in mid air and then shoot again. As long as you don't touch the ground or miss a shot you'll reuse your rope without wasting ammo!</tip>
- <tip>If you'd like to keep others from using your preferred nickname on the official server, register an account at http://www.hedgewars.org/.</tip>
- <tip>You're bored of default gameplay? Try one of the missions - they'll offer different gameplay depending on the one you picked.</tip>
- <tip>By default the game will always record the last game played as a demo. Select 'Local Game' and pick the 'Demos' button on the lower right corner to play or manage them.</tip>
- <tip>Hedgewars is free software (Open Source) we create in our spare time. If you've got problems, ask on our forums or visit our IRC room!</tip>
+ <tip>If you’re unsure what to do and don’t want to waste ammo, skip one round. But don’t let too much time pass as there will be Sudden Death!</tip>
+ <tip>Want to save ropes? Release the rope in mid air and then shoot again. As long as you don’t touch the ground or miss a shot you’ll reuse your rope without wasting ammo!</tip>
+ <tip>If you’d like to keep others from using your preferred nickname on the official server, register an account at <a href="http://www.hedgewars.org/">http://www.hedgewars.org/</a>.</tip>
+ <tip>You're bored of default gameplay? Try one of the missions — they'll offer different gameplay depending on the one you picked.</tip>
+ <tip>By default the game will always record the last game played as a demo. Select “Local Game” and pick the “Demos” button on the lower right corner to play or manage them.</tip>
+ <tip>Hedgewars is free software (Open Source) we create in our spare time. If you’ve got problems, ask on our forums or visit our IRC room!</tip>
<tip>Hedgewars is free software (Open Source) we create in our spare time. If you like it, help us with a small donation or contribute your own work!</tip>
<tip>Hedgewars is free software (Open Source) we create in our spare time. Share it with your family and friends as you like!</tip>
<tip>Hedgewars is free software (Open Source) we create in our spare time, just for fun! Meet the devs in <a href="irc://irc.freenode.net/hedgewars">#hedgewars</a>!</tip>
- <tip>From time to time there will be official tournaments. Upcoming events will be announced at http://www.hedgewars.org/ some days in advance.</tip>
+ <tip>From time to time there will be official tournaments. Upcoming events will be announced at <a href="http://www.hedgewars.org/">http://www.hedgewars.org/</a> some days in advance.</tip>
<tip>Hedgewars is available in many languages. If the translation in your language seems to be missing or outdated, feel free to contact us!</tip>
<tip>Hedgewars can be run on lots of different operating systems including Microsoft Windows, Mac OS X and GNU/Linux.</tip>
- <tip>Always remember you're able to set up your own games in local and network/online play. You're not restricted to the 'Simple Game' option.</tip>
+ <tip>Always remember you’re able to set up your own games in local and network/online play. You’re not restricted to the “Simple Game” option.</tip>
<tip>Connect one or more gamepads before starting the game to be able to assign their controls to your teams.</tip>
<tip>Create an account on <a href="http://www.hedgewars.org/">http://www.hedgewars.org/</a> to keep others from using your most favourite nickname while playing on the official server.</tip>
<tip>While playing you should give yourself a short break at least once an hour.</tip>
- <tip>If your graphics card isn't able to provide hardware accelerated OpenGL, try to enable the low quality mode to improve performance.</tip>
- <tip>If your graphics card isn't able to provide hardware accelerated OpenGL, try to update the associated drivers.</tip>
- <tip>We're open to suggestions and constructive feedback. If you don't like something or got a great idea, let us know!</tip>
+ <tip>If your graphics card isn’t able to provide hardware accelerated OpenGL, try to enable the low quality mode to improve performance.</tip>
+ <tip>If your graphics card isn’t able to provide hardware accelerated OpenGL, try to update the associated drivers.</tip>
+ <tip>We’re open to suggestions and constructive feedback. If you don’t like something or got a great idea, let us know!</tip>
<tip>Especially while playing online be polite and always remember there might be some minors playing with or against you as well!</tip>
- <tip>Special game modes such as 'Vampirism' or 'Karma' allow you to develop completely new tactics. Try them in a custom game!</tip>
- <tip>You should never install Hedgewars on computers you don't own (school, university, work, etc.). Please ask the responsible person instead!</tip>
- <tip>Hedgewars can be perfect for short games during breaks. Just ensure you don't add too many hedgehogs or use an huge map. Reducing time and health might help as well.</tip>
+ <tip>Special game modes such as “Vampirism” or “Karma” allow you to develop completely new tactics. Try them in a custom game!</tip>
+ <tip>You should never install Hedgewars on computers you don’t own (school, university, work, etc.). Please ask the responsible person instead!</tip>
+ <tip>Hedgewars can be perfect for short games during breaks. Just ensure you don’t add too many hedgehogs or use an huge map. Reducing time and health might help as well.</tip>
<tip>No hedgehogs were harmed in making this game.</tip>
<tip>There are three different jumps available. Tap [high jump] twice to do a very high/backwards jump.</tip>
<tip>Afraid of falling off a cliff? Hold down [precise] to turn [left] or [right] without actually moving.</tip>
- <tip>Some weapons require special strategies or just lots of training, so don't give up on a particular tool if you miss an enemy once.</tip>
- <tip>Most weapons won't work once they touch the water. The Homing Bee as well as the Cake are exceptions to this.</tip>
- <tip>The Old Limbuger only causes a small explosion. However the wind affected smelly cloud can poison lots of hogs at once.</tip>
- <tip>The Piano Strike is the most damaging air strike. You'll lose the hedgehog performing it, so there's a huge downside as well.</tip>
+ <tip>Some weapons require special strategies or just lots of training, so don’t give up on a particular tool if you miss an enemy once.</tip>
+ <tip>Most weapons won’t work once they touch the water. The Homing Bee as well as the Cake are exceptions to this.</tip>
+ <tip>The Old Limburger only causes a small explosion. However the wind affected smelly cloud can poison lots of hogs at once.</tip>
+ <tip>The Piano Strike is the most damaging air strike. You’ll lose the hedgehog performing it, so there’s a huge downside as well.</tip>
<tip>The Homing Bee can be tricky to use. Its turn radius depends on its velocity, so try to not use full power.</tip>
- <tip>Sticky Mines are a perfect tool to create small chain reactions knocking enemy hedgehogs into dire situations ... or water.</tip>
+ <tip>Sticky Mines are a perfect tool to create small chain reactions knocking enemy hedgehogs into dire situations … or water.</tip>
<tip>The Hammer is most effective when used on bridges or girders. Hit hogs will just break through the ground.</tip>
- <tip>If you're stuck behind an enemy hedgehog, use the Hammer to free yourself without getting damaged by an explosion.</tip>
- <tip>The Cake's maximum walking distance depends on the ground it has to pass. Use [attack] to detonate it early.</tip>
+ <tip>If you’re stuck behind an enemy hedgehog, use the Hammer to free yourself without getting damaged by an explosion.</tip>
+ <tip>The Cake’s maximum walking distance depends on the ground it has to pass. Use [attack] to detonate it early.</tip>
<tip>The Flame Thrower is a weapon but it can be used for tunnel digging as well.</tip>
<tip>Use the Molotov or Flame Thrower to temporary keep hedgehogs from passing terrain such as tunnels or platforms.</tip>
- <tip>Want to know who's behind the game? Click on the Hedgewars logo in the main menu to see the credits.</tip>
+ <tip>Want to know who’s behind the game? Click on the Hedgewars logo in the main menu to see the credits.</tip>
<tip>Like Hedgewars? Become a fan on <a href="http://www.facebook.com/Hedgewars">Facebook</a> or follow us on <a href="http://twitter.com/hedgewars">Twitter</a></tip>
- <tip>Feel free to draw your own graves, hats, flags or even maps and themes! But note that you'll have to share them somewhere to use them online.</tip>
+ <tip>Feel free to draw your own graves, hats, flags or even maps and themes! But note that you’ll have to share them somewhere to use them online.</tip>
<tip>Keep your video card drivers up to date to avoid issues playing the game.</tip>
- <tip>Heads or tails? Type '/rnd' in lobby and you'll find out. Also '/rnd rock paper scissors' works!</tip>
- <tip>You're able to associate Hedgewars related files (savegames and demo recordings) with the game to launch them right from your favorite file or internet browser.</tip>
+ <tip>Heads or tails? Type “/rnd” in the lobby and you’ll find out. Also “/rnd rock paper scissors” works!</tip>
+ <tip>You’re able to associate Hedgewars related files (savegames and demo recordings) with the game to launch them right from your favorite file or web browser.</tip>
+ <tip>Dud mines are not harmless: Although their timer is broken, they can still explode if they took too much abuse!</tip>
+ <tip>Love is hot! Use Seduction to thaw frozen hedgehogs.</tip>
+ <tip>Smoke coming from a barrel is an indicator that it is low on “health” and even small amounts of damage might cause it to burst.</tip>
+ <tip>Barrels start with 60 health and take damage like hedgehogs, so they need some abuse until they explode.</tip>
+ <tip>Need more bounce power? Change the bounce strength of grenades, cluster bombs, old limburgers and mines while holding [precise] and pressing one of the timer keys.</tip>
+ <tip>Did you forget the goals or game modifiers inside the game? Hit the pause or quit key to review them again!</tip>
+ <tip>You can punch, whip and hammer other things than just hedgehogs. Hit them all!</tip>
+ <tip>If not mentioned otherwise, mines normally explode after 3 seconds.</tip>
+ <tip>In King Mode, your king will start out healthier, stronger and more resistant to damage and blows than the minions.</tip>
+ <tip>In King Mode, the king will take damage each turn when there are no minions left in the team.</tip>
+ <tip>The whip also hits hedgehogs and objects behind a thin wall.</tip>
+ <tip>A cleaver deals more damage the faster it’s moving.</tip>
+ <tip>You can drop cakes from cliffs, but you have to stand very close to the edge, so be careful.</tip>
+ <tip>Use your rope to push away other hedgehogs i.e. by sliding on the ground. This technique is known as “rope-knocking”.</tip>
+ <tip>Don’t stand still on an icy slope, or you will slip away. Alternatively, you can hold down [precise].</tip>
+ <tip>In the lands of Snow and Christmas, the snow piles up over time, unless the land is indestructible.</tip>
+ <tip>Be aware in lands of Snow and Christmas, because girders are made of slippery ice.</tip>
+ <tip>The retreat time depends on the weapon you used. Be careful, some weapons don’t have a retreat time and immediately end your turn!</tip>
<windows-only>
- <tip>The version of Hedgewars supports <a href="http://www.xfire.com">Xfire</a>. Make sure to add Hedgewars to its game list so your friends can see you playing.</tip>
- <tip>You can find your Hedgewars configuration files under "My Documents\Hedgewars". Create backups or take the files with you, but don't edit them by hand.</tip>
+ <tip>This version of Hedgewars supports <a href="http://www.xfire.com">Xfire</a>. Make sure to add Hedgewars to its game list so your friends can see you playing.</tip>
+ <tip>You can find your Hedgewars configuration files under “My Documents\Hedgewars”. Create backups or take the files with you, but don’t edit them by hand.</tip>
</windows-only>
<mac-only>
- <tip>You can find your Hedgewars configuration files under "Library/Application Support/Hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</tip>
+ <tip>You can find your Hedgewars configuration files under “Library/Application Support/Hedgewars” in your home directory. Create backups or take the files with you, but don’t edit them by hand.</tip>
</mac-only>
<linux-only>
- <tip>You can find your Hedgewars configuration files under ".hedgewars" in your home directory. Create backups or take the files with you, but don't edit them by hand.</tip>
+ <tip>You can find your Hedgewars configuration files under “.hedgewars” in your home directory. Create backups or take the files with you, but don’t edit them by hand.</tip>
</linux-only>
</tips>
--- a/share/hedgewars/Data/Maps/ClimbHome/map.lua Fri Sep 11 21:41:35 2015 +0200
+++ b/share/hedgewars/Data/Maps/ClimbHome/map.lua Sat Sep 12 04:02:27 2015 +0200
@@ -88,9 +88,7 @@
dummyHog = AddHog(" ", 0, 1, "NoHat")
HH[dummyHog] = nil
totalHedgehogs = totalHedgehogs - 1
- if not showWaterStats then
- SendStat(siClanHealth, tostring(32640), " ")
- end
+ teams[GetHogTeamName(dummyHog)] = nil
SendStat(siClanHealth, tostring(32640), " ")
end
end
@@ -112,6 +110,8 @@
elseif gear == Cake then
Cake = nil
elseif GetGearType(gear) == gtHedgehog then
+ onGameTick20()
+ onGearDamage(gear, 0)
HH[gear] = nil
end
end
@@ -595,6 +595,7 @@
else
SendStat(siCustomAchievement, string.format(text, RecordHeightHogName))
end
+ SendStat(siPointType, loc("points"))
SendStat(siPlayerKills, actualHeight, loc(GetHogTeamName(CurrentHedgehog)))
EndGame()
end
@@ -629,7 +630,7 @@
SendStat(siGraphTitle, string.format(loc("Team’s best heights per round")))
if winner.score < 1500 then
- SendStat(siCustomAchievement, string.format(loc("This round’s award for ulitmate disappointment goes to: Everyone!")))
+ SendStat(siCustomAchievement, string.format(loc("This round’s award for ultimate disappointment goes to: Everyone!")))
else
if winner.score > 30000 then text = loc("%s (%s) reached for the sky and beyond with a height of %d!")
elseif winner.score > 24750 then text = loc("%s (%s) was certainly not afraid of heights: Peak height of %d!")
Binary file share/hedgewars/Data/Maps/ShoppaKing/map.png has changed
Binary file share/hedgewars/Data/Maps/ShoppaKing/map.xcf has changed
Binary file share/hedgewars/Data/Maps/TrophyRace/map.png has changed
Binary file share/hedgewars/Data/Maps/TrophyRace/map.xcf has changed
--- a/share/hedgewars/Data/Missions/Training/ClimbHome.lua Fri Sep 11 21:41:35 2015 +0200
+++ b/share/hedgewars/Data/Missions/Training/ClimbHome.lua Sat Sep 12 04:02:27 2015 +0200
@@ -1,11 +1,18 @@
HedgewarsScriptLoad("/Scripts/Locale.lua")
-isSinglePlayer = true
+local isSinglePlayer = true
-- trying to allow random theme, but fixed theme objects...
-- Also skip some ugly themes, or ones where the sky is "meh"
--local themes = { "Art","Cake","City","EarthRise","Halloween","Olympics","Underwater","Bamboo","Castle","Compost","Eyes","Hell","Planes","Bath","Cave","CrazyMission","Freeway","Island","Sheep","Blox","Cheese","Deepspace","Fruit","Jungle","Snow","Brick","Christmas","Desert","Golf","Nature","Stage" }
local themes = {"Christmas","Hell","Bamboo","City","Island","Bath","Compost","Jungle","Desert","Nature","Olympics","Brick","EarthRise","Sheep","Cake","Freeway","Snow","Castle","Fruit","Stage","Cave","Golf","Cheese","Halloween"}
+local showWaterStats = true -- uses the AI team to draw water height.
+local scaleGraph = true
+local totalHedgehogs = 0
+local HH = {}
+local teams = {}
+local dummyHog = nil
+
function onGameInit()
-- Ensure people get same map for same theme
@@ -16,10 +23,19 @@
DisableGameFlags(gfBottomBorder+gfBorder)
CaseFreq = 0
Explosives = 0
+ MineDudPercent = 0
Map = "ClimbHome"
AddTeam(loc("Lonely Hog"), 0xDD0000, "Simple", "Island", "Default")
player = AddHog(loc("Climber"), 0, 1, "NoHat")
- AddTeam(loc("Water Gods"), 0x4980C1, "Simple", "Island", "Default")
- dummyHog = AddHog("Poseidon", 5, 1, "NoHat")
- --HideHog(dummyHog)
+ if showWaterStats then
+ AddTeam(" ", 0x545C9D, "Simple", "Island", "Default")
+ elseif scaleGraph then
+ AddTeam(" ", 0x050505, "Simple", "Island", "Default")
+ end
+ if showWaterStats or scaleGraph then
+ dummyHog = AddHog(" ", 0, 1, "NoHat")
+ HH[dummyHog] = nil
+ totalHedgehogs = totalHedgehogs - 1
+ SendStat(siClanHealth, tostring(32640), " ")
+ end
end
Binary file share/hedgewars/Data/Music/olympics_sd.ogg has changed
Binary file share/hedgewars/Data/Music/sdmusic.ogg has changed
--- a/share/hedgewars/Data/Scripts/Multiplayer/DiagonalMaze.lua Fri Sep 11 21:41:35 2015 +0200
+++ b/share/hedgewars/Data/Scripts/Multiplayer/DiagonalMaze.lua Sat Sep 12 04:02:27 2015 +0200
@@ -6,14 +6,18 @@
function onGameInit()
MapGen = mgDrawn
TemplateFilter = 0
- for y = 48,2048,200 do
- for x = 48,4048,200 do
+ local step = 80 + 10 * MapFeatureSize
+ local width = 1 + div(math.max(0, MapFeatureSize-12), 6)
+ -- center maze
+ local xoff = div((4000 % step), 2)
+ for y = 48,2048,step do
+ for x = 48+xoff,4048-step,step do
if GetRandom(2) == 0 then
- AddPoint(x,y,1)
- AddPoint(x+200,y+200)
+ AddPoint(x,y,width)
+ AddPoint(x+step,y+step)
else
- AddPoint(x,y+200,1)
- AddPoint(x+200,y)
+ AddPoint(x,y+step,width)
+ AddPoint(x+step,y)
end
end
end
--- a/share/hedgewars/Data/Scripts/Multiplayer/Tunnels.lua Fri Sep 11 21:41:35 2015 +0200
+++ b/share/hedgewars/Data/Scripts/Multiplayer/Tunnels.lua Sat Sep 12 04:02:27 2015 +0200
@@ -12,7 +12,7 @@
end
side = 0
- for i = 0,GetRandom(15)+25 do
+ for i = 0,1+MapFeatureSize*2 do
if side > 3 then
size = GetRandom(4)+4
else
--- a/share/hedgewars/Data/Themes/Olympics/theme.cfg Fri Sep 11 21:41:35 2015 +0200
+++ b/share/hedgewars/Data/Themes/Olympics/theme.cfg Sat Sep 12 04:02:27 2015 +0200
@@ -4,6 +4,7 @@
water-bottom = $34, $3C, $7D
water-opacity = $80
music = Olympics.ogg
+sd-music = olympics_sd.ogg
clouds = 9
object = Statue, 3, 42, 258, 115, 2, 1, 0, 0, 165, 240
object = Column01, 3, 21, 258, 80, 2, 1, 0, 0, 110, 240