merge
authorkoda
Wed, 14 Sep 2011 22:39:39 +0200
changeset 5906 ed9676dc8cb4
parent 5713 190d6bb075c5 (diff)
parent 5905 0a00bbe97e22 (current diff)
child 5907 64ccc6be0ec5
merge
share/hedgewars/Data/Graphics/Hats/Balrog.png
share/hedgewars/Data/Graphics/Hats/Blanka.png
share/hedgewars/Data/Graphics/Hats/BlankaToothless.png
share/hedgewars/Data/Graphics/Hats/BlueCap.png
share/hedgewars/Data/Graphics/Hats/BlueHair.png
share/hedgewars/Data/Graphics/Hats/Bob.png
share/hedgewars/Data/Graphics/Hats/BrainSlug.png
share/hedgewars/Data/Graphics/Hats/BrainSlugMouth.png
share/hedgewars/Data/Graphics/Hats/Bub.png
share/hedgewars/Data/Graphics/Hats/Bunny.png
share/hedgewars/Data/Graphics/Hats/Chunli.png
share/hedgewars/Data/Graphics/Hats/Cororon.png
share/hedgewars/Data/Graphics/Hats/Deer.png
share/hedgewars/Data/Graphics/Hats/Falcon.png
share/hedgewars/Data/Graphics/Hats/Geordi.png
share/hedgewars/Data/Graphics/Hats/GreenCap.png
share/hedgewars/Data/Graphics/Hats/GreenHair.png
share/hedgewars/Data/Graphics/Hats/GreyHair.png
share/hedgewars/Data/Graphics/Hats/Guile.png
share/hedgewars/Data/Graphics/Hats/Honda.png
share/hedgewars/Data/Graphics/Hats/Ken.png
share/hedgewars/Data/Graphics/Hats/KirbyMask.png
share/hedgewars/Data/Graphics/Hats/Kululun.png
share/hedgewars/Data/Graphics/Hats/Ladle.png
share/hedgewars/Data/Graphics/Hats/Luigi.png
share/hedgewars/Data/Graphics/Hats/Mario.png
share/hedgewars/Data/Graphics/Hats/Moose.png
share/hedgewars/Data/Graphics/Hats/OrangeHair.png
share/hedgewars/Data/Graphics/Hats/Pig.png
share/hedgewars/Data/Graphics/Hats/PinkHair.png
share/hedgewars/Data/Graphics/Hats/PrincessDaisy.png
share/hedgewars/Data/Graphics/Hats/PrincessPeach.png
share/hedgewars/Data/Graphics/Hats/Pumpkin_Hat.png
share/hedgewars/Data/Graphics/Hats/PurpleHair.png
share/hedgewars/Data/Graphics/Hats/RedCap.png
share/hedgewars/Data/Graphics/Hats/RedHair.png
share/hedgewars/Data/Graphics/Hats/Ryu.png
share/hedgewars/Data/Graphics/Hats/Samus.png
share/hedgewars/Data/Graphics/Hats/SauceBoatSilver.png
share/hedgewars/Data/Graphics/Hats/Sonic.png
share/hedgewars/Data/Graphics/Hats/Teacup.png
share/hedgewars/Data/Graphics/Hats/TeamCap.png
share/hedgewars/Data/Graphics/Hats/TeamHair.png
share/hedgewars/Data/Graphics/Hats/Teapot.png
share/hedgewars/Data/Graphics/Hats/Toad.png
share/hedgewars/Data/Graphics/Hats/Vega.png
share/hedgewars/Data/Graphics/Hats/Wario.png
share/hedgewars/Data/Graphics/Hats/YellowCap.png
share/hedgewars/Data/Graphics/Hats/YellowHair.png
share/hedgewars/Data/Graphics/Hats/apple.png
share/hedgewars/Data/Graphics/Hats/ash.png
share/hedgewars/Data/Graphics/Hats/banana.png
share/hedgewars/Data/Graphics/Hats/beaver.png
share/hedgewars/Data/Graphics/Hats/charmander.png
share/hedgewars/Data/Graphics/Hats/chikorita.png
share/hedgewars/Data/Graphics/Hats/cyborg.png
share/hedgewars/Data/Graphics/Hats/darthvader.png
share/hedgewars/Data/Graphics/Hats/diglett.png
share/hedgewars/Data/Graphics/Hats/jigglypuff.png
share/hedgewars/Data/Graphics/Hats/junior.png
share/hedgewars/Data/Graphics/Hats/lemon.png
share/hedgewars/Data/Graphics/Hats/link.png
share/hedgewars/Data/Graphics/Hats/lugia.png
share/hedgewars/Data/Graphics/Hats/mudkip.png
share/hedgewars/Data/Graphics/Hats/orange.png
share/hedgewars/Data/Graphics/Hats/pikachu.png
share/hedgewars/Data/Graphics/Hats/porkey.png
share/hedgewars/Data/Graphics/Hats/sheep.png
share/hedgewars/Data/Graphics/Hats/slowpoke.png
share/hedgewars/Data/Graphics/Hats/spidey.png
share/hedgewars/Data/Graphics/Hats/squirtle.png
share/hedgewars/Data/Graphics/Hats/stormtrooper.png
share/hedgewars/Data/Graphics/Hats/venom.png
share/hedgewars/Data/Graphics/Hats/voltorb.png
share/hedgewars/Data/Scripts/Multiplayer/GaudyRacer.cfg
share/hedgewars/Data/Scripts/Multiplayer/GaudyRacer.lua
--- a/.hgtags	Wed Sep 14 20:42:45 2011 +0200
+++ b/.hgtags	Wed Sep 14 22:39:39 2011 +0200
@@ -42,3 +42,5 @@
 0000000000000000000000000000000000000000 0.9.9
 fee68e3a303998fdfcc69f74775dc84a36f587fb 0.9.9.1
 0000000000000000000000000000000000000000 0.9.9.1
