# HG changeset patch
# User koda
# Date 1289152841 -3600
# Node ID adb144a907aaa717c3d1569fe900aeb28da40e49
# Parent c2d590fc8df96dd79b8983d9fa6c3bdc2139e375
remove last warnings from xcodeproj
update credits
diff -r c2d590fc8df9 -r adb144a907aa QTfrontend/about.cpp
--- a/QTfrontend/about.cpp Sun Nov 07 18:58:17 2010 +0100
+++ b/QTfrontend/about.cpp Sun Nov 07 19:00:41 2010 +0100
@@ -78,11 +78,12 @@
"Many engine improvements and graphics: Carlos Vives <mail@carlosvives.es>
"
"Few engine and frontend improvements: Richard Karolyi <sheepluva@ercatec.net>
"
"Maze maps: Henning Kühn <prg@cooco.de>"
+ "Engine and frontend improvements: Henrik Rostedt <henrik.rostedt@gmail.com>
"
"
" +
QLabel::tr("Art:") + "
"
+ QString::fromUtf8(
- "Finn Brice <tiyuri@gmail.com>"
+ "
John Dum <fizzy@gmail.com>"
"
"
"Joshua Frese <joshfrese@gmail.com>"
"
"
@@ -99,7 +100,7 @@
QLabel::tr("Sounds:") + ""
"Hedgehogs voice: Stephen Alexander <ArmagonNo1@gmail.com>"
"
"
- "Finn Brice <tiyuri@gmail.com>"
+ "John Dum <fizzy@gmail.com>"
"
"
"Jonatan Nilsson <jonatanfan@gmail.com>"
"
"
diff -r c2d590fc8df9 -r adb144a907aa README
--- a/README Sun Nov 07 18:58:17 2010 +0100
+++ b/README Sun Nov 07 19:00:41 2010 +0100
@@ -10,7 +10,7 @@
Copyright 2008, 2009 Stephen Alexander
'Nature' music theme:
-Copyright 2008 Finn Brice
+Copyright 2008 John Dum
'Pirate', 'City', 'Oriental', 'Snow' music themes:
Copyright 2008 Jonatan Nilsson
@@ -18,7 +18,7 @@
Images in Data/Graphics,
themes "nature", "Snow", "City",
maps "Bath", "Hedgelove", "Hedgewars", "Hydrant", "mushrooms", "Plane"
-Copyright 2008 Finn Brice
+Copyright 2008 John Dum
Fonts: see Fonts_LICENSE.txt
diff -r c2d590fc8df9 -r adb144a907aa hedgewars/GSHandlers.inc
--- a/hedgewars/GSHandlers.inc Sun Nov 07 18:58:17 2010 +0100
+++ b/hedgewars/GSHandlers.inc Sun Nov 07 19:00:41 2010 +0100
@@ -3035,7 +3035,7 @@
if (move.isNegative) then
begin
bubble^.X := bubble^.X + 28;
- bubble^.dX *= -1
+ bubble^.dX:= bubble^.dX * (-1)
end
else bubble^.X := bubble^.X - 28;
end;
diff -r c2d590fc8df9 -r adb144a907aa hedgewars/PascalExports.pas
--- a/hedgewars/PascalExports.pas Sun Nov 07 18:58:17 2010 +0100
+++ b/hedgewars/PascalExports.pas Sun Nov 07 19:00:41 2010 +0100
@@ -26,6 +26,7 @@
{$INCLUDE "config.inc"}
type PPByte = ^PByte;
+var dummy: boolean; // avoid compiler hint
implementation
{$IFDEF HWLIBRARY}
diff -r c2d590fc8df9 -r adb144a907aa hedgewars/hwLibrary.pas
--- a/hedgewars/hwLibrary.pas Sun Nov 07 18:58:17 2010 +0100
+++ b/hedgewars/hwLibrary.pas Sun Nov 07 19:00:41 2010 +0100
@@ -13,6 +13,9 @@
// to make these functions available in the C/C++/Objective-C source files
// (add "#include PascalImports.h" near the top of these files if it's not there yet)
uses cmem, hwengine, PascalExports;
-
+begin
+ // avoid compiler warnings about units not being used
+ isTerminated:= isTerminated;
+ dummy:= dummy;
end.
diff -r c2d590fc8df9 -r adb144a907aa project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj
--- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Sun Nov 07 18:58:17 2010 +0100
+++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Sun Nov 07 19:00:41 2010 +0100
@@ -150,6 +150,7 @@
61A670FB12747E0D00B06CE7 /* title_small.png in Resources */ = {isa = PBXBuildFile; fileRef = 619C09E911E8B8D600F1DF16 /* title_small.png */; };
61A6710612747E4000B06CE7 /* backgroundCenter.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F903E511DF58550068B24D /* backgroundCenter.png */; };
61B3D71C11EA6F2700EC7420 /* uKeys.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; };
+ 61B9C9CA12871E1300B4D51F /* storeButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F903ED11DF58550068B24D /* storeButton.png */; };
61C079E411F35A300072BF46 /* EditableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 61C079E311F35A300072BF46 /* EditableCellView.m */; };
61D205A1127CDD1100ABD83E /* ObjcExports.m in Sources */ = {isa = PBXBuildFile; fileRef = 61D205A0127CDD1100ABD83E /* ObjcExports.m */; };
61DE8F221257EB1100B80214 /* AmmoMenuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61DE8F211257EB1100B80214 /* AmmoMenuViewController.m */; };
@@ -2172,6 +2173,7 @@
61E2F7451283752C00E12521 /* tw.png in Resources */,
61DF0EDC1284DF2300F3F10B /* HelpPageLobbyViewController-iPhone.xib in Resources */,
61DF0F211284F72A00F3F10B /* HelpPageInGameViewController-iPhone.xib in Resources */,
+ 61B9C9CA12871E1300B4D51F /* storeButton.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -2374,7 +2376,7 @@
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CODE_SIGN_IDENTITY = "iPhone Distribution: Vittorio Giovara";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Vittorio Giovara";
- FPC_COMMON_OPTIONS = "-dIPHONEOS -Cs2000000 -vwi -B -Sgix -Sc";
+ FPC_COMMON_OPTIONS = "-dIPHONEOS -Cs2000000 -vwi -B -Sgix";
FPC_COMPILER_BINARY_DIR = /usr/local/lib/fpc/2.5.1;
FPC_MAIN_FILE = "$(PROJECT_DIR)/../../hedgewars/hwLibrary.pas";
FPC_RTL_UNITS_BASE = /usr/local/lib/fpc;
@@ -2468,7 +2470,7 @@
CODE_SIGN_ENTITLEMENTS = "Entitlements-Distribution.plist";
CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
- FPC_COMMON_OPTIONS = "-dIPHONEOS -Cs2000000 -vwi -B -Sgix -Sc";
+ FPC_COMMON_OPTIONS = "-dIPHONEOS -Cs2000000 -vwi -B -Sgix";
FPC_COMPILER_BINARY_DIR = /usr/local/lib/fpc/2.5.1;
FPC_MAIN_FILE = "$(PROJECT_DIR)/../../hedgewars/hwLibrary.pas";
FPC_RTL_UNITS_BASE = /usr/local/lib/fpc;
@@ -2560,7 +2562,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer: Vittorio Giovara (DC2BRETXAC)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Vittorio Giovara (DC2BRETXAC)";
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- FPC_COMMON_OPTIONS = "-dIPHONEOS -Cs2000000 -vwi -B -Sgix -Sc";
+ FPC_COMMON_OPTIONS = "-dIPHONEOS -Cs2000000 -vwi -B -Sgix";
FPC_COMPILER_BINARY_DIR = /usr/local/lib/fpc/2.5.1;
FPC_MAIN_FILE = "$(PROJECT_DIR)/../../hedgewars/hwLibrary.pas";
FPC_RTL_UNITS_BASE = /usr/local/lib/fpc;
@@ -2696,7 +2698,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer: Vittorio Giovara (DC2BRETXAC)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Vittorio Giovara (DC2BRETXAC)";
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- FPC_COMMON_OPTIONS = "-dIPHONEOS -Cs2000000 -vwi -B -Sgix -Sc";
+ FPC_COMMON_OPTIONS = "-dIPHONEOS -Cs2000000 -vwi -B -Sgix";
FPC_COMPILER_BINARY_DIR = /usr/local/lib/fpc/2.5.1;
FPC_MAIN_FILE = "$(PROJECT_DIR)/../../hedgewars/hwLibrary.pas";
FPC_RTL_UNITS_BASE = /usr/local/lib/fpc;
@@ -2740,7 +2742,7 @@
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
- FPC_COMMON_OPTIONS = "-dIPHONEOS -Cs2000000 -vwi -B -Sgix -Sc";
+ FPC_COMMON_OPTIONS = "-dIPHONEOS -Cs2000000 -vwi -B -Sgix";
FPC_COMPILER_BINARY_DIR = /usr/local/lib/fpc/2.5.1;
FPC_MAIN_FILE = "$(PROJECT_DIR)/../../hedgewars/hwLibrary.pas";
FPC_RTL_UNITS_BASE = /usr/local/lib/fpc;
diff -r c2d590fc8df9 -r adb144a907aa project_files/HedgewarsMobile/Resources/Settings/iFrontend/credits.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/iFrontend/credits.plist Sun Nov 07 18:58:17 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/iFrontend/credits.plist Sun Nov 07 19:00:41 2010 +0100
@@ -15,9 +15,10 @@
Carlos "Palewolf" Vives
Richard "Sheepluva" Korlyi
Henning "Prg" Kühn
+ Henrik "Henek" Rostedt
- Tiyuri
+ John "Fizzy" Dum
Joshua Frese
Stanko Tadić
Julien Koesten
@@ -27,7 +28,7 @@
Stephen "Armagon" Alexander
- Finn "Tiyuri" Brice
+ John "Fizzy" Dum
Jonatan Nilsson
Daniel Martin
@@ -53,7 +54,7 @@
Aleksey Andreev
Aleksander Rudalev
- Natasha Stafeeva
+ Natasha Korotaeva
Adam Higerd
@@ -69,9 +70,10 @@
Many engine improvements and graphics
Many engine and server improvements
Maze maps
+ Engine and frontend improvements
-
+ Main graphics