# HG changeset patch # User koda # Date 1289551786 -3600 # Node ID 3084dc7b4624f1f857f1eaf1f1ebaf4522362666 # Parent 5e3c5fe2cb1454085ac3397d48028a9fd67ab1a4# Parent bf46b4bdf27dcfae6ea511a529f5e031e08ba3cd merge this two safe commits from trunk to release branch diff -r 5e3c5fe2cb14 -r 3084dc7b4624 hedgewars/uScript.pas --- a/hedgewars/uScript.pas Thu Nov 11 22:17:54 2010 +0300 +++ b/hedgewars/uScript.pas Fri Nov 12 09:49:46 2010 +0100 @@ -52,7 +52,8 @@ uTeams, uKeys, uChat, - uStats; + uStats, + uRandom; var luaState : Plua_State; ScriptAmmoLoadout : shortstring; @@ -118,6 +119,17 @@ lc_hidemission:= 0; end; +function lc_addcaption(L : Plua_State) : LongInt; Cdecl; +begin + if lua_gettop(L) = 1 then + begin + AddCaption(lua_tostring(L, 1), cWhiteColor, capgrpMessage); + end + else + LuaError('Lua: Wrong number of parameters passed to AddCaption!'); + lc_addcaption:= 0; +end; + function lc_campaignlock(L : Plua_State) : LongInt; Cdecl; begin if lua_gettop(L) = 1 then @@ -787,6 +799,28 @@ ScriptSetAmmo(TAmmoType(lua_tointeger(L, 1)), lua_tointeger(L, 2), lua_tointeger(L, 3), lua_tointeger(L, 4), lua_tointeger(L, 5)); lc_setammo:= 0 end; + +function lc_getrandom(L : Plua_State) : LongInt; Cdecl; +var m : LongInt; +begin + if lua_gettop(L) <> 1 then + begin + LuaError('Lua: Wrong number of parameters passed to GetRandom!'); + lua_pushnil(L); // return value on stack (nil) + end + else + begin + m:= lua_tointeger(L, 1); + if (m > 0) then + lua_pushinteger(L, GetRandom(m)) + else + begin + LuaError('Lua: Tried to pass 0 to GetRandom!'); + lua_pushnil(L); + end + end; + lc_getrandom:= 1 +end; /////////////////// procedure ScriptPrintStack; @@ -1144,6 +1178,7 @@ lua_register(luaState, 'ParseCommand', @lc_parsecommand); lua_register(luaState, 'ShowMission', @lc_showmission); lua_register(luaState, 'HideMission', @lc_hidemission); +lua_register(luaState, 'AddCaption', @lc_addcaption); lua_register(luaState, 'SetAmmo', @lc_setammo); lua_register(luaState, 'PlaySound', @lc_playsound); lua_register(luaState, 'AddTeam', @lc_addteam); @@ -1174,6 +1209,7 @@ lua_register(luaState, 'CampaignUnlock', @lc_campaignunlock); lua_register(luaState, 'GetGearMessage', @lc_getgearmessage); lua_register(luaState, 'SetGearMessage', @lc_setgearmessage); +lua_register(luaState, 'GetRandom', @lc_getrandom); ScriptClearStack; // just to be sure stack is empty diff -r 5e3c5fe2cb14 -r 3084dc7b4624 project_files/HedgewarsMobile/Classes/GameSetup.m --- a/project_files/HedgewarsMobile/Classes/GameSetup.m Thu Nov 11 22:17:54 2010 +0300 +++ b/project_files/HedgewarsMobile/Classes/GameSetup.m Fri Nov 12 09:49:46 2010 +0100 @@ -428,7 +428,7 @@ NSString *modelId = modelType(); if ([modelId hasPrefix:@"iPhone1"] || // = iPhone or iPhone 3G [modelId hasPrefix:@"iPod1,1"] || [modelId hasPrefix:@"iPod2,1"]) // = iPod Touch or iPod Touch 2G - tmpQuality = 0x00000001 | 0x00000002 | 0x00000040; // rqLowRes | rqBlurryLand | rqKillFlakes + tmpQuality = 0x00000001 | 0x00000002 | 0x00000008 | 0x00000040; // rqLowRes | rqBlurryLand | rqSimpleRope | rqKillFlakes else if ([modelId hasPrefix:@"iPhone2"] || // = iPhone 3GS [modelId hasPrefix:@"iPod3"]) // = iPod Touch 3G tmpQuality = 0x00000002 | 0x00000040; // rqBlurryLand | rqKillFlakes diff -r 5e3c5fe2cb14 -r 3084dc7b4624 project_files/HedgewarsMobile/Classes/GeneralSettingsViewController.m --- a/project_files/HedgewarsMobile/Classes/GeneralSettingsViewController.m Thu Nov 11 22:17:54 2010 +0300 +++ b/project_files/HedgewarsMobile/Classes/GeneralSettingsViewController.m Fri Nov 12 09:49:46 2010 +0100 @@ -107,7 +107,10 @@ return 2; break; case 2: // other stuff - return 2; + if (IS_IPAD()) + return 2; + else + return 1; break; default: DLog(@"Nope"); @@ -207,7 +210,7 @@ switchContent = (UISwitch *)cell.accessoryView; if (row == 0) { cell.textLabel.text = NSLocalizedString(@"Alternate Damage", @""); - cell.detailTextLabel.text = NSLocalizedString(@"Damage popups will notify you on every single hit a hedgehog suffers", @""); + cell.detailTextLabel.text = NSLocalizedString(@"Damage popups will notify you on every single hit", @""); switchContent.on = [[self.settingsDictionary objectForKey:@"alternate"] boolValue]; switchContent.tag = 30; } else { diff -r 5e3c5fe2cb14 -r 3084dc7b4624 project_files/HedgewarsMobile/Classes/MapConfigViewController.m --- a/project_files/HedgewarsMobile/Classes/MapConfigViewController.m Thu Nov 11 22:17:54 2010 +0300 +++ b/project_files/HedgewarsMobile/Classes/MapConfigViewController.m Fri Nov 12 09:49:46 2010 +0100 @@ -127,9 +127,6 @@ if (cell == nil) cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease]; - if (IS_IPAD()) - cell.textLabel.textColor = UICOLOR_HW_YELLOW_TEXT; - if (self.dataSourceArray == nil) [self loadDataSourceArray]; NSArray *source = [self.dataSourceArray objectAtIndex:scIndex]; @@ -138,6 +135,7 @@ cell.textLabel.text = labelString; cell.textLabel.adjustsFontSizeToFitWidth = YES; cell.textLabel.minimumFontSize = 7; + cell.textLabel.textColor = UICOLOR_HW_YELLOW_TEXT; if (isRandomness()) { UIImage *image = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/%@/icon.png",THEMES_DIRECTORY(),labelString]]; @@ -353,6 +351,7 @@ self.missionCommand = mission; // nice animation for updating the table when appropriate (on iphone) + /* if (IS_IPAD() == NO) if (((oldPage == 0 || oldPage == 2) && (newPage == 1 || newPage == 3)) || ((oldPage == 1 || oldPage == 3) && (newPage == 0 || newPage == 2)) || @@ -362,6 +361,7 @@ self.tableView.frame = CGRectMake(295, 0, 185, 276); [UIView commitAnimations]; } + */ [self.tableView reloadData]; [self updatePreview]; @@ -424,14 +424,11 @@ self.staticMapCommand = @""; self.missionCommand = @""; - if (IS_IPAD()) { - if ([self.tableView respondsToSelector:@selector(setBackgroundView:)]) - [self.tableView setBackgroundView:nil]; - self.view.backgroundColor = [UIColor clearColor]; - self.tableView.separatorColor = UICOLOR_HW_YELLOW_BODER; - self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone; - self.tableView.rowHeight = 45; - } + if ([self.tableView respondsToSelector:@selector(setBackgroundView:)]) + [self.tableView setBackgroundView:nil]; + self.view.backgroundColor = [UIColor clearColor]; + self.tableView.separatorColor = UICOLOR_HW_YELLOW_BODER; + self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone; } -(void) viewWillAppear:(BOOL)animated { diff -r 5e3c5fe2cb14 -r 3084dc7b4624 project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.m --- a/project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.m Thu Nov 11 22:17:54 2010 +0300 +++ b/project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.m Fri Nov 12 09:49:46 2010 +0100 @@ -41,9 +41,20 @@ self.selectedScheme = nil; self.selectedWeapon = nil; - if ([self.tableView respondsToSelector:@selector(setBackgroundView:)]) - [self.tableView setBackgroundView:nil]; - self.view.backgroundColor = [UIColor clearColor]; + if ([self.tableView respondsToSelector:@selector(setBackgroundView:)]) { + if (IS_IPAD()) + [self.tableView setBackgroundView:nil]; + else { + UIImage *backgroundImage = [[UIImage alloc] initWithContentsOfFile:@"backgroundCenter.png"]; + UIImageView *background = [[UIImageView alloc] initWithImage:backgroundImage]; + [backgroundImage release]; + [self.tableView setBackgroundView:background]; + [background release]; + } + } else { + self.view.backgroundColor = [UIColor blackColor]; + } + self.tableView.separatorColor = UICOLOR_HW_YELLOW_BODER; self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone; } diff -r 5e3c5fe2cb14 -r 3084dc7b4624 project_files/HedgewarsMobile/Classes/TeamConfigViewController.m --- a/project_files/HedgewarsMobile/Classes/TeamConfigViewController.m Thu Nov 11 22:17:54 2010 +0300 +++ b/project_files/HedgewarsMobile/Classes/TeamConfigViewController.m Fri Nov 12 09:49:46 2010 +0100 @@ -39,9 +39,20 @@ CGSize screenSize = [[UIScreen mainScreen] bounds].size; self.view.frame = CGRectMake(0, 0, screenSize.height, screenSize.width - 44); - if ([self.tableView respondsToSelector:@selector(setBackgroundView:)]) - [self.tableView setBackgroundView:nil]; - self.view.backgroundColor = [UIColor clearColor]; + if ([self.tableView respondsToSelector:@selector(setBackgroundView:)]) { + if (IS_IPAD()) + [self.tableView setBackgroundView:nil]; + else { + UIImage *backgroundImage = [[UIImage alloc] initWithContentsOfFile:@"backgroundCenter.png"]; + UIImageView *background = [[UIImageView alloc] initWithImage:backgroundImage]; + [backgroundImage release]; + [self.tableView setBackgroundView:background]; + [background release]; + } + } else { + self.view.backgroundColor = [UIColor blackColor]; + } + self.tableView.separatorColor = UICOLOR_HW_YELLOW_BODER; self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone; } diff -r 5e3c5fe2cb14 -r 3084dc7b4624 project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj --- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Thu Nov 11 22:17:54 2010 +0300 +++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Fri Nov 12 09:49:46 2010 +0100 @@ -37,7 +37,6 @@ 611E0EE811FB20610077A41E /* cornerButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 611E0EE611FB20610077A41E /* cornerButton.png */; }; 611E12FF117BBBDA0044B62F /* Entitlements-Development.plist in Resources */ = {isa = PBXBuildFile; fileRef = 611E12FE117BBBDA0044B62F /* Entitlements-Development.plist */; }; 611EE974122A9C4100DF6938 /* clickSound.wav in Resources */ = {isa = PBXBuildFile; fileRef = 611EE973122A9C4100DF6938 /* clickSound.wav */; }; - 611EE9D9122AA10A00DF6938 /* backSound.wav in Resources */ = {isa = PBXBuildFile; fileRef = 611EE9D7122AA10A00DF6938 /* backSound.wav */; }; 611EE9DA122AA10A00DF6938 /* selSound.wav in Resources */ = {isa = PBXBuildFile; fileRef = 611EE9D8122AA10A00DF6938 /* selSound.wav */; }; 611EEAEE122B2A4D00DF6938 /* HelpPageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 611EEAEC122B2A4D00DF6938 /* HelpPageViewController.m */; }; 611EEAEF122B2A4D00DF6938 /* HelpPageLobbyViewController-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 611EEAED122B2A4D00DF6938 /* HelpPageLobbyViewController-iPad.xib */; }; @@ -127,7 +126,10 @@ 617989BE114AB47A00BA94A9 /* libSDL_net.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 617989BB114AB47500BA94A9 /* libSDL_net.a */; }; 61798A14114AB65C00BA94A9 /* libSDL_ttf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 61798A13114AB65600BA94A9 /* libSDL_ttf.a */; }; 61799289114AE08700BA94A9 /* Data in Resources */ = {isa = PBXBuildFile; fileRef = 61798A5E114AE08600BA94A9 /* Data */; }; - 6183D83E11E2BCE200A88903 /* LI-ipad-Landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 6183D83C11E2BCE200A88903 /* LI-ipad-Landscape.png */; }; + 61808A4B128C901B005D0E2F /* startButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 61808A4A128C901B005D0E2F /* startButton.png */; }; + 61808A5D128C930A005D0E2F /* backSound.wav in Resources */ = {isa = PBXBuildFile; fileRef = 611EE9D7122AA10A00DF6938 /* backSound.wav */; }; + 61808A6F128C94E1005D0E2F /* backgroundTop.png in Resources */ = {isa = PBXBuildFile; fileRef = 61808A6E128C94E1005D0E2F /* backgroundTop.png */; }; + 6183D83E11E2BCE200A88903 /* Default-ipad-Landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 6183D83C11E2BCE200A88903 /* Default-ipad-Landscape.png */; }; 61842B24122B619D0096E335 /* HelpPageInGameViewController-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 61842B23122B619D0096E335 /* HelpPageInGameViewController-iPad.xib */; }; 61842B3E122B65BD0096E335 /* helpabove.png in Resources */ = {isa = PBXBuildFile; fileRef = 61842B3D122B65BD0096E335 /* helpabove.png */; }; 61842B40122B66280096E335 /* helpleft.png in Resources */ = {isa = PBXBuildFile; fileRef = 61842B3F122B66280096E335 /* helpleft.png */; }; @@ -142,15 +144,12 @@ 61A1188511683A8C00359010 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61A117FE1168322700359010 /* CoreGraphics.framework */; settings = {ATTRIBUTES = (Required, ); }; }; 61A118D311683CD100359010 /* HedgewarsTitle.png in Resources */ = {isa = PBXBuildFile; fileRef = 611FD9CB1155A28C00C2203D /* HedgewarsTitle.png */; }; 61A670BE12747D8900B06CE7 /* borderBottom.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F903E911DF58550068B24D /* borderBottom.png */; }; - 61A670BF12747D9100B06CE7 /* borderTop.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F903EA11DF58550068B24D /* borderTop.png */; }; 61A670C012747D9B00B06CE7 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 6183D83D11E2BCE200A88903 /* Default.png */; }; 61A670C112747DB900B06CE7 /* MainMenuViewController-iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6165924C11CA9CB400D6E256 /* MainMenuViewController-iPhone.xib */; }; 61A670C212747DBD00B06CE7 /* MapConfigViewController-iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6165924E11CA9CB400D6E256 /* MapConfigViewController-iPhone.xib */; }; - 61A670FA12747E0000B06CE7 /* playButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F903EC11DF58550068B24D /* playButton.png */; }; 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 */; }; @@ -875,7 +874,9 @@ 617989B3114AB47500BA94A9 /* SDL_net.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL_net.xcodeproj; path = "../../../Library/SDL-1.3/SDL_net/Xcode-iPhoneOS/SDL_net.xcodeproj"; sourceTree = SOURCE_ROOT; }; 61798A0B114AB65600BA94A9 /* SDL_ttf.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL_ttf.xcodeproj; path = "../../../Library/SDL-1.3/SDL_ttf/Xcode-iPhoneOS/SDL_ttf.xcodeproj"; sourceTree = SOURCE_ROOT; }; 61798A5E114AE08600BA94A9 /* Data */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Data; sourceTree = ""; }; - 6183D83C11E2BCE200A88903 /* LI-ipad-Landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "LI-ipad-Landscape.png"; path = "Resources/Icons/LI-ipad-Landscape.png"; sourceTree = ""; }; + 61808A4A128C901B005D0E2F /* startButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = startButton.png; path = "Resources/Frontend-iPhone/startButton.png"; sourceTree = ""; }; + 61808A6E128C94E1005D0E2F /* backgroundTop.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = backgroundTop.png; path = "Resources/Frontend-iPhone/backgroundTop.png"; sourceTree = ""; }; + 6183D83C11E2BCE200A88903 /* Default-ipad-Landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-ipad-Landscape.png"; path = "Resources/Icons/Default-ipad-Landscape.png"; sourceTree = ""; }; 6183D83D11E2BCE200A88903 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Default.png; path = Resources/Icons/Default.png; sourceTree = ""; }; 61842B23122B619D0096E335 /* HelpPageInGameViewController-iPad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "HelpPageInGameViewController-iPad.xib"; path = "../Resources/HelpPageInGameViewController-iPad.xib"; sourceTree = ""; }; 61842B3D122B65BD0096E335 /* helpabove.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = helpabove.png; path = Resources/Overlay/helpabove.png; sourceTree = ""; }; @@ -924,16 +925,8 @@ 61F7A43511E290650040BA66 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon.png; path = Resources/Icons/Icon.png; sourceTree = ""; }; 61F7A43611E290650040BA66 /* Icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon@2x.png"; path = "Resources/Icons/Icon@2x.png"; sourceTree = ""; }; 61F7A43711E290650040BA66 /* iTunesArtwork.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = iTunesArtwork.png; path = Resources/Icons/iTunesArtwork.png; sourceTree = ""; }; - 61F903E411DF58550068B24D /* backgroundBottom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = backgroundBottom.png; path = "Resources/Frontend-iPhone/backgroundBottom.png"; sourceTree = ""; }; 61F903E511DF58550068B24D /* backgroundCenter.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = backgroundCenter.png; path = "Resources/Frontend-iPhone/backgroundCenter.png"; sourceTree = ""; }; - 61F903E611DF58550068B24D /* backgroundLeft.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = backgroundLeft.png; path = "Resources/Frontend-iPhone/backgroundLeft.png"; sourceTree = ""; }; - 61F903E711DF58550068B24D /* backgroundRight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = backgroundRight.png; path = "Resources/Frontend-iPhone/backgroundRight.png"; sourceTree = ""; }; - 61F903E811DF58550068B24D /* backgroundTop.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = backgroundTop.png; path = "Resources/Frontend-iPhone/backgroundTop.png"; sourceTree = ""; }; 61F903E911DF58550068B24D /* borderBottom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = borderBottom.png; path = "Resources/Frontend-iPhone/borderBottom.png"; sourceTree = ""; }; - 61F903EA11DF58550068B24D /* borderTop.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = borderTop.png; path = "Resources/Frontend-iPhone/borderTop.png"; sourceTree = ""; }; - 61F903EB11DF58550068B24D /* networkButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = networkButton.png; path = "Resources/Frontend-iPhone/networkButton.png"; sourceTree = ""; }; - 61F903EC11DF58550068B24D /* playButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = playButton.png; path = "Resources/Frontend-iPhone/playButton.png"; sourceTree = ""; }; - 61F903ED11DF58550068B24D /* storeButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = storeButton.png; path = "Resources/Frontend-iPhone/storeButton.png"; sourceTree = ""; }; 61F9040811DF58B00068B24D /* settingsButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = settingsButton.png; path = Resources/settingsButton.png; sourceTree = ""; }; 61F9040A11DF59370068B24D /* background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = background.png; path = "Resources/Frontend-iPad/background.png"; sourceTree = ""; }; 61F9040C11DF59D10068B24D /* localplayButton.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = localplayButton.png; path = "Resources/Frontend-iPad/localplayButton.png"; sourceTree = ""; }; @@ -1051,8 +1044,7 @@ 611EE9D7122AA10A00DF6938 /* backSound.wav */, 611EE9D8122AA10A00DF6938 /* selSound.wav */, 61F7A42811E2905C0040BA66 /* Icons */, - 61F903FA11DF58680068B24D /* Frontend-iPad */, - 61F903E311DF584D0068B24D /* Frontend-iPhone */, + 61F903FA11DF58680068B24D /* Frontend */, 6179936611501D1E00BA94A9 /* Overlay */, 61798A5E114AE08600BA94A9 /* Data */, 6187AEA5120781B900B31A27 /* Settings */, @@ -1389,7 +1381,7 @@ children = ( 61E2F7421283752C00E12521 /* fb.png */, 61E2F7431283752C00E12521 /* tw.png */, - 6183D83C11E2BCE200A88903 /* LI-ipad-Landscape.png */, + 6183D83C11E2BCE200A88903 /* Default-ipad-Landscape.png */, 6183D83D11E2BCE200A88903 /* Default.png */, 61F7A43111E290650040BA66 /* Icon-72.png */, 61F7A43211E290650040BA66 /* Icon-Small-50.png */, @@ -1402,37 +1394,24 @@ name = Icons; sourceTree = ""; }; - 61F903E311DF584D0068B24D /* Frontend-iPhone */ = { + 61F903FA11DF58680068B24D /* Frontend */ = { isa = PBXGroup; children = ( 619C09E911E8B8D600F1DF16 /* title_small.png */, - 61F903E411DF58550068B24D /* backgroundBottom.png */, + 61808A6E128C94E1005D0E2F /* backgroundTop.png */, 61F903E511DF58550068B24D /* backgroundCenter.png */, - 61F903E611DF58550068B24D /* backgroundLeft.png */, - 61F903E711DF58550068B24D /* backgroundRight.png */, - 61F903E811DF58550068B24D /* backgroundTop.png */, 61F903E911DF58550068B24D /* borderBottom.png */, - 61F903EA11DF58550068B24D /* borderTop.png */, - 61F903EB11DF58550068B24D /* networkButton.png */, - 61F903EC11DF58550068B24D /* playButton.png */, - 61F903ED11DF58550068B24D /* storeButton.png */, - ); - name = "Frontend-iPhone"; - sourceTree = ""; - }; - 61F903FA11DF58680068B24D /* Frontend-iPad */ = { - isa = PBXGroup; - children = ( 615AD96112073B4D00F2FF04 /* startGameButton.png */, 615AD9EA1207654E00F2FF04 /* helpButton.png */, 615AD9E8120764CA00F2FF04 /* backButton.png */, + 61808A4A128C901B005D0E2F /* startButton.png */, 61EBA62811DFF2BC0048B68A /* title.png */, 61F9040C11DF59D10068B24D /* localplayButton.png */, 61F9040D11DF59D10068B24D /* netplayButton.png */, 61F9040A11DF59370068B24D /* background.png */, 61EBA62C11DFF3310048B68A /* backgroundAndTitle.png */, ); - name = "Frontend-iPad"; + name = Frontend; sourceTree = ""; }; 9283015C0F10E48900CC5A3C /* Pascal Sources */ = { @@ -2131,7 +2110,7 @@ 61F7A43A11E290650040BA66 /* Icon-Small.png in Resources */, 61F7A43C11E290650040BA66 /* Icon.png in Resources */, 61F7A43E11E290650040BA66 /* iTunesArtwork.png in Resources */, - 6183D83E11E2BCE200A88903 /* LI-ipad-Landscape.png in Resources */, + 6183D83E11E2BCE200A88903 /* Default-ipad-Landscape.png in Resources */, 6129B9F711EFB04D0017E305 /* denied.png in Resources */, 611E0EE711FB20610077A41E /* ammoButton.png in Resources */, 611E0EE811FB20610077A41E /* cornerButton.png in Resources */, @@ -2142,7 +2121,6 @@ 615AD9EB1207654E00F2FF04 /* helpButton.png in Resources */, 6187AEBD120781B900B31A27 /* Settings in Resources */, 611EE974122A9C4100DF6938 /* clickSound.wav in Resources */, - 611EE9D9122AA10A00DF6938 /* backSound.wav in Resources */, 611EE9DA122AA10A00DF6938 /* selSound.wav in Resources */, 611EEAEF122B2A4D00DF6938 /* HelpPageLobbyViewController-iPad.xib in Resources */, 611EEBC1122B34A800DF6938 /* helpingame.png in Resources */, @@ -2160,11 +2138,9 @@ 610D5FB21270E2660033333A /* Icon-Small@2x.png in Resources */, 610D5FB31270E26C0033333A /* Icon@2x.png in Resources */, 61A670BE12747D8900B06CE7 /* borderBottom.png in Resources */, - 61A670BF12747D9100B06CE7 /* borderTop.png in Resources */, 61A670C012747D9B00B06CE7 /* Default.png in Resources */, 61A670C112747DB900B06CE7 /* MainMenuViewController-iPhone.xib in Resources */, 61A670C212747DBD00B06CE7 /* MapConfigViewController-iPhone.xib in Resources */, - 61A670FA12747E0000B06CE7 /* playButton.png in Resources */, 61A670FB12747E0D00B06CE7 /* title_small.png in Resources */, 61A6710612747E4000B06CE7 /* backgroundCenter.png in Resources */, 614AE65D127D090A0070BF5F /* smallerBackground~ipad.png in Resources */, @@ -2173,7 +2149,9 @@ 61E2F7451283752C00E12521 /* tw.png in Resources */, 61DF0EDC1284DF2300F3F10B /* HelpPageLobbyViewController-iPhone.xib in Resources */, 61DF0F211284F72A00F3F10B /* HelpPageInGameViewController-iPhone.xib in Resources */, - 61B9C9CA12871E1300B4D51F /* storeButton.png in Resources */, + 61808A4B128C901B005D0E2F /* startButton.png in Resources */, + 61808A5D128C930A005D0E2F /* backSound.wav in Resources */, + 61808A6F128C94E1005D0E2F /* backgroundTop.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2191,7 +2169,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\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,TrophyRace} ${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\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,TrophyRace} ${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 5e3c5fe2cb14 -r 3084dc7b4624 project_files/HedgewarsMobile/Info.plist --- a/project_files/HedgewarsMobile/Info.plist Thu Nov 11 22:17:54 2010 +0300 +++ b/project_files/HedgewarsMobile/Info.plist Fri Nov 12 09:49:46 2010 +0100 @@ -34,7 +34,7 @@ UIApplicationExitsOnSuspend UILaunchImageFile~ipad - LI-ipad + Default-ipad UIStatusBarHidden UISupportedInterfaceOrientations diff -r 5e3c5fe2cb14 -r 3084dc7b4624 project_files/HedgewarsMobile/Resources/Frontend-iPhone/backgroundBottom.png Binary file project_files/HedgewarsMobile/Resources/Frontend-iPhone/backgroundBottom.png has changed diff -r 5e3c5fe2cb14 -r 3084dc7b4624 project_files/HedgewarsMobile/Resources/Frontend-iPhone/backgroundCenter.png Binary file project_files/HedgewarsMobile/Resources/Frontend-iPhone/backgroundCenter.png has changed diff -r 5e3c5fe2cb14 -r 3084dc7b4624 project_files/HedgewarsMobile/Resources/Frontend-iPhone/backgroundLeft.png Binary file project_files/HedgewarsMobile/Resources/Frontend-iPhone/backgroundLeft.png has changed diff -r 5e3c5fe2cb14 -r 3084dc7b4624 project_files/HedgewarsMobile/Resources/Frontend-iPhone/backgroundRight.png Binary file project_files/HedgewarsMobile/Resources/Frontend-iPhone/backgroundRight.png has changed diff -r 5e3c5fe2cb14 -r 3084dc7b4624 project_files/HedgewarsMobile/Resources/Frontend-iPhone/backgroundTop.png Binary file project_files/HedgewarsMobile/Resources/Frontend-iPhone/backgroundTop.png has changed diff -r 5e3c5fe2cb14 -r 3084dc7b4624 project_files/HedgewarsMobile/Resources/Frontend-iPhone/borderBottom.png Binary file project_files/HedgewarsMobile/Resources/Frontend-iPhone/borderBottom.png has changed diff -r 5e3c5fe2cb14 -r 3084dc7b4624 project_files/HedgewarsMobile/Resources/Frontend-iPhone/borderTop.png Binary file project_files/HedgewarsMobile/Resources/Frontend-iPhone/borderTop.png has changed diff -r 5e3c5fe2cb14 -r 3084dc7b4624 project_files/HedgewarsMobile/Resources/Frontend-iPhone/networkButton.png Binary file project_files/HedgewarsMobile/Resources/Frontend-iPhone/networkButton.png has changed diff -r 5e3c5fe2cb14 -r 3084dc7b4624 project_files/HedgewarsMobile/Resources/Frontend-iPhone/playButton.png Binary file project_files/HedgewarsMobile/Resources/Frontend-iPhone/playButton.png has changed diff -r 5e3c5fe2cb14 -r 3084dc7b4624 project_files/HedgewarsMobile/Resources/Frontend-iPhone/startButton.png Binary file project_files/HedgewarsMobile/Resources/Frontend-iPhone/startButton.png has changed diff -r 5e3c5fe2cb14 -r 3084dc7b4624 project_files/HedgewarsMobile/Resources/Frontend-iPhone/storeButton.png Binary file project_files/HedgewarsMobile/Resources/Frontend-iPhone/storeButton.png has changed diff -r 5e3c5fe2cb14 -r 3084dc7b4624 project_files/HedgewarsMobile/Resources/GameConfigViewController.xib --- a/project_files/HedgewarsMobile/Resources/GameConfigViewController.xib Thu Nov 11 22:17:54 2010 +0300 +++ b/project_files/HedgewarsMobile/Resources/GameConfigViewController.xib Fri Nov 12 09:49:46 2010 +0100 @@ -2,9 +2,9 @@ 1024 - 10F569 + 10H574 804 - 1038.29 + 1038.35 461.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -94,8 +94,8 @@ - 1 - MC4yNTA5ODA0MDcgMC41MDE5NjA4MTQgMAA + 2 + MC4yMzEzNzI1NjUgMCAwLjQ2Mjc0NTEzMDEAA diff -r 5e3c5fe2cb14 -r 3084dc7b4624 project_files/HedgewarsMobile/Resources/Icons/Default-ipad-Landscape.png Binary file project_files/HedgewarsMobile/Resources/Icons/Default-ipad-Landscape.png has changed diff -r 5e3c5fe2cb14 -r 3084dc7b4624 project_files/HedgewarsMobile/Resources/Icons/Default.png Binary file project_files/HedgewarsMobile/Resources/Icons/Default.png has changed diff -r 5e3c5fe2cb14 -r 3084dc7b4624 project_files/HedgewarsMobile/Resources/Icons/LI-ipad-Landscape.png Binary file project_files/HedgewarsMobile/Resources/Icons/LI-ipad-Landscape.png has changed diff -r 5e3c5fe2cb14 -r 3084dc7b4624 project_files/HedgewarsMobile/Resources/MainMenuViewController-iPhone.xib --- a/project_files/HedgewarsMobile/Resources/MainMenuViewController-iPhone.xib Thu Nov 11 22:17:54 2010 +0300 +++ b/project_files/HedgewarsMobile/Resources/MainMenuViewController-iPhone.xib Fri Nov 12 09:49:46 2010 +0100 @@ -2,9 +2,9 @@ 1024 - 10F569 + 10H574 804 - 1038.29 + 1038.35 461.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -45,7 +45,7 @@ 274 - {{0, 21}, {480, 278}} + {480, 300} 3 @@ -56,13 +56,25 @@ IBCocoaTouchFramework NSImage - backgroundCenter.png + backgroundTop.png + + + + + 292 + {{0, 300}, {480, 20}} + + NO + IBCocoaTouchFramework + + NSImage + borderBottom.png 293 - {{120, 44}, {240, 52}} + {{109, 35}, {262, 84}} NO NO @@ -74,40 +86,10 @@ title_small.png - - - 266 - {{0, 297}, {480, 23}} - - NO - NO - 4 - NO - IBCocoaTouchFramework - - NSImage - borderBottom.png - - - - - 290 - {480, 17} - - NO - NO - 4 - NO - IBCocoaTouchFramework - - NSImage - borderTop.png - - 289 - {{130, 178}, {220, 52}} + {{208, 169}, {64, 64}} 1 @@ -137,13 +119,13 @@ NSImage - playButton.png + startButton.png 269 - {{401, 247}, {59, 52}} + {{355, 208}, {59, 52}} NO NO @@ -166,7 +148,7 @@ 269 - {{20, 247}, {59, 52}} + {{66, 208}, {59, 52}} NO NO @@ -189,7 +171,7 @@ 292 - {{231, 111}, {18, 19}} + {{20, 19}, {18, 19}} NO 0.5 @@ -283,13 +265,12 @@ YES + - + - - - + @@ -305,8 +286,8 @@ - 35 - + 23 + @@ -315,8 +296,18 @@ - 23 - + 45 + + + + + 41 + + + + + 43 + @@ -329,21 +320,6 @@ - - 36 - - - - - 41 - - - - - 43 - - - @@ -355,54 +331,50 @@ 1.IBEditorWindowLastContentRect 1.IBPluginDependency 22.IBPluginDependency + 22.IBViewBoundsToFrameTransform 23.IBPluginDependency 23.IBViewBoundsToFrameTransform 24.IBPluginDependency 24.IBViewBoundsToFrameTransform 28.IBPluginDependency 28.IBViewBoundsToFrameTransform - 35.IBPluginDependency - 35.IBViewBoundsToFrameTransform - 36.IBPluginDependency - 36.IBViewBoundsToFrameTransform 41.IBPluginDependency 41.IBViewBoundsToFrameTransform 43.IBPluginDependency 43.IBViewBoundsToFrameTransform + 45.IBPluginDependency YES MainMenuViewController UIResponder - {{478, 779}, {480, 320}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin + {{517, 519}, {480, 320}} com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - P4AAAL+AAABC7AAAwpYAAA + P4AAAL+AAAAAAAAAw5UAAA com.apple.InterfaceBuilder.IBCocoaTouchPlugin - P4AAAL+AAABDAgAAw1gAAA + P4AAAL+AAABC2gAAww8AAA com.apple.InterfaceBuilder.IBCocoaTouchPlugin - AUPIgABDdwAAA + P4AAAL+AAABDTAAAw20AAA com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - AQAAAABDlIAAA + P4AAAL+AAABDsYAAw4QAAA com.apple.InterfaceBuilder.IBCocoaTouchPlugin - P4AAAL+AAABDZwAAwwcAAA + P4AAAL+AAABBcAAAwhAAAA com.apple.InterfaceBuilder.IBCocoaTouchPlugin - P4AAAL+AAABDywAAw5cAAA + P4AAAL+AAABCjAAAw4QAAA + com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -421,7 +393,7 @@ - 44 + 45 @@ -668,22 +640,20 @@ YES YES - backgroundCenter.png + backgroundTop.png borderBottom.png - borderTop.png - playButton.png savesButton.png settingsButton.png + startButton.png title_small.png YES - {480, 278} - {480, 21} - {480, 21} - {216, 51} + {480, 300} + {480, 20} {61, 59} {61, 59} + {64, 64} {262, 84} diff -r 5e3c5fe2cb14 -r 3084dc7b4624 project_files/HedgewarsMobile/Resources/MapConfigViewController-iPhone.xib --- a/project_files/HedgewarsMobile/Resources/MapConfigViewController-iPhone.xib Thu Nov 11 22:17:54 2010 +0300 +++ b/project_files/HedgewarsMobile/Resources/MapConfigViewController-iPhone.xib Fri Nov 12 09:49:46 2010 +0100 @@ -2,9 +2,9 @@ 1024 - 10F569 + 10H574 804 - 1038.29 + 1038.35 461.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -42,6 +42,18 @@ 274 YES + + + 292 + {480, 276} + + NO + IBCocoaTouchFramework + + NSImage + backgroundCenter.png + + 292 @@ -87,6 +99,10 @@ + + 2 + MC4wMjM1Mjk0MTQwOSAwLjM3NjQ3MDYyNTQgMAA + @@ -130,7 +146,7 @@ 292 - {{28, 234}, {42, 21}} + {{20, 221}, {48, 35}} NO YES @@ -138,9 +154,9 @@ NO IBCocoaTouchFramework ... - - 1 - MCAwIDAAA + + 2 + MC45NDkwMTk2NzA1IDAuNzY4NjI3NTI0NCAwAA 1 @@ -150,7 +166,7 @@ 292 - {{100, 203}, {145, 29}} + {{88, 209}, {169, 29}} NO YES @@ -163,7 +179,10 @@ 24 16 - + + 2 + MC45NDExNzY1MzM3IDAuODE1Njg2MzQ1MSAwAA + 1 10 @@ -174,16 +193,22 @@ 274 {{284, 0}, {196, 276}} - + + 3 + MCAwAA + + NO YES + NO IBCocoaTouchFramework NO - 1 + 1 + 2 0 YES 44 - 22 - 22 + 10 + 10 {480, 276} @@ -331,11 +356,12 @@ YES - - + + + @@ -381,6 +407,11 @@ Table View (Themes) + + 35 + + + @@ -392,26 +423,48 @@ 1.IBEditorWindowLastContentRect 1.IBPluginDependency 11.IBPluginDependency + 11.IBViewBoundsToFrameTransform 17.IBPluginDependency + 17.IBViewBoundsToFrameTransform 25.IBPluginDependency + 25.IBViewBoundsToFrameTransform + 35.IBPluginDependency + 35.IBViewBoundsToFrameTransform 7.IBPluginDependency 8.IBPluginDependency 9.CustomClassName 9.IBPluginDependency + 9.IBViewBoundsToFrameTransform YES MapConfigViewController UIResponder - {{744, 568}, {480, 320}} + {{507, 233}, {480, 320}} com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + P4AAAL+AAABB6AAAw3kAAA + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + P4AAAL+AAABCyAAAw2YAAA + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + P4AAAL+AAABDjgAAw4kAAA + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + P4AAAL+AAAAAAAAAw58AAA + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin MapPreviewButtonView com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + P4AAAL+AAABBUAAAwxIAAA + @@ -430,7 +483,7 @@ - 34 + 35 @@ -700,6 +753,14 @@ + UIImageView + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIImageView.h + + + UILabel UIView @@ -826,6 +887,10 @@ YES ../Hedgewars.xcodeproj 3 + + backgroundCenter.png + {480, 276} + 123