+718f98a9df122d73f3ba9add4d1654865199de31 Hedgewars-iOS-1.3
+cba92708277b6d0aeabfff2b878845b7d848bdcd Hedgewars-iOS-1.3.1
--- a/project_files/HedgewarsMobile/Classes/GameInterfaceBridge.m	Wed Sep 14 20:42:45 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/GameInterfaceBridge.m	Wed Sep 14 22:39:39 2011 +0200
@@ -78,8 +78,8 @@
         height = (int) screenBounds.size.width;
     }
 
-    NSString *horizontalSize = [[NSString alloc] initWithFormat:@"%d", width];
-    NSString *verticalSize = [[NSString alloc] initWithFormat:@"%d", height];
+    NSString *horizontalSize = [[NSString alloc] initWithFormat:@"%d", width * (int)getScreenScale()];
+    NSString *verticalSize = [[NSString alloc] initWithFormat:@"%d", height * (int)getScreenScale()];
     NSString *rotation = [[NSString alloc] initWithString:@"0"];
 
     NSString *modelId = getModelType();
@@ -88,7 +88,7 @@
         tmpQuality = 0x00000001 | 0x00000002 | 0x00000008 | 0x00000040;                 // rqLowRes | rqBlurryLand | rqSimpleRope | rqKillFlakes
     else if ([modelId hasPrefix:@"iPhone2"] || [modelId hasPrefix:@"iPod3"])                                    // = iPhone 3GS or iPod Touch 3G
         tmpQuality = 0x00000002 | 0x00000040;                                           // rqBlurryLand | rqKillFlakes
-    else if ([modelId hasPrefix:@"iPad1"] || [modelId hasPrefix:@"iPod4"])                    // = iPad 1G or iPod Touch 4G
+    else if ([modelId hasPrefix:@"iPad1"] || [modelId hasPrefix:@"iPod4"])                                      // = iPad 1G or iPod Touch 4G
         tmpQuality = 0x00000002;                                                        // rqBlurryLand
     else                                                                                                        // = everything else
         tmpQuality = 0;                                                                 // full quality
--- a/project_files/HedgewarsMobile/Classes/InGameMenuViewController.m	Wed Sep 14 20:42:45 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/InGameMenuViewController.m	Wed Sep 14 22:39:39 2011 +0200
@@ -45,7 +45,7 @@
     NSArray *array = [[NSArray alloc] initWithObjects:
                       NSLocalizedString(@"Show Help", @""),
                       NSLocalizedString(@"Tag", @""),
-                      NSLocalizedString(@"Snapshot",@""),
+//                      NSLocalizedString(@"Snapshot",@""),
                       NSLocalizedString(@"End Game", @""),
                       nil];
     self.menuList = array;
@@ -117,7 +117,8 @@
 }
 
 -(NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-    return 4;
+    return 3;
+//    return 4;
 }
 
 -(UITableViewCell *)tableView:(UITableView *)aTableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
@@ -151,6 +152,7 @@
 
             break;
         case 2:
+/*
             alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Going to take a screenshot",@"")
                                                message:NSLocalizedString(@"The game snapshot will be placed in your Photo Album and it will be taken as soon as the pause menu is dismissed",@"")
                                               delegate:nil
@@ -162,6 +164,7 @@
 
             break;
         case 3:
+*/
             actionSheet = [[UIActionSheet alloc] initWithTitle:NSLocalizedString(@"Are you reeeeeally sure?", @"")
                                                       delegate:self
                                              cancelButtonTitle:NSLocalizedString(@"Well, maybe not...", @"")
--- a/project_files/HedgewarsMobile/Info.plist	Wed Sep 14 20:42:45 2011 +0200
+++ b/project_files/HedgewarsMobile/Info.plist	Wed Sep 14 22:39:39 2011 +0200
@@ -28,7 +28,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.3</string>
+	<string>1.3.1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchImageFile~ipad</key>