# HG changeset patch
# User koda
# Date 1287518149 -7200
# Node ID 86c3a6e8e265d7e6b0fd97d3fc765960d53761fd
# Parent 928e2040d34f9e6e809631e0033002b0f8aa771d
ios version bump and other minor things
diff -r 928e2040d34f -r 86c3a6e8e265 project_files/HedgewarsMobile/Classes/CommodityFunctions.m
--- a/project_files/HedgewarsMobile/Classes/CommodityFunctions.m Sun Oct 17 17:47:07 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/CommodityFunctions.m Tue Oct 19 21:55:49 2010 +0200
@@ -74,45 +74,45 @@
switch (type) {
case 0: //default
theWeapon = [[NSDictionary alloc] initWithObjectsAndKeys:
- @"9391929422199121032235111001201000000211110101011",@"ammostore_initialqt",
- @"0405040541600655546554464776576666666155510101117",@"ammostore_probability",
+ @"9391929422199121032235111001201000000211110101010",@"ammostore_initialqt",
+ @"0405040541600655546554464776576666666155510101110",@"ammostore_probability",
@"0000000000000205500000040007004000000000200000000",@"ammostore_delay",
- @"1311110312111111123114111111111111111211111101111",@"ammostore_crate", nil];
+ @"1311110312111111123114111111111111111211111101110",@"ammostore_crate", nil];
break;
case 1: //crazy
theWeapon = [[NSDictionary alloc] initWithObjectsAndKeys:
- @"9999999999999999992999999999999999299999999909999",@"ammostore_initialqt",
- @"1111110111111111111111111111111111111111111101111",@"ammostore_probability",
+ @"9999999999999999992999999999999999299999999909990",@"ammostore_initialqt",
+ @"1111110111111111111111111111111111111111111101110",@"ammostore_probability",
@"0000000000000000000000000000000000000000000000000",@"ammostore_delay",
- @"1311110312111111123114111111111111111211110101111",@"ammostore_crate", nil];
+ @"1311110312111111123114111111111111111211110101110",@"ammostore_crate", nil];
break;
case 2: //pro mode
theWeapon = [[NSDictionary alloc] initWithObjectsAndKeys:
@"9090009000000000000009000000000000000000000000000",@"ammostore_initialqt",
@"0000000000000000000000000000000000000000000000000",@"ammostore_probability",
@"0000000000000205500000040007004000000000200000000",@"ammostore_delay",
- @"1111111111111111111111111111111111111111100101111",@"ammostore_crate", nil];
+ @"1111111111111111111111111111111111111111100101110",@"ammostore_crate", nil];
break;
case 3: //shoppa
theWeapon = [[NSDictionary alloc] initWithObjectsAndKeys:
@"0000009900000000000000000000000000000000000000000",@"ammostore_initialqt",
@"4444410044244402210112121222422000000002000400010",@"ammostore_probability",
@"0000000000000000000000000000000000000000000000000",@"ammostore_delay",
- @"1111111111111111111111111111111111111111101101111",@"ammostore_crate", nil];
+ @"1111111111111111111111111111111111111111101101110",@"ammostore_crate", nil];
break;
case 4: //basketball
theWeapon = [[NSDictionary alloc] initWithObjectsAndKeys:
@"9391929422199121032235111001201000000211110101000",@"ammostore_initialqt",
@"0000000000000000000000000000000000000000000000000",@"ammostore_probability",
@"0000000000000005500000040007004000000000200000000",@"ammostore_delay",
- @"1111111111111111111111111111111111111111111101111",@"ammostore_crate", nil];
+ @"1111111111111111111111111111111111111111111101110",@"ammostore_crate", nil];
break;
case 5: //minefield
theWeapon = [[NSDictionary alloc] initWithObjectsAndKeys:
@"0000009900090000000300000000000000000000000000000",@"ammostore_initialqt",
@"0000000000000000000000000000000000000000000000000",@"ammostore_probability",
@"0000000000000205500000040007004000000000200000000",@"ammostore_delay",
- @"1111111111111111111111111111111111111111111101111",@"ammostore_crate", nil];
+ @"1111111111111111111111111111111111111111111101110",@"ammostore_crate", nil];
break;
default:
NSLog(@"Nope");
diff -r 928e2040d34f -r 86c3a6e8e265 project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj
--- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Sun Oct 17 17:47:07 2010 +0200
+++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Tue Oct 19 21:55:49 2010 +0200
@@ -1458,7 +1458,7 @@
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
- 1D6058900D05DD3D006BFB54 /* Test Lua */ = {
+ 1D6058900D05DD3D006BFB54 /* Hedgewars */ = {
isa = PBXNativeTarget;
buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "Hedgewars" */;
buildPhases = (
@@ -1542,7 +1542,7 @@
);
projectRoot = "";
targets = (
- 1D6058900D05DD3D006BFB54 /* Test Lua */,
+ 1D6058900D05DD3D006BFB54 /* Hedgewars */,
928301160F10CAFC00CC5A3C /* fpc */,
6179928B114AE0C800BA94A9 /* UpdateDataFolder */,
);
@@ -2147,7 +2147,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "#copy new stuff over old stuff\nrm -rf ${PROJECT_DIR}/Data\ncp -R ${PROJECT_DIR}/../../share/hedgewars/Data ${PROJECT_DIR}/Data\n\n#copy some files from QTfrontend/res\nmkdir ${PROJECT_DIR}/Data/Graphics/Btn\ncp ${PROJECT_DIR}/../../QTfrontend/res/btn*.png ${PROJECT_DIR}/Data/Graphics/Btn\ncp ${PROJECT_DIR}/../../QTfrontend/res/ammopic.png ${PROJECT_DIR}/Data/Graphics/Btn/iconAmmo.png\ncp ${PROJECT_DIR}/../../QTfrontend/res/icon*.png ${PROJECT_DIR}/Data/Graphics/Btn\ncp -R ${PROJECT_DIR}/../../QTfrontend/res/botlevels ${PROJECT_DIR}/Data/Graphics/Hedgehog/botlevels\n\n#delete all CMakeLists.txt and image source files\nfind ${PROJECT_DIR}/Data -name CMakeLists.txt -delete\nfind ${PROJECT_DIR}/Data -name *.svg -delete\nfind ${PROJECT_DIR}/Data -name *.svgz -delete\nfind ${PROJECT_DIR}/Data -name *.sifz -delete\nfind ${PROJECT_DIR}/Data -name *.xcf -delete\n\n#delete desktop frontend translation\nrm -rf ${PROJECT_DIR}/Data/Locale/hedgewars_*\n\n#delete dummy maps and hats\nrm -rf ${PROJECT_DIR}/Data/Maps/{test*,Ruler}\nrm -rf ${PROJECT_DIR}/Data/Hats/{TeamCap,TeamHeadband,TeamHair}\n\n#copy mono audio\ncp -R ${PROJECT_DIR}/audio/* ${PROJECT_DIR}/Data/\n\n#the following ones must be removed when their support is implemented\nrm -rf ${PROJECT_DIR}/Data/Maps/{Cheese,FlightJoust}\n\n#move Lua maps in Missions\nmkdir ${PROJECT_DIR}/Data/Missions/Maps/\nmv ${PROJECT_DIR}/Data/Maps/{Basketball,Knockball} ${PROJECT_DIR}/Data/Missions/Maps/\n\n#reduce the number of flakes for City\nawk '{if ($1 == 1500) $1=40; print $0}' < ${PROJECT_DIR}/Data/Themes/City/theme.cfg > /tmp/tempfile\nmv /tmp/tempfile ${PROJECT_DIR}/Data/Themes/City/theme.cfg\n\n#remove Isalnd from the list of Themes\nawk '{if ($1 != \"Island\") print $0}' < ${PROJECT_DIR}/Data/Themes/themes.cfg > /tmp/tempfile && mv /tmp/tempfile ${PROJECT_DIR}/Data/Themes/themes.cfg\n\n#remove Isalnd from the Maps and themes\nrm -rf ${PROJECT_DIR}/Data/Themes/Island\nawk '{if ($1 == \"Island\") print \"Nature\"}' < ${PROJECT_DIR}/Data/Maps/Cave/map.cfg > /tmp/tempfile && mv /tmp/tempfile ${PROJECT_DIR}/Data/Maps/Cave/map.cfg\nawk '{if ($1 == \"Island\") print \"Nature\"}' < ${PROJECT_DIR}/Data/Maps/Lonely_Island/map.cfg > /tmp/tempfile && mv /tmp/tempfile ${PROJECT_DIR}/Data/Maps/Lonely_Island/map.cfg\nawk '{if ($1 == \"Island\") print \"Nature\"}' < ${PROJECT_DIR}/Data/Maps/PirateFlag/map.cfg > /tmp/tempfile && mv /tmp/tempfile ${PROJECT_DIR}/Data/Maps/PirateFlag/map.cfg\n\n#delete the Classic voice\nrm -rf ${PROJECT_DIR}/Data/Sounds/voices/Classic\n\n#delete useless fonts\nrm -rf ${PROJECT_DIR}/Data/Fonts/{wqy-zenhei.ttc,DroidSansFallback.ttf}\n\n#delete all names, reserved hats\nrm -rf ${PROJECT_DIR}/Data/Names/\nrm -rf ${PROJECT_DIR}/Data/Graphics/Hats/Reserved/\n";
+ shellScript = "#copy new stuff over old stuff\nrm -rf ${PROJECT_DIR}/Data\ncp -R ${PROJECT_DIR}/../../share/hedgewars/Data ${PROJECT_DIR}/Data\n\n#copy some files from QTfrontend/res\nmkdir ${PROJECT_DIR}/Data/Graphics/Btn\ncp ${PROJECT_DIR}/../../QTfrontend/res/btn*.png ${PROJECT_DIR}/Data/Graphics/Btn\ncp ${PROJECT_DIR}/../../QTfrontend/res/ammopic.png ${PROJECT_DIR}/Data/Graphics/Btn/iconAmmo.png\ncp ${PROJECT_DIR}/../../QTfrontend/res/icon*.png ${PROJECT_DIR}/Data/Graphics/Btn\ncp -R ${PROJECT_DIR}/../../QTfrontend/res/botlevels ${PROJECT_DIR}/Data/Graphics/Hedgehog/botlevels\n\n#delete all CMakeLists.txt and image source files\nfind ${PROJECT_DIR}/Data -name CMakeLists.txt -delete\nfind ${PROJECT_DIR}/Data -name *.svg -delete\nfind ${PROJECT_DIR}/Data -name *.svgz -delete\nfind ${PROJECT_DIR}/Data -name *.sifz -delete\nfind ${PROJECT_DIR}/Data -name *.xcf -delete\nfind ${PROJECT_DIR}/Data -name *.orig -delete\n\n#delete desktop frontend translation\nrm -rf ${PROJECT_DIR}/Data/Locale/hedgewars_*\n\n#delete dummy maps and hats\nrm -rf ${PROJECT_DIR}/Data/Maps/{test*,Ruler}\nrm -rf ${PROJECT_DIR}/Data/Hats/{TeamCap,TeamHeadband,TeamHair}\n\n#copy mono audio\ncp -R ${PROJECT_DIR}/audio/* ${PROJECT_DIR}/Data/\n\n#the following ones must be removed when their support is implemented\nrm -rf ${PROJECT_DIR}/Data/Maps/{Cheese,FlightJoust}\n\n#move Lua maps in Missions\nmkdir ${PROJECT_DIR}/Data/Missions/Maps/\nmv ${PROJECT_DIR}/Data/Maps/{Basketball,Knockball} ${PROJECT_DIR}/Data/Missions/Maps/\n\n#reduce the number of flakes for City\nawk '{if ($1 == 1500) $1=40; print $0}' < ${PROJECT_DIR}/Data/Themes/City/theme.cfg > /tmp/tempfile\nmv /tmp/tempfile ${PROJECT_DIR}/Data/Themes/City/theme.cfg\n\n#remove Isalnd from the list of Themes\nawk '{if ($1 != \"Island\") print $0}' < ${PROJECT_DIR}/Data/Themes/themes.cfg > /tmp/tempfile && mv /tmp/tempfile ${PROJECT_DIR}/Data/Themes/themes.cfg\n\n#remove Isalnd from the Maps and themes\nrm -rf ${PROJECT_DIR}/Data/Themes/Island\nawk '{if ($1 == \"Island\") print \"Nature\"}' < ${PROJECT_DIR}/Data/Maps/Cave/map.cfg > /tmp/tempfile && mv /tmp/tempfile ${PROJECT_DIR}/Data/Maps/Cave/map.cfg\nawk '{if ($1 == \"Island\") print \"Nature\"}' < ${PROJECT_DIR}/Data/Maps/Lonely_Island/map.cfg > /tmp/tempfile && mv /tmp/tempfile ${PROJECT_DIR}/Data/Maps/Lonely_Island/map.cfg\nawk '{if ($1 == \"Island\") print \"Nature\"}' < ${PROJECT_DIR}/Data/Maps/PirateFlag/map.cfg > /tmp/tempfile && mv /tmp/tempfile ${PROJECT_DIR}/Data/Maps/PirateFlag/map.cfg\n\n#delete the Classic voice\nrm -rf ${PROJECT_DIR}/Data/Sounds/voices/Classic\n\n#delete useless fonts\nrm -rf ${PROJECT_DIR}/Data/Fonts/{wqy-zenhei.ttc,DroidSansFallback.ttf}\n\n#delete all names, reserved hats\nrm -rf ${PROJECT_DIR}/Data/Names/\nrm -rf ${PROJECT_DIR}/Data/Graphics/Hats/Reserved/\n";
showEnvVarsInLog = 0;
};
9283011B0F10CB2D00CC5A3C /* Build libfpc.a */ = {
diff -r 928e2040d34f -r 86c3a6e8e265 project_files/HedgewarsMobile/Info.plist
--- a/project_files/HedgewarsMobile/Info.plist Sun Oct 17 17:47:07 2010 +0200
+++ b/project_files/HedgewarsMobile/Info.plist Tue Oct 19 21:55:49 2010 +0200
@@ -28,9 +28,13 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>1.0.1</string>
+ <string>1.1</string>
<key>LSRequiresIPhoneOS</key>
<true/>
+ <key>UIApplicationExitsOnSuspend</key>
+ <true/>
+ <key>UILaunchImageFile~ipad</key>
+ <string>LI-ipad</string>
<key>UIStatusBarHidden</key>
<true/>
<key>UISupportedInterfaceOrientations</key>
@@ -38,9 +42,5 @@
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
- <key>UILaunchImageFile~ipad</key>
- <string>LI-ipad</string>
- <key>UIApplicationExitsOnSuspend</key>
- <true/>
</dict>
</plist>
diff -r 928e2040d34f -r 86c3a6e8e265 project_files/HedgewarsMobile/Resources/MainMenuViewController-iPad.xib
--- a/project_files/HedgewarsMobile/Resources/MainMenuViewController-iPad.xib Sun Oct 17 17:47:07 2010 +0200
+++ b/project_files/HedgewarsMobile/Resources/MainMenuViewController-iPad.xib Tue Oct 19 21:55:49 2010 +0200
@@ -90,33 +90,6 @@
<string key="NSResourceName">localplayButton.png</string>
</object>
</object>
- <object class="IBUIButton" id="607338789">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">-2147483356</int>
- <string key="NSFrame">{{611, 417}, {263, 244}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <int key="IBUITag">1</int>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <reference key="IBUIFont" ref="917635782"/>
- <double key="IBUITitleEdgeInsets.top">215</double>
- <double key="IBUITitleEdgeInsets.bottom">0.0</double>
- <double key="IBUITitleEdgeInsets.left">0.0</double>
- <double key="IBUITitleEdgeInsets.right">0.0</double>
- <string key="IBUINormalTitle">Multiplayer</string>
- <reference key="IBUIHighlightedTitleColor" ref="918890028"/>
- <object class="NSColor" key="IBUINormalTitleColor">
- <int key="NSColorSpace">2</int>
- <bytes key="NSRGB">MC45OTYwNzg0OTEyIDAuODAwMDAwMDcxNSAwLjAzOTIxNTY4NzY2AA</bytes>
- </object>
- <reference key="IBUINormalTitleShadowColor" ref="112471976"/>
- <object class="NSCustomResource" key="IBUINormalBackgroundImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">netplayButton.png</string>
- </object>
- </object>
<object class="IBUIButton" id="95106947">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
@@ -227,15 +200,6 @@
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">switchViews:</string>
- <reference key="source" ref="607338789"/>
- <reference key="destination" ref="372490531"/>
- <int key="IBEventType">7</int>
- </object>
- <int key="connectionID">49</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">switchViews:</string>
<reference key="source" ref="898948205"/>
<reference key="destination" ref="372490531"/>
<int key="IBEventType">7</int>
@@ -267,7 +231,6 @@
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="976741091"/>
- <reference ref="607338789"/>
<reference ref="898948205"/>
<reference ref="867308721"/>
<reference ref="894101036"/>
@@ -293,12 +256,6 @@
<string key="objectName">local</string>
</object>
<object class="IBObjectRecord">
- <int key="objectID">40</int>
- <reference key="object" ref="607338789"/>
- <reference key="parent" ref="191373211"/>
- <string key="objectName">multi</string>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">45</int>
<reference key="object" ref="95106947"/>
<reference key="parent" ref="191373211"/>
@@ -330,7 +287,6 @@
<string>1.IBPluginDependency</string>
<string>37.IBPluginDependency</string>
<string>39.IBPluginDependency</string>
- <string>40.IBPluginDependency</string>
<string>45.IBPluginDependency</string>
<string>52.IBPluginDependency</string>
<string>88.IBPluginDependency</string>
@@ -346,7 +302,6 @@
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -384,17 +339,6 @@
<string key="candidateClassName">id</string>
</object>
</object>
- <object class="NSMutableDictionary" key="outlets">
- <string key="NS.key.0">versionLabel</string>
- <string key="NS.object.0">UILabel</string>
- </object>
- <object class="NSMutableDictionary" key="toOneOutletInfosByName">
- <string key="NS.key.0">versionLabel</string>
- <object class="IBToOneOutletInfo" key="NS.object.0">
- <string key="name">versionLabel</string>
- <string key="candidateClassName">UILabel</string>
- </object>
- </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">Classes/MainMenuViewController.h</string>
@@ -533,14 +477,6 @@
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">UILabel</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UILabel.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
<string key="className">UIResponder</string>
<string key="superclassName">NSObject</string>
<reference key="sourceIdentifier" ref="864669175"/>
@@ -633,7 +569,6 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>backgroundAndTitle.png</string>
<string>localplayButton.png</string>
- <string>netplayButton.png</string>
<string>savesButton.png</string>
<string>settingsButton.png</string>
</object>
@@ -641,7 +576,6 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>{1024, 768}</string>
<string>{263, 244}</string>
- <string>{263, 244}</string>
<string>{61, 59}</string>
<string>{61, 59}</string>
</object>
diff -r 928e2040d34f -r 86c3a6e8e265 project_files/HedgewarsMobile/Resources/Settings/credits.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/credits.plist Sun Oct 17 17:47:07 2010 +0200
+++ b/project_files/HedgewarsMobile/Resources/Settings/credits.plist Tue Oct 19 21:55:49 2010 +0200
@@ -17,7 +17,7 @@
<string>Henning "Prg" Kühn</string>
</array>
<array>
- <string>Finn "Tiyuri" Brice</string>
+ <string>Tiyuri</string>
<string>Joshua Frese</string>
<string>Stanko Tadić</string>
<string>Julien Koesten</string>
@@ -71,7 +71,7 @@
<string>Maze maps</string>
</array>
<array>
- <string>Graphics</string>
+ <string></string>
<string></string>
<string></string>
<string></string>
diff -r 928e2040d34f -r 86c3a6e8e265 share/hedgewars/Data/Locale/en.txt
--- a/share/hedgewars/Data/Locale/en.txt Sun Oct 17 17:47:07 2010 +0200
+++ b/share/hedgewars/Data/Locale/en.txt Tue Oct 19 21:55:49 2010 +0200
@@ -49,7 +49,7 @@
00:46=Flamethrower
00:47=Sticky Mine
00:48=Hammer
-00:49=Resurrector
+00:49=Resurrector (beta)
01:00=Let's fight!
01:01=Round draw