# HG changeset patch # User koda # Date 1316563542 -7200 # Node ID 306cedbeb21389e63cfece1f2e69641dc0bef757 # Parent c3a8cab64fcb848f10a8d72b25853cdfa8600618 fixed several 'retina display' images and added a bunch more (though just from upscaling the normal ones; might be nice to have 'em redrawn at a real higher resolution) diff -r c3a8cab64fcb -r 306cedbeb213 project_files/HedgewarsMobile/Classes/AmmoMenuViewController.m --- a/project_files/HedgewarsMobile/Classes/AmmoMenuViewController.m Tue Sep 20 23:43:52 2011 +0200 +++ b/project_files/HedgewarsMobile/Classes/AmmoMenuViewController.m Wed Sep 21 02:05:42 2011 +0200 @@ -169,9 +169,10 @@ [self.view addSubview:button]; [array addObject:button]; - int x_src = ((i*32)/(int)ammoStoreImage.size.height)*32; - int y_src = (i*32)%(int)ammoStoreImage.size.height; - UIImage *img = [ammoStoreImage cutAt:CGRectMake(x_src, y_src, 32, 32)]; + int size = 32*getScreenScale(); + int x_src = ((i*size)/(int)(ammoStoreImage.size.height*getScreenScale()))*size; + int y_src = (i*size)%(int)(ammoStoreImage.size.height*getScreenScale()); + UIImage *img = [ammoStoreImage cutAt:CGRectMake(x_src, y_src, size, size)]; [imgs addObject:img]; } [self performSelectorOnMainThread:@selector(setButtonsArray:) withObject:array waitUntilDone:NO]; diff -r c3a8cab64fcb -r 306cedbeb213 project_files/HedgewarsMobile/Classes/CommodityFunctions.h --- a/project_files/HedgewarsMobile/Classes/CommodityFunctions.h Tue Sep 20 23:43:52 2011 +0200 +++ b/project_files/HedgewarsMobile/Classes/CommodityFunctions.h Wed Sep 21 02:05:42 2011 +0200 @@ -24,7 +24,6 @@ #define DOCUMENTS_FOLDER() [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0] #define DEBUG_FILE() [DOCUMENTS_FOLDER() stringByAppendingString:@"/hw-game.log"] -#define HEDGEHOG_FILE() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Settings/Images/hedgehog.png"] #define BASICFLAGS_FILE() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Settings/basicFlags.plist"] #define GAMEMODS_FILE() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Settings/gameMods.plist"] #define CREDITS_FILE() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Settings/credits.plist"] diff -r c3a8cab64fcb -r 306cedbeb213 project_files/HedgewarsMobile/Classes/MasterViewController.m --- a/project_files/HedgewarsMobile/Classes/MasterViewController.m Tue Sep 20 23:43:52 2011 +0200 +++ b/project_files/HedgewarsMobile/Classes/MasterViewController.m Wed Sep 21 02:05:42 2011 +0200 @@ -92,7 +92,7 @@ iconStr = [NSString stringWithFormat:@"%@/Egg.png",GRAPHICS_DIRECTORY()]; break; case 2: - iconStr = [NSString stringWithFormat:@"%@/Molotov.png",GRAPHICS_DIRECTORY()]; + iconStr = [NSString stringWithFormat:@"%@/cheese.png",GRAPHICS_DIRECTORY()]; break; case 3: iconStr = [NSString stringWithFormat:@"%@/Target.png",GRAPHICS_DIRECTORY()]; diff -r c3a8cab64fcb -r 306cedbeb213 project_files/HedgewarsMobile/Classes/SingleWeaponViewController.m --- a/project_files/HedgewarsMobile/Classes/SingleWeaponViewController.m Tue Sep 20 23:43:52 2011 +0200 +++ b/project_files/HedgewarsMobile/Classes/SingleWeaponViewController.m Wed Sep 21 02:05:42 2011 +0200 @@ -165,10 +165,12 @@ weaponCell.delegate = self; } - int x = ((row*32)/(int)self.ammoStoreImage.size.height)*32; - int y = (row*32)%(int)self.ammoStoreImage.size.height; + int size = 32 * getScreenScale(); + int corners = 8 * getScreenScale(); + int x = ((row*size)/(int)(self.ammoStoreImage.size.height*getScreenScale()))*size; + int y = (row*size)%(int)(self.ammoStoreImage.size.height*getScreenScale()); - UIImage *img = [[self.ammoStoreImage cutAt:CGRectMake(x, y, 32, 32)] makeRoundCornersOfSize:CGSizeMake(7, 7)]; + UIImage *img = [[self.ammoStoreImage cutAt:CGRectMake(x, y, size, size)] makeRoundCornersOfSize:CGSizeMake(corners, corners)]; weaponCell.weaponIcon.image = img; weaponCell.weaponName.text = [NSString stringWithUTF8String:HW_getWeaponNameByIndex(row)]; weaponCell.tag = row; diff -r c3a8cab64fcb -r 306cedbeb213 project_files/HedgewarsMobile/Classes/StatsPageViewController.m --- a/project_files/HedgewarsMobile/Classes/StatsPageViewController.m Tue Sep 20 23:43:52 2011 +0200 +++ b/project_files/HedgewarsMobile/Classes/StatsPageViewController.m Wed Sep 21 02:05:42 2011 +0200 @@ -73,14 +73,16 @@ static NSString *CellIdentifier0 = @"Cell0"; NSInteger section = [indexPath section]; NSInteger row = [indexPath row]; - NSString *imgString = @""; + NSString *imgName = @""; + NSString *imgPath = BTN_DIRECTORY(); UITableViewCell *cell = [aTableView dequeueReusableCellWithIdentifier:CellIdentifier0]; if (cell == nil) cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier0] autorelease]; if (section == 0) { // winning team - imgString = @"StatsStar"; + imgName = @"star"; + imgPath = [[NSBundle mainBundle] resourcePath]; cell.textLabel.text = [self.statsArray objectAtIndex:1]; cell.textLabel.textColor = UICOLOR_HW_YELLOW_TEXT; } else if (section == 1) { // teams ranking @@ -92,9 +94,9 @@ blue:(color & 0xFF)/255.0f alpha:1.0f]; cell.textLabel.text = [NSString stringWithFormat:@"%d. %@ (%@ kills)", row+1, [info objectAtIndex:2], [info objectAtIndex:1]]; - imgString = [NSString stringWithFormat:@"StatsMedal%d",row+1]; + imgName = [NSString stringWithFormat:@"StatsMedal%d",row+1]; } else if (section == 2) { // general info - imgString = @"iconDamage"; + imgName = @"iconDamage"; cell.textLabel.text = [self.statsArray objectAtIndex:row + 2]; cell.textLabel.textColor = UICOLOR_HW_YELLOW_TEXT; } else { // exit button @@ -104,7 +106,9 @@ cell.imageView.image = nil; } - UIImage *img = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/%@.png",BTN_DIRECTORY(),imgString]]; + NSString *imgString = [[NSString alloc] initWithFormat:@"%@/%@.png",imgPath,imgName]; + UIImage *img = [[UIImage alloc] initWithContentsOfFile:imgString]; + [imgString release]; UIImageView *imgView = [[UIImageView alloc] initWithImage:img]; cell.imageView.image = img; [img release]; diff -r c3a8cab64fcb -r 306cedbeb213 project_files/HedgewarsMobile/Classes/SupportViewController.m --- a/project_files/HedgewarsMobile/Classes/SupportViewController.m Tue Sep 20 23:43:52 2011 +0200 +++ b/project_files/HedgewarsMobile/Classes/SupportViewController.m Wed Sep 21 02:05:42 2011 +0200 @@ -64,6 +64,7 @@ static NSString *CellIdentifier = @"Cell"; NSInteger row = [indexPath row]; NSInteger section = [indexPath section]; + NSString *imgName = @""; UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier]; if (cell == nil) @@ -71,33 +72,35 @@ NSString *rowString = [self.waysToSupport objectAtIndex:(row + section)]; cell.textLabel.text = rowString; - NSString *imgString = nil; if (section == 0) { - imgString = [BTN_DIRECTORY() stringByAppendingString:@"/StatsStar.png"]; + imgName = @"star"; cell.textLabel.textAlignment = UITextAlignmentCenter; cell.imageView.image = nil; } else { cell.textLabel.textAlignment = UITextAlignmentLeft; switch (row) { case 0: - imgString = @"fb.png"; + imgName = @"fb"; break; case 1: - imgString = @"tw.png"; + imgName = @"tw"; break; case 2: - imgString = @"Icon-Small.png"; + imgName = @"hedgehog"; break; case 3: - imgString = @"irc.png"; + imgName = @"irc"; break; default: DLog(@"No way"); break; } } + + NSString *imgString = [[NSString alloc] initWithFormat:@"%@/%@.png",[[NSBundle mainBundle] resourcePath],imgName]; UIImage *img = [[UIImage alloc] initWithContentsOfFile:imgString]; + [imgString release]; cell.imageView.image = img; if (section == 0) { UIImageView *imgView = [[UIImageView alloc] initWithImage:img]; diff -r c3a8cab64fcb -r 306cedbeb213 project_files/HedgewarsMobile/Classes/TeamConfigViewController.m --- a/project_files/HedgewarsMobile/Classes/TeamConfigViewController.m Tue Sep 20 23:43:52 2011 +0200 +++ b/project_files/HedgewarsMobile/Classes/TeamConfigViewController.m Wed Sep 21 02:05:42 2011 +0200 @@ -102,7 +102,9 @@ } -(UIImage *)drawHogsRepeated:(NSInteger) manyTimes { - UIImage *hogSprite = [[UIImage alloc] initWithContentsOfFile:HEDGEHOG_FILE()]; + NSString *imgString = [[NSString alloc] initWithFormat:@"%@/hedgehog.png",[[NSBundle mainBundle] resourcePath]]; + UIImage *hogSprite = [[UIImage alloc] initWithContentsOfFile:imgString]; + [imgString release]; CGFloat screenScale = getScreenScale(); int w = hogSprite.size.width * screenScale; int h = hogSprite.size.height * screenScale; @@ -185,8 +187,9 @@ NSString *teamPath = [NSString stringWithFormat:@"%@/%@.plist",TEAMS_DIRECTORY(),cell.textLabel.text]; NSDictionary *firstHog = [[[NSDictionary dictionaryWithContentsOfFile:teamPath] objectForKey:@"hedgehogs"] objectAtIndex:0]; if ([[firstHog objectForKey:@"level"] intValue] != 0) { - NSString *filePath = [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Settings/Images/robotBadge.png"]; - UIImage *sprite = [[UIImage alloc] initWithContentsOfFile:filePath]; + NSString *imgString = [[NSString alloc] initWithFormat:@"%@/robotBadge.png",[[NSBundle mainBundle] resourcePath]]; + UIImage *sprite = [[UIImage alloc] initWithContentsOfFile:imgString]; + [imgString release]; UIImageView *spriteView = [[UIImageView alloc] initWithImage:sprite]; [sprite release]; diff -r c3a8cab64fcb -r 306cedbeb213 project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj --- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Tue Sep 20 23:43:52 2011 +0200 +++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Wed Sep 21 02:05:42 2011 +0200 @@ -34,7 +34,7 @@ 61188BF512A6FE570026C5DA /* arrowRight@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6103D39C129B350700911D8D /* arrowRight@2x.png */; }; 61188BF612A6FE590026C5DA /* arrowUp@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6103D39D129B350700911D8D /* arrowUp@2x.png */; }; 61188BF712A6FE5A0026C5DA /* backButton@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6172FED31298CE6600D73365 /* backButton@2x.png */; }; - 61188BF812A6FE5C0026C5DA /* background@2x~iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = 6172FED61298CF9800D73365 /* background@2x~iphone.png */; }; + 61188BF812A6FE5C0026C5DA /* background~iphone@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6172FED61298CF9800D73365 /* background~iphone@2x.png */; }; 61188BF912A6FE5D0026C5DA /* checkbox@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 615FEAD912A2A4C10098EE92 /* checkbox@2x.png */; }; 61188BFA12A6FE5E0026C5DA /* cornerButton@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6103D39E129B350700911D8D /* cornerButton@2x.png */; }; 61188BFB12A6FE610026C5DA /* Default-ipad-Landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 6183D83C11E2BCE200A88903 /* Default-ipad-Landscape.png */; }; @@ -44,13 +44,13 @@ 61188BFF12A6FE7E0026C5DA /* joyButtonAttack@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6103D392129B34E900911D8D /* joyButtonAttack@2x.png */; }; 61188C0012A6FE810026C5DA /* joyButtonBackJump@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6103D393129B34E900911D8D /* joyButtonBackJump@2x.png */; }; 61188C0112A6FE820026C5DA /* joyButtonForwardJump@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6103D394129B34E900911D8D /* joyButtonForwardJump@2x.png */; }; - 61188C0212A6FE840026C5DA /* localplayButton@2x~iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = 615FEADE12A2A6640098EE92 /* localplayButton@2x~iphone.png */; }; + 61188C0212A6FE840026C5DA /* localplayButton~iphone@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 615FEADE12A2A6640098EE92 /* localplayButton~iphone@2x.png */; }; 61188C0312A6FE860026C5DA /* netplayButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F9040D11DF59D10068B24D /* netplayButton.png */; }; 61188C0412A6FE880026C5DA /* savesButton@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6172FEC81298CE4800D73365 /* savesButton@2x.png */; }; 61188C0512A6FE8F0026C5DA /* Data in Resources */ = {isa = PBXBuildFile; fileRef = 61798A5E114AE08600BA94A9 /* Data */; }; - 61188C0612A6FE950026C5DA /* smallerBackground@2x~iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = 6172FEEC1298D25D00D73365 /* smallerBackground@2x~iphone.png */; }; + 61188C0612A6FE950026C5DA /* smallerBackground~iphone@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6172FEEC1298D25D00D73365 /* smallerBackground~iphone@2x.png */; }; 61188C0712A6FE960026C5DA /* settingsButton@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6172FECA1298CE4E00D73365 /* settingsButton@2x.png */; }; - 61188C0812A6FE9A0026C5DA /* title@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 618899811299516000D55FD6 /* title@2x.png */; }; + 61188C0812A6FE9A0026C5DA /* title~iphone@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 618899811299516000D55FD6 /* title~iphone@2x.png */; }; 61188C0912A6FE9C0026C5DA /* tw@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6103D385129B348200911D8D /* tw@2x.png */; }; 611D9BFB12497E9800008271 /* SavedGamesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 611D9BF912497E9800008271 /* SavedGamesViewController.m */; }; 611D9BFC12497E9800008271 /* SavedGamesViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 611D9BFA12497E9800008271 /* SavedGamesViewController.xib */; }; @@ -113,6 +113,14 @@ 6167A6761391514600AA6D07 /* RestoreViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6167A6741391514600AA6D07 /* RestoreViewController.m */; }; 6167A6771391514600AA6D07 /* RestoreViewController-iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6167A6751391514600AA6D07 /* RestoreViewController-iPhone.xib */; }; 6167A72D13919E6800AA6D07 /* RestoreViewController-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6167A72C13919E6800AA6D07 /* RestoreViewController-iPad.xib */; }; + 6167C87414294727003DD50F /* surprise@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167C87314294727003DD50F /* surprise@2x.png */; }; + 6167C88C14294738003DD50F /* denied@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167C88B14294738003DD50F /* denied@2x.png */; }; + 6167C8F51429502C003DD50F /* hedgehog.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167C8EF1429502C003DD50F /* hedgehog.png */; }; + 6167C8F61429502C003DD50F /* hedgehog@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167C8F01429502C003DD50F /* hedgehog@2x.png */; }; + 6167C8F71429502C003DD50F /* robotBadge.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167C8F11429502C003DD50F /* robotBadge.png */; }; + 6167C8F81429502C003DD50F /* robotBadge@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167C8F21429502C003DD50F /* robotBadge@2x.png */; }; + 6167C8F91429502C003DD50F /* star.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167C8F31429502C003DD50F /* star.png */; }; + 6167C8FA1429502C003DD50F /* star@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167C8F41429502C003DD50F /* star@2x.png */; }; 6172FED91298CF9800D73365 /* background~iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = 6172FED71298CF9800D73365 /* background~iphone.png */; }; 6172FEEF1298D25D00D73365 /* mediumBackground~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 6172FEEB1298D25D00D73365 /* mediumBackground~ipad.png */; }; 6172FEF11298D25D00D73365 /* smallerBackground~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 6172FEED1298D25D00D73365 /* smallerBackground~ipad.png */; }; @@ -203,7 +211,7 @@ 61E2F7441283752C00E12521 /* fb.png in Resources */ = {isa = PBXBuildFile; fileRef = 61E2F7421283752C00E12521 /* fb.png */; }; 61E2F7451283752C00E12521 /* tw.png in Resources */ = {isa = PBXBuildFile; fileRef = 61E2F7431283752C00E12521 /* tw.png */; }; 61E5D68D12AB006F00566F29 /* uLandPainted.pas in Sources */ = {isa = PBXBuildFile; fileRef = 61E5D68C12AB006F00566F29 /* uLandPainted.pas */; }; - 61EBA62A11DFF2BC0048B68A /* title.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EBA62811DFF2BC0048B68A /* title.png */; }; + 61EBA62A11DFF2BC0048B68A /* title~iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EBA62811DFF2BC0048B68A /* title~iphone.png */; }; 61EDB5B0135B3F97009B29A6 /* GameInterfaceBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = 61EDB5AF135B3F97009B29A6 /* GameInterfaceBridge.m */; }; 61EF920E11DF57AC003441C4 /* arrowDown.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EF920511DF57AC003441C4 /* arrowDown.png */; }; 61EF920F11DF57AC003441C4 /* arrowLeft.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EF920611DF57AC003441C4 /* arrowLeft.png */; }; @@ -364,7 +372,7 @@ 615AD9E8120764CA00F2FF04 /* backButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = backButton.png; path = Resources/Frontend/backButton.png; sourceTree = ""; }; 615AD9EA1207654E00F2FF04 /* helpButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = helpButton.png; path = Resources/Frontend/helpButton.png; sourceTree = ""; }; 615FEAD912A2A4C10098EE92 /* checkbox@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "checkbox@2x.png"; path = "Resources/Icons/checkbox@2x.png"; sourceTree = ""; }; - 615FEADE12A2A6640098EE92 /* localplayButton@2x~iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "localplayButton@2x~iphone.png"; path = "Resources/Frontend/localplayButton@2x~iphone.png"; sourceTree = ""; }; + 615FEADE12A2A6640098EE92 /* localplayButton~iphone@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "localplayButton~iphone@2x.png"; path = "Resources/Frontend/localplayButton~iphone@2x.png"; sourceTree = ""; }; 615FEADF12A2A6640098EE92 /* localplayButton~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "localplayButton~ipad.png"; path = "Resources/Frontend/localplayButton~ipad.png"; sourceTree = ""; }; 615FEAE012A2A6640098EE92 /* localplayButton~iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "localplayButton~iphone.png"; path = "Resources/Frontend/localplayButton~iphone.png"; sourceTree = ""; }; 6163EE7C11CC2600001C0453 /* SingleWeaponViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SingleWeaponViewController.h; sourceTree = ""; }; @@ -434,14 +442,22 @@ 6167A6741391514600AA6D07 /* RestoreViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RestoreViewController.m; sourceTree = ""; }; 6167A6751391514600AA6D07 /* RestoreViewController-iPhone.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "RestoreViewController-iPhone.xib"; path = "../Resources/RestoreViewController-iPhone.xib"; sourceTree = ""; }; 6167A72C13919E6800AA6D07 /* RestoreViewController-iPad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "RestoreViewController-iPad.xib"; path = "../Resources/RestoreViewController-iPad.xib"; sourceTree = ""; }; + 6167C87314294727003DD50F /* surprise@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "surprise@2x.png"; path = "Resources/surprise@2x.png"; sourceTree = ""; }; + 6167C88B14294738003DD50F /* denied@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "denied@2x.png"; path = "Resources/denied@2x.png"; sourceTree = ""; }; + 6167C8EF1429502C003DD50F /* hedgehog.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = hedgehog.png; path = Resources/Icons/hedgehog.png; sourceTree = ""; }; + 6167C8F01429502C003DD50F /* hedgehog@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "hedgehog@2x.png"; path = "Resources/Icons/hedgehog@2x.png"; sourceTree = ""; }; + 6167C8F11429502C003DD50F /* robotBadge.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = robotBadge.png; path = Resources/Icons/robotBadge.png; sourceTree = ""; }; + 6167C8F21429502C003DD50F /* robotBadge@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "robotBadge@2x.png"; path = "Resources/Icons/robotBadge@2x.png"; sourceTree = ""; }; + 6167C8F31429502C003DD50F /* star.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = star.png; path = Resources/Icons/star.png; sourceTree = ""; }; + 6167C8F41429502C003DD50F /* star@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "star@2x.png"; path = "Resources/Icons/star@2x.png"; sourceTree = ""; }; 6172FEA21298C7F900D73365 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default@2x.png"; path = "Resources/Icons/Default@2x.png"; sourceTree = ""; }; 6172FEC81298CE4800D73365 /* savesButton@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "savesButton@2x.png"; path = "Resources/Frontend/savesButton@2x.png"; sourceTree = ""; }; 6172FECA1298CE4E00D73365 /* settingsButton@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "settingsButton@2x.png"; path = "Resources/Frontend/settingsButton@2x.png"; sourceTree = ""; }; 6172FED31298CE6600D73365 /* backButton@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "backButton@2x.png"; path = "Resources/Frontend/backButton@2x.png"; sourceTree = ""; }; - 6172FED61298CF9800D73365 /* background@2x~iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "background@2x~iphone.png"; path = "Resources/Frontend/background@2x~iphone.png"; sourceTree = ""; }; + 6172FED61298CF9800D73365 /* background~iphone@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "background~iphone@2x.png"; path = "Resources/Frontend/background~iphone@2x.png"; sourceTree = ""; }; 6172FED71298CF9800D73365 /* background~iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "background~iphone.png"; path = "Resources/Frontend/background~iphone.png"; sourceTree = ""; }; 6172FEEB1298D25D00D73365 /* mediumBackground~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "mediumBackground~ipad.png"; path = "Resources/Frontend/mediumBackground~ipad.png"; sourceTree = ""; }; - 6172FEEC1298D25D00D73365 /* smallerBackground@2x~iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "smallerBackground@2x~iphone.png"; path = "Resources/Frontend/smallerBackground@2x~iphone.png"; sourceTree = ""; }; + 6172FEEC1298D25D00D73365 /* smallerBackground~iphone@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "smallerBackground~iphone@2x.png"; path = "Resources/Frontend/smallerBackground~iphone@2x.png"; sourceTree = ""; }; 6172FEED1298D25D00D73365 /* smallerBackground~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "smallerBackground~ipad.png"; path = "Resources/Frontend/smallerBackground~ipad.png"; sourceTree = ""; }; 6172FEEE1298D25D00D73365 /* smallerBackground~iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "smallerBackground~iphone.png"; path = "Resources/Frontend/smallerBackground~iphone.png"; sourceTree = ""; }; 6174F7C612CD62E300205D6F /* smallerTitle.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = smallerTitle.png; path = Resources/Frontend/smallerTitle.png; sourceTree = ""; }; @@ -493,7 +509,7 @@ 61842B3D122B65BD0096E335 /* helpabove.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = helpabove.png; path = Resources/Overlay/helpabove.png; sourceTree = ""; }; 61842B3F122B66280096E335 /* helpleft.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = helpleft.png; path = Resources/Overlay/helpleft.png; sourceTree = ""; }; 6187AEA5120781B900B31A27 /* Settings */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Settings; path = Resources/Settings; sourceTree = ""; }; - 618899811299516000D55FD6 /* title@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "title@2x.png"; path = "Resources/Frontend/title@2x.png"; sourceTree = ""; }; + 618899811299516000D55FD6 /* title~iphone@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "title~iphone@2x.png"; path = "Resources/Frontend/title~iphone@2x.png"; sourceTree = ""; }; 61889984129995B500D55FD6 /* title~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "title~ipad.png"; path = "Resources/Frontend/title~ipad.png"; sourceTree = ""; }; 618E27B612A2C30700C20EF0 /* SDL_net.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL_net.xcodeproj; path = "../../../Library/SDL_net/Xcode-iPhoneOS/SDL_net.xcodeproj"; sourceTree = SOURCE_ROOT; }; 619598181364BCD200B429B6 /* Tremor.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Tremor.xcodeproj; path = ../../misc/libtremor/Xcode/Tremor.xcodeproj; sourceTree = SOURCE_ROOT; }; @@ -542,7 +558,7 @@ 61E2F7421283752C00E12521 /* fb.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = fb.png; path = Resources/Icons/fb.png; sourceTree = ""; }; 61E2F7431283752C00E12521 /* tw.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = tw.png; path = Resources/Icons/tw.png; sourceTree = ""; }; 61E5D68C12AB006F00566F29 /* uLandPainted.pas */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = uLandPainted.pas; path = ../../hedgewars/uLandPainted.pas; sourceTree = SOURCE_ROOT; }; - 61EBA62811DFF2BC0048B68A /* title.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = title.png; path = Resources/Frontend/title.png; sourceTree = ""; }; + 61EBA62811DFF2BC0048B68A /* title~iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "title~iphone.png"; path = "Resources/Frontend/title~iphone.png"; sourceTree = ""; }; 61EDB5AE135B3F97009B29A6 /* GameInterfaceBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GameInterfaceBridge.h; sourceTree = ""; }; 61EDB5AF135B3F97009B29A6 /* GameInterfaceBridge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GameInterfaceBridge.m; sourceTree = ""; }; 61EF920511DF57AC003441C4 /* arrowDown.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = arrowDown.png; path = Resources/Overlay/arrowDown.png; sourceTree = ""; }; @@ -653,11 +669,11 @@ 29B97315FDCFA39411CA2CEA /* Other Sources */ = { isa = PBXGroup; children = ( + 61DE91561258B76800B80214 /* Custom UIs */, 61AC067212B2E32D000B52A2 /* Appirater.h */, 61AC067312B2E32D000B52A2 /* Appirater.m */, 6165929C11CA9E2F00D6E256 /* HedgewarsAppDelegate.h */, 6165929D11CA9E2F00D6E256 /* HedgewarsAppDelegate.m */, - 61DE91561258B76800B80214 /* Custom UIs */, 32CA4F630368D1EE00C91783 /* Hedgewars_Prefix.pch */, 61A97F0E136F675A00DD9878 /* hwconsts.h */, 6165922911CA9BD500D6E256 /* PascalImports.h */, @@ -678,8 +694,6 @@ 29B97317FDCFA39411CA2CEA /* Resources */ = { isa = PBXGroup; children = ( - 612CABCA1391D3D1005E9596 /* Sounds */, - 6199E86C12464A8E00DADF8C /* surprise.png */, 611EEBC0122B34A800DF6938 /* helpingame.png */, 611EEC30122B54D700DF6938 /* helpplain.png */, 611EEBC2122B355700DF6938 /* helpbottom.png */, @@ -687,6 +701,10 @@ 611EEBC3122B355700DF6938 /* helpright.png */, 61842B3F122B66280096E335 /* helpleft.png */, 6129B9F611EFB04D0017E305 /* denied.png */, + 6167C88B14294738003DD50F /* denied@2x.png */, + 6199E86C12464A8E00DADF8C /* surprise.png */, + 6167C87314294727003DD50F /* surprise@2x.png */, + 612CABCA1391D3D1005E9596 /* Sounds */, 61F7A42811E2905C0040BA66 /* Icons */, 61F903FA11DF58680068B24D /* Frontend */, 6179936611501D1E00BA94A9 /* Overlay */, @@ -726,8 +744,6 @@ 611D9BF312497B7700008271 /* Other Controllers */ = { isa = PBXGroup; children = ( - 61B7A33612CC21080086B604 /* StatsPageViewController.h */, - 61B7A33712CC21080086B604 /* StatsPageViewController.m */, 61F2E7CB1205EDE0005734F7 /* AboutViewController.h */, 61F2E7CC1205EDE0005734F7 /* AboutViewController.m */, 61F2E7CD1205EDE0005734F7 /* AboutViewController.xib */, @@ -738,6 +754,8 @@ 611D9BF812497E9800008271 /* SavedGamesViewController.h */, 611D9BF912497E9800008271 /* SavedGamesViewController.m */, 611D9BFA12497E9800008271 /* SavedGamesViewController.xib */, + 61B7A33612CC21080086B604 /* StatsPageViewController.h */, + 61B7A33712CC21080086B604 /* StatsPageViewController.m */, ); name = "Other Controllers"; sourceTree = ""; @@ -984,6 +1002,12 @@ 6103D383129B346A00911D8D /* fb@2x.png */, 61E2F7431283752C00E12521 /* tw.png */, 6103D385129B348200911D8D /* tw@2x.png */, + 6167C8EF1429502C003DD50F /* hedgehog.png */, + 6167C8F01429502C003DD50F /* hedgehog@2x.png */, + 6167C8F11429502C003DD50F /* robotBadge.png */, + 6167C8F21429502C003DD50F /* robotBadge@2x.png */, + 6167C8F31429502C003DD50F /* star.png */, + 6167C8F41429502C003DD50F /* star@2x.png */, 6183D83C11E2BCE200A88903 /* Default-ipad-Landscape.png */, 6183D83D11E2BCE200A88903 /* Default.png */, 6172FEA21298C7F900D73365 /* Default@2x.png */, @@ -1009,20 +1033,20 @@ 615AD9E8120764CA00F2FF04 /* backButton.png */, 6172FED31298CE6600D73365 /* backButton@2x.png */, 615AD96112073B4D00F2FF04 /* startGameButton.png */, - 615FEADE12A2A6640098EE92 /* localplayButton@2x~iphone.png */, + 615FEADE12A2A6640098EE92 /* localplayButton~iphone@2x.png */, 615FEAE012A2A6640098EE92 /* localplayButton~iphone.png */, 615FEADF12A2A6640098EE92 /* localplayButton~ipad.png */, 61F9040D11DF59D10068B24D /* netplayButton.png */, - 61EBA62811DFF2BC0048B68A /* title.png */, - 618899811299516000D55FD6 /* title@2x.png */, + 61EBA62811DFF2BC0048B68A /* title~iphone.png */, + 618899811299516000D55FD6 /* title~iphone@2x.png */, 61889984129995B500D55FD6 /* title~ipad.png */, 6174F7C612CD62E300205D6F /* smallerTitle.png */, 6174F7C712CD62E300205D6F /* smallerTitle@2x.png */, 61F9040A11DF59370068B24D /* background.png */, - 6172FED61298CF9800D73365 /* background@2x~iphone.png */, + 6172FED61298CF9800D73365 /* background~iphone@2x.png */, 6172FED71298CF9800D73365 /* background~iphone.png */, 6172FEEB1298D25D00D73365 /* mediumBackground~ipad.png */, - 6172FEEC1298D25D00D73365 /* smallerBackground@2x~iphone.png */, + 6172FEEC1298D25D00D73365 /* smallerBackground~iphone@2x.png */, 6172FEEE1298D25D00D73365 /* smallerBackground~iphone.png */, 6172FEED1298D25D00D73365 /* smallerBackground~ipad.png */, ); @@ -1274,7 +1298,7 @@ 61EF921411DF57AC003441C4 /* joyButtonForwardJump.png in Resources */, 61F9040911DF58B00068B24D /* settingsButton.png in Resources */, 61F9040B11DF59370068B24D /* background.png in Resources */, - 61EBA62A11DFF2BC0048B68A /* title.png in Resources */, + 61EBA62A11DFF2BC0048B68A /* title~iphone.png in Resources */, 61F7A43811E290650040BA66 /* Icon-72.png in Resources */, 61F7A43911E290650040BA66 /* Icon-Small-50.png in Resources */, 61F7A43A11E290650040BA66 /* Icon-Small.png in Resources */, @@ -1326,7 +1350,7 @@ 61188BF512A6FE570026C5DA /* arrowRight@2x.png in Resources */, 61188BF612A6FE590026C5DA /* arrowUp@2x.png in Resources */, 61188BF712A6FE5A0026C5DA /* backButton@2x.png in Resources */, - 61188BF812A6FE5C0026C5DA /* background@2x~iphone.png in Resources */, + 61188BF812A6FE5C0026C5DA /* background~iphone@2x.png in Resources */, 61188BF912A6FE5D0026C5DA /* checkbox@2x.png in Resources */, 61188BFA12A6FE5E0026C5DA /* cornerButton@2x.png in Resources */, 61188BFB12A6FE610026C5DA /* Default-ipad-Landscape.png in Resources */, @@ -1336,19 +1360,27 @@ 61188BFF12A6FE7E0026C5DA /* joyButtonAttack@2x.png in Resources */, 61188C0012A6FE810026C5DA /* joyButtonBackJump@2x.png in Resources */, 61188C0112A6FE820026C5DA /* joyButtonForwardJump@2x.png in Resources */, - 61188C0212A6FE840026C5DA /* localplayButton@2x~iphone.png in Resources */, + 61188C0212A6FE840026C5DA /* localplayButton~iphone@2x.png in Resources */, 61188C0312A6FE860026C5DA /* netplayButton.png in Resources */, 61188C0412A6FE880026C5DA /* savesButton@2x.png in Resources */, 61188C0512A6FE8F0026C5DA /* Data in Resources */, - 61188C0612A6FE950026C5DA /* smallerBackground@2x~iphone.png in Resources */, + 61188C0612A6FE950026C5DA /* smallerBackground~iphone@2x.png in Resources */, 61188C0712A6FE960026C5DA /* settingsButton@2x.png in Resources */, - 61188C0812A6FE9A0026C5DA /* title@2x.png in Resources */, + 61188C0812A6FE9A0026C5DA /* title~iphone@2x.png in Resources */, 61188C0912A6FE9C0026C5DA /* tw@2x.png in Resources */, 6174F7C812CD62E300205D6F /* smallerTitle.png in Resources */, 6174F7C912CD62E300205D6F /* smallerTitle@2x.png in Resources */, 6167A6771391514600AA6D07 /* RestoreViewController-iPhone.xib in Resources */, 6167A72D13919E6800AA6D07 /* RestoreViewController-iPad.xib in Resources */, 612CABC81391D3CC005E9596 /* hwclassic.mp3 in Resources */, + 6167C87414294727003DD50F /* surprise@2x.png in Resources */, + 6167C88C14294738003DD50F /* denied@2x.png in Resources */, + 6167C8F51429502C003DD50F /* hedgehog.png in Resources */, + 6167C8F61429502C003DD50F /* hedgehog@2x.png in Resources */, + 6167C8F71429502C003DD50F /* robotBadge.png in Resources */, + 6167C8F81429502C003DD50F /* robotBadge@2x.png in Resources */, + 6167C8F91429502C003DD50F /* star.png in Resources */, + 6167C8FA1429502C003DD50F /* star@2x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1366,7 +1398,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "#copy new stuff over old stuff\nrm -rf ${PROJECT_DIR}/Data\n\n#create config.inc\necho \"Updating config file...\"\nPROTO=`cat ${PROJECT_DIR}/../../CMakeLists.txt | grep HEDGEWARS_PROTO_VER | cut -d ' ' -f 2 | cut -d ')' -f 1`\nMAJN=`cat ${PROJECT_DIR}/../../CMakeLists.txt | grep CPACK_PACKAGE_VERSION_MAJOR | xargs | cut -d ' ' -f 2 |cut -d ')' -f 1`\nMINN=`cat ${PROJECT_DIR}/../../CMakeLists.txt | grep CPACK_PACKAGE_VERSION_MINOR | xargs | cut -d ' ' -f 2 |cut -d ')' -f 1`\nPATN=`cat ${PROJECT_DIR}/../../CMakeLists.txt | grep CPACK_PACKAGE_VERSION_PATCH | xargs | cut -d ' ' -f 2 | cut -d '$' -f 1`\nREVN=-`/usr/local/bin/hg id -n ${PROJECT_DIR}/../../`\necho \"const cNetProtoVersion = $PROTO; const cVersionString = '${MAJN}.${MINN}.${PATN}${REVN}'; const cLuaLibrary = '';\" > ${PROJECT_DIR}/../../hedgewars/config.inc\n\necho \"Copying Data...\"\ncp -R ${PROJECT_DIR}/../../share/hedgewars/Data ${PROJECT_DIR}/Data\n\n#copy some files from QTfrontend/res\necho \"Fetching additional graphics 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/icon*.png ${PROJECT_DIR}/Data/Graphics/Btn/\ncp ${PROJECT_DIR}/../../QTfrontend/res/StatsMedal*.png ${PROJECT_DIR}/Data/Graphics/Btn/\ncp ${PROJECT_DIR}/../../QTfrontend/res/StatsR.png ${PROJECT_DIR}/Data/Graphics/Btn/StatsStar.png\ncp ${PROJECT_DIR}/../../QTfrontend/res/ammopic.png ${PROJECT_DIR}/Data/Graphics/Btn/iconAmmo.png\ncp -R ${PROJECT_DIR}/../../QTfrontend/res/botlevels ${PROJECT_DIR}/Data/Graphics/Hedgehog/botlevels/\n\necho \"Removing text and dummy files...\"\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, misc stuff\nrm -rf ${PROJECT_DIR}/Data/Maps/{test*,Ruler}\nrm -rf ${PROJECT_DIR}/Data/Graphics/Hats/{TeamCap,TeamHeadband,TeamHair}\nrm -rf ${PROJECT_DIR}/Data/misc/\n\n#delete forbidden maps and WIP themes (remember to check that no Map uses them)\nrm -rf ${PROJECT_DIR}/Data/Maps/{Cheese,FlightJoust}\nrm -rf ${PROJECT_DIR}/Data/Themes/{Beach,Digital}\n\n#delete unused 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\necho \"Handling audio files...\"\n#delete the Classic voice\nrm -rf ${PROJECT_DIR}/Data/Sounds/voices/Classic\n#delete the main theme file\nrm -rf ${PROJECT_DIR}/Data/Music/main_theme.ogg\n#copy mono audio\ncp -R ${PROJECT_DIR}/Audio/* ${PROJECT_DIR}/Data/\n#remove unused voices\nfor i in {Amazing,Brilliant,Bugger,Bungee,Cutitout,Drat,Excellent,Fire,FlawlessPossibility,Gonnagetyou,Grenade,Hmm,Justyouwait,Leavemealone,Ohdear,Ouch,Perfect,Revenge,Runaway,Solong,Thisoneismine,VictoryPossibility,Watchthis,Whatthe,Whoopsee}; do find Data/Sounds/voices/ -name $i.ogg -delete; done\n\necho \"Tweaking Data contents...\"\n#move Lua maps in Missions\nmkdir ${PROJECT_DIR}/Data/Missions/Maps/\nmv ${PROJECT_DIR}/Data/Maps/{Basketball,Knockball,TrophyRace,CTF_Blizzard,Control} ${PROJECT_DIR}/Data/Missions/Maps/\n#workaround for missing map in CTF_Blizzard\nln -s ../../../Maps/Blizzard/map.png ${PROJECT_DIR}/Data/Missions/Maps/CTF_Blizzard/map.png\n#remove cfg files since we have plists\nfind ${PROJECT_DIR}/Data/Scripts -name *.cfg -delete\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\necho \"Done\""; + shellScript = "#copy new stuff over old stuff\nrm -rf ${PROJECT_DIR}/Data\n\n#create config.inc\necho \"Updating config file...\"\nPROTO=`cat ${PROJECT_DIR}/../../CMakeLists.txt | grep HEDGEWARS_PROTO_VER | cut -d ' ' -f 2 | cut -d ')' -f 1`\nMAJN=`cat ${PROJECT_DIR}/../../CMakeLists.txt | grep CPACK_PACKAGE_VERSION_MAJOR | xargs | cut -d ' ' -f 2 |cut -d ')' -f 1`\nMINN=`cat ${PROJECT_DIR}/../../CMakeLists.txt | grep CPACK_PACKAGE_VERSION_MINOR | xargs | cut -d ' ' -f 2 |cut -d ')' -f 1`\nPATN=`cat ${PROJECT_DIR}/../../CMakeLists.txt | grep CPACK_PACKAGE_VERSION_PATCH | xargs | cut -d ' ' -f 2 | cut -d '$' -f 1`\nREVN=-`/usr/local/bin/hg id -n ${PROJECT_DIR}/../../`\necho \"const cNetProtoVersion = $PROTO; const cVersionString = '${MAJN}.${MINN}.${PATN}${REVN}'; const cLuaLibrary = '';\" > ${PROJECT_DIR}/../../hedgewars/config.inc\n\necho \"Copying Data...\"\ncp -R ${PROJECT_DIR}/../../share/hedgewars/Data ${PROJECT_DIR}/Data\n\n#copy some files from QTfrontend/res\necho \"Fetching additional graphics 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/icon*.png ${PROJECT_DIR}/Data/Graphics/Btn/\ncp ${PROJECT_DIR}/../../QTfrontend/res/StatsMedal*.png ${PROJECT_DIR}/Data/Graphics/Btn/\ncp ${PROJECT_DIR}/../../QTfrontend/res/ammopic.png ${PROJECT_DIR}/Data/Graphics/Btn/iconAmmo.png\ncp -R ${PROJECT_DIR}/../../QTfrontend/res/botlevels ${PROJECT_DIR}/Data/Graphics/Hedgehog/botlevels/\n\necho \"Removing text and dummy files...\"\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 *.psd -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, misc stuff\nrm -rf ${PROJECT_DIR}/Data/Maps/{test*,Ruler}\nrm -rf ${PROJECT_DIR}/Data/Graphics/Hats/{TeamCap,TeamHeadband,TeamHair}\nrm -rf ${PROJECT_DIR}/Data/misc/\n\n#delete forbidden maps and WIP themes (remember to check that no Map uses them)\nrm -rf ${PROJECT_DIR}/Data/Maps/{Cheese,FlightJoust}\nrm -rf ${PROJECT_DIR}/Data/Themes/{Beach,Digital}\n\n#delete unused 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\necho \"Handling audio files...\"\n#delete the Classic voice\nrm -rf ${PROJECT_DIR}/Data/Sounds/voices/Classic\n#delete the main theme file\nrm -rf ${PROJECT_DIR}/Data/Music/main_theme.ogg\n#copy mono audio\ncp -R ${PROJECT_DIR}/Audio/* ${PROJECT_DIR}/Data/\n#remove unused voices\nfor i in {Amazing,Brilliant,Bugger,Bungee,Cutitout,Drat,Excellent,Fire,FlawlessPossibility,Gonnagetyou,Grenade,Hmm,Justyouwait,Leavemealone,Ohdear,Ouch,Perfect,Revenge,Runaway,Solong,Thisoneismine,VictoryPossibility,Watchthis,Whatthe,Whoopsee}; do find Data/Sounds/voices/ -name $i.ogg -delete; done\n\necho \"Tweaking Data contents...\"\n#move Lua maps in Missions\nmkdir ${PROJECT_DIR}/Data/Missions/Maps/\nmv ${PROJECT_DIR}/Data/Maps/{Basketball,Knockball,TrophyRace,CTF_Blizzard,Control} ${PROJECT_DIR}/Data/Missions/Maps/\n#workaround for missing map in CTF_Blizzard\nln -s ../../../Maps/Blizzard/map.png ${PROJECT_DIR}/Data/Missions/Maps/CTF_Blizzard/map.png\n#remove cfg files since we have plists\nfind ${PROJECT_DIR}/Data/Scripts -name *.cfg -delete\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\necho \"Done\""; showEnvVarsInLog = 0; }; 9283011B0F10CB2D00CC5A3C /* Build libfpc.a */ = { diff -r c3a8cab64fcb -r 306cedbeb213 project_files/HedgewarsMobile/Info.plist --- a/project_files/HedgewarsMobile/Info.plist Tue Sep 20 23:43:52 2011 +0200 +++ b/project_files/HedgewarsMobile/Info.plist Wed Sep 21 02:05:42 2011 +0200 @@ -31,10 +31,12 @@ 1.3.1 LSRequiresIPhoneOS + UIPrerenderedIcon + + UIStatusBarHidden + UILaunchImageFile~ipad Default-ipad - UIStatusBarHidden - UISupportedInterfaceOrientations UIInterfaceOrientationLandscapeLeft diff -r c3a8cab64fcb -r 306cedbeb213 project_files/HedgewarsMobile/Resources/Frontend/background@2x~iphone.png Binary file project_files/HedgewarsMobile/Resources/Frontend/background@2x~iphone.png has changed diff -r c3a8cab64fcb -r 306cedbeb213 project_files/HedgewarsMobile/Resources/Frontend/background~iphone@2x.png Binary file project_files/HedgewarsMobile/Resources/Frontend/background~iphone@2x.png has changed diff -r c3a8cab64fcb -r 306cedbeb213 project_files/HedgewarsMobile/Resources/Frontend/localplayButton@2x~iphone.png Binary file project_files/HedgewarsMobile/Resources/Frontend/localplayButton@2x~iphone.png has changed diff -r c3a8cab64fcb -r 306cedbeb213 project_files/HedgewarsMobile/Resources/Frontend/localplayButton~iphone@2x.png Binary file project_files/HedgewarsMobile/Resources/Frontend/localplayButton~iphone@2x.png has changed diff -r c3a8cab64fcb -r 306cedbeb213 project_files/HedgewarsMobile/Resources/Frontend/smallerBackground@2x~iphone.png Binary file project_files/HedgewarsMobile/Resources/Frontend/smallerBackground@2x~iphone.png has changed diff -r c3a8cab64fcb -r 306cedbeb213 project_files/HedgewarsMobile/Resources/Frontend/smallerBackground~iphone@2x.png Binary file project_files/HedgewarsMobile/Resources/Frontend/smallerBackground~iphone@2x.png has changed diff -r c3a8cab64fcb -r 306cedbeb213 project_files/HedgewarsMobile/Resources/Frontend/title.png Binary file project_files/HedgewarsMobile/Resources/Frontend/title.png has changed diff -r c3a8cab64fcb -r 306cedbeb213 project_files/HedgewarsMobile/Resources/Frontend/title@2x.png Binary file project_files/HedgewarsMobile/Resources/Frontend/title@2x.png has changed diff -r c3a8cab64fcb -r 306cedbeb213 project_files/HedgewarsMobile/Resources/Frontend/title~iphone.png Binary file project_files/HedgewarsMobile/Resources/Frontend/title~iphone.png has changed diff -r c3a8cab64fcb -r 306cedbeb213 project_files/HedgewarsMobile/Resources/Frontend/title~iphone@2x.png Binary file project_files/HedgewarsMobile/Resources/Frontend/title~iphone@2x.png has changed diff -r c3a8cab64fcb -r 306cedbeb213 project_files/HedgewarsMobile/Resources/Icons/hedgehog.png Binary file project_files/HedgewarsMobile/Resources/Icons/hedgehog.png has changed diff -r c3a8cab64fcb -r 306cedbeb213 project_files/HedgewarsMobile/Resources/Icons/hedgehog@2x.png Binary file project_files/HedgewarsMobile/Resources/Icons/hedgehog@2x.png has changed diff -r c3a8cab64fcb -r 306cedbeb213 project_files/HedgewarsMobile/Resources/Icons/robotBadge.png Binary file project_files/HedgewarsMobile/Resources/Icons/robotBadge.png has changed diff -r c3a8cab64fcb -r 306cedbeb213 project_files/HedgewarsMobile/Resources/Icons/robotBadge@2x.png Binary file project_files/HedgewarsMobile/Resources/Icons/robotBadge@2x.png has changed diff -r c3a8cab64fcb -r 306cedbeb213 project_files/HedgewarsMobile/Resources/Icons/star.png Binary file project_files/HedgewarsMobile/Resources/Icons/star.png has changed diff -r c3a8cab64fcb -r 306cedbeb213 project_files/HedgewarsMobile/Resources/Icons/star@2x.png Binary file project_files/HedgewarsMobile/Resources/Icons/star@2x.png has changed diff -r c3a8cab64fcb -r 306cedbeb213 project_files/HedgewarsMobile/Resources/MainMenuViewController-iPhone.xib --- a/project_files/HedgewarsMobile/Resources/MainMenuViewController-iPhone.xib Tue Sep 20 23:43:52 2011 +0200 +++ b/project_files/HedgewarsMobile/Resources/MainMenuViewController-iPhone.xib Wed Sep 21 02:05:42 2011 +0200 @@ -2,9 +2,9 @@ 1056 - 10H574 + 10K549 823 - 1038.35 + 1038.36 461.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -12,7 +12,7 @@ YES - + YES @@ -71,7 +71,7 @@ IBCocoaTouchFramework NSImage - title.png + title~iphone.png @@ -631,7 +631,7 @@ localplayButton~iphone.png savesButton.png settingsButton.png - title.png + title~iphone.png YES diff -r c3a8cab64fcb -r 306cedbeb213 project_files/HedgewarsMobile/Resources/RestoreViewController-iPad.xib --- a/project_files/HedgewarsMobile/Resources/RestoreViewController-iPad.xib Tue Sep 20 23:43:52 2011 +0200 +++ b/project_files/HedgewarsMobile/Resources/RestoreViewController-iPad.xib Wed Sep 21 02:05:42 2011 +0200 @@ -2,9 +2,9 @@ 1056 - 10J869 + 10K549 823 - 1038.35 + 1038.36 461.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -105,8 +105,8 @@ 16 - 1 - MSAxIDAAA + 2 + MSAwLjc4MDM5MjIyOTYgMAA 1 @@ -305,7 +305,7 @@ YES RestoreViewController UIResponder - {{640, 244}, {540, 640}} + {{566, 244}, {540, 640}} com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin diff -r c3a8cab64fcb -r 306cedbeb213 project_files/HedgewarsMobile/Resources/RestoreViewController-iPhone.xib --- a/project_files/HedgewarsMobile/Resources/RestoreViewController-iPhone.xib Tue Sep 20 23:43:52 2011 +0200 +++ b/project_files/HedgewarsMobile/Resources/RestoreViewController-iPhone.xib Wed Sep 21 02:05:42 2011 +0200 @@ -2,9 +2,9 @@ 1056 - 10J869 + 10K549 823 - 1038.35 + 1038.36 461.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -71,8 +71,8 @@ 16 - 1 - MSAxIDAAA + 2 + MSAwLjgyNzQ1MTA1MDMgMAA 3 diff -r c3a8cab64fcb -r 306cedbeb213 project_files/HedgewarsMobile/Resources/Settings/Images/hedgehog.png Binary file project_files/HedgewarsMobile/Resources/Settings/Images/hedgehog.png has changed diff -r c3a8cab64fcb -r 306cedbeb213 project_files/HedgewarsMobile/Resources/Settings/Images/hedgehog@2x.png Binary file project_files/HedgewarsMobile/Resources/Settings/Images/hedgehog@2x.png has changed diff -r c3a8cab64fcb -r 306cedbeb213 project_files/HedgewarsMobile/Resources/Settings/Images/robotBadge.png Binary file project_files/HedgewarsMobile/Resources/Settings/Images/robotBadge.png has changed diff -r c3a8cab64fcb -r 306cedbeb213 project_files/HedgewarsMobile/Resources/Settings/Images/robotBadge@2x.png Binary file project_files/HedgewarsMobile/Resources/Settings/Images/robotBadge@2x.png has changed diff -r c3a8cab64fcb -r 306cedbeb213 project_files/HedgewarsMobile/Resources/denied@2x.png Binary file project_files/HedgewarsMobile/Resources/denied@2x.png has changed diff -r c3a8cab64fcb -r 306cedbeb213 project_files/HedgewarsMobile/Resources/surprise@2x.png Binary file project_files/HedgewarsMobile/Resources/surprise@2x.png has changed diff -r c3a8cab64fcb -r 306cedbeb213 share/hedgewars/Data/Graphics/AmmoMenu/Ammos@2x.png Binary file share/hedgewars/Data/Graphics/AmmoMenu/Ammos@2x.png has changed diff -r c3a8cab64fcb -r 306cedbeb213 share/hedgewars/Data/Graphics/AmmoMenu/Ammos_bw@2x.png Binary file share/hedgewars/Data/Graphics/AmmoMenu/Ammos_bw@2x.png has changed diff -r c3a8cab64fcb -r 306cedbeb213 share/hedgewars/Data/Graphics/AmmoMenu/CMakeLists.txt --- a/share/hedgewars/Data/Graphics/AmmoMenu/CMakeLists.txt Tue Sep 20 23:43:52 2011 +0200 +++ b/share/hedgewars/Data/Graphics/AmmoMenu/CMakeLists.txt Wed Sep 21 02:05:42 2011 +0200 @@ -1,5 +1,5 @@ file(GLOB AmmoMenuSprites *.png) -list(REMOVE_ITEM AmmoMenuSprites *_iPhone.png) +list(REMOVE_ITEM AmmoMenuSprites *@2x.png) install(FILES ${AmmoMenuSprites} diff -r c3a8cab64fcb -r 306cedbeb213 share/hedgewars/Data/Graphics/CMakeLists.txt --- a/share/hedgewars/Data/Graphics/CMakeLists.txt Tue Sep 20 23:43:52 2011 +0200 +++ b/share/hedgewars/Data/Graphics/CMakeLists.txt Wed Sep 21 02:05:42 2011 +0200 @@ -6,6 +6,7 @@ add_subdirectory(SuddenDeath) file(GLOB BaseSprites *.png) +list(REMOVE_ITEM BaseSprites *@2x.png) install(FILES ${BaseSprites} diff -r c3a8cab64fcb -r 306cedbeb213 share/hedgewars/Data/Graphics/Egg@2x.png Binary file share/hedgewars/Data/Graphics/Egg@2x.png has changed diff -r c3a8cab64fcb -r 306cedbeb213 share/hedgewars/Data/Graphics/Seduction@2x.png Binary file share/hedgewars/Data/Graphics/Seduction@2x.png has changed diff -r c3a8cab64fcb -r 306cedbeb213 share/hedgewars/Data/Graphics/Target@2x.png Binary file share/hedgewars/Data/Graphics/Target@2x.png has changed diff -r c3a8cab64fcb -r 306cedbeb213 share/hedgewars/Data/Graphics/TargetBee@2x.png Binary file share/hedgewars/Data/Graphics/TargetBee@2x.png has changed diff -r c3a8cab64fcb -r 306cedbeb213 share/hedgewars/Data/Graphics/cheese@2x.png Binary file share/hedgewars/Data/Graphics/cheese@2x.png has changed