--- 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
--- 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
--- 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 {
--- 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 {
--- 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;
}
--- 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;
}
--- 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 = "<group>"; };
- 6183D83C11E2BCE200A88903 /* LI-ipad-Landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "LI-ipad-Landscape.png"; path = "Resources/Icons/LI-ipad-Landscape.png"; sourceTree = "<group>"; };
+ 61808A4A128C901B005D0E2F /* startButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = startButton.png; path = "Resources/Frontend-iPhone/startButton.png"; sourceTree = "<group>"; };
+ 61808A6E128C94E1005D0E2F /* backgroundTop.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = backgroundTop.png; path = "Resources/Frontend-iPhone/backgroundTop.png"; sourceTree = "<group>"; };
+ 6183D83C11E2BCE200A88903 /* Default-ipad-Landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-ipad-Landscape.png"; path = "Resources/Icons/Default-ipad-Landscape.png"; sourceTree = "<group>"; };
6183D83D11E2BCE200A88903 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Default.png; path = Resources/Icons/Default.png; sourceTree = "<group>"; };
61842B23122B619D0096E335 /* HelpPageInGameViewController-iPad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "HelpPageInGameViewController-iPad.xib"; path = "../Resources/HelpPageInGameViewController-iPad.xib"; sourceTree = "<group>"; };
61842B3D122B65BD0096E335 /* helpabove.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = helpabove.png; path = Resources/Overlay/helpabove.png; sourceTree = "<group>"; };
@@ -924,16 +925,8 @@
61F7A43511E290650040BA66 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon.png; path = Resources/Icons/Icon.png; sourceTree = "<group>"; };
61F7A43611E290650040BA66 /* Icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon@2x.png"; path = "Resources/Icons/Icon@2x.png"; sourceTree = "<group>"; };
61F7A43711E290650040BA66 /* iTunesArtwork.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = iTunesArtwork.png; path = Resources/Icons/iTunesArtwork.png; sourceTree = "<group>"; };
- 61F903E411DF58550068B24D /* backgroundBottom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = backgroundBottom.png; path = "Resources/Frontend-iPhone/backgroundBottom.png"; sourceTree = "<group>"; };
61F903E511DF58550068B24D /* backgroundCenter.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = backgroundCenter.png; path = "Resources/Frontend-iPhone/backgroundCenter.png"; sourceTree = "<group>"; };
- 61F903E611DF58550068B24D /* backgroundLeft.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = backgroundLeft.png; path = "Resources/Frontend-iPhone/backgroundLeft.png"; sourceTree = "<group>"; };
- 61F903E711DF58550068B24D /* backgroundRight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = backgroundRight.png; path = "Resources/Frontend-iPhone/backgroundRight.png"; sourceTree = "<group>"; };
- 61F903E811DF58550068B24D /* backgroundTop.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = backgroundTop.png; path = "Resources/Frontend-iPhone/backgroundTop.png"; sourceTree = "<group>"; };
61F903E911DF58550068B24D /* borderBottom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = borderBottom.png; path = "Resources/Frontend-iPhone/borderBottom.png"; sourceTree = "<group>"; };
- 61F903EA11DF58550068B24D /* borderTop.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = borderTop.png; path = "Resources/Frontend-iPhone/borderTop.png"; sourceTree = "<group>"; };
- 61F903EB11DF58550068B24D /* networkButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = networkButton.png; path = "Resources/Frontend-iPhone/networkButton.png"; sourceTree = "<group>"; };
- 61F903EC11DF58550068B24D /* playButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = playButton.png; path = "Resources/Frontend-iPhone/playButton.png"; sourceTree = "<group>"; };
- 61F903ED11DF58550068B24D /* storeButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = storeButton.png; path = "Resources/Frontend-iPhone/storeButton.png"; sourceTree = "<group>"; };
61F9040811DF58B00068B24D /* settingsButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = settingsButton.png; path = Resources/settingsButton.png; sourceTree = "<group>"; };
61F9040A11DF59370068B24D /* background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = background.png; path = "Resources/Frontend-iPad/background.png"; sourceTree = "<group>"; };
61F9040C11DF59D10068B24D /* localplayButton.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = localplayButton.png; path = "Resources/Frontend-iPad/localplayButton.png"; sourceTree = "<group>"; };
@@ -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 = "<group>";
};
- 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 = "<group>";
- };
- 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 = "<group>";
};
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 */ = {
--- 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 @@
<key>UIApplicationExitsOnSuspend</key>
<true/>
<key>UILaunchImageFile~ipad</key>
- <string>LI-ipad</string>
+ <string>Default-ipad</string>
<key>UIStatusBarHidden</key>
<true/>
<key>UISupportedInterfaceOrientations</key>
Binary file project_files/HedgewarsMobile/Resources/Frontend-iPhone/backgroundBottom.png has changed
Binary file project_files/HedgewarsMobile/Resources/Frontend-iPhone/backgroundCenter.png has changed
Binary file project_files/HedgewarsMobile/Resources/Frontend-iPhone/backgroundLeft.png has changed
Binary file project_files/HedgewarsMobile/Resources/Frontend-iPhone/backgroundRight.png has changed
Binary file project_files/HedgewarsMobile/Resources/Frontend-iPhone/backgroundTop.png has changed
Binary file project_files/HedgewarsMobile/Resources/Frontend-iPhone/borderBottom.png has changed
Binary file project_files/HedgewarsMobile/Resources/Frontend-iPhone/borderTop.png has changed
Binary file project_files/HedgewarsMobile/Resources/Frontend-iPhone/networkButton.png has changed
Binary file project_files/HedgewarsMobile/Resources/Frontend-iPhone/playButton.png has changed
Binary file project_files/HedgewarsMobile/Resources/Frontend-iPhone/startButton.png has changed
Binary file project_files/HedgewarsMobile/Resources/Frontend-iPhone/storeButton.png has changed
--- 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 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1024</int>
- <string key="IBDocument.SystemVersion">10F569</string>
+ <string key="IBDocument.SystemVersion">10H574</string>
<string key="IBDocument.InterfaceBuilderVersion">804</string>
- <string key="IBDocument.AppKitVersion">1038.29</string>
+ <string key="IBDocument.AppKitVersion">1038.35</string>
<string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -94,8 +94,8 @@
<reference ref="4"/>
</object>
<object class="NSColor" key="IBTintColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MC4yNTA5ODA0MDcgMC41MDE5NjA4MTQgMAA</bytes>
+ <int key="NSColorSpace">2</int>
+ <bytes key="NSRGB">MC4yMzEzNzI1NjUgMCAwLjQ2Mjc0NTEzMDEAA</bytes>
</object>
</object>
</object>
Binary file project_files/HedgewarsMobile/Resources/Icons/Default-ipad-Landscape.png has changed
Binary file project_files/HedgewarsMobile/Resources/Icons/Default.png has changed
Binary file project_files/HedgewarsMobile/Resources/Icons/LI-ipad-Landscape.png has changed
--- 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 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1024</int>
- <string key="IBDocument.SystemVersion">10F569</string>
+ <string key="IBDocument.SystemVersion">10H574</string>
<string key="IBDocument.InterfaceBuilderVersion">804</string>
- <string key="IBDocument.AppKitVersion">1038.29</string>
+ <string key="IBDocument.AppKitVersion">1038.35</string>
<string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -45,7 +45,7 @@
<object class="IBUIImageView" id="249993817">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">274</int>
- <string key="NSFrame">{{0, 21}, {480, 278}}</string>
+ <string key="NSFrameSize">{480, 300}</string>
<reference key="NSSuperview" ref="191373211"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
@@ -56,13 +56,25 @@
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<object class="NSCustomResource" key="IBUIImage">
<string key="NSClassName">NSImage</string>
- <string key="NSResourceName">backgroundCenter.png</string>
+ <string key="NSResourceName">backgroundTop.png</string>
+ </object>
+ </object>
+ <object class="IBUIImageView" id="745649693">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{0, 300}, {480, 20}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <object class="NSCustomResource" key="IBUIImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">borderBottom.png</string>
</object>
</object>
<object class="IBUIImageView" id="171108356">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">293</int>
- <string key="NSFrame">{{120, 44}, {240, 52}}</string>
+ <string key="NSFrame">{{109, 35}, {262, 84}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -74,40 +86,10 @@
<string key="NSResourceName">title_small.png</string>
</object>
</object>
- <object class="IBUIImageView" id="936485487">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">266</int>
- <string key="NSFrame">{{0, 297}, {480, 23}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- <int key="IBUIContentMode">4</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <object class="NSCustomResource" key="IBUIImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">borderBottom.png</string>
- </object>
- </object>
- <object class="IBUIImageView" id="821240857">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">290</int>
- <string key="NSFrameSize">{480, 17}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- <int key="IBUIContentMode">4</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <object class="NSCustomResource" key="IBUIImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">borderTop.png</string>
- </object>
- </object>
<object class="IBUIButton" id="124270424">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">289</int>
- <string key="NSFrame">{{130, 178}, {220, 52}}</string>
+ <string key="NSFrame">{{208, 169}, {64, 64}}</string>
<reference key="NSSuperview" ref="191373211"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int>
@@ -137,13 +119,13 @@
</object>
<object class="NSCustomResource" key="IBUINormalImage">
<string key="NSClassName">NSImage</string>
- <string key="NSResourceName">playButton.png</string>
+ <string key="NSResourceName">startButton.png</string>
</object>
</object>
<object class="IBUIButton" id="753723574">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">269</int>
- <string key="NSFrame">{{401, 247}, {59, 52}}</string>
+ <string key="NSFrame">{{355, 208}, {59, 52}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -166,7 +148,7 @@
<object class="IBUIButton" id="705508539">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">269</int>
- <string key="NSFrame">{{20, 247}, {59, 52}}</string>
+ <string key="NSFrame">{{66, 208}, {59, 52}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -189,7 +171,7 @@
<object class="IBUIButton" id="818907840">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{231, 111}, {18, 19}}</string>
+ <string key="NSFrame">{{20, 19}, {18, 19}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<float key="IBUIAlpha">0.5</float>
@@ -283,13 +265,12 @@
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="249993817"/>
+ <reference ref="745649693"/>
<reference ref="171108356"/>
- <reference ref="753723574"/>
+ <reference ref="818907840"/>
<reference ref="705508539"/>
<reference ref="124270424"/>
- <reference ref="818907840"/>
- <reference ref="936485487"/>
- <reference ref="821240857"/>
+ <reference ref="753723574"/>
</object>
<reference key="parent" ref="0"/>
</object>
@@ -305,8 +286,8 @@
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">35</int>
- <reference key="object" ref="821240857"/>
+ <int key="objectID">23</int>
+ <reference key="object" ref="171108356"/>
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
@@ -315,8 +296,18 @@
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">23</int>
- <reference key="object" ref="171108356"/>
+ <int key="objectID">45</int>
+ <reference key="object" ref="745649693"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">41</int>
+ <reference key="object" ref="818907840"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">43</int>
+ <reference key="object" ref="705508539"/>
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
@@ -329,21 +320,6 @@
<reference key="object" ref="753723574"/>
<reference key="parent" ref="191373211"/>
</object>
- <object class="IBObjectRecord">
- <int key="objectID">36</int>
- <reference key="object" ref="936485487"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">41</int>
- <reference key="object" ref="818907840"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">43</int>
- <reference key="object" ref="705508539"/>
- <reference key="parent" ref="191373211"/>
- </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -355,54 +331,50 @@
<string>1.IBEditorWindowLastContentRect</string>
<string>1.IBPluginDependency</string>
<string>22.IBPluginDependency</string>
+ <string>22.IBViewBoundsToFrameTransform</string>
<string>23.IBPluginDependency</string>
<string>23.IBViewBoundsToFrameTransform</string>
<string>24.IBPluginDependency</string>
<string>24.IBViewBoundsToFrameTransform</string>
<string>28.IBPluginDependency</string>
<string>28.IBViewBoundsToFrameTransform</string>
- <string>35.IBPluginDependency</string>
- <string>35.IBViewBoundsToFrameTransform</string>
- <string>36.IBPluginDependency</string>
- <string>36.IBViewBoundsToFrameTransform</string>
<string>41.IBPluginDependency</string>
<string>41.IBViewBoundsToFrameTransform</string>
<string>43.IBPluginDependency</string>
<string>43.IBViewBoundsToFrameTransform</string>
+ <string>45.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>MainMenuViewController</string>
<string>UIResponder</string>
- <string>{{478, 779}, {480, 320}}</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>{{517, 519}, {480, 320}}</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABC7AAAwpYAAA</bytes>
+ <bytes key="NSTransformStruct">P4AAAL+AAAAAAAAAw5UAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABDAgAAw1gAAA</bytes>
+ <bytes key="NSTransformStruct">P4AAAL+AAABC2gAAww8AAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<object class="NSAffineTransform">
- <bytes key="NSTransformStruct">AUPIgABDdwAAA</bytes>
+ <bytes key="NSTransformStruct">P4AAAL+AAABDTAAAw20AAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform"/>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<object class="NSAffineTransform">
- <bytes key="NSTransformStruct">AQAAAABDlIAAA</bytes>
+ <bytes key="NSTransformStruct">P4AAAL+AAABDsYAAw4QAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABDZwAAwwcAAA</bytes>
+ <bytes key="NSTransformStruct">P4AAAL+AAABBcAAAwhAAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABDywAAw5cAAA</bytes>
+ <bytes key="NSTransformStruct">P4AAAL+AAABCjAAAw4QAAA</bytes>
</object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -421,7 +393,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">44</int>
+ <int key="maxID">45</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -668,22 +640,20 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>backgroundCenter.png</string>
+ <string>backgroundTop.png</string>
<string>borderBottom.png</string>
- <string>borderTop.png</string>
- <string>playButton.png</string>
<string>savesButton.png</string>
<string>settingsButton.png</string>
+ <string>startButton.png</string>
<string>title_small.png</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>{480, 278}</string>
- <string>{480, 21}</string>
- <string>{480, 21}</string>
- <string>{216, 51}</string>
+ <string>{480, 300}</string>
+ <string>{480, 20}</string>
<string>{61, 59}</string>
<string>{61, 59}</string>
+ <string>{64, 64}</string>
<string>{262, 84}</string>
</object>
</object>
--- 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 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1024</int>
- <string key="IBDocument.SystemVersion">10F569</string>
+ <string key="IBDocument.SystemVersion">10H574</string>
<string key="IBDocument.InterfaceBuilderVersion">804</string>
- <string key="IBDocument.AppKitVersion">1038.29</string>
+ <string key="IBDocument.AppKitVersion">1038.35</string>
<string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -42,6 +42,18 @@
<int key="NSvFlags">274</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUIImageView" id="574494641">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrameSize">{480, 276}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <object class="NSCustomResource" key="IBUIImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">backgroundCenter.png</string>
+ </object>
+ </object>
<object class="IBUISegmentedControl" id="88728219">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
@@ -87,6 +99,10 @@
<reference ref="4"/>
<reference ref="4"/>
</object>
+ <object class="NSColor" key="IBTintColor">
+ <int key="NSColorSpace">2</int>
+ <bytes key="NSRGB">MC4wMjM1Mjk0MTQwOSAwLjM3NjQ3MDYyNTQgMAA</bytes>
+ </object>
</object>
<object class="IBUISlider" id="938256702">
<reference key="NSNextResponder" ref="191373211"/>
@@ -130,7 +146,7 @@
<object class="IBUILabel" id="634417433">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{28, 234}, {42, 21}}</string>
+ <string key="NSFrame">{{20, 221}, {48, 35}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
@@ -138,9 +154,9 @@
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<string key="IBUIText">...</string>
- <object class="NSColor" key="IBUITextColor" id="306081020">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MCAwIDAAA</bytes>
+ <object class="NSColor" key="IBUITextColor">
+ <int key="NSColorSpace">2</int>
+ <bytes key="NSRGB">MC45NDkwMTk2NzA1IDAuNzY4NjI3NTI0NCAwAA</bytes>
</object>
<nil key="IBUIHighlightedColor"/>
<int key="IBUIBaselineAdjustment">1</int>
@@ -150,7 +166,7 @@
<object class="IBUILabel" id="743202682">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{100, 203}, {145, 29}}</string>
+ <string key="NSFrame">{{88, 209}, {169, 29}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
@@ -163,7 +179,10 @@
<double key="NSSize">24</double>
<int key="NSfFlags">16</int>
</object>
- <reference key="IBUITextColor" ref="306081020"/>
+ <object class="NSColor" key="IBUITextColor">
+ <int key="NSColorSpace">2</int>
+ <bytes key="NSRGB">MC45NDExNzY1MzM3IDAuODE1Njg2MzQ1MSAwAA</bytes>
+ </object>
<nil key="IBUIHighlightedColor"/>
<int key="IBUIBaselineAdjustment">1</int>
<float key="IBUIMinimumFontSize">10</float>
@@ -174,16 +193,22 @@
<int key="NSvFlags">274</int>
<string key="NSFrame">{{284, 0}, {196, 276}}</string>
<reference key="NSSuperview" ref="191373211"/>
- <reference key="IBUIBackgroundColor" ref="437070330"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MCAwAA</bytes>
+ </object>
+ <bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIBouncesZoom">NO</bool>
- <int key="IBUISeparatorStyle">1</int>
+ <int key="IBUIStyle">1</int>
+ <int key="IBUISeparatorStyle">2</int>
<int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
<bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
<float key="IBUIRowHeight">44</float>
- <float key="IBUISectionHeaderHeight">22</float>
- <float key="IBUISectionFooterHeight">22</float>
+ <float key="IBUISectionHeaderHeight">10</float>
+ <float key="IBUISectionFooterHeight">10</float>
</object>
</object>
<string key="NSFrameSize">{480, 276}</string>
@@ -331,11 +356,12 @@
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="326163764"/>
- <reference ref="634417433"/>
<reference ref="565214171"/>
- <reference ref="743202682"/>
<reference ref="938256702"/>
<reference ref="88728219"/>
+ <reference ref="574494641"/>
+ <reference ref="743202682"/>
+ <reference ref="634417433"/>
</object>
<reference key="parent" ref="0"/>
</object>
@@ -381,6 +407,11 @@
<reference key="parent" ref="191373211"/>
<string key="objectName">Table View (Themes)</string>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">35</int>
+ <reference key="object" ref="574494641"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -392,26 +423,48 @@
<string>1.IBEditorWindowLastContentRect</string>
<string>1.IBPluginDependency</string>
<string>11.IBPluginDependency</string>
+ <string>11.IBViewBoundsToFrameTransform</string>
<string>17.IBPluginDependency</string>
+ <string>17.IBViewBoundsToFrameTransform</string>
<string>25.IBPluginDependency</string>
+ <string>25.IBViewBoundsToFrameTransform</string>
+ <string>35.IBPluginDependency</string>
+ <string>35.IBViewBoundsToFrameTransform</string>
<string>7.IBPluginDependency</string>
<string>8.IBPluginDependency</string>
<string>9.CustomClassName</string>
<string>9.IBPluginDependency</string>
+ <string>9.IBViewBoundsToFrameTransform</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>MapConfigViewController</string>
<string>UIResponder</string>
- <string>{{744, 568}, {480, 320}}</string>
+ <string>{{507, 233}, {480, 320}}</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABB6AAAw3kAAA</bytes>
+ </object>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABCyAAAw2YAAA</bytes>
+ </object>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABDjgAAw4kAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAAAAAAAAw58AAA</bytes>
+ </object>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>MapPreviewButtonView</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABBUAAAwxIAAA</bytes>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -430,7 +483,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">34</int>
+ <int key="maxID">35</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -700,6 +753,14 @@
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">UIImageView</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIImageView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">UILabel</string>
<string key="superclassName">UIView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -826,6 +887,10 @@
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<string key="IBDocument.LastKnownRelativeProjectPath">../Hedgewars.xcodeproj</string>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+ <string key="NS.key.0">backgroundCenter.png</string>
+ <string key="NS.object.0">{480, 276}</string>
+ </object>
<string key="IBCocoaTouchPluginVersion">123</string>
</data>
</archive>